check for api enabled on launch, api worker check for parent win close

Venipa · Jan 17, 2022 · f7b0511 · f7b0511
1 parent 8e16a17
commit f7b0511
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/api/createApiWorker.ts b/src/api/createApiWorker.ts
@@ -9,7 +9,9 @@ export interface ApiWorker {
   destroy(): void;
   rendererId: number;
 }
-export const createApiWorker = async (): Promise<ApiWorker> => {
+export const createApiWorker = async (
+  parent?: BrowserWindow
+): Promise<ApiWorker> => {
   const workerSource = path.join(__dirname, "api.js");
   logger.debug("Worker Added", workerSource);
   const worker = new BrowserWindow({
@@ -29,7 +31,9 @@ export const createApiWorker = async (): Promise<ApiWorker> => {
       disableHtmlFullscreenWindowResize: true,
       preload: workerSource,
     },
+    parent,
   });
+  if (parent) parent.on("close", () => worker.destroy());
   await worker.loadURL(EMPTY_URL);
 
   if (isDevelopment) worker.webContents.openDevTools();

diff --git a/src/app/plugins/apiProvider.plugin.ts b/src/app/plugins/apiProvider.plugin.ts
@@ -29,10 +29,14 @@ export default class ApiProvider extends BaseProvider
   sendMessage(...args: any[]) {
     return this._thread?.send("socket", ...args);
   }
+  private get settingsProvider() {
+    return this.getProvider("settings") as SettingsProvider;
+  }
   async AfterInit() {
     if (this._thread) this._thread.destroy();
-    this._thread = await createApiWorker();
-    const config = this.getProvider("settings") as SettingsProvider;
+    const config = this.settingsProvider;
+    if (!config.instance?.api?.enabled) return;
+    this._thread = await createApiWorker(this.windowContext.main);
     const rendererId = await this._thread.invoke<number>("initialize", {
       config: { ...config!.instance },
     });