v1.0.41: add 1-hour elapsed check with continue/stop dialog, auto-stop on no response
This commit is contained in:
@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
|
||||
}
|
||||
|
||||
// src/plugin.ts
|
||||
var CURRENT_VERSION = "1.0.40";
|
||||
var CURRENT_VERSION = "1.0.41";
|
||||
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,9 +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();
|
||||
pendingKeyDown = /* @__PURE__ */ new Set();
|
||||
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 || "");
|
||||
@@ -6618,13 +6670,16 @@ var TimerToggle = class extends SingletonAction {
|
||||
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(`\u23F1 ${title}`)]);
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
{QÕ¿óîj¶?Íz_ÎDA+ÌOÎi °<u,&/Õ+ødeÆá¤"÷œSw+&öO.RC‘&óä^H-¯
|
||||
ג /}‚ֿ‘I]<5D>“v¶₪6ִ®[cV”+<2B>הש™>f&6<>$
|
||||
ת¹ת«b;<3B>׀<EFBFBD>אר»@פִb}©ע&X
|
||||
Reference in New Issue
Block a user