Ensure we only handle dom-ready once (#771)

* Remove get-port listener if exists * make sure dom-ready only ever fires once * remove handler fix
chaiNNer-org · Aug 19, 2022 · b91cd5b · b91cd5b
1 parent c4eefdc
commit b91cd5b
Showing 1 changed file with 31 additions and 18 deletions.
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -549,30 +549,43 @@ const doSplashScreenChecks = async () =>
         // Send events to splash screen renderer as they happen
         // Added some sleep functions so I can see that this is doing what I want it to
         // TODO: Remove the sleeps (or maybe not, since it feels more like something is happening here)
-        splash.webContents.once('dom-ready', async () => {
-            splash.webContents.send('checking-port');
-            const port = await getValidPort(splash);
-            await sleep(250);
+        const trueOnce = (fn: () => void): (() => void) => {
+            let first = true;
+            return () => {
+                if (first) {
+                    first = false;
+                    fn();
+                }
+            };
+        };
 
-            splash.webContents.send('checking-python');
-            await checkPythonEnv(splash);
-            await sleep(250);
+        splash.webContents.once(
+            'dom-ready',
+            trueOnce(async () => {
+                splash.webContents.send('checking-port');
+                const port = await getValidPort(splash);
+                await sleep(250);
 
-            splash.webContents.send('checking-deps');
-            await checkPythonDeps(splash);
-            await checkNvidiaSmi();
-            await sleep(250);
+                splash.webContents.send('checking-python');
+                await checkPythonEnv(splash);
+                await sleep(250);
 
-            splash.webContents.send('spawning-backend');
-            await spawnBackend(port);
+                splash.webContents.send('checking-deps');
+                await checkPythonDeps(splash);
+                await checkNvidiaSmi();
+                await sleep(250);
 
-            registerEventHandlers();
+                splash.webContents.send('spawning-backend');
+                await spawnBackend(port);
 
-            splash.webContents.send('splash-finish');
-            await sleep(250);
+                registerEventHandlers();
 
-            resolve();
-        });
+                splash.webContents.send('splash-finish');
+                await sleep(250);
+
+                resolve();
+            })
+        );
 
         ipcMain.once('backend-ready', async () => {
             splash.webContents.send('finish-loading');