9router 0.3.91 → 0.3.97

package/cli.js

@@ -117,6 +117,9 @@ function compareVersions(a, b) {
 function killAllAppProcesses() {
   return new Promise((resolve) => {
     try {
+      // Kill MITM first (admin/sudo process, needs special handling)
+      killMitmByPidFile();
+
       const platform = process.platform;
       let pids = [];
 
@@ -143,6 +146,18 @@ function killAllAppProcesses() {
         } catch (e) {
           // No processes found or error - continue
         }
+
+        // Also kill cloudflared.exe (tunnel holds file locks on Windows)
+        try {
+          const cfCmd = `powershell -NonInteractive -WindowStyle Hidden -Command "Get-Process cloudflared -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Id"`;
+          const cfOut = execSync(cfCmd, { encoding: "utf8", windowsHide: true, timeout: 5000 });
+          cfOut.split("\n").forEach(l => {
+            const pid = l.trim();
+            if (pid && !isNaN(pid)) pids.push(pid);
+          });
+        } catch (e) {
+          // No cloudflared running - continue
+        }
       } else {
         // macOS/Linux: use ps to find all matching processes
         try {
@@ -153,7 +168,7 @@ function killAllAppProcesses() {
           const lines = output.split('\n');
 
           lines.forEach(line => {
-            const isAppProcess = line.includes("9router") || line.includes("next-server");
+            const isAppProcess = line.includes("9router") || line.includes("next-server") || line.includes("cloudflared");
             if (isAppProcess) {
               const parts = line.trim().split(/\s+/);
               const pid = parts[1];
@@ -193,6 +208,34 @@ function killAllAppProcesses() {
   });
 }
 
+// Kill MITM server by PID file (MITM runs as admin/sudo, needs special handling)
+function killMitmByPidFile() {
+  try {
+    const mitmPidFile = path.join(
+      process.platform === "win32"
+        ? path.join(process.env.APPDATA || "", "9router")
+        : path.join(os.homedir(), ".9router"),
+      "mitm", ".mitm.pid"
+    );
+    if (!fs.existsSync(mitmPidFile)) return;
+    const pid = parseInt(fs.readFileSync(mitmPidFile, "utf8").trim(), 10);
+    if (!pid) return;
+
+    if (process.platform === "win32") {
+      // Admin CLI → admin MITM → same token → OK
+      execSync(`taskkill /F /T /PID ${pid}`, { stdio: "ignore", windowsHide: true, timeout: 3000 });
+    } else {
+      // Try sudo -n first (uses cached sudo token if still valid)
+      try { execSync(`sudo -n kill -9 ${pid} 2>/dev/null`, { stdio: "ignore", timeout: 3000 }); }
+      catch {
+        // Fallback: direct kill (works if MITM not root, or CLI is root)
+        try { process.kill(pid, "SIGKILL"); } catch { }
+      }
+    }
+    try { fs.unlinkSync(mitmPidFile); } catch { }
+  } catch { }
+}
+
 // Kill any process on specific port
 function killProcessOnPort(port) {
   return new Promise((resolve) => {
@@ -312,41 +355,31 @@ function performUpdate() {
 
   try {
     if (process.platform === "win32") {
-      // Windows: run directly in current terminal to avoid file-lock deadlock
-      // Remove global package dir first to prevent stale file locks
-      try {
-        const globalRoot = execSync("npm root -g", { encoding: "utf8", timeout: 10000 }).trim();
-        const pkgDir = path.join(globalRoot, pkg.name);
-        if (fs.existsSync(pkgDir)) {
-          fs.rmSync(pkgDir, { recursive: true, force: true });
-        }
-      } catch (e) { /* best effort */ }
+      // Windows: spawn detached .bat then exit CLI to release all file locks
+      const updateScript = `@echo off
+timeout /t 3 /nobreak >nul
+echo Installing new version...
+npm install -g ${pkg.name}@latest --prefer-online
+if %ERRORLEVEL% EQU 0 (
+  echo.
+  echo Update completed. Run "${pkg.name}" to start.
+) else (
+  echo.
+  echo Update failed. Try manually: npm install -g ${pkg.name}@latest
+)
+pause
+`;
+      const scriptPath = path.join(os.tmpdir(), `${APP_NAME}-update.bat`);
+      fs.writeFileSync(scriptPath, updateScript);
 
-      const MAX_RETRIES = 3;
-      const RETRY_DELAY_MS = 5000;
+      spawn("cmd", ["/c", "start", "", "cmd", "/c", scriptPath], {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: false
+      }).unref();
 
-      for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-        try {
-          console.log(`📥 Installing new version... (attempt ${attempt}/${MAX_RETRIES})`);
-          execSync(`npm install -g ${pkg.name}@latest --prefer-online`, {
-            stdio: "inherit",
-            timeout: 120000,
-            windowsHide: true
-          });
-          console.log(`\n✅ Update completed. Run '${pkg.name}' to start.`);
-          process.exit(0);
-        } catch (err) {
-          if (attempt < MAX_RETRIES) {
-            console.log(`⏳ Retry ${attempt}/${MAX_RETRIES} in ${RETRY_DELAY_MS / 1000}s...`);
-            const end = Date.now() + RETRY_DELAY_MS;
-            while (Date.now() < end) { /* wait */ }
-          } else {
-            console.error(`\n❌ Update failed after ${MAX_RETRIES} attempts.`);
-            console.log(`💡 Try manually: npm install -g ${pkg.name}@latest\n`);
-            process.exit(1);
-          }
-        }
-      }
+      console.log("\n🔄 Update started in new window. This window will close...");
+      process.exit(0);
     } else {
       // macOS/Linux: spawn detached update script (no file-lock issues on Unix)
       const updateScript = `#!/bin/bash
@@ -402,7 +435,7 @@ function openBrowser(url) {
     cmd = `xdg-open "${url}"`;
   }
 
-  exec(cmd, (err) => {
+  exec(cmd, { windowsHide: true }, (err) => {
     if (err) {
       console.log(`Open browser manually: ${url}`);
     }
@@ -483,18 +516,31 @@ function startServer(latestVersion) {
   let restartCount = 0;
   let serverStartTime = Date.now();
 
+  const CRASH_LOG_LINES = 50;
+  let crashLog = [];
+
   function spawnServer() {
     serverStartTime = Date.now();
-    return spawn(RUNTIME, [serverPath], {
+    crashLog = [];
+    const child = spawn(RUNTIME, [serverPath], {
       cwd: standaloneDir,
-      stdio: showLog ? "inherit" : "ignore",
+      stdio: showLog ? "inherit" : ["ignore", "ignore", "pipe"],
       detached: true,
+      windowsHide: true,
       env: {
         ...process.env,
         PORT: port.toString(),
         HOSTNAME: host
       }
     });
+    if (!showLog && child.stderr) {
+      child.stderr.on("data", (data) => {
+        const lines = data.toString().split("\n").filter(Boolean);
+        crashLog.push(...lines);
+        if (crashLog.length > CRASH_LOG_LINES) crashLog = crashLog.slice(-CRASH_LOG_LINES);
+      });
+    }
+    return child;
   }
 
   let server = spawnServer();
@@ -510,6 +556,8 @@ function startServer(latestVersion) {
         const { killTray } = require("./src/cli/tray/tray");
         killTray();
       } catch (e) { }
+      // Kill MITM server (admin/sudo process) via PID file
+      killMitmByPidFile();
       // Kill server process directly
       if (server.pid) {
         process.kill(server.pid, "SIGKILL");
@@ -591,8 +639,10 @@ function startServer(latestVersion) {
 
         if (choice === "update") {
           cleanup();
-          // Wait for server process to fully terminate before npm install
-          await new Promise(r => setTimeout(r, 2000));
+          // Kill ALL lingering processes (server/next-server/cloudflared/tray) to release file locks on Windows
+          await killAllAppProcesses();
+          await killProcessOnPort(port);
+          await new Promise(r => setTimeout(r, 1500));
           performUpdate();
           return;
         } else if (choice === "web") {
@@ -623,6 +673,7 @@ function startServer(latestVersion) {
           const bgProcess = spawn(process.execPath, [__filename, "--tray", "--skip-update", "-p", port.toString()], {
             detached: true,
             stdio: "ignore",
+            windowsHide: true,
             env: { ...process.env }
           });
           bgProcess.unref();
@@ -690,6 +741,11 @@ function startServer(latestVersion) {
     restartCount++;
     const delay = Math.min(1000 * restartCount, 10000);
     console.error(`\n⚠️  Server exited (code=${code ?? "unknown"}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
+    if (crashLog.length) {
+      console.error("\n--- Server crash log ---");
+      crashLog.forEach(l => console.error(l));
+      console.error("--- End crash log ---\n");
+    }
 
     setTimeout(() => {
       server = spawnServer();

package/package.json

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