v1.0.40: bump version.json so auto-updater delivers update to staff

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
v1.0.40: fix duplicate timer race condition on rapid double-press
2026-05-15 17:07:17 +01:00 · 2026-05-13 18:18:52 +01:00 · 2026-04-24 09:29:43 +01:00 · 2026-04-24 09:20:41 +01:00 · 2026-04-24 09:15:48 +01:00 · 2026-04-24 09:13:38 +01:00
9 changed files with 193 additions and 188 deletions
--- a/com.pdma.notion-timer.sdPlugin/bin/plugin.js
+++ b/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.29";
+var CURRENT_VERSION = "1.0.40";
 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=
@@ -6488,6 +6488,28 @@ async function checkForUpdates(sendStatus) {
      return;
    }
    const fs3 = await import("fs");
+    const path5 = await import("path");
+    const pluginRoot = path5.join(path5.dirname(__filename), "..");
+    const ASSETS = [
+      "ui/property-inspector.html",
+      "ui/global-property-inspector.html",
+      "imgs/idle.png",
+      "imgs/running.png"
+    ];
+    const PLUGIN_BASE = `${GITEA_BASE}/com.pdma.notion-timer.sdPlugin`;
+    const assetResps = await Promise.all(ASSETS.map((p) => fetchWithTimeout2(`${PLUGIN_BASE}/${p}`)));
+    for (let i = 0; i < ASSETS.length; i++) {
+      if (assetResps[i].ok) {
+        fs3.writeFileSync(path5.join(pluginRoot, ASSETS[i]), Buffer.from(await assetResps[i].arrayBuffer()));
+      }
+    }
+    const LEGACY = ["imgs/idle.svg", "imgs/running.svg"];
+    for (const f of LEGACY) {
+      try {
+        fs3.unlinkSync(path5.join(pluginRoot, f));
+      } catch {
+      }
+    }
    fs3.writeFileSync(__filename, newCode);
    plugin_default.logger.info(`Updated to ${version}, restarting\u2026`);
    process.exit(0);
@@ -6506,17 +6528,17 @@ async function getGlobal() {
  return { ...stored, ...HARDCODED };
 }
 var memRunningEntryId = void 0;
-async function getRunningEntryId() {
-  if (memRunningEntryId === void 0) {
-    const stored = await plugin_default.settings.getGlobalSettings();
-    memRunningEntryId = stored.runningEntryId ?? null;
-  }
-  return memRunningEntryId;
-}
-async function setRunningEntry(entryId) {
-  memRunningEntryId = entryId;
+var memRunningActionId = void 0;
+async function loadRunningState() {
+  if (memRunningEntryId !== void 0) return;
  const stored = await plugin_default.settings.getGlobalSettings();
-  await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
+  memRunningEntryId = stored.runningEntryId ?? null;
+  memRunningActionId = stored.runningActionId ?? null;
+}
+function setRunningEntry(entryId, actionId) {
+  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));
 }
 async function sendProjectsToPI(tokenOverride) {
  try {
@@ -6546,90 +6568,75 @@ function buttonTitle(projectName) {
  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }
 var TimerToggle = class extends SingletonAction {
-  settingsCache = /* @__PURE__ */ new Map();
+  projectCache = /* @__PURE__ */ new Map();
+  pendingKeyDown = /* @__PURE__ */ new Set();
  async onWillAppear(ev) {
-    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)]);
+    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 {
-      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)]);
-      }
+      await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
    }
  }
  async onPropertyInspectorDidAppear(_ev) {
    await sendProjectsToPI();
  }
  async onKeyDown(ev) {
-    this.settingsCache.set(ev.action.id, ev.payload.settings);
-    const global = await getGlobal();
-    const { projectId, projectName, activeEntryId } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-    if (!isConfigured(global)) {
-      await ev.action.showAlert();
-      return;
-    }
-    if (!projectId) {
-      await ev.action.showAlert();
-      return;
-    }
+    if (this.pendingKeyDown.has(ev.action.id)) return;
+    this.pendingKeyDown.add(ev.action.id);
    try {
-      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 ev.action.setState(0);
-        await ev.action.setTitle(title);
-        await setRunningEntry(null);
-      } else {
-        const prevEntryId = await getRunningEntryId();
-        if (prevEntryId) {
+      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 {
          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 || ""))]);
+            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(`\u23F1 ${title}`)]);
        }
-        await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
-        if (prevEntryId) {
-          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
-        );
-        const started = { ...ev.payload.settings, activeEntryId: entryId };
-        await ev.action.setSettings(started);
-        this.settingsCache.set(ev.action.id, started);
-        await setRunningEntry(entryId);
      }
-    } catch (err) {
-      plugin_default.logger.error("Timer toggle failed:", err);
-      await ev.action.showAlert();
+      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);
+          }
+          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();
+      }
+    } finally {
+      this.pendingKeyDown.delete(ev.action.id);
    }
  }
 };
--- a/com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig
+++ b/com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig
@@ -1 +1 @@
-йщJОЁ▀⌠Ы╚▓яU(д┘Ж░░8ДОЬMJv ё√шHАXаJ┌╗∙И╧OУнаzЛ╧CщеC╔/эУ6╩
+{QÕ¿óîj¶?Íz_ÎDA+ÌOÎi °<u,&/Õ+ødeÆá¤"÷œSw+&öO.RC‘&óä^H-¯
--- a/com.pdma.notion-timer.sdPlugin/manifest.json
+++ b/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.29",
+  "Version": "1.0.39",
  "SDKVersion": 2,
  "Software": { "MinimumVersion": "5.0" },
  "OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],
--- a/com.pdma.notion-timer.sdPlugin/ui/property-inspector.html
+++ b/com.pdma.notion-timer.sdPlugin/ui/property-inspector.html
@@ -195,11 +195,20 @@
        userId:      document.getElementById("userId").value,
      };
      $PI.setGlobalSettings(creds);
+      globalUserId = creds.userId;
      setCredStatus("Credentials saved.", "ok");
-      if (creds.notionToken) {
-        setStatus("Loading…", "");
-        $PI.sendToPlugin({ event: "refreshProjects", token: creds.notionToken });
-      }
+    }
+
+    function scheduleCredSave() {
+      clearTimeout(credSaveTimer);
+      credSaveTimer = setTimeout(function() {
+        saveCredentials();
+        var token = document.getElementById("notionToken").value.trim();
+        if (token) {
+          setStatus("Loading…", "");
+          $PI.sendToPlugin({ event: "refreshProjects", token: token });
+        }
+      }, 600);
    }

    function populateUsers(users, userId) {
@@ -215,11 +224,6 @@
      });
    }

-    function scheduleCredSave() {
-      clearTimeout(credSaveTimer);
-      credSaveTimer = setTimeout(saveCredentials, 600);
-    }
-
    function save() {
      var sel = document.getElementById("projectSelect");
      var opt = sel.options[sel.selectedIndex];
--- a/install.sh
+++ b/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/master/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
+curl -sL "${GITEA}/${REPO}/raw/branch/stable-rebuild/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"

 echo "Installing — Stream Deck will open automatically..."
 open "${PLUGIN_FILE}"
--- a/notion-timer.streamDeckPlugin
+++ b/notion-timer.streamDeckPlugin
--- a/package.json
+++ b/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 && rm -f notion-timer.streamDeckPlugin && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
+    "package": "npm run build && 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\"",
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.29";
+const CURRENT_VERSION = "1.0.40";
 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=
@@ -49,6 +49,28 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
    }

    const fs = await import("fs");
+    const path = await import("path");
+    const pluginRoot = path.join(path.dirname(__filename), "..");
+
+    const ASSETS = [
+      "ui/property-inspector.html",
+      "ui/global-property-inspector.html",
+      "imgs/idle.png",
+      "imgs/running.png",
+    ];
+    const PLUGIN_BASE = `${GITEA_BASE}/com.pdma.notion-timer.sdPlugin`;
+    const assetResps = await Promise.all(ASSETS.map(p => fetchWithTimeout(`${PLUGIN_BASE}/${p}`)));
+    for (let i = 0; i < ASSETS.length; i++) {
+      if (assetResps[i].ok) {
+        fs.writeFileSync(path.join(pluginRoot, ASSETS[i]), Buffer.from(await assetResps[i].arrayBuffer()));
+      }
+    }
+
+    const LEGACY = ["imgs/idle.svg", "imgs/running.svg"];
+    for (const f of LEGACY) {
+      try { fs.unlinkSync(path.join(pluginRoot, f)); } catch { /* already gone */ }
+    }
+
    fs.writeFileSync(__filename, newCode);
    streamDeck.logger.info(`Updated to ${version}, restarting…`);
    process.exit(0);
@@ -74,12 +96,12 @@ interface GlobalSettings {
  projectsDbId: string;
  userId: string;
  runningEntryId?: string | null;
+  runningActionId?: string | null;
 }

 interface TimerSettings {
  projectId: string;
  projectName: string;
-  activeEntryId: string | null;
 }

 const HARDCODED = {
@@ -92,21 +114,24 @@ async function getGlobal(): Promise<GlobalSettings> {
  return { ...stored, ...HARDCODED };
 }

-// In-memory cache so onWillAppear can check running state without an async round-trip
-let memRunningEntryId: string | null | undefined = undefined; // undefined = not yet loaded
+// In-memory running state — avoids async round-trips on every button press
+let memRunningEntryId:  string | null | undefined = undefined;
+let memRunningActionId: string | null | undefined = undefined;

-async function getRunningEntryId(): Promise<string | null> {
-  if (memRunningEntryId === undefined) {
-    const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
-    memRunningEntryId = stored.runningEntryId ?? null;
-  }
-  return memRunningEntryId;
+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 setRunningEntry(entryId: string | null): Promise<void> {
-  memRunningEntryId = entryId;
-  const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
-  await streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
+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 sendProjectsToPI(tokenOverride?: string): Promise<void> {
@@ -135,36 +160,24 @@ 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 settingsCache = new Map<string, TimerSettings>();
+  private projectCache = new Map<string, TimerSettings>();
+  private pendingKeyDown = new Set<string>();

  async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
-    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)]);
+    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 {
-      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)]);
-      }
+      await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
    }
  }

@@ -173,82 +186,64 @@ class TimerToggle extends SingletonAction<TimerSettings> {
  }

  async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
-    this.settingsCache.set(ev.action.id, ev.payload.settings);
-    const global = await getGlobal();
-    const { projectId, projectName, activeEntryId } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-
-    if (!isConfigured(global)) {
-      await ev.action.showAlert();
-      return;
-    }
-
-    if (!projectId) {
-      await ev.action.showAlert();
-      return;
-    }
-
+    if (this.pendingKeyDown.has(ev.action.id)) return;
+    this.pendingKeyDown.add(ev.action.id);
    try {
-      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 ev.action.setState(0);
-        await ev.action.setTitle(title);
-        await setRunningEntry(null);
-      } else {
-        const prevEntryId = await getRunningEntryId();
+    const { projectId, projectName } = ev.payload.settings;
+    const title = buttonTitle(projectName || "");
+    const isRunning = memRunningActionId === ev.action.id;

-        // Optimistically update visuals immediately — no waiting for API
-        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 || ""))]);
-            }
+    // Instant visual feedback — no setSettings, no flash
+    if (projectId) {
+      if (isRunning) {
+        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}`)]);
+      }
+    }

-        // Now do the API calls
-        if (prevEntryId) {
-          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 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);
        }
-
-        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);
+        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(`⏱ ${title}`)]);
      }
    } catch (err) {
+      // Revert visual on error
+      await Promise.all([
+        ev.action.setState(isRunning ? 1 : 0),
+        ev.action.setTitle(isRunning ? `⏱ ${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);
@@ -267,5 +262,4 @@ 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);
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{ "version": "1.0.29" }
+{ "version": "1.0.40" }
Author	SHA1	Message	Date
pdmarf	f76c5ac33b	v1.0.40: bump version.json so auto-updater delivers update to staff Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-15 17:07:17 +01:00
pdmarf	6e0976a284	v1.0.40: fix duplicate timer race condition on rapid double-press onKeyDown is async and calls await startTimer (~1s network). A second press before that resolves saw the same state (isRunning=false, memRunningEntryId=null) and created a second Notion entry. Only the last startTimer call's ID was tracked, orphaning the first entry running indefinitely in Notion. pendingKeyDown Set acts as a per-action mutex: a second press while the first is in-flight is dropped. try/finally guarantees the lock is always released. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 18:18:52 +01:00
pdmarf	060a2bc917	v1.0.39: fix button flash by making setRunningEntry synchronous Remove await from running-state updates so onWillAppear cannot fire between the optimistic setState(1) and the API call completing, eliminating the green→blue→green flash on button press.	2026-04-24 09:29:43 +01:00
pdmarf	4171b2f6e9	v1.0.38: eliminate setSettings from onKeyDown to fix flash setSettings always resets the button visual state — no workaround exists. Removed activeEntryId from per-button settings entirely. Running state now tracked via runningActionId in global settings (alongside runningEntryId). onWillAppear restores state from memRunningActionId. onKeyDown only calls setState — clean, instant. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:20:41 +01:00
pdmarf	35a0bbb867	v1.0.37: send setSettings and setState simultaneously to avoid flash Previously setSettings was awaited first (causing blue flash), then setState was called. Now both are sent in the same Promise.all so Stream Deck processes setState in the same batch, overriding the visual reset from setSettings with no visible blue transition. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:15:48 +01:00
pdmarf	5cdc77ccf3	v1.0.36: eliminate blue flash between setSettings and setState setState was being called after setRunningEntry, which makes two async global settings calls and takes ~1 second. During that time the button sat in the blue reset state from setSettings. Now setState is called immediately after setSettings, before setRunningEntry, so the blue flash is imperceptibly brief. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:13:38 +01:00
pdmarf	bb021633a3	v1.0.35: re-assert setState(0) after setSettings on stop path setSettings() resets the visual state in both directions. The start path already re-asserted setState(1) after setSettings. The stop path was missing the equivalent setState(0), leaving the button green. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:11:30 +01:00
pdmarf	93616d3a1a	v1.0.34: fix both buttons showing green simultaneously When pressing B while A was running, B went green immediately but A stayed green until getGlobal()+getRunningEntryId() resolved. Now uses settingsCache to turn off all running buttons in the same synchronous pass as turning B on — no async gap where both appear active. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:07:55 +01:00
pdmarf	2fd2b6ad8a	v1.0.33: instant button feedback on key press Visual state change now happens before any async work (getGlobal, getRunningEntryId, API calls). Previously the button waited for getGlobal() to resolve before going green, causing a 1-2s delay. Also reverts optimistic state on API error. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:05:41 +01:00
pdmarf	e3a19234a9	v1.0.32: re-assert button state after setSettings resets it setSettings() causes Stream Deck to reset the button visual back to its default state (state 0). The optimistic setState(1) was correct but got overridden. Now setState(1) is called again after setSettings completes to ensure the button stays green. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 09:01:55 +01:00
pdmarf	a233cfc4fd	v1.0.31: fix name selection being wiped when refreshProjects fires Selecting a name called saveCredentials, which sent refreshProjects, which re-fetched users and called populateUsers(users, globalUserId) with globalUserId still empty — immediately clearing the selection. Fix: saveCredentials now updates globalUserId immediately, and refreshProjects is only triggered by token changes (scheduleCredSave), not by name changes. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 08:58:42 +01:00
pdmarf	036567bc7c	v1.0.30: auto-updater now updates HTML and images, not just plugin.js Previous versions of checkForUpdates only wrote plugin.js, leaving property-inspector.html stale on all machines that used Check for Updates. PI fixes (name dropdown, refreshProjects) never reached them. Now downloads and writes all UI and image assets before restarting. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 08:56:37 +01:00