make globkey worker work better

benawad · Apr 5, 2021 · 9f27b1f · 9f27b1f · vercel · Apr 5, 2021
1 parent 945d7e8
commit 9f27b1f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/baklava/package.json b/baklava/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dogehouse",
-    "version": "1.0.36",
+    "version": "1.0.37",
     "description": "Taking voice conversations to the moon 🚀",
     "main": "./dist/electron.js",
     "scripts": {

diff --git a/baklava/src/electron.ts b/baklava/src/electron.ts
@@ -11,7 +11,7 @@ import {
 import i18n from "i18next";
 import Backend from "i18next-node-fs-backend";
 import { autoUpdater } from "electron-updater";
-import { RegisterKeybinds, exitApp } from "./utils/keybinds";
+import { RegisterKeybinds, stopWorkersAndExitApp } from "./utils/keybinds";
 import { HandleVoiceTray } from "./utils/tray";
 import { ALLOWED_HOSTS, isLinux, isMac, MENU_TEMPLATE } from "./constants";
 import path from "path";
@@ -191,7 +191,7 @@ if (!instanceLock) {
   if (process.env.hotReload) {
     app.relaunch();
   }
-  exitApp();
+  stopWorkersAndExitApp();
 } else {
   app.on("ready", () => {
     localize().then(() => {
@@ -246,7 +246,7 @@ autoUpdater.on('update-not-available', () => {
 });
 
 app.on("window-all-closed", async () => {
-  await exitApp();
+  await stopWorkersAndExitApp();
 });
 app.on("activate", () => {
   if (mainWindow === null) {

diff --git a/baklava/src/utils/keybinds/index.ts b/baklava/src/utils/keybinds/index.ts
@@ -137,7 +137,7 @@ export function RegisterKeybinds(bWindows: bWindowsType) {
         }
     });
 }
-export async function exitApp() {
+export async function stopWorkersAndExitApp() {
     worker.removeAllListeners();
     await worker.terminate();
     globkey.unload();

diff --git a/baklava/src/utils/keybinds/worker.ts b/baklava/src/utils/keybinds/worker.ts
@@ -2,10 +2,8 @@ import { isMainThread, parentPort } from 'worker_threads';
 import globkey from 'globkey';
 
 if (!isMainThread) {
-    let shouldBreak = false;
     globkey.start();
     while (true) {
-        if (shouldBreak) break;
         let keys = globkey.getKeys();
         if (parentPort) parentPort.postMessage({ type: 'keys', keys: keys });
     }