9router 0.3.47 → 0.3.49

package/cli.js

@@ -123,17 +123,17 @@ function killAllAppProcesses() {
       if (platform === "win32") {
         // Windows: use tasklist + findstr (works on all Windows versions)
         try {
-          const output = execSync('tasklist /FO CSV /V 2>nul | findstr /I "node"', { 
+          const output = execSync('tasklist /FO CSV /V 2>nul | findstr /I "node"', {
             encoding: 'utf8',
             shell: true,
             windowsHide: true,
             timeout: 5000
           });
           const lines = output.split('\n').filter(l => l.trim());
-          
+
           lines.forEach(line => {
-            const isAppProcess = line.toLowerCase().includes("9router") || 
-                                 line.toLowerCase().includes("next-server");
+            const isAppProcess = line.toLowerCase().includes("9router") ||
+              line.toLowerCase().includes("next-server");
             if (isAppProcess) {
               // CSV format: "name","pid",...
               const match = line.match(/"node\.exe","(\d+)"/i);
@@ -148,12 +148,12 @@ function killAllAppProcesses() {
       } else {
         // macOS/Linux: use ps to find all matching processes
         try {
-          const output = execSync('ps aux 2>/dev/null', { 
+          const output = execSync('ps aux 2>/dev/null', {
             encoding: 'utf8',
             timeout: 5000
           });
           const lines = output.split('\n');
-          
+
           lines.forEach(line => {
             const isAppProcess = line.includes("9router") || line.includes("next-server");
             if (isAppProcess) {
@@ -182,7 +182,7 @@ function killAllAppProcesses() {
             // Process already dead or can't kill - continue
           }
         });
-        
+
         // Wait for processes to fully terminate
         setTimeout(() => resolve(), 1000);
       } else {
@@ -204,11 +204,11 @@ function killProcessOnPort(port) {
 
       if (platform === "win32") {
         try {
-          const output = execSync(`netstat -ano | findstr :${port}`, { 
-            encoding: 'utf8', 
+          const output = execSync(`netstat -ano | findstr :${port}`, {
+            encoding: 'utf8',
             shell: true,
             windowsHide: true,
-            timeout: 5000 
+            timeout: 5000
           }).trim();
           const lines = output.split('\n').filter(l => l.includes('LISTENING'));
           if (lines.length > 0) {
@@ -221,9 +221,9 @@ function killProcessOnPort(port) {
       } else {
         // macOS/Linux
         try {
-          const pidOutput = execSync(`lsof -ti:${port}`, { 
-            encoding: 'utf8', 
-            stdio: ['pipe', 'pipe', 'ignore'] 
+          const pidOutput = execSync(`lsof -ti:${port}`, {
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore']
           }).trim();
           if (pidOutput) {
             pid = pidOutput.split('\n')[0];
@@ -250,12 +250,12 @@ function isRestrictedEnvironment() {
   if (process.env.CODESPACES === "true" || process.env.GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN) {
     return "GitHub Codespaces";
   }
-  
+
   // Check for Docker
   if (fs.existsSync("/.dockerenv") || (fs.existsSync("/proc/1/cgroup") && fs.readFileSync("/proc/1/cgroup", "utf8").includes("docker"))) {
     return "Docker";
   }
-  
+
   return null;
 }
 
@@ -380,7 +380,7 @@ fi
 function openBrowser(url) {
   const platform = process.platform;
   let cmd;
-  
+
   if (platform === "darwin") {
     cmd = `open "${url}"`;
   } else if (platform === "win32") {
@@ -388,7 +388,7 @@ function openBrowser(url) {
   } else {
     cmd = `xdg-open "${url}"`;
   }
-  
+
   exec(cmd, (err) => {
     if (err) {
       console.log(`Open browser manually: ${url}`);
@@ -420,11 +420,11 @@ async function showInterfaceMenu(latestVersion) {
   const { selectMenu } = require("./src/cli/utils/input");
   const { clearScreen } = require("./src/cli/utils/display");
   const { getEndpoint } = require("./src/cli/utils/endpoint");
-  
+
   clearScreen();
-  
+
   const displayHost = host === DEFAULT_HOST ? "localhost" : host;
-  
+
   // Detect tunnel/local mode for server URL display
   let serverUrl;
   try {
@@ -433,26 +433,26 @@ async function showInterfaceMenu(latestVersion) {
   } catch (e) {
     serverUrl = `http://${displayHost}:${port}`;
   }
-  
+
   const subtitle = `🚀 Server: \x1b[32m${serverUrl}\x1b[0m`;
-  
+
   const menuItems = [];
-  
+
   if (latestVersion) {
     menuItems.push({ label: `Update to v${latestVersion} (current: v${pkg.version})`, icon: "⬆" });
   }
-  
+
   menuItems.push(
     { label: "Web UI (Open in Browser)", icon: "🌐" },
     { label: "Terminal UI (Interactive CLI)", icon: "💻" },
     { label: "Hide to Tray (Background)", icon: "🔔" },
     { label: "Exit", icon: "🚪" }
   );
-  
+
   const selected = await selectMenu(`Choose Interface (v${pkg.version})`, menuItems, 0, subtitle);
-  
+
   const offset = latestVersion ? 1 : 0;
-  
+
   if (latestVersion && selected === 0) return "update";
   if (selected === offset) return "web";
   if (selected === offset + 1) return "terminal";
@@ -460,20 +460,31 @@ async function showInterfaceMenu(latestVersion) {
   return "exit";
 }
 
+const MAX_RESTARTS = 5;
+const RESTART_RESET_MS = 30000; // Reset counter if alive > 30s
+
 function startServer(latestVersion) {
   const displayHost = host === DEFAULT_HOST ? "localhost" : host;
   const url = `http://${displayHost}:${port}/dashboard`;
 
-  const server = spawn(RUNTIME, [serverPath], {
-    cwd: standaloneDir,
-    stdio: showLog ? "inherit" : "ignore",
-    detached: true,
-    env: {
-      ...process.env,
-      PORT: port.toString(),
-      HOSTNAME: host
-    }
-  });
+  let restartCount = 0;
+  let serverStartTime = Date.now();
+
+  function spawnServer() {
+    serverStartTime = Date.now();
+    return spawn(RUNTIME, [serverPath], {
+      cwd: standaloneDir,
+      stdio: showLog ? "inherit" : "ignore",
+      detached: true,
+      env: {
+        ...process.env,
+        PORT: port.toString(),
+        HOSTNAME: host
+      }
+    });
+  }
+
+  let server = spawnServer();
 
   // Cleanup function - force kill server process
   let isCleaningUp = false;
@@ -485,14 +496,14 @@ function startServer(latestVersion) {
       try {
         const { killTray } = require("./src/cli/tray/tray");
         killTray();
-      } catch (e) {}
+      } catch (e) { }
       // Kill server process directly
       if (server.pid) {
         process.kill(server.pid, "SIGKILL");
       }
       // Also try to kill process group
       process.kill(-server.pid, "SIGKILL");
-    } catch (e) {}
+    } catch (e) { }
   }
 
   // Suppress all errors during shutdown (systray lib throws JSON parse errors)
@@ -546,13 +557,13 @@ function startServer(latestVersion) {
   if (trayMode) {
     console.log(`\n🚀 ${pkg.name} v${pkg.version}`);
     console.log(`Server: http://${displayHost}:${port}`);
-    
+
     setTimeout(() => {
       initTrayIcon();
       console.log("\n💡 Router is now running in system tray. Close this terminal if you want.");
       console.log("   Right-click tray icon to open dashboard or quit.\n");
     }, 2000);
-    
+
     return;
   }
 
@@ -560,11 +571,11 @@ function startServer(latestVersion) {
   setTimeout(async () => {
     // Start tray icon alongside TUI
     initTrayIcon();
-    
+
     try {
       while (true) {
         const choice = await showInterfaceMenu(latestVersion);
-        
+
         if (choice === "update") {
           cleanup();
           performUpdate();
@@ -583,7 +594,7 @@ function startServer(latestVersion) {
           // Hide to tray - spawn detached background process
           const { clearScreen } = require("./src/cli/utils/display");
           clearScreen();
-          
+
           // Enable auto startup on OS boot
           try {
             const { enableAutoStart } = require("./src/cli/tray/autostart");
@@ -591,8 +602,8 @@ function startServer(latestVersion) {
             if (enabled) {
               console.log("✅ Auto-start enabled (will run on OS boot)");
             }
-          } catch (e) {}
-          
+          } catch (e) { }
+
           // Spawn new detached process with --tray flag
           const bgProcess = spawn(process.execPath, [__filename, "--tray", "--skip-update", "-p", port.toString()], {
             detached: true,
@@ -600,13 +611,13 @@ function startServer(latestVersion) {
             env: { ...process.env }
           });
           bgProcess.unref();
-          
+
           console.log(`\n🔔 9Router is now running in background (PID: ${bgProcess.pid})`);
           console.log(`   Server: http://${displayHost}:${port}`);
           console.log(`\n💡 You can close this terminal. Right-click tray icon to:`);
           console.log(`   • Open Dashboard`);
           console.log(`   • Quit\n`);
-          
+
           // Exit current process - background process takes over
           cleanup();
           process.exit(0);
@@ -624,13 +635,43 @@ function startServer(latestVersion) {
     }
   }, 3000);
 
-  server.on("error", (err) => {
-    console.error("Failed to start server:", err.message);
-    cleanup();
-    process.exit(1);
-  });
+  function attachServerEvents() {
+    server.on("error", (err) => {
+      console.error("Failed to start server:", err.message);
+      if (!isShuttingDown) tryRestart();
+      else { cleanup(); process.exit(1); }
+    });
 
-  server.on("close", (code) => {
-    process.exit(code || 0);
-  });
+    server.on("close", (code) => {
+      if (isShuttingDown || code === 0) {
+        process.exit(code || 0);
+        return;
+      }
+      tryRestart(code);
+    });
+  }
+
+  function tryRestart(code) {
+    const aliveMs = Date.now() - serverStartTime;
+    // Reset counter if last run was stable
+    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
+
+    if (restartCount >= MAX_RESTARTS) {
+      console.error(`\n❌ Server crashed ${MAX_RESTARTS} times. Giving up.`);
+      cleanup();
+      process.exit(1);
+      return;
+    }
+
+    restartCount++;
+    const delay = Math.min(1000 * restartCount, 10000);
+    console.error(`\n⚠️  Server exited (code=${code ?? "unknown"}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
+
+    setTimeout(() => {
+      server = spawnServer();
+      attachServerEvents();
+    }, delay);
+  }
+
+  attachServerEvents();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9router",
-  "version": "0.3.47",
+  "version": "0.3.49",
   "description": "9Router CLI - Start and manage 9Router server",
   "bin": {
     "9router": "./cli.js"