feat: make main window reload after restart, handle better backend start and restart

Author: maximka76667

electron-app/src/ipc/handlers.js

@@ -19,6 +19,7 @@ import {
   getCurrentView,
   getMainWindow,
   loadView,
+  reloadWindow,
 } from "../windows/mainWindow.js";
 
 /**
@@ -61,7 +62,10 @@ function setupIpcHandlers() {
   ipcMain.handle("save-config", async (event, config) => {
     try {
       await writeConfig(config);
-      restartBackend();
+      await restartBackend();
+
+      reloadWindow();
+
       return true;
     } catch (error) {
       logger.electron.error("Error saving config:", error);
@@ -96,7 +100,10 @@ function setupIpcHandlers() {
   ipcMain.handle("import-config", async () => {
     try {
       await importConfig();
-      restartBackend();
+      await restartBackend();
+
+      reloadWindow();
+
       return true;
     } catch (error) {
       logger.electron.error("Error importing config:", error);

electron-app/src/processes/backend.js

@@ -25,6 +25,9 @@ const appPath = getAppPath();
 // Store the backend process instance
 let backendProcess = null;
 
+// Common log window instance for all backend processes
+let storedLogWindow = null;
+
 // Store error messages (keep last 10 lines to avoid memory issues)
 let lastBackendError = null;
 
@@ -34,7 +37,13 @@ let lastBackendError = null;
  * @example
  * startBackend();
  */
-function startBackend(logWindow = null) {
+async function startBackend(logWindow = null) {
+  if (logWindow) {
+    storedLogWindow = logWindow;
+  }
+
+  const currentLogWindow = logWindow || storedLogWindow;
+
   return new Promise((resolve, reject) => {
     // Get paths for binary and config
     const backendBin = getBinaryPath("backend");
@@ -69,9 +78,9 @@ function startBackend(logWindow = null) {
       logger.backend.info(`${data.toString().trim()}`);
 
       // Send log message to log window
-      if (logWindow) {
+      if (currentLogWindow && !currentLogWindow.isDestroyed()) {
         const htmlData = convert.toHtml(data.toString().trim());
-        logWindow.webContents.send("log", htmlData);
+        currentLogWindow.webContents.send("log", htmlData);
       }
     });
 
@@ -83,9 +92,9 @@ function startBackend(logWindow = null) {
       lastBackendError = errorMsg;
 
       // Send error message to log window
-      if (logWindow) {
+      if (currentLogWindow && !currentLogWindow.isDestroyed()) {
         const htmlError = convert.toHtml(errorMsg);
-        logWindow.webContents.send("log", htmlError);
+        currentLogWindow.webContents.send("log", htmlError);
       }
     });
 
@@ -102,7 +111,7 @@ function startBackend(logWindow = null) {
     // If the backend didn't fail in this period of time, resolve the promise
     setTimeout(() => {
       resolve(backendProcess);
-    }, 4000);
+    }, 2000);
 
     // Handle process exit
     backendProcess.on("close", (code) => {
@@ -127,32 +136,46 @@ function startBackend(logWindow = null) {
 }
 
 /**
- * Stops the backend process by sending a SIGTERM signal.
+ * Stops the backend process by sending a SIGTERM and std.in.end() signal.
+ * If the process does not exit gracefully after defined time, it will be force killed.
  * @returns {void}
  * @example
  * stopBackend();
  */
-function stopBackend() {
-  // Only stop if process exists and is still running
-  if (backendProcess && !backendProcess.killed) {
-    logger.backend.info("Stopping backend...");
-
-    backendProcess.stdin.end();
-
-    const fallbackTimer = setTimeout(() => {
-      if (backendProcess && !backendProcess.killed) {
-        logger.backend.warning(
-          "Backend did not exit gracefully, force killing..."
-        );
-        backendProcess.kill("SIGKILL");
-      }
-    }, 2000);
+async function stopBackend() {
+  return new Promise((resolve, reject) => {
+    const localBackendProcess = backendProcess;
 
-    fallbackTimer.unref();
+    // Only stop if process exists and is still running
+    if (localBackendProcess && !localBackendProcess.killed) {
+      logger.backend.info("Stopping backend...");
 
-    // Clear the process reference
-    backendProcess = null;
-  }
+      localBackendProcess.once("close", () => {
+        // Clear the process reference
+        if (localBackendProcess === backendProcess) {
+          backendProcess = null;
+        }
+        resolve();
+      });
+
+      localBackendProcess.kill("SIGTERM");
+      localBackendProcess.stdin.end();
+
+      const fallbackTimer = setTimeout(() => {
+        if (localBackendProcess && !localBackendProcess.killed) {
+          logger.backend.warning(
+            "Backend did not exit gracefully, force killing..."
+          );
+          localBackendProcess.kill("SIGKILL");
+        }
+      }, 2000);
+
+      fallbackTimer.unref();
+    } else {
+      logger.backend.warning("Backend process not found, skipping stop...");
+      resolve();
+    }
+  });
 }
 
 /**
@@ -161,11 +184,18 @@ function stopBackend() {
  * @example
  * restartBackend();
  */
-function restartBackend() {
+async function restartBackend() {
   // Stop current process first
-  stopBackend();
+  await stopBackend();
+
   // Start a new process
-  startBackend();
+  try {
+    await startBackend();
+    logger.electron.info("Backend restarted successfully");
+  } catch (error) {
+    logger.electron.error("Failed to restart backend:", error);
+    throw error; // Let the IPC handler know it failed
+  }
 }
 
 export { restartBackend, startBackend, stopBackend };

electron-app/src/windows/mainWindow.js

@@ -98,6 +98,18 @@ function loadView(view) {
   }
 }
 
+/**
+ * Reloads the main window.
+ * @returns {void}
+ * @example
+ * reloadWindow();
+ */
+function reloadWindow() {
+  if (mainWindow) {
+    mainWindow.reload();
+  }
+}
+
 /**
  * Returns the name of the currently loaded view.
  * @returns {string} The current view name (e.g., "ethernet-view", "control-station").
@@ -124,4 +136,4 @@ function getMainWindow() {
   return mainWindow;
 }
 
-export { createWindow, getCurrentView, getMainWindow, loadView };
+export { createWindow, getCurrentView, getMainWindow, loadView, reloadWindow };

frontend/testing-view/src/hooks/useAppMode.ts

@@ -31,7 +31,6 @@ export function useAppMode(
     // logger.testingView.log("[DEBUG] isDev", isDev);
     // logger.testingView.log("[DEBUG] isLoading", isLoading);
     // logger.testingView.log("[DEBUG] hasData", hasData);
-    // logger.testingView.log("[DEBUG] backendConnected", backendConnected);
     // logger.testingView.log("[DEBUG] hasError", hasError);
 
     if (isLoading || isRestarting) return "loading";