From 32e8638dbbcc82e0e4a81c672c948c4c05c7c98c Mon Sep 17 00:00:00 2001
From: Vinayak_Dhulubulu <vinayakdhulubulu45@gmail.com>
Date: Thu, 4 Jun 2026 12:20:05 +0530
Subject: [PATCH] fix: support electron development window

---
 electron/main.cjs | 142 +++++++++++++++++++++++++---------------------
 package.json      |   3 +-
 2 files changed, 79 insertions(+), 66 deletions(-)

diff --git a/electron/main.cjs b/electron/main.cjs
index 6fd09bb..7378456 100644
--- a/electron/main.cjs
+++ b/electron/main.cjs
@@ -2,32 +2,14 @@ const { app, BrowserWindow } = require('electron');
 const path = require('path');
 const { spawn } = require('child_process');
 const http = require('http');
-const fs = require('fs');
 
 let mainWindow;
 let serverProcess;
-let serverHost = '0.0.0.0';
-let serverPort = 3000;
-
-try {
-  const configPath = './src/server-config.json';
-  if (fs.existsSync(configPath)) {
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-    if (config.host) serverHost = config.host;
-    if (config.frontendPort) serverPort = config.frontendPort;
-  }
-} catch (e) {
-  console.warn('Failed to load server config:', e);
-}
+const isDev = !app.isPackaged;
 
-// Prevent multiple instances
-const gotLock = app.requestSingleInstanceLock();
-if (!gotLock) {
-  app.quit();
-  process.exit(0);
-}
+const DEV_URL = process.env.VITE_DEV_SERVER_URL || 'http://localhost:3000';
 
-// Wait until server is ready
+// Wait for server
 function waitForServer(url) {
   return new Promise((resolve) => {
     const check = () => {
@@ -35,68 +17,98 @@ function waitForServer(url) {
         .get(url, () => resolve())
         .on('error', () => setTimeout(check, 500));
     };
+
     check();
   });
 }
 
-// Start Nitro server (production)
-function startServer() {
-  return new Promise((resolve) => {
-    const serverPath = path.join(
-      process.resourcesPath,
-      'app.asar.unpacked',
-      '.output',
-      'server',
-      'index.mjs'
-    );
-
-    console.log("Starting server from:", serverPath);
-
-    serverProcess = spawn('node', [serverPath], {
-      stdio: 'ignore',       // no terminal
-      windowsHide: true,     // hide CMD
-      env: {
-        ...process.env,
-        HOST: serverHost,
-        PORT: serverPort.toString(),
-      },
-    });
-
-    waitForServer(`http://localhost:${serverPort}`).then(resolve);
+// Start production Nitro server
+async function startProductionServer() {
+  const serverPath = path.join(
+    process.resourcesPath,
+    'app.asar.unpacked',
+    '.output',
+    'server',
+    'index.mjs'
+  );
+
+  console.log('Starting production server:', serverPath);
+
+  serverProcess = spawn('node', [serverPath], {
+    stdio: 'inherit',
+    windowsHide: true,
+    env: {
+      ...process.env,
+      HOST: '0.0.0.0',
+      PORT: '3000',
+    },
   });
-}
 
-// Create window
-function createWindow() {
-  if (mainWindow) return;
+  await waitForServer('http://localhost:3000');
+}
 
+// Create Electron window
+async function createWindow() {
   mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
-    show: false,
-  });
 
-  mainWindow.loadURL(`http://localhost:${serverPort}`);
+    // IMPORTANT
+    show: true,
 
-  // Show when ready
-  mainWindow.once('ready-to-show', () => {
-    mainWindow.show();
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false,
+    },
   });
 
-  // Debug only if needed
-  mainWindow.webContents.on('did-fail-load', (e, code, desc) => {
-    console.log("LOAD FAILED:", code, desc);
+  mainWindow.webContents.openDevTools();
+
+  try {
+    if (isDev) {
+      console.log("Loading DEV URL:", DEV_URL);
+
+      await waitForServer(DEV_URL);
+
+      await mainWindow.loadURL(DEV_URL);
+    } else {
+      console.log("Loading PROD URL");
+
+      await startProductionServer();
+
+      await mainWindow.loadURL("http://localhost:3000");
+    }
+
+    console.log("WINDOW LOADED");
+  } catch (err) {
+    console.error("LOAD ERROR:", err);
+  }
+
+  mainWindow.on("closed", () => {
+    mainWindow = null;
   });
+
+  mainWindow.webContents.on(
+    "did-fail-load",
+    (_, code, desc) => {
+      console.log("FAILED LOAD:", code, desc);
+    }
+  );
+
+  mainWindow.webContents.on(
+    "render-process-gone",
+    (_, details) => {
+      console.log("RENDER GONE:", details);
+    }
+  );
 }
 
-// App start
-app.whenReady().then(async () => {
-  await startServer();
-  createWindow();
-});
+app.whenReady().then(createWindow);
 
-// Cleanup
 app.on('window-all-closed', () => {
   if (serverProcess) serverProcess.kill();
-  if (process.platform !== 'darwin') app.quit();
+
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
 });
\ No newline at end of file
diff --git a/package.json b/package.json
index af6a743..ddeece2 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
 		"start": "vite preview --host --open",
 		"build": "vite build",
 		"electron": "npx electron .",
-		"electron-dev": "concurrently \"vite\" \"wait-on http://localhost:3000 && VITE_DEV_SERVER_URL=http://localhost:3000 electron .\"",
+		"electron-dev": "concurrently \"vite\" \"wait-on http://localhost:3000 && cross-env VITE_DEV_SERVER_URL=http://localhost:3000 electron .\"",
 		"dist": "electron-builder",
 		"preview": "vite preview",
 		"test": "vitest run",
@@ -50,6 +50,7 @@
 		"@vitejs/plugin-react": "^5.2.0",
 		"autoprefixer": "^10.4.23",
 		"concurrently": "^9.2.1",
+		"cross-env": "^10.1.0",
 		"daisyui": "^5.5.14",
 		"electron": "^40.6.1",
 		"electron-builder": "^26.8.1",