feat(notify): Cancel button on Windows toasts via the talk: protocol handler
Windows toasts cannot call back into the daemon, so the Cancel button opens a talk: link instead: `talk:cancel?id=<id>&port=<port>`. The daemon registers the talk: URL protocol for the current user (HKCU, no admin) and points it at `talk uri "%1"`; Windows starts that on the click, and `talk uri` posts to the new endpoint POST /cancel-item, which cancels only the announcement with that id (queue.CancelItem). The toast is tagged and removed again when the announcement ends. For now the toast is shown under Windows PowerShell's app identity, which unpackaged programs can use without a Start Menu shortcut. Verified on the Windows 11 VM: registry entry written by the daemon, Start-Process "talk:cancel?id=…&port=7800" (what the button does) stops the playing announcement within two seconds, no toast errors in the log. Tests: `talk uri` against a real handler on a loopback port (playing vs waiting id, dead daemon, talk:test, garbage links), POST /cancel-item process test (only the playing item, waiting one plays next, 400 without id). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
1 parent
83a15af9c5
commit
00eb76128b
16 files changed
+446
-22
No files matched your search
+38
-13
@@ -6,7 +6,9 @@
|
||||
// action, closed again when the announcement ends. Fallback when
|
||||
// no session bus is reachable: notify-send (no action).
|
||||
// macOS: osascript `display notification` (no action).
|
||||
// Windows: PowerShell toast (Windows.UI.Notifications; no action yet).
|
||||
// Windows: PowerShell toast (Windows.UI.Notifications) with a Cancel
|
||||
// button that opens a talk: link; the talk: protocol handler
|
||||
// (registered in HKCU, `talk uri`) relays the click to the daemon.
|
||||
//
|
||||
// Missing tools are a clear error for the caller (log), never an abort: a
|
||||
// notification is an extra, not a contract.
|
||||
@@ -58,17 +60,18 @@ func Describe() string {
|
||||
case "darwin":
|
||||
return "osascript (Notification Center; no cancel button)"
|
||||
case "windows":
|
||||
return "powershell (Windows toast; no cancel button yet)"
|
||||
return "powershell (Windows toast with cancel button via the talk: link)"
|
||||
default:
|
||||
return "notify-send (libnotify; no session bus, so no cancel button)"
|
||||
}
|
||||
}
|
||||
|
||||
// SupportsCancel reports whether notifications on this system can carry a
|
||||
// Cancel action that reaches talk (Linux with a notification service that
|
||||
// has the "actions" capability).
|
||||
// Cancel button that reaches talk: Linux with a notification service that
|
||||
// has the "actions" capability, or Windows (toast button via the talk:
|
||||
// protocol handler).
|
||||
func SupportsCancel() bool {
|
||||
return dbusSupportsActions()
|
||||
return dbusSupportsActions() || runtime.GOOS == "windows"
|
||||
}
|
||||
|
||||
func tool() string {
|
||||
@@ -96,16 +99,35 @@ func Show(ctx context.Context, text string) error {
|
||||
return showWithTool(ctx, text)
|
||||
}
|
||||
|
||||
// Announcement is what Announce shows for a playing announcement.
|
||||
type Announcement struct {
|
||||
// Text is the announcement text (the notification body).
|
||||
Text string
|
||||
|
||||
// CancelLabel is the button label ("Cancel", "Abbrechen").
|
||||
CancelLabel string
|
||||
|
||||
// CancelURI is the talk: link the button opens where the click cannot
|
||||
// reach the daemon directly (Windows toast): talk:cancel?id=…&port=….
|
||||
// The talk: protocol handler (talk uri) turns it into POST /cancel-item.
|
||||
CancelURI string
|
||||
|
||||
// Tag identifies the notification for closing it again where the
|
||||
// platform needs a tag (Windows); typically the announcement id.
|
||||
Tag string
|
||||
}
|
||||
|
||||
// Announce shows the notification for an announcement that is playing: the
|
||||
// text plus a Cancel action labelled cancelLabel where the platform supports
|
||||
// it. onCancel runs when the user clicks it. The returned close function
|
||||
// dismisses the notification (call it when the announcement ends); it is
|
||||
// never nil. Platforms without actions show a plain notification and the
|
||||
// close function does nothing.
|
||||
func Announce(ctx context.Context, text, cancelLabel string, onCancel func()) (close func(), err error) {
|
||||
// text plus a Cancel button where the platform supports it. onCancel runs
|
||||
// when the user clicks it on platforms that report the click back (Linux
|
||||
// D-Bus); on Windows the click opens CancelURI instead. The returned close
|
||||
// function dismisses the notification (call it when the announcement
|
||||
// ends); it is never nil. Platforms without actions show a plain
|
||||
// notification and the close function does nothing.
|
||||
func Announce(ctx context.Context, a Announcement, onCancel func()) (close func(), err error) {
|
||||
noop := func() {}
|
||||
if dbusAvailable() {
|
||||
id, err := dbusNotify(ctx, text, []string{"cancel", cancelLabel}, func(action string) {
|
||||
id, err := dbusNotify(ctx, a.Text, []string{"cancel", a.CancelLabel}, func(action string) {
|
||||
if action == "cancel" && onCancel != nil {
|
||||
onCancel()
|
||||
}
|
||||
@@ -115,7 +137,10 @@ func Announce(ctx context.Context, text, cancelLabel string, onCancel func()) (c
|
||||
}
|
||||
// fall through to the tool on a bus error
|
||||
}
|
||||
return noop, showWithTool(ctx, text)
|
||||
if runtime.GOOS == "windows" && a.CancelURI != "" {
|
||||
return announceWindows(ctx, a)
|
||||
}
|
||||
return noop, showWithTool(ctx, a.Text)
|
||||
}
|
||||
|
||||
// showWithTool shows a notification through the OS tool (no action).
|
||||
|
||||
Reference in new issue
Block a user