pdm/stream_deck_notion_timer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable-rebuild'

Browse Source
This commit is contained in:
pdmarf
2026-04-24 09:05:44 +01:00
parent e493c19cc8 2fd2b6ad8a
commit ea15f72215
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
com.pdma.notion-timer.sdPlugin/bin/plugin.js
View File

@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
}
// src/plugin.ts
var CURRENT_VERSION = "1.0.32";
var CURRENT_VERSION = "1.0.33";
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=
@@ -6593,10 +6593,18 @@ var TimerToggle = class extends SingletonAction {
}
async onKeyDown(ev) {
this.settingsCache.set(ev.action.id, ev.payload.settings);
const global = await getGlobal();
const { projectId, projectName, activeEntryId } = ev.payload.settings;
const title = buttonTitle(projectName || "");
if (projectId) {
if (activeEntryId) {
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
} else {
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
}
}
const global = await getGlobal();
if (!isConfigured(global)) {
await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `\u23F1 ${title}` : title)]);
await ev.action.showAlert();
return;
}
@@ -6610,8 +6618,6 @@ var TimerToggle = class extends SingletonAction {
const stopped = { ...ev.payload.settings, activeEntryId: null };
await ev.action.setSettings(stopped);
this.settingsCache.set(ev.action.id, stopped);
await ev.action.setState(0);
await ev.action.setTitle(title);
await setRunningEntry(null);
} else {
const prevEntryId = await getRunningEntryId();
@@ -6623,9 +6629,6 @@ var TimerToggle = class extends SingletonAction {
await Promise.all([other.setState(0), other.setTitle(buttonTitle(otherSettings.projectName || ""))]);
}
}
}
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
if (prevEntryId) {
await stopTimer(global.notionToken, prevEntryId);
for (const other of this.actions) {
if (other.id === ev.action.id) continue;
@@ -6651,6 +6654,7 @@ var TimerToggle = class extends SingletonAction {
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
}
} catch (err) {
await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `\u23F1 ${title}` : title)]);
plugin_default.logger.error("Timer toggle failed:", err);
await ev.action.showAlert();
}

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

@@ -1 +1 @@
ôÙ"Ë4-Ħ8peŒ—Oc"ÜuÉ»SÀ<53>>gé‡-ŸÁ#—&<26>Óò¿q‰¡N0Åý”ÒvZ¶ÍÎI²<49>ß
ÜYÈZ‡Ã¾÷G¡ã¯Ã¦9â¹¸ß ]W‹¬çjB=1ø™+n‡A ;cû%‚:`k·„¿ç°õÀÓáæ

2
com.pdma.notion-timer.sdPlugin/manifest.json
View File

@@ -2,7 +2,7 @@
"Author": "Pete Marfleet",
"Description": "Toggle Notion time tracking for a project with a single button press.",
"Name": "Notion Timer",
"Version": "1.0.32",
"Version": "1.0.33",
"SDKVersion": 2,
"Software": { "MinimumVersion": "5.0" },
"OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],

BIN
notion-timer.streamDeckPlugin
View File

Binary file not shown.

28
src/plugin.ts
View File

@@ -1,4 +1,4 @@
const CURRENT_VERSION = "1.0.32";
const CURRENT_VERSION = "1.0.33";
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=
@@ -198,11 +198,22 @@ class TimerToggle extends SingletonAction<TimerSettings> {
async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
this.settingsCache.set(ev.action.id, ev.payload.settings);
const global = await getGlobal();
const { projectId, projectName, activeEntryId } = ev.payload.settings;
const title = buttonTitle(projectName || "");
// Instant visual feedback before any async work
if (projectId) {
if (activeEntryId) {
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
} else {
await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
}
}
const global = await getGlobal();
if (!isConfigured(global)) {
await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `⏱ ${title}` : title)]);
await ev.action.showAlert();
return;
}
@@ -218,13 +229,11 @@ class TimerToggle extends SingletonAction<TimerSettings> {
const stopped = { ...ev.payload.settings, activeEntryId: null };
await ev.action.setSettings(stopped);
this.settingsCache.set(ev.action.id, stopped);
await ev.action.setState(0);
await ev.action.setTitle(title);
await setRunningEntry(null);
} else {
const prevEntryId = await getRunningEntryId();
// Optimistically update visuals immediately — no waiting for API
// Turn off the previously running button immediately
if (prevEntryId) {
for (const other of this.actions) {
if (other.id === ev.action.id) continue;
@@ -233,11 +242,6 @@ class TimerToggle extends SingletonAction<TimerSettings> {
await Promise.all([other.setState(0), other.setTitle(buttonTitle(otherSettings.projectName || ""))]);
}
}
}
await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
// Now do the API calls
if (prevEntryId) {
await stopTimer(global.notionToken, prevEntryId);
for (const other of this.actions) {
if (other.id === ev.action.id) continue;
@@ -261,10 +265,12 @@ class TimerToggle extends SingletonAction<TimerSettings> {
await ev.action.setSettings(started);
this.settingsCache.set(ev.action.id, started);
await setRunningEntry(entryId);
// Re-assert state after setSettings, which can reset visual state
// Re-assert after setSettings resets visual state
await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
}
} catch (err) {
// Revert optimistic visual on error
await Promise.all([ev.action.setState(activeEntryId ? 1 : 0), ev.action.setTitle(activeEntryId ? `⏱ ${title}` : title)]);
streamDeck.logger.error("Timer toggle failed:", err);
await ev.action.showAlert();
}

2
version.json
View File

@@ -1 +1 @@
{ "version": "1.0.32" }
{ "version": "1.0.33" }