qdesk 1.0.3 → 1.0.5

package/dist/chord-utils.js

@@ -1,4 +1,4 @@
-import { CallNextHookEx, decodeKeyboardHookLParam, DispatchMessageW, GetAsyncKeyState, GetMessageW, GetModuleHandleW, registerKeyboardHookCallback, SetWindowsHookExW, TranslateMessage, UnhookWindowsHookEx, unregisterCallback, } from "./koffi-utils.js";
+import { CallNextHookEx, decodeKeyboardHookLParam, DispatchMessageW, GetAsyncKeyState, GetModuleHandleW, PeekMessageW, registerKeyboardHookCallback, SetWindowsHookExW, TranslateMessage, UnhookWindowsHookEx, unregisterCallback, } from "./koffi-utils.js";
 const process = globalThis.process;
 const MOD_ALT = 0x0001;
 const MOD_CONTROL = 0x0002;
@@ -14,6 +14,7 @@ const HC_ACTION = 0;
 const WH_KEYBOARD_LL = 13;
 const WM_KEYDOWN = 0x0100;
 const WM_SYSKEYDOWN = 0x0104;
+const PM_REMOVE = 0x0001;
 export function normalizeChord(chord) {
     const parts = chord
         .split("+")
@@ -155,6 +156,8 @@ export function startListening(options) {
     }
     let keyboardHook = null;
     let keyboardHookProcPtr = null;
+    let messagePump;
+    let isShuttingDown = false;
     const callback = (nCode, wParam, lParam) => {
         const passThrough = () => BigInt(Number(CallNextHookEx(keyboardHook, nCode, wParam, lParam)));
         try {
@@ -206,7 +209,15 @@ export function startListening(options) {
         process.exit(1);
     }
     function shutdown() {
+        if (isShuttingDown) {
+            return;
+        }
+        isShuttingDown = true;
         console.log("\n[qdesk] Shutting down...");
+        if (messagePump) {
+            clearInterval(messagePump);
+            messagePump = undefined;
+        }
         if (keyboardHook) {
             UnhookWindowsHookEx(keyboardHook);
             keyboardHook = null;
@@ -222,18 +233,12 @@ export function startListening(options) {
     return {
         runMessageLoop: () => {
             const msg = {};
-            while (true) {
-                const ret = Number(GetMessageW(msg, null, 0, 0));
-                if (ret === 0) {
-                    break;
+            messagePump = setInterval(() => {
+                while (Number(PeekMessageW(msg, null, 0, 0, PM_REMOVE)) !== 0) {
+                    TranslateMessage(msg);
+                    DispatchMessageW(msg);
                 }
-                if (ret === -1) {
-                    console.error("[error] GetMessageW returned -1");
-                    break;
-                }
-                TranslateMessage(msg);
-                DispatchMessageW(msg);
-            }
+            }, 8);
         },
     };
 }

package/dist/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { readFileSync } from "node:fs";
 import process from "node:process";
 import { normalizeChord, startListening } from "./chord-utils.js";
 import { setScreenHue } from "./screen-hue.js";
@@ -6,6 +7,23 @@ import { activateWindowByHandle, getActiveWindowHandleAndName, } from "./window-
 // Configure this chord at the top of file.
 const DEFAULT_ADD_CHORD = "win+ctrl+a";
 const DEFAULT_DROP_CHORD = "win+ctrl+d";
+function hasCliFlag(flag) {
+    return process.argv.slice(2).includes(flag);
+}
+function getPackageVersion() {
+    try {
+        const packageJson = readFileSync(new URL("../package.json", import.meta.url), "utf8");
+        const parsed = JSON.parse(packageJson);
+        return parsed.version ?? "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+}
+if (hasCliFlag("--version") || hasCliFlag("-v")) {
+    console.log(getPackageVersion());
+    process.exit(0);
+}
 function normalizeChordInput(chord) {
     return normalizeChord(chord.trim().toLowerCase());
 }

package/dist/koffi-utils.js

@@ -53,6 +53,13 @@ export const GetMessageW = user32.func("GetMessageW", "int", [
     UINT,
     UINT,
 ]);
+export const PeekMessageW = user32.func("PeekMessageW", "int", [
+    koffi.out(koffi.pointer(MSG)),
+    HWND,
+    UINT,
+    UINT,
+    UINT,
+]);
 export const TranslateMessage = user32.func("TranslateMessage", "int", [
     koffi.pointer(MSG),
 ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdesk",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "repository": {
     "type": "git",