v1.0.24: stable-rebuild from v1.0.14 (pure, no modifications)

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.23";
+var CURRENT_VERSION = "1.0.24";
 var GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/master";
 var SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -6492,19 +6492,6 @@ async function getGlobal() {
   const stored = await plugin_default.settings.getGlobalSettings();
   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;
-  const stored = await plugin_default.settings.getGlobalSettings();
-  await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
-}
 function isConfigured(g) {
   return !!(g.notionToken && g.userId);
 }
@@ -6514,24 +6501,15 @@ function buttonTitle(projectName) {
 var TimerToggle = class extends SingletonAction {
   settingsCache = /* @__PURE__ */ new Map();
   async onWillAppear(ev) {
+    this.settingsCache.set(ev.action.id, ev.payload.settings);
     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) {
+    if (activeEntryId) {
       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) {
     try {
       const global = await getGlobal();
@@ -6573,15 +6551,13 @@ var TimerToggle = class extends SingletonAction {
         this.settingsCache.set(ev.action.id, stopped);
         await ev.action.setState(0);
         await ev.action.setTitle(title);
-        await setRunningEntry(null);
+        await ev.action.showOk();
       } else {
-        const prevEntryId = await getRunningEntryId();
-        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) {
+          if (otherSettings?.activeEntryId) {
+            await stopTimer(global.notionToken, otherSettings.activeEntryId);
             const stopped = { ...otherSettings, activeEntryId: null };
             await other.setSettings(stopped);
             this.settingsCache.set(other.id, stopped);
@@ -6589,7 +6565,6 @@ var TimerToggle = class extends SingletonAction {
             await other.setTitle(buttonTitle(otherSettings.projectName || ""));
           }
         }
-        }
         const entryId = await startTimer(
           global.notionToken,
           global.timingDbId,
@@ -6600,9 +6575,9 @@ var TimerToggle = class extends SingletonAction {
         const started = { ...ev.payload.settings, activeEntryId: entryId };
         await ev.action.setSettings(started);
         this.settingsCache.set(ev.action.id, started);
-        await setRunningEntry(entryId);
         await ev.action.setState(1);
         await ev.action.setTitle(`\u23F1 ${title}`);
+        await ev.action.showOk();
       }
     } catch (err) {
       plugin_default.logger.error("Timer toggle failed:", err);

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

@@ -1 +1 @@
-ä(=uõÐüIXˆ<58>»pTüD0tQ	ŽÚãεF’ïÊr•!Ÿ(\ç$À€{Þó
+ÞòÝRlgˆ¶ª=
{¸óÞÛd¼H•øXº¿žìÑ	æJó0OTù1Š“Änï8àª?—שáƒà}‹IQÉjÊ[

com.pdma.notion-timer.sdPlugin/imgs/idle.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 144" width="144" height="144">
+  <circle cx="72" cy="58" r="42" fill="none" stroke="#888888" stroke-width="6"/>
+  <line x1="72" y1="58" x2="72" y2="28" stroke="#888888" stroke-width="6" stroke-linecap="round"/>
+  <line x1="72" y1="58" x2="94" y2="71" stroke="#888888" stroke-width="6" stroke-linecap="round"/>
+  <line x1="62" y1="12" x2="82" y2="12" stroke="#888888" stroke-width="6" stroke-linecap="round"/>
+  <line x1="72" y1="12" x2="72" y2="20" stroke="#888888" stroke-width="6" stroke-linecap="round"/>
+</svg>

com.pdma.notion-timer.sdPlugin/imgs/running.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 144" width="144" height="144">
+  <circle cx="72" cy="58" r="42" fill="#1a3a1a" stroke="#4caf50" stroke-width="6"/>
+  <line x1="72" y1="58" x2="72" y2="28" stroke="#4caf50" stroke-width="6" stroke-linecap="round"/>
+  <line x1="72" y1="58" x2="94" y2="71" stroke="#4caf50" stroke-width="6" stroke-linecap="round"/>
+  <line x1="62" y1="12" x2="82" y2="12" stroke="#4caf50" stroke-width="6" stroke-linecap="round"/>
+  <line x1="72" y1="12" x2="72" y2="20" stroke="#4caf50" stroke-width="6" stroke-linecap="round"/>
+  <circle cx="72" cy="58" r="5" fill="#4caf50"/>
+</svg>

src/plugin.ts

@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.23";
+const CURRENT_VERSION = "1.0.24";
 const GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/master";
 const SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -66,7 +66,6 @@ interface GlobalSettings {
   timingDbId: string;
   projectsDbId: string;
   userId: string;
-  runningEntryId?: string | null;
 }
 
 interface TimerSettings {
@@ -85,23 +84,6 @@ 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
-
-async function getRunningEntryId(): Promise<string | null> {
-  if (memRunningEntryId === undefined) {
-    const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
-    memRunningEntryId = stored.runningEntryId ?? null;
-  }
-  return memRunningEntryId;
-}
-
-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 isConfigured(g: GlobalSettings): boolean {
   return !!(g.notionToken && g.userId);
 }
@@ -116,28 +98,15 @@ class TimerToggle extends SingletonAction<TimerSettings> {
   private settingsCache = new Map<string, TimerSettings>();
 
   async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
+    this.settingsCache.set(ev.action.id, ev.payload.settings);
     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) {
+    if (activeEntryId) {
       await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
     } else {
       await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
     }
   }
-  }
 
   async onPropertyInspectorDidAppear(ev: PropertyInspectorDidAppearEvent<TimerSettings>): Promise<void> {
     try {
@@ -184,17 +153,14 @@ class TimerToggle extends SingletonAction<TimerSettings> {
         this.settingsCache.set(ev.action.id, stopped);
         await ev.action.setState(0);
         await ev.action.setTitle(title);
-        await setRunningEntry(null);
+        await ev.action.showOk();
       } else {
-        const prevEntryId = await getRunningEntryId();
-
-        // Stop previous timer
-        if (prevEntryId) {
-          await stopTimer(global.notionToken, prevEntryId);
+        // Stop any other running timer first
         for (const other of this.actions) {
           if (other.id === ev.action.id) continue;
           const otherSettings = this.settingsCache.get(other.id);
-            if (otherSettings?.activeEntryId === prevEntryId) {
+          if (otherSettings?.activeEntryId) {
+            await stopTimer(global.notionToken, otherSettings.activeEntryId);
             const stopped = { ...otherSettings, activeEntryId: null };
             await other.setSettings(stopped);
             this.settingsCache.set(other.id, stopped);
@@ -202,7 +168,6 @@ class TimerToggle extends SingletonAction<TimerSettings> {
             await other.setTitle(buttonTitle(otherSettings.projectName || ""));
           }
         }
-        }
 
         const entryId = await startTimer(
           global.notionToken,
@@ -214,9 +179,9 @@ class TimerToggle extends SingletonAction<TimerSettings> {
         const started = { ...ev.payload.settings, activeEntryId: entryId };
         await ev.action.setSettings(started);
         this.settingsCache.set(ev.action.id, started);
-        await setRunningEntry(entryId);
         await ev.action.setState(1);
         await ev.action.setTitle(`⏱ ${title}`);
+        await ev.action.showOk();
       }
     } catch (err) {
       streamDeck.logger.error("Timer toggle failed:", err);

version.json

@@ -1 +1 @@
-{ "version": "1.0.15" }
+{ "version": "1.0.14" }