Merge branch 'stable-rebuild'

Install script and auto-updater both point at master. No more
separate branches needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

com.pdma.notion-timer.sdPlugin/bin/plugin.js

@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
 }
 
 // src/plugin.ts
-var CURRENT_VERSION = "1.0.40";
+var CURRENT_VERSION = "1.0.33";
 var GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
 var SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -6528,17 +6528,17 @@ async function getGlobal() {
   return { ...stored, ...HARDCODED };
 }
 var memRunningEntryId = void 0;
-var memRunningActionId = void 0;
-async function loadRunningState() {
-  if (memRunningEntryId !== void 0) return;
-  const stored = await plugin_default.settings.getGlobalSettings();
-  memRunningEntryId = stored.runningEntryId ?? null;
-  memRunningActionId = stored.runningActionId ?? null;
+async function getRunningEntryId() {
+  if (memRunningEntryId === void 0) {
+    const stored = await plugin_default.settings.getGlobalSettings();
+    memRunningEntryId = stored.runningEntryId ?? null;
+  }
+  return memRunningEntryId;
 }
-function setRunningEntry(entryId, actionId) {
+async function setRunningEntry(entryId) {
   memRunningEntryId = entryId;
-  memRunningActionId = actionId;
-  plugin_default.settings.getGlobalSettings().then((stored) => plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId })).catch((err) => plugin_default.logger.error("Failed to persist running state:", err));
+  const stored = await plugin_default.settings.getGlobalSettings();
+  await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
 }
 async function sendProjectsToPI(tokenOverride) {
   try {
@@ -6568,75 +6568,95 @@ function buttonTitle(projectName) {
   return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }
 var TimerToggle = class extends SingletonAction {
-  projectCache = /* @__PURE__ */ new Map();
-  pendingKeyDown = /* @__PURE__ */ new Set();
+  settingsCache = /* @__PURE__ */ new Map();
   async onWillAppear(ev) {
-    this.projectCache.set(ev.action.id, ev.payload.settings);
-    const title = buttonTitle(ev.payload.settings.projectName || "");
-    await loadRunningState();
-    const isRunning = memRunningActionId === ev.action.id;
-    if (isRunning) {
-      await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
-    } else {
+    const { activeEntryId, projectName } = ev.payload.settings;
+    const title = buttonTitle(projectName || "");
+    const running = await getRunningEntryId();
+    const isRunning = !!activeEntryId && activeEntryId === running;
+    if (activeEntryId && !isRunning) {
+      const cleared = { ...ev.payload.settings, activeEntryId: null };
+      await ev.action.setSettings(cleared);
+      this.settingsCache.set(ev.action.id, cleared);
       await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+    } else {
+      this.settingsCache.set(ev.action.id, ev.payload.settings);
+      if (isRunning) {
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+      } else {
+        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      }
     }
   }
   async onPropertyInspectorDidAppear(_ev) {
     await sendProjectsToPI();
   }
   async onKeyDown(ev) {
-    if (this.pendingKeyDown.has(ev.action.id)) return;
-    this.pendingKeyDown.add(ev.action.id);
+    this.settingsCache.set(ev.action.id, ev.payload.settings);
+    const { projectId, projectName, activeEntryId } = ev.payload.settings;
+    const title = buttonTitle(projectName || "");
+    if (projectId) {
+      if (activeEntryId) {
+        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      } else {
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+      }
+    }
+    const global = await getGlobal();
+    if (!isConfigured(global)) {
+      await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `\u23F1 ${title}` : title)]);
+      await ev.action.showAlert();
+      return;
+    }
+    if (!projectId) {
+      await ev.action.showAlert();
+      return;
+    }
     try {
-      const { projectId, projectName } = ev.payload.settings;
-      const title = buttonTitle(projectName || "");
-      const isRunning = memRunningActionId === ev.action.id;
-      if (projectId) {
-        if (isRunning) {
-          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
-        } else {
+      if (activeEntryId) {
+        await stopTimer(global.notionToken, activeEntryId);
+        const stopped = { ...ev.payload.settings, activeEntryId: null };
+        await ev.action.setSettings(stopped);
+        this.settingsCache.set(ev.action.id, stopped);
+        await setRunningEntry(null);
+      } else {
+        const prevEntryId = await getRunningEntryId();
+        if (prevEntryId) {
           for (const other of this.actions) {
             if (other.id === ev.action.id) continue;
-            if (memRunningActionId === other.id) {
-              const s = this.projectCache.get(other.id);
-              await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
+            const otherSettings = this.settingsCache.get(other.id);
+            if (otherSettings?.activeEntryId === prevEntryId) {
+              await Promise.all([other.setState(0), other.setTitle(buttonTitle(otherSettings.projectName || ""))]);
             }
           }
-          await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
-        }
-      }
-      const global = await getGlobal();
-      if (!isConfigured(global)) {
-        await ev.action.showAlert();
-        return;
-      }
-      if (!projectId) {
-        await ev.action.showAlert();
-        return;
-      }
-      try {
-        if (isRunning) {
-          await stopTimer(global.notionToken, memRunningEntryId);
-          setRunningEntry(null, null);
-          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
-        } else {
-          if (memRunningEntryId) {
-            await stopTimer(global.notionToken, memRunningEntryId);
+          await stopTimer(global.notionToken, prevEntryId);
+          for (const other of this.actions) {
+            if (other.id === ev.action.id) continue;
+            const otherSettings = this.settingsCache.get(other.id);
+            if (otherSettings?.activeEntryId === prevEntryId) {
+              const stopped = { ...otherSettings, activeEntryId: null };
+              await other.setSettings(stopped);
+              this.settingsCache.set(other.id, stopped);
+            }
           }
-          const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
-          setRunningEntry(entryId, ev.action.id);
-          await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
         }
-      } catch (err) {
-        await Promise.all([
-          ev.action.setState(isRunning ? 1 : 0),
-          ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
-        ]);
-        plugin_default.logger.error("Timer toggle failed:", err);
-        await ev.action.showAlert();
+        const entryId = await startTimer(
+          global.notionToken,
+          global.timingDbId,
+          projectId,
+          projectName,
+          global.userId
+        );
+        const started = { ...ev.payload.settings, activeEntryId: entryId };
+        await ev.action.setSettings(started);
+        this.settingsCache.set(ev.action.id, started);
+        await setRunningEntry(entryId);
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
       }
-    } finally {
-      this.pendingKeyDown.delete(ev.action.id);
+    } catch (err) {
+      await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `\u23F1 ${title}` : title)]);
+      plugin_default.logger.error("Timer toggle failed:", err);
+      await ev.action.showAlert();
     }
   }
 };

com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig

@@ -1 +1 @@
-{QÕ¿óîj¶?Íz_ÎDA+ÌOÎi °<u,&/Õ+ødeÆá¤"÷œSw+&öO.RC‘&óä^H-¯
+ÜYÈZ‡Ã¾÷G¡ã¯Ã¦9â¹¸ß ]W‹¬çjB=1ø™+n‡A;cû%‚:`k·„¿ç°õÀÓáæ

com.pdma.notion-timer.sdPlugin/manifest.json

@@ -2,7 +2,7 @@
   "Author": "Pete Marfleet",
   "Description": "Toggle Notion time tracking for a project with a single button press.",
   "Name": "Notion Timer",
-  "Version": "1.0.39",
+  "Version": "1.0.33",
   "SDKVersion": 2,
   "Software": { "MinimumVersion": "5.0" },
   "OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],

install.sh

@@ -7,7 +7,7 @@ TMP_DIR=$(mktemp -d)
 PLUGIN_FILE="${TMP_DIR}/notion-timer.streamDeckPlugin"
 
 echo "Downloading Notion Timer..."
-curl -sL "${GITEA}/${REPO}/raw/branch/stable-rebuild/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
+curl -sL "${GITEA}/${REPO}/raw/branch/master/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
 
 echo "Installing — Stream Deck will open automatically..."
 open "${PLUGIN_FILE}"

package.json

@@ -4,7 +4,7 @@
   "description": "Notion time tracking toggle for Stream Deck",
   "scripts": {
     "build": "esbuild src/plugin.ts --bundle --platform=node --target=node20 --outfile=com.pdma.notion-timer.sdPlugin/bin/plugin.js --external:electron && node scripts/sign.js",
-    "package": "npm run build && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
+    "package": "npm run build && rm -f notion-timer.streamDeckPlugin && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
     "dev": "esbuild src/plugin.ts --bundle --platform=node --target=node20 --outfile=com.pdma.notion-timer.sdPlugin/bin/plugin.js --external:electron --watch",
     "sign": "node scripts/sign.js",
     "link": "ln -sf \"$(pwd)/com.pdma.notion-timer.sdPlugin\" \"$HOME/Library/Application Support/com.elgato.StreamDeck/Plugins/com.pdma.notion-timer.sdPlugin\"",

src/plugin.ts

@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.40";
+const CURRENT_VERSION = "1.0.33";
 const GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
 const SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -52,6 +52,7 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
     const path = await import("path");
     const pluginRoot = path.join(path.dirname(__filename), "..");
 
+    // Update UI and image assets
     const ASSETS = [
       "ui/property-inspector.html",
       "ui/global-property-inspector.html",
@@ -66,6 +67,7 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
       }
     }
 
+    // Remove legacy SVG icons that persist on disk after Stream Deck merge-installs
     const LEGACY = ["imgs/idle.svg", "imgs/running.svg"];
     for (const f of LEGACY) {
       try { fs.unlinkSync(path.join(pluginRoot, f)); } catch { /* already gone */ }
@@ -96,12 +98,12 @@ interface GlobalSettings {
   projectsDbId: string;
   userId: string;
   runningEntryId?: string | null;
-  runningActionId?: string | null;
 }
 
 interface TimerSettings {
   projectId: string;
   projectName: string;
+  activeEntryId: string | null;
 }
 
 const HARDCODED = {
@@ -114,24 +116,21 @@ async function getGlobal(): Promise<GlobalSettings> {
   return { ...stored, ...HARDCODED };
 }
 
-// In-memory running state — avoids async round-trips on every button press
-let memRunningEntryId:  string | null | undefined = undefined;
-let memRunningActionId: string | null | undefined = undefined;
+// In-memory cache so onWillAppear can check running state without an async round-trip
+let memRunningEntryId: string | null | undefined = undefined; // undefined = not yet loaded
 
-async function loadRunningState(): Promise<void> {
-  if (memRunningEntryId !== undefined) return;
-  const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
-  memRunningEntryId  = stored.runningEntryId  ?? null;
-  memRunningActionId = stored.runningActionId ?? null;
+async function getRunningEntryId(): Promise<string | null> {
+  if (memRunningEntryId === undefined) {
+    const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
+    memRunningEntryId = stored.runningEntryId ?? null;
+  }
+  return memRunningEntryId;
 }
 
-function setRunningEntry(entryId: string | null, actionId: string | null): void {
-  memRunningEntryId  = entryId;
-  memRunningActionId = actionId;
-  // Persist in background — do not await, so the visual is never blocked
-  streamDeck.settings.getGlobalSettings<GlobalSettings>()
-    .then(stored => streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId }))
-    .catch(err => streamDeck.logger.error("Failed to persist running state:", err));
+async function setRunningEntry(entryId: string | null): Promise<void> {
+  memRunningEntryId = entryId;
+  const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
+  await streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
 }
 
 async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
@@ -160,24 +159,36 @@ function isConfigured(g: GlobalSettings): boolean {
   return !!(g.notionToken && g.userId);
 }
 
+// Strip leading emoji characters so the button title shows just the project name
 function buttonTitle(projectName: string): string {
   return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }
 
 @action({ UUID: "com.pdma.notion-timer.toggle" })
 class TimerToggle extends SingletonAction<TimerSettings> {
-  private projectCache = new Map<string, TimerSettings>();
-  private pendingKeyDown = new Set<string>();
+  private settingsCache = new Map<string, TimerSettings>();
 
   async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
-    this.projectCache.set(ev.action.id, ev.payload.settings);
-    const title = buttonTitle(ev.payload.settings.projectName || "");
-    await loadRunningState();
-    const isRunning = memRunningActionId === ev.action.id;
-    if (isRunning) {
-      await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
-    } else {
+    const { activeEntryId, projectName } = ev.payload.settings;
+    const title = buttonTitle(projectName || "");
+
+    // Use in-memory cache to determine correct state before rendering — no flash
+    const running = await getRunningEntryId();
+    const isRunning = !!activeEntryId && activeEntryId === running;
+
+    if (activeEntryId && !isRunning) {
+      // Self-heal: this button thinks it's running but it's not — clear it
+      const cleared = { ...ev.payload.settings, activeEntryId: null };
+      await ev.action.setSettings(cleared);
+      this.settingsCache.set(ev.action.id, cleared);
       await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+    } else {
+      this.settingsCache.set(ev.action.id, ev.payload.settings);
+      if (isRunning) {
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
+      } else {
+        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      }
     }
   }
 
@@ -186,64 +197,90 @@ class TimerToggle extends SingletonAction<TimerSettings> {
   }
 
   async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
-    if (this.pendingKeyDown.has(ev.action.id)) return;
-    this.pendingKeyDown.add(ev.action.id);
-    try {
-    const { projectId, projectName } = ev.payload.settings;
+    this.settingsCache.set(ev.action.id, ev.payload.settings);
+    const { projectId, projectName, activeEntryId } = ev.payload.settings;
     const title = buttonTitle(projectName || "");
-    const isRunning = memRunningActionId === ev.action.id;
 
-    // Instant visual feedback — no setSettings, no flash
+    // Instant visual feedback before any async work
     if (projectId) {
-      if (isRunning) {
+      if (activeEntryId) {
         await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
       } else {
-        for (const other of this.actions) {
-          if (other.id === ev.action.id) continue;
-          if (memRunningActionId === other.id) {
-            const s = this.projectCache.get(other.id);
-            await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
-          }
-        }
         await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
       }
     }
 
     const global = await getGlobal();
-    if (!isConfigured(global)) { await ev.action.showAlert(); return; }
-    if (!projectId)             { await ev.action.showAlert(); return; }
+
+    if (!isConfigured(global)) {
+      await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `⏱ ${title}` : title)]);
+      await ev.action.showAlert();
+      return;
+    }
+
+    if (!projectId) {
+      await ev.action.showAlert();
+      return;
+    }
 
     try {
-      if (isRunning) {
-        await stopTimer(global.notionToken, memRunningEntryId!);
-        setRunningEntry(null, null);
-        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      if (activeEntryId) {
+        await stopTimer(global.notionToken, activeEntryId);
+        const stopped = { ...ev.payload.settings, activeEntryId: null };
+        await ev.action.setSettings(stopped);
+        this.settingsCache.set(ev.action.id, stopped);
+        await setRunningEntry(null);
       } else {
-        if (memRunningEntryId) {
-          await stopTimer(global.notionToken, memRunningEntryId);
+        const prevEntryId = await getRunningEntryId();
+
+        // Turn off the previously running button immediately
+        if (prevEntryId) {
+          for (const other of this.actions) {
+            if (other.id === ev.action.id) continue;
+            const otherSettings = this.settingsCache.get(other.id);
+            if (otherSettings?.activeEntryId === prevEntryId) {
+              await Promise.all([other.setState(0), other.setTitle(buttonTitle(otherSettings.projectName || ""))]);
+            }
+          }
+          await stopTimer(global.notionToken, prevEntryId);
+          for (const other of this.actions) {
+            if (other.id === ev.action.id) continue;
+            const otherSettings = this.settingsCache.get(other.id);
+            if (otherSettings?.activeEntryId === prevEntryId) {
+              const stopped = { ...otherSettings, activeEntryId: null };
+              await other.setSettings(stopped);
+              this.settingsCache.set(other.id, stopped);
+            }
+          }
         }
-        const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
-        setRunningEntry(entryId, ev.action.id);
+
+        const entryId = await startTimer(
+          global.notionToken,
+          global.timingDbId,
+          projectId,
+          projectName,
+          global.userId,
+        );
+        const started = { ...ev.payload.settings, activeEntryId: entryId };
+        await ev.action.setSettings(started);
+        this.settingsCache.set(ev.action.id, started);
+        await setRunningEntry(entryId);
+        // Re-assert after setSettings resets visual state
         await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
       }
     } catch (err) {
-      // Revert visual on error
-      await Promise.all([
-        ev.action.setState(isRunning ? 1 : 0),
-        ev.action.setTitle(isRunning ? `⏱ ${title}` : title),
-      ]);
+      // Revert optimistic visual on error
+      await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `⏱ ${title}` : title)]);
       streamDeck.logger.error("Timer toggle failed:", err);
       await ev.action.showAlert();
     }
-    } finally {
-      this.pendingKeyDown.delete(ev.action.id);
-    }
   }
 }
 
 const timerAction = new TimerToggle();
 streamDeck.actions.registerAction(timerAction);
 
+// v2 requires using streamDeck.ui.onSendToPlugin — the SingletonAction method does not fire
 streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?: string }>(async (ev) => {
   if (ev.payload.event === "saveSettings" && ev.payload.settings) {
     await ev.action.setSettings(ev.payload.settings);
@@ -262,4 +299,5 @@ streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?:
 
 streamDeck.connect();
 
+// Check for updates 10 seconds after startup to avoid disrupting initial connection
 setTimeout(() => checkForUpdates(), 10_000);

version.json

@@ -1 +1 @@
-{ "version": "1.0.40" }
+{ "version": "1.0.33" }