swiftbar-github 1.0.1 → 1.1.1

package/README.md

@@ -16,4 +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,25 +71,38 @@ 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, argument) {
+function action(label, args, refresh = false) {
     if (!launcher)
         return `${label} | href=${inbox}`;
-    return `${label} | bash="${launcher.replaceAll('"', '\\"')}" param1=${argument} terminal=false`;
+    const params = args.map((arg, index) => `param${index + 1}=${arg}`).join(" ");
+    return `${label} | bash="${launcher.replaceAll('"', '\\"')}" ${params} terminal=false${refresh ? " refresh=true" : ""}`;
 }
-async function fetchActivity(argument) {
-    const github = new Octokit({
+async function client() {
+    return new Octokit({
         auth: await token(),
         userAgent: "swiftbar-github",
         request: {
@@ -103,6 +116,9 @@ async function fetchActivity(argument) {
         },
         log: { debug() { }, info() { }, warn() { }, error() { } },
     });
+}
+async function fetchActivity(argument) {
+    const github = await client();
     const { data: user } = await github.rest.users.getAuthenticated();
     const requested = await github.paginate(github.rest.search.issuesAndPullRequests, {
         q: `is:pr is:open archived:false review-requested:${user.login}`,
@@ -122,12 +138,11 @@ async function fetchActivity(argument) {
             repository,
             title,
             key: item.html_url,
-            group: `github-review-${item.html_url}`,
             alertTitle: "Review requested",
         };
     });
     if (argument === "open-reviews")
-        return { reviews, notifications: [] };
+        return { reviews, notifications: [], unread: [] };
     const reviewURLs = new Set(reviews.map((item) => item.url));
     const unread = await github.paginate(github.rest.activity.listNotificationsForAuthenticatedUser, {
         all: false,
@@ -146,26 +161,25 @@ async function fetchActivity(argument) {
             repository,
             title,
             url: item.url,
-            group: `github-notification-${item.id}`,
             alertTitle: `GitHub: ${reason}`,
             reason,
         };
     });
-    return { reviews, notifications };
+    return { reviews, notifications, unread };
 }
-function renderMenu(reviews, notifications) {
+function renderMenu(reviews, notifications, unread) {
     const total = reviews.length + notifications.length;
     if (!total)
         return "";
     const menu = [
-        `${total} | templateImage=${icon}`,
+        `${process.env.SWIFTBAR_GITHUB_DEV ? "Dev " : ""}${total} | templateImage=${icon}`,
         "---",
         `Review requests (${reviews.length}) | color=gray`,
     ];
     if (reviews.length) {
         for (const item of reviews)
             menu.push(`${item.repository} ${item.title} | href=${item.url}`);
-        menu.push(action("Open all review requests", "open-reviews"));
+        menu.push(action("Open all review requests", ["open-reviews"]));
     }
     else
         menu.push("No reviews requested | color=gray");
@@ -173,37 +187,89 @@ function renderMenu(reviews, notifications) {
     if (notifications.length) {
         for (const item of notifications)
             menu.push(`${item.repository} [${item.reason}]: ${item.title} | href=${item.url}`);
-        menu.push(action("Open all notifications", "open-notifications"));
+        menu.push(action("Open all notifications", ["open-notifications"]));
     }
     else
         menu.push("No unread notifications | color=gray");
+    if (unread.length) {
+        const types = {
+            PullRequest: "Pull requests",
+            Issue: "Issues",
+            Discussion: "Discussions",
+            Commit: "Commits",
+            Release: "Releases",
+        };
+        menu.push("---", "Mark as read");
+        menu.push(`--${action(`All notifications (${unread.length})`, ["mark-read", unread.map((item) => item.id).join(",")], true)}`);
+        for (const [heading, labelFor] of [
+            [
+                "By type",
+                (item) => text(types[item.subject.type] || item.subject.type),
+            ],
+            [
+                "By reason",
+                (item) => text(item.reason).replaceAll("_", " "),
+            ],
+        ]) {
+            const groups = new Map();
+            for (const item of unread) {
+                const label = labelFor(item);
+                const ids = groups.get(label) || [];
+                ids.push(item.id);
+                groups.set(label, ids);
+            }
+            menu.push("-----", `--${heading} | color=gray`);
+            for (const [label, ids] of [...groups].sort(([a], [b]) => a.localeCompare(b)))
+                menu.push(`--${action(`${label} (${ids.length})`, ["mark-read", ids.join(",")], true)}`);
+        }
+    }
     return menu.join("\n");
 }
-async function deliverAlerts(file, items) {
+async function deliverAlerts(file, items, represented = []) {
     await mkdir(cache, { recursive: true });
     const path = join(cache, file);
     const seen = await state(path);
-    const current = [];
+    const current = new Set(represented);
     for (const item of items) {
+        if (current.has(item.key))
+            continue;
         if (!seen || seen.has(item.key) || (await notify(item)))
-            current.push(item.key);
+            current.add(item.key);
     }
-    await save(path, current);
+    await save(path, [...current]);
 }
 async function main() {
     const argument = process.argv[2];
-    if (argument && !["open-reviews", "open-notifications"].includes(argument))
+    if (argument &&
+        !["open-reviews", "open-notifications", "mark-read"].includes(argument))
         throw new Error("Usage: swiftbar-github");
-    const { reviews, notifications } = await fetchActivity(argument);
+    if (argument === "mark-read") {
+        const ids = (process.argv[3] || "").split(",").map(Number);
+        if (ids.some((id) => !Number.isSafeInteger(id) || id <= 0))
+            throw new Error("Usage: swiftbar-github mark-read <thread-ids>");
+        const github = await client();
+        for (const id of ids)
+            await github.rest.activity.markThreadAsRead({ thread_id: id });
+        return;
+    }
+    const { reviews, notifications, unread } = await fetchActivity(argument);
     if (argument) {
         const items = argument === "open-reviews" ? reviews : notifications;
         for (const item of items)
             await exec("/usr/bin/open", ["-g", item.url]);
         return;
     }
-    const menu = renderMenu(reviews, notifications);
+    const menu = renderMenu(reviews, notifications, unread);
+    const previousReviews = await state(join(cache, "requested-prs"));
+    const reviewURLs = new Set([
+        ...reviews.map((item) => item.url),
+        ...(previousReviews || []),
+    ]);
+    const represented = unread
+        .filter((item) => item.reason === "review_requested" && reviewURLs.has(webURL(item)))
+        .map((item) => `${item.id}:${item.updated_at}`);
     await deliverAlerts("requested-prs", reviews);
-    await deliverAlerts("inbox-notifications", notifications);
+    await deliverAlerts("inbox-notifications", notifications, represented);
     if (menu)
         console.log(menu);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "swiftbar-github",
-	"version": "1.0.1",
+	"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"
 	}
 }

package/swiftbar-github.3m.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+# <swiftbar.hideAbout>true</swiftbar.hideAbout>
+# <swiftbar.hideRunInTerminal>true</swiftbar.hideRunInTerminal>
+# <swiftbar.hideLastUpdated>true</swiftbar.hideLastUpdated>
+# <swiftbar.hideDisablePlugin>true</swiftbar.hideDisablePlugin>
+# <swiftbar.hideSwiftBar>true</swiftbar.hideSwiftBar>
 
 if output=$(npx --yes swiftbar-github@latest "$@" 2>/dev/null); then
   [[ -z "$output" ]] || printf '%s\n' "$output"