Here we go again.

Author: alexanderson1993

client/app/components/NotFound/index.tsx renamed to client/app/components/NotFound/index.client.tsx

@@ -19,7 +19,7 @@ import {Icon, href as iconsHref} from "@thorium/ui/Icon";
 import {ReactNode} from "react";
 import {getBackground} from "./utils/getBackground";
 import {ClientOnly} from "remix-utils/client-only";
-import NoMatch from "./components/NotFound";
+import NoMatch from "./components/NotFound/index.client";
 import Button from "@thorium/ui/Button";
 
 export const meta: MetaFunction = () => {

client/app/root.tsx

@@ -10,6 +10,7 @@ import {
 import {ipcHandlers} from "./helpers/ipcHandlers";
 import {autoUpdater} from "electron-updater";
 import {initWin} from "./helpers/autoUpdate";
+import {port} from "./helpers/settings";
 
 let win: BrowserWindow | null = null;
 app.enableSandbox();
@@ -29,22 +30,14 @@ app.on("will-finish-launching", () => {
   });
 });
 
-const cert = fs.readFileSync(
-  path.join(
-    app.getAppPath(),
-    is.development ? `desktop/resources/server.cert` : `../app/server.cert`
-  ),
-  "utf8"
-);
-const port = Number(process.env.PORT) || 4444;
-
 async function createWindow() {
-  await startThoriumServer();
-  ipcHandlers();
-  loaded = true;
-  if (loadedPath) {
-    loadFile(loadedPath);
-  }
+  const cert = fs.readFileSync(
+    path.join(
+      app.getAppPath(),
+      is.development ? `desktop/resources/server.cert` : `../app/server.cert`
+    ),
+    "utf8"
+  );
   // TODO: Manage this with the multi-window manager some day
   app.on(
     "certificate-error",
@@ -55,7 +48,7 @@ async function createWindow() {
       callback(certificate.data === cert);
     }
   );
-  restoreMenubar(app);
+
   win = new BrowserWindow({
     width: 1024,
     height: 768,
@@ -71,33 +64,29 @@ async function createWindow() {
     },
     show: false,
   });
+
   initWin(win);
-  win.webContents.setWindowOpenHandler(({url}) => {
-    shell.openExternal(url);
-    return {action: "deny"};
-  });
+  await win.loadFile("index.html");
+  await startThoriumServer();
+  ipcHandlers();
+  loaded = true;
+  if (loadedPath) {
+    loadFile(loadedPath);
+  }
+  restoreMenubar(app);
 
   // We add 1 to the port, since we want to connect to the HTTPS server
   // which is 1 more than the default port
-  win.loadURL(`http://localhost:${port}`);
-  win.on("closed", () => {
-    win = null;
-  });
-  win.on("ready-to-show", () => {
-    if (win) {
-      win.show();
-      win.focus();
-    }
-  });
+  await win.loadURL(`http://0.0.0.0:${port}`);
 }
 
 app.whenReady().then(async () => {
+  await createWindow();
   try {
     await autoUpdater.checkForUpdatesAndNotify();
   } catch (error) {
     // Ignore it
   }
-  await createWindow();
 });
 
 app.on("window-all-closed", async () => {

desktop/main/electron.ts

@@ -1,9 +1,22 @@
 import {autoUpdater} from "electron-updater";
-import {BrowserWindow} from "electron";
+import {BrowserWindow, shell} from "electron";
 
 let win: BrowserWindow | null = null;
 export function initWin(newWin: BrowserWindow) {
   win = newWin;
+  win.webContents.setWindowOpenHandler(({url}) => {
+    shell.openExternal(url);
+    return {action: "deny"};
+  });
+  win.on("closed", () => {
+    win = null;
+  });
+  win.on("ready-to-show", () => {
+    if (win) {
+      win.show();
+      win.focus();
+    }
+  });
 }
 function sendStatusToWindow(text: string) {
   win?.webContents.send("update-message", text);

desktop/main/helpers/autoUpdate.ts

@@ -5,3 +5,5 @@ export const settings = new Store<{recentDocs: string[]}>({
     recentDocs: [],
   },
 });
+
+export const port = Number(process.env.PORT) || 4444;

desktop/main/helpers/settings.ts

@@ -2,6 +2,8 @@ import {app} from "electron";
 import path from "path";
 import {fork, ChildProcess} from "child_process";
 import {hostSecret} from "../hostSecret";
+import waitOn from "wait-on";
+import {port} from "./settings";
 
 let child: ChildProcess | null = null;
 export async function startThoriumServer() {
@@ -23,11 +25,6 @@ export async function startThoriumServer() {
     // ],
     silent: true,
   });
-  child.once("message", function (msg) {
-    if (msg === "ready") {
-    } else if (msg === "error") {
-    }
-  });
   child.stdout?.on("data", function (data) {
     const message: string = data.toString();
     console.info(message);
@@ -41,7 +38,9 @@ export async function startThoriumServer() {
     console.error(err);
   });
 
-  await new Promise(res => setTimeout(res, 1000));
+  await waitOn({
+    resources: [`http://0.0.0.0:${port}/healthcheck`],
+  });
 }
 
 app.on("before-quit", async event => {
@@ -55,14 +54,7 @@ app.on("before-quit", async event => {
 export async function stopThoriumServer() {
   if (child) {
     await Promise.race([
-      new Promise<void>(res => {
-        child?.once("message", message => {
-          if (message === "saved") {
-            res();
-          }
-        });
-        child?.send("save");
-      }),
+      fetch(`http://0.0.0.0:${port}/snapshot`, {method: "POST"}),
       new Promise(res => setTimeout(res, 5000)),
     ]);
     child.kill();

desktop/main/helpers/startThoriumServer.ts

@@ -11,6 +11,7 @@
   "author": "Alex Anderson",
   "devDependencies": {
     "@types/bonjour": "^3.5.13",
+    "@types/wait-on": "^5.3.4",
     "copy-dir-cli": "^0.0.3",
     "electron-esbuild": "^8.0.0"
   },
@@ -19,6 +20,7 @@
     "electron-better-ipc": "^2.0.1",
     "electron-store": "^8.1.0",
     "electron-updater": "^6.1.7",
-    "electron-util": "^0.17.2"
+    "electron-util": "^0.17.2",
+    "wait-on": "^7.2.0"
   }
 }