v1.0.45: delay blocked-press icon correction to avoid native flash collision

Diagnosed via instrumented logging: the v1.0.44 blocked-press redraw was calling setState()/setTitle() successfully (no error, confirmed in logs) but Stream Deck wasn't visually applying it — the corrective image call was landing too close to Stream Deck's own native key-press flash animation and getting silently dropped. Forcing a page navigation away and back always redrew correctly, proving the tracked state was right all along and this was purely a rendering timing issue. Adding a 150ms delay before the corrective redraw lets the native animation settle first; confirmed fixed on device.
v1.0.44: clear tracked running state immediately after stopping old timer
2026-08-25 16:52:32 +01:00 · 2026-08-25 16:34:38 +01:00 · 2026-08-25 16:27:46 +01:00 · 2026-08-25 15:42:43 +01:00 · 2026-07-13 13:21:34 +01:00 · 2026-05-15 17:07:17 +01:00
5 changed files with 202 additions and 48 deletions
@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
 }

 // src/plugin.ts
-var CURRENT_VERSION = "1.0.39";
+var CURRENT_VERSION = "1.0.45";
 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=
@@ -6567,8 +6567,61 @@ function isConfigured(g) {
 function buttonTitle(projectName) {
  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }
+var ELAPSED_CHECK_MS = 60 * 60 * 1e3;
+var DIALOG_TIMEOUT_SECONDS = 300;
+async function promptContinue(title) {
+  const { execFile: execFile3 } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Timer for ${safeTitle} has been running for over an hour.
+
+Should it continue?" buttons {"Stop", "Continue"} default button "Continue" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile3("osascript", ["-e", script], (err, stdout) => {
+      if (err || /gave up:true/.test(String(stdout))) {
+        resolve("timeout");
+        return;
+      }
+      resolve(/button returned:Stop/.test(String(stdout)) ? "stop" : "continue");
+    });
+  });
+}
 var TimerToggle = class extends SingletonAction {
  projectCache = /* @__PURE__ */ new Map();
+  keyDownBusy = false;
+  elapsedCheckTimer = null;
+  clearElapsedCheck() {
+    if (this.elapsedCheckTimer) clearTimeout(this.elapsedCheckTimer);
+    this.elapsedCheckTimer = null;
+  }
+  scheduleElapsedCheck(entryId, actionId, title) {
+    this.clearElapsedCheck();
+    this.elapsedCheckTimer = setTimeout(() => {
+      this.checkElapsed(entryId, actionId, title);
+    }, ELAPSED_CHECK_MS);
+  }
+  async checkElapsed(entryId, actionId, title) {
+    if (memRunningEntryId !== entryId) return;
+    const answer = await promptContinue(title);
+    if (memRunningEntryId !== entryId) return;
+    if (answer === "continue") {
+      this.scheduleElapsedCheck(entryId, actionId, title);
+      return;
+    }
+    try {
+      const global = await getGlobal();
+      await stopTimer(global.notionToken, entryId);
+    } catch (err) {
+      plugin_default.logger.error("Auto-stop after elapsed-check failed:", err);
+    }
+    setRunningEntry(null, null);
+    this.clearElapsedCheck();
+    for (const action2 of this.actions) {
+      if (action2.id === actionId) {
+        await Promise.all([action2.setState(0), action2.setTitle(title)]);
+        break;
+      }
+    }
+  }
  async onWillAppear(ev) {
    this.projectCache.set(ev.action.id, ev.payload.settings);
    const title = buttonTitle(ev.payload.settings.projectName || "");
@@ -6584,52 +6637,71 @@ var TimerToggle = class extends SingletonAction {
    await sendProjectsToPI();
  }
  async onKeyDown(ev) {
-    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;
-          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}`)]);
-      }
-    }
-    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) {
+    if (this.keyDownBusy) {
+      const title = buttonTitle(ev.payload.settings.projectName || "");
+      const shouldBeRunning = memRunningActionId === ev.action.id;
+      await new Promise((resolve) => setTimeout(resolve, 150));
      await Promise.all([
-        ev.action.setState(isRunning ? 1 : 0),
-        ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
+        ev.action.setState(shouldBeRunning ? 1 : 0),
+        ev.action.setTitle(shouldBeRunning ? `\u23F1 ${title}` : title)
      ]);
-      plugin_default.logger.error("Timer toggle failed:", err);
-      await ev.action.showAlert();
+      return;
+    }
+    this.keyDownBusy = true;
+    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 {
+          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(`\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);
+          this.clearElapsedCheck();
+          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+        } else {
+          if (memRunningEntryId) {
+            await stopTimer(global.notionToken, memRunningEntryId);
+            setRunningEntry(null, null);
+            this.clearElapsedCheck();
+          }
+          const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
+          setRunningEntry(entryId, ev.action.id);
+          this.scheduleElapsedCheck(entryId, ev.action.id, title);
+          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.keyDownBusy = false;
    }
  }
 };
@@ -1 +1 @@
-в<╥!Ъ░xR√з└СRё;=▀LI"я╓╢HuэF├ы▐Ос─╒┘	sb▌Y╛{йH│╤Н.JщNЦь1╔l
+696’``w¾)G¶"éoÛ£šAyÍ‹xìØ“ÁÞ¶á„ÙdG»Cv+t9ãXÅü]M>IÁ¨Í–¼š²ßÁ
@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.39";
+const CURRENT_VERSION = "1.0.45";
 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=
@@ -164,9 +164,64 @@ function buttonTitle(projectName: string): string {
  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }

+const ELAPSED_CHECK_MS = 60 * 60 * 1000; // 1 hour
+const DIALOG_TIMEOUT_SECONDS = 300; // 5 minutes
+
+async function promptContinue(title: string): Promise<"stop" | "continue" | "timeout"> {
+  const { execFile } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Timer for ${safeTitle} has been running for over an hour.\n\nShould it continue?" buttons {"Stop", "Continue"} default button "Continue" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile("osascript", ["-e", script], (err, stdout) => {
+      if (err || /gave up:true/.test(String(stdout))) { resolve("timeout"); return; }
+      resolve(/button returned:Stop/.test(String(stdout)) ? "stop" : "continue");
+    });
+  });
+}
+
@action({ UUID: "com.pdma.notion-timer.toggle" })
 class TimerToggle extends SingletonAction<TimerSettings> {
  private projectCache = new Map<string, TimerSettings>();
+  private keyDownBusy = false;
+  private elapsedCheckTimer: NodeJS.Timeout | null = null;
+
+  private clearElapsedCheck(): void {
+    if (this.elapsedCheckTimer) clearTimeout(this.elapsedCheckTimer);
+    this.elapsedCheckTimer = null;
+  }
+
+  private scheduleElapsedCheck(entryId: string, actionId: string, title: string): void {
+    this.clearElapsedCheck();
+    this.elapsedCheckTimer = setTimeout(() => {
+      this.checkElapsed(entryId, actionId, title);
+    }, ELAPSED_CHECK_MS);
+  }
+
+  private async checkElapsed(entryId: string, actionId: string, title: string): Promise<void> {
+    if (memRunningEntryId !== entryId) return;
+    const answer = await promptContinue(title);
+    if (memRunningEntryId !== entryId) return;
+
+    if (answer === "continue") {
+      this.scheduleElapsedCheck(entryId, actionId, title);
+      return;
+    }
+
+    try {
+      const global = await getGlobal();
+      await stopTimer(global.notionToken, entryId);
+    } catch (err) {
+      streamDeck.logger.error("Auto-stop after elapsed-check failed:", err);
+    }
+    setRunningEntry(null, null);
+    this.clearElapsedCheck();
+    for (const action of this.actions) {
+      if (action.id === actionId) {
+        await Promise.all([action.setState(0), action.setTitle(title)]);
+        break;
+      }
+    }
+  }

  async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
    this.projectCache.set(ev.action.id, ev.payload.settings);
@@ -185,6 +240,26 @@ class TimerToggle extends SingletonAction<TimerSettings> {
  }

  async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
+    // Global lock across ALL buttons of this action, not just this one — otherwise
+    // near-simultaneous presses on two different buttons both read memRunningActionId
+    // as "nothing running" and both start a timer in Notion.
+    if (this.keyDownBusy) {
+      // Blocked press: redraw THIS button to match known truth instead of leaving
+      // whatever it was already showing (which can be stale from an out-of-band
+      // Notion edit) — a pure visual correction, no Notion calls. Delayed slightly
+      // because redrawing immediately can collide with Stream Deck's own native
+      // key-press flash animation and get silently dropped.
+      const title = buttonTitle(ev.payload.settings.projectName || "");
+      const shouldBeRunning = memRunningActionId === ev.action.id;
+      await new Promise((resolve) => setTimeout(resolve, 150));
+      await Promise.all([
+        ev.action.setState(shouldBeRunning ? 1 : 0),
+        ev.action.setTitle(shouldBeRunning ? `⏱ ${title}` : title),
+      ]);
+      return;
+    }
+    this.keyDownBusy = true;
+    try {
    const { projectId, projectName } = ev.payload.settings;
    const title = buttonTitle(projectName || "");
    const isRunning = memRunningActionId === ev.action.id;
@@ -213,13 +288,17 @@ class TimerToggle extends SingletonAction<TimerSettings> {
      if (isRunning) {
        await stopTimer(global.notionToken, memRunningEntryId!);
        setRunningEntry(null, null);
+        this.clearElapsedCheck();
        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
      } else {
        if (memRunningEntryId) {
          await stopTimer(global.notionToken, memRunningEntryId);
+          setRunningEntry(null, null);
+          this.clearElapsedCheck();
        }
        const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
        setRunningEntry(entryId, ev.action.id);
+        this.scheduleElapsedCheck(entryId, ev.action.id, title);
        await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
      }
    } catch (err) {
@@ -231,6 +310,9 @@ class TimerToggle extends SingletonAction<TimerSettings> {
      streamDeck.logger.error("Timer toggle failed:", err);
      await ev.action.showAlert();
    }
+    } finally {
+      this.keyDownBusy = false;
+    }
  }
 }

@@ -1 +1 @@
-{ "version": "1.0.39" }
+{ "version": "1.0.45" }
Author	SHA1	Message	Date
pdmarf	e897f0a8f5	v1.0.45: delay blocked-press icon correction to avoid native flash collision Diagnosed via instrumented logging: the v1.0.44 blocked-press redraw was calling setState()/setTitle() successfully (no error, confirmed in logs) but Stream Deck wasn't visually applying it — the corrective image call was landing too close to Stream Deck's own native key-press flash animation and getting silently dropped. Forcing a page navigation away and back always redrew correctly, proving the tracked state was right all along and this was purely a rendering timing issue. Adding a 150ms delay before the corrective redraw lets the native animation settle first; confirmed fixed on device.	2026-08-25 16:52:32 +01:00
pdmarf	2e2f2553ac	v1.0.44: clear tracked running state immediately after stopping old timer Found while testing v1.0.43's icon self-heal: when switching from one running timer to another, the old Notion entry was stopped but memRunningActionId/EntryId weren't cleared until AFTER the new startTimer call resolved. During that gap, a blocked press on the just-stopped button read the stale (not-yet-cleared) tracked id and self-healed itself back to a wrongly-'running' green — reinforcing the exact staleness the self-heal was meant to fix. Now cleared to null the moment the old timer is actually stopped.	2026-08-25 16:34:38 +01:00
pdmarf	45201bc376	v1.0.43: self-heal stale button icon when blocked by the keyDown lock When a keyDown is blocked by the v1.0.42 lock, redraw that button to match memRunningActionId instead of leaving whatever it was already showing. This closes the follow-on issue found while testing 1.0.42: a button's key image can go stale if its Notion timer was ever stopped/started outside the plugin (e.g. a manual Notion edit), and a blocked press was leaving that stale image in place — misleading the user into thinking a timer was running when it wasn't, which then caused a real unintended timer start on the next press.	2026-08-25 16:27:46 +01:00
pdmarf	18f8007df5	v1.0.42: fix duplicate timer race across different buttons pendingKeyDown was a Set keyed by action.id, so it only blocked a button from re-firing itself. Pressing two different buttons in fast succession (e.g. RB01 then RA01) both passed the guard, both read memRunningActionId before either had persisted it, and both started a Notion timer entry. Replaced with a single keyDownBusy flag shared across all buttons of the action, set synchronously before the first await, closing the race.	2026-08-25 15:42:43 +01:00
pdmarf	ce1a17975d	v1.0.41: add 1-hour elapsed check with continue/stop dialog, auto-stop on no response	2026-07-13 13:21:34 +01:00
pdmarfandClaude Sonnet 4.6	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
pdmarfandClaude Sonnet 4.6	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