more graceful endings

jonluca · Apr 19, 2023 · 7425a14 · 7425a14
1 parent 3b63767
commit 7425a14
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/electron-src/data/base-database.ts b/electron-src/data/base-database.ts
@@ -23,6 +23,14 @@ export class BaseDatabase<T> {
     this.postSetup = postSetup;
   }
 
+  terminate = () => {
+    const db = this.dbWriter;
+    this.dbWriter = undefined;
+    if (db) {
+      return db.destroy();
+    }
+  };
+
   isDbInitialized = () => {
     return !!this.dbWriter;
   };

diff --git a/electron-src/index.ts b/electron-src/index.ts
@@ -105,7 +105,6 @@ if (!amMainInstance) {
       await installExtensions();
     }
     await dbWorker.startWorker();
-
     nativeTheme.themeSource = "dark";
     dbWorker.setupHandlers();
     appReady.resolve();
@@ -139,8 +138,10 @@ if (!amMainInstance) {
       appReady.promise.then(() => showApp());
     }
   });
-
-  app.on("window-all-closed", () => {
-    app.quit();
+  app.on("will-quit", () => {
+    logStream.write("Quitting");
+    dbWorker.stopWorker();
+    logStream.end();
+    process.exit(0);
   });
 }
diff --git a/electron-src/window/main-window.ts b/electron-src/window/main-window.ts
@@ -26,7 +26,7 @@ const setupNext = async () => {
   } catch (e) {
     logger.error(`Failed to prepare next: ${e}`);
     showErrorAlert("Error", "Failed to prepare next");
-    app.quit();
+    app.exit(-1);
     return;
   }
 };

diff --git a/electron-src/workers/database-worker.ts b/electron-src/workers/database-worker.ts
@@ -1,4 +1,5 @@
-import { spawn, Worker } from "threads";
+import type { ModuleThread } from "threads";
+import { spawn, Thread, Worker } from "threads";
 import type { SQLDatabase } from "../data/database";
 import { handleIpc } from "../ipc/ipc";
 import db from "../data/database";
@@ -37,6 +38,14 @@ class DbWorker {
     this.embeddingsWorker = await spawn<WorkerType<EmbeddingsDatabase>>(new Worker(embeddingWorkerPath, opts));
   };
 
+  stopWorker = () => {
+    this.worker.terminate();
+    this.embeddingsWorker.terminate();
+    if (!isDev) {
+      Thread.terminate(this.worker as ModuleThread<WorkerType<SQLDatabase>>);
+      Thread.terminate(this.embeddingsWorker as ModuleThread<WorkerType<EmbeddingsDatabase>>);
+    }
+  };
   setupHandlers() {
     for (const property in db) {
       const prop = property as keyof WorkerType<SQLDatabase>;