Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.
JavaScript aianthropiccross-platformgeminigroqlinuxmacosnvidiaopen-sourceopenaiparakeetspeech-to-texttranscribewhisperwindows
refactor(hotkeys): tighten unregisterSlot guard and trim review comments
Gabriel Steindb75e281b70a
diff --git a/src/helpers/hotkeyManager.js b/src/helpers/hotkeyManager.jsindex 291ca6c83..b927a1ee4 100644--- a/src/helpers/hotkeyManager.js+++ b/src/helpers/hotkeyManager.js@@ -296,7 +296,7 @@ class HotkeyManager extends EventEmitter {unregisterSlot(slotName) {const slot = this.slots.get(slotName);- if (!slot || !(slot.hotkeys && slot.hotkeys.length)) return;+ if (!slot || !(slot.hotkeys?.length || slot.accelerators?.length)) return;// On KDE (X11 or Wayland), persistent slots are managed via KGlobalAccelif (this.useKDE && this.kdeManager && slotName !== "cancel") {@@ -324,11 +324,7 @@ class HotkeyManager extends EventEmitter {return;}- // Release exactly what was registered. `accelerators` mirrors `hotkeys`- // index-for-index and holds null for the entries a native listener owns, so- // it cannot drift from the platform rules in _registerSingleHotkey the way- // a re-derived list does — modifier-only combos only bypass globalShortcut- // on Windows.+ // Release what was actually registered; native-listener entries are null.for (const accel of slot.accelerators || []) {if (!accel) continue;try {diff --git a/test/helpers/hotkeySlotUnregister.test.js b/test/helpers/hotkeySlotUnregister.test.jsindex b180d3952..827885eab 100644--- a/test/helpers/hotkeySlotUnregister.test.js+++ b/test/helpers/hotkeySlotUnregister.test.js@@ -41,19 +41,13 @@ test.beforeEach(() => {test("unregisterSlot releases every accelerator the slot registered", async () => {const manager = new HotkeyManager();- // "Control+Alt" is modifier-only. Only Windows diverts those to the native- // low-level listener; everywhere else globalShortcut owns them, so the- // teardown has to release them too.- await manager.registerSlot("agent", "F7,Control+Alt", noop);- const heldAfterRegister = [...registered.keys()];+ // Only Windows diverts modifier-only combos to the native listener, so+ // everywhere else globalShortcut owns "Control+Alt" and must release it.+ await manager.registerSlot("agent", "F7,Control+Alt", noop, { atomic: true });manager.unregisterSlot("agent");- assert.deepEqual(- [...registered.keys()],- [],- `slot teardown left accelerators registered (held after register: ${heldAfterRegister.join(", ")})`- );+ assert.deepEqual([...registered.keys()], []);assert.deepEqual(manager.getSlotHotkeys("agent"), []);});@@ -73,8 +67,7 @@ test("unregisterSlot never releases an accelerator the slot does not own", asyncawait manager.registerSlot("agent", "F7", noop, { atomic: true });await manager.registerSlot("cancel", "F8", noop, { atomic: true });- // On Linux, registration defensively unregisters its own accelerator before- // registering it; only the teardown's unregister calls are under test here.+ // Linux registration defensively unregisters first; only teardown is under test.unregisterCalls.length = 0;manager.unregisterSlot("agent");@@ -84,6 +77,18 @@ test("unregisterSlot never releases an accelerator the slot does not own", asyncassert.deepEqual(manager.getSlotHotkeys("cancel"), ["F8"]);});+test("unregisterSlot skips hotkeys a native listener owns", async () => {+ const manager = new HotkeyManager();++ // "RightShift" gets a null accelerator on every platform.+ await manager.registerSlot("dictation", "F7,RightShift", noop, { atomic: true });+ unregisterCalls.length = 0;++ manager.unregisterSlot("dictation");++ assert.deepEqual(unregisterCalls, ["F7"]);+});+test("unregisterSlot on an already-cleared slot is a no-op", async () => {const manager = new HotkeyManager();