v1.0.41: add 1-hour elapsed check with continue/stop dialog, auto-stop on no response
This commit is contained in:
+58
-1
@@ -1,4 +1,4 @@
|
||||
const CURRENT_VERSION = "1.0.40";
|
||||
const CURRENT_VERSION = "1.0.41";
|
||||
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,10 +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 pendingKeyDown = new Set<string>();
|
||||
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);
|
||||
@@ -217,13 +271,16 @@ 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);
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user