@timmy6942025/cli-timer 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timmy6942025/cli-timer",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Simple customizable terminal timer and stopwatch",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -14,6 +14,8 @@ const TIMER_SAMPLE_TEXT = "00:00:00";
 
 const MIN_TICK_RATE_MS = 50;
 const MAX_TICK_RATE_MS = 1000;
+const MAC_NOTIFICATION_VERIFY_ATTEMPTS = 8;
+const MAC_NOTIFICATION_VERIFY_DELAY_MS = 75;
 
 const DEFAULT_KEYBINDINGS = Object.freeze({
   pauseKey: "p",
@@ -480,18 +482,88 @@ function spawnOk(command, args, options) {
   }
 }
 
+function sleepSync(ms) {
+  const durationMs = Math.max(0, Number(ms) || 0);
+  if (durationMs <= 0) {
+    return;
+  }
+  try {
+    const waitArray = new Int32Array(new SharedArrayBuffer(4));
+    Atomics.wait(waitArray, 0, 0, durationMs);
+  } catch (_error) {
+    const started = Date.now();
+    while (Date.now() - started < durationMs) {
+    }
+  }
+}
+
+function readProcessCommand(pid) {
+  try {
+    const result = spawnSync("ps", ["-p", String(pid), "-o", "comm="], { encoding: "utf8", stdio: "pipe" });
+    if (result.error || result.status !== 0) {
+      return "";
+    }
+    return String(result.stdout || "").trim();
+  } catch (_error) {
+    return "";
+  }
+}
+
+function resolveMacNotificationSenderCandidates() {
+  const candidates = [];
+  const explicit = String(process.env.CLI_TIMER_NOTIFICATION_SENDER || "").trim();
+  if (explicit) {
+    candidates.push(explicit);
+  }
+
+  const termProgram = String(process.env.TERM_PROGRAM || "").toLowerCase();
+  if (termProgram === "apple_terminal") {
+    candidates.push("com.apple.Terminal");
+  } else if (termProgram === "iterm.app") {
+    candidates.push("com.googlecode.iterm2");
+  } else if (termProgram === "vscode") {
+    candidates.push("com.microsoft.VSCode");
+  } else if (termProgram === "warpterminal" || termProgram === "warp") {
+    candidates.push("dev.warp.Warp-Stable");
+  }
+
+  const parentCommand = readProcessCommand(process.ppid).toLowerCase();
+  if (parentCommand.includes("terminal.app")) {
+    candidates.push("com.apple.Terminal");
+  }
+  if (parentCommand.includes("iterm")) {
+    candidates.push("com.googlecode.iterm2");
+  }
+  if (parentCommand.includes("warp")) {
+    candidates.push("dev.warp.Warp-Stable");
+  }
+  if (parentCommand.includes("visual studio code") || parentCommand.includes("vscode")) {
+    candidates.push("com.microsoft.VSCode");
+  }
+  if (parentCommand.includes("codex.app")) {
+    candidates.push("com.openai.codex");
+  }
+
+  return [...new Set(candidates)].filter(Boolean);
+}
+
 function terminalNotifierDelivered(groupId) {
   try {
-    const listed = spawnSync("terminal-notifier", ["-list", groupId], { encoding: "utf8", stdio: "pipe" });
-    if (listed.error || listed.status !== 0) {
-      return false;
+    for (let attempt = 0; attempt < MAC_NOTIFICATION_VERIFY_ATTEMPTS; attempt += 1) {
+      const listed = spawnSync("terminal-notifier", ["-list", groupId], { encoding: "utf8", stdio: "pipe" });
+      if (!listed.error && listed.status === 0) {
+        const output = String(listed.stdout || "");
+        if (output.includes(groupId)) {
+          return true;
+        }
+      }
+      if (attempt + 1 < MAC_NOTIFICATION_VERIFY_ATTEMPTS) {
+        sleepSync(MAC_NOTIFICATION_VERIFY_DELAY_MS);
+      }
     }
-    const output = String(listed.stdout || "");
-    return output.includes(groupId);
+    return false;
   } catch (_error) {
     return false;
-  } finally {
-    spawnOk("terminal-notifier", ["-remove", groupId]);
   }
 }
 
@@ -505,10 +577,27 @@ function sendSystemNotification({ title, message }) {
 
   try {
     if (process.platform === "darwin") {
-      const groupId = `cli-timer-${Date.now()}-${Math.floor(Math.random() * 1e9)}`;
-      if (spawnOk("terminal-notifier", ["-title", safeTitle, "-message", safeMessage, "-group", groupId])) {
-        if (terminalNotifierDelivered(groupId)) {
-          return true;
+      const senderCandidates = resolveMacNotificationSenderCandidates();
+      const senderArgsSets = senderCandidates.map((bundleId) => ["-sender", bundleId]);
+      senderArgsSets.push([]);
+
+      for (const senderArgs of senderArgsSets) {
+        const groupId = `cli-timer-${Date.now()}-${Math.floor(Math.random() * 1e9)}`;
+        if (
+          spawnOk("terminal-notifier", [
+            "-title",
+            safeTitle,
+            "-message",
+            safeMessage,
+            "-group",
+            groupId,
+            "-ignoreDnD",
+            ...senderArgs
+          ])
+        ) {
+          if (terminalNotifierDelivered(groupId)) {
+            return true;
+          }
         }
       }
       const script = `display notification "${escapeAppleScriptString(safeMessage)}" with title "${escapeAppleScriptString(safeTitle)}"`;