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.
This commit is contained in:
pdmarf
2026-08-25 15:42:43 +01:00
parent ce1a17975d
commit 18f8007df5
4 changed files with 15 additions and 13 deletions
+8 -5
View File
@@ -1,4 +1,4 @@
const CURRENT_VERSION = "1.0.41";
const CURRENT_VERSION = "1.0.42";
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=
@@ -182,7 +182,7 @@ async function promptContinue(title: string): Promise<"stop" | "continue" | "tim
@action({ UUID: "com.pdma.notion-timer.toggle" })
class TimerToggle extends SingletonAction<TimerSettings> {
private projectCache = new Map<string, TimerSettings>();
private pendingKeyDown = new Set<string>();
private keyDownBusy = false;
private elapsedCheckTimer: NodeJS.Timeout | null = null;
private clearElapsedCheck(): void {
@@ -240,8 +240,11 @@ 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);
// 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) return;
this.keyDownBusy = true;
try {
const { projectId, projectName } = ev.payload.settings;
const title = buttonTitle(projectName || "");
@@ -293,7 +296,7 @@ class TimerToggle extends SingletonAction<TimerSettings> {
await ev.action.showAlert();
}
} finally {
this.pendingKeyDown.delete(ev.action.id);
this.keyDownBusy = false;
}
}
}