swiftbar-github 1.1.0 → 1.1.1

package/README.md

@@ -16,6 +16,6 @@ Download [swiftbar-github.3m.sh](https://cdn.jsdelivr.net/npm/swiftbar-github@la
 
 Run `chmod +x swiftbar-github.3m.sh`. Updates resolve through `@latest` on each refresh; downloaded versions are cached. For authentication without `gh`, set `GH_TOKEN` or `GITHUB_TOKEN` in SwiftBar's environment.
 
-Allow notifications for the bundled terminal-notifier in macOS System Settings. Click entries to open them on GitHub.
+Allow notifications for terminal-notifier in macOS System Settings. Click entries or desktop notifications to open them on GitHub; desktop notification clicks are available for five minutes.
 
 Use **Mark as read** to clear unread threads by type or reason. This does not complete pending review requests. Option-click the menu to access SwiftBar's hidden controls.

package/dist/swiftbar-github.js

@@ -1,12 +1,12 @@
-import { execFile } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { basename, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { promisify } from "node:util";
 import { Octokit } from "@octokit/rest";
-import nodeNotifier from "node-notifier";
 const exec = promisify(execFile);
-const notifier = new nodeNotifier.NotificationCenter({ withFallback: false });
+const notifier = join(dirname(createRequire(import.meta.url).resolve("node-notifier")), "vendor/mac.noindex/terminal-notifier.app/Contents/MacOS/terminal-notifier");
 const inbox = "https://github.com/notifications";
 const launcher = process.env.SWIFTBAR_PLUGIN_PATH;
 const cache = process.env.SWIFTBAR_PLUGIN_CACHE_PATH ||
@@ -71,16 +71,28 @@ async function save(file, values) {
 }
 function notify(item) {
     return new Promise((resolve) => {
-        const notification = {
-            title: item.alertTitle,
-            subtitle: item.repository,
-            message: item.title,
-            open: item.url,
-            sound: "default",
-            group: item.group,
-            timeout: false,
-        };
-        notifier.notify(notification, (error) => resolve(!error));
+        const child = spawn(notifier, [
+            "-title",
+            item.alertTitle,
+            "-subtitle",
+            item.repository,
+            "-message",
+            item.title,
+            "-open",
+            item.url,
+            "-group",
+            `github-${item.url}`,
+            "-sound",
+            "default",
+            "-timeout",
+            "300",
+        ], { detached: true, stdio: "ignore" });
+        child.once("error", () => resolve(false));
+        child.once("spawn", () => {
+            // Record the handoff, not the eventual click or timeout.
+            child.unref();
+            resolve(true);
+        });
     });
 }
 function action(label, args, refresh = false) {
@@ -126,7 +138,6 @@ async function fetchActivity(argument) {
             repository,
             title,
             key: item.html_url,
-            group: `github-review-${item.html_url}`,
             alertTitle: "Review requested",
         };
     });
@@ -150,7 +161,6 @@ async function fetchActivity(argument) {
             repository,
             title,
             url: item.url,
-            group: `github-notification-${item.id}`,
             alertTitle: `GitHub: ${reason}`,
             reason,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "swiftbar-github",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "GitHub notifications and review requests in the macOS menu bar",
 	"license": "MIT",
 	"repository": "github:jryom/swiftbar-github",
@@ -27,7 +27,6 @@
 	"devDependencies": {
 		"@biomejs/biome": "^2.5.15",
 		"@types/node": "^26.6.5",
-		"@types/node-notifier": "^8.0.5",
 		"typescript": "^7.0.2"
 	}
 }