9router 0.3.12 → 0.3.13

package/app/src/mitm/manager.js

@@ -368,34 +368,28 @@ async function startMitm(apiKey, sudoPassword) {
   // Kill any leftover MITM server from a previous failed start attempt
   await killLeftoverMitm(sudoPassword);
 
-  // Check port 443 availability BEFORE modifying system
-  // "no-permission" = EACCES: port may be held by a root process, check via lsof/netstat
-  const portStatus = await checkPort443Free();
-  if (portStatus === "in-use" || portStatus === "no-permission") {
-    const owner = await getPort443Owner(sudoPassword);
-    if (owner && owner.name === "node") {
-      // Orphan MITM node process — kill it and continue
-      console.log(`[MITM] Killing orphan node process on port 443 (PID ${owner.pid})...`);
-      try {
-        if (IS_WIN) {
-          await new Promise((resolve) => exec(`taskkill /F /PID ${owner.pid}`, resolve));
-        } else {
+  if (!IS_WIN) {
+    // Check port 443 availability — Windows handles this inside elevated script
+    const portStatus = await checkPort443Free();
+    if (portStatus === "in-use" || portStatus === "no-permission") {
+      const owner = await getPort443Owner(sudoPassword);
+      if (owner && owner.name === "node") {
+        // Orphan MITM node process — kill it and continue
+        console.log(`[MITM] Killing orphan node process on port 443 (PID ${owner.pid})...`);
+        try {
           const { execWithPassword } = require("./dns/dnsConfig");
           await execWithPassword(`kill -9 ${owner.pid}`, sudoPassword);
-        }
-        await new Promise(r => setTimeout(r, 800));
-      } catch {
-        // best effort — continue anyway
+          await new Promise(r => setTimeout(r, 800));
+        } catch { /* best effort */ }
+      } else if (owner) {
+        const shortName = owner.name.includes("/")
+          ? owner.name.split("/").filter(Boolean).pop()
+          : owner.name;
+        throw new Error(
+          `Port 443 is already in use by "${shortName}" (PID ${owner.pid}). Stop that process first, then retry.`
+        );
       }
-    } else if (owner) {
-      const shortName = owner.name.includes("/")
-        ? owner.name.split("/").filter(Boolean).pop()
-        : owner.name;
-      throw new Error(
-        `Port 443 is already in use by "${shortName}" (PID ${owner.pid}). Stop that process first, then retry.`
-      );
     }
-    // owner === null + no-permission → likely just needs sudo, proceed
   }
 
   // 1. Generate SSL certificate if not exists (no elevation needed)
@@ -432,6 +426,11 @@ async function startMitm(apiKey, sudoPassword) {
     ).join("\n");
 
     const psScript = [
+      `# 0. Kill any orphan node process on port 443`,
+      `$conn = Get-NetTCPConnection -LocalPort 443 -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1`,
+      `if ($conn -and $conn.OwningProcess -gt 4) { Stop-Process -Id $conn.OwningProcess -Force -ErrorAction SilentlyContinue }`,
+      `Start-Sleep -Milliseconds 500`,
+      ``,
       `# 1. Install SSL cert to Windows Root store`,
       `$c = & certutil -store Root 'daily-cloudcode-pa.googleapis.com' 2>&1`,
       `if ($LASTEXITCODE -ne 0) { & certutil -addstore Root '${certPs}' | Out-Null }`,
@@ -506,8 +505,11 @@ async function startMitm(apiKey, sudoPassword) {
     serverProcess.stdin.end();
   }
 
-  serverPid = serverProcess.pid;
-  fs.writeFileSync(PID_FILE, String(serverPid));
+  // Windows: node was started by elevated script — PID comes from health check later
+  if (!IS_WIN && serverProcess) {
+    serverPid = serverProcess.pid;
+    fs.writeFileSync(PID_FILE, String(serverPid));
+  }
 
   let startError = null;
   if (!IS_WIN) {

package/package.json

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