9router 0.3.5 → 0.3.7

package/app/src/mitm/manager.js

@@ -276,11 +276,12 @@ async function killLeftoverMitm(sudoPassword) {
  * Returns { ok, pid } on success, null on timeout.
  */
 function pollMitmHealth(timeoutMs) {
+  const healthPort = MITM_PORT;
   return new Promise((resolve) => {
     const deadline = Date.now() + timeoutMs;
     const check = () => {
       const req = https.request(
-        { hostname: "127.0.0.1", port: 443, path: "/_mitm_health", method: "GET", rejectUnauthorized: false },
+        { hostname: "127.0.0.1", port: healthPort, path: "/_mitm_health", method: "GET", rejectUnauthorized: false },
         (res) => {
           let body = "";
           res.on("data", (d) => { body += d; });
@@ -407,24 +408,22 @@ async function startMitm(apiKey, sudoPassword) {
   console.log("Starting MITM server...");
 
   if (IS_WIN) {
-    // Windows: single UAC prompt does cert install + DNS + server start all at once
     const hostsFile = path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts");
     const TARGET_HOSTS_WIN = ["daily-cloudcode-pa.googleapis.com", "cloudcode-pa.googleapis.com"];
-
-    // Escape paths for PowerShell single-quoted strings
     const esc = (s) => s.replace(/'/g, "''");
-    const nodePsPath = esc(process.execPath);
-    const serverPsPath = esc(SERVER_PATH);
     const certPsPath = esc(certPath);
     const hostsPsPath = esc(hostsFile);
+    const nodePsPath = esc(process.execPath);
+    const serverPsPath = esc(SERVER_PATH);
 
-    // Build DNS add lines for each host
     const dnsAddLines = TARGET_HOSTS_WIN.map(h =>
       `if (-not (Select-String -Path '${hostsPsPath}' -Pattern '${h}' -Quiet)) { Add-Content -Path '${hostsPsPath}' -Value "127.0.0.1 ${h}" }`
     ).join("\n");
 
-    const psScript = `
-# 1. Install cert if not already in Root store
+    // Single elevated script: cert + DNS + urlacl (allow node to bind 443) + start node
+    // urlacl grants non-admin processes permission to bind port 443 via HTTP.sys
+    const setupScript = `
+# 1. Install cert to Root store if not present
 $certCheck = & certutil -store Root 'daily-cloudcode-pa.googleapis.com' 2>&1
 if ($LASTEXITCODE -ne 0) {
   & certutil -addstore Root '${certPsPath}' | Out-Null
@@ -434,22 +433,34 @@ if ($LASTEXITCODE -ne 0) {
 ${dnsAddLines}
 & ipconfig /flushdns | Out-Null
 
-# 3. Start node server hidden with env vars
+# 3. Grant permission for any user to bind HTTPS port 443 (no admin needed after this)
+& netsh http add urlacl url=https://+:${MITM_PORT}/ user=Everyone 2>&1 | Out-Null
+
+# 4. Start node MITM server (now allowed to bind 443 without admin)
 $env:ROUTER_API_KEY = '${esc(apiKey)}'
 $env:NODE_ENV = 'production'
 Start-Process -FilePath '${nodePsPath}' -ArgumentList '"${serverPsPath}"' -WindowStyle Hidden
 `.trim();
 
-    // Write script to temp file to avoid command-line quoting issues
-    const tmpScript = path.join(os.tmpdir(), `mitm_start_${Date.now()}.ps1`);
-    fs.writeFileSync(tmpScript, psScript, "utf8");
+    const tmpSetup = path.join(os.tmpdir(), `mitm_setup_${Date.now()}.ps1`);
+    fs.writeFileSync(tmpSetup, setupScript, "utf8");
+
+    // Outer spawn WITHOUT -NonInteractive so UAC dialog can appear
+    await new Promise((resolve, reject) => {
+      const setupProc = spawn("powershell", [
+        "-NoProfile", "-WindowStyle", "Hidden",
+        "-Command",
+        `Start-Process powershell -ArgumentList '-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File \\"${esc(tmpSetup)}\\"' -Verb RunAs -Wait; Remove-Item '${esc(tmpSetup)}' -ErrorAction SilentlyContinue`
+      ], { stdio: "ignore", windowsHide: true });
+      setupProc.on("close", () => resolve());
+      setupProc.on("error", reject);
+    });
+
+    if (_updateSettings) await _updateSettings({ mitmCertInstalled: true }).catch(() => { });
 
-    // Single UAC prompt — runs entire setup elevated
-    serverProcess = spawn("powershell", [
-      "-NoProfile", "-NonInteractive", "-WindowStyle", "Hidden",
-      "-Command",
-      `Start-Process powershell -ArgumentList '-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File \\"${tmpScript}\\"' -Verb RunAs -Wait; Remove-Item '${esc(tmpScript)}' -ErrorAction SilentlyContinue`
-    ], { stdio: "ignore", windowsHide: true });
+    // serverProcess reference not available (started inside elevated script)
+    // PID will be captured from health check response
+    serverProcess = { pid: null, killed: false };
   } else {
     // macOS/Linux: install cert + add DNS (requires sudo), then spawn server
     const settings = _getSettings ? await _getSettings().catch(() => ({})) : {};
@@ -472,8 +483,8 @@ Start-Process -FilePath '${nodePsPath}' -ArgumentList '"${serverPsPath}"' -Windo
     serverProcess.stdin.end();
   }
 
-  serverPid = serverProcess.pid;
-  fs.writeFileSync(PID_FILE, String(serverPid));
+  serverPid = IS_WIN ? null : serverProcess.pid;
+  if (serverPid) fs.writeFileSync(PID_FILE, String(serverPid));
 
   let startError = null;
   if (!IS_WIN) {
@@ -508,10 +519,7 @@ Start-Process -FilePath '${nodePsPath}' -ArgumentList '"${serverPsPath}"' -Windo
     throw new Error(`MITM server failed to start. ${reason}`);
   }
 
-  // On Windows, mark cert as installed after successful start
-  if (IS_WIN && _updateSettings) await _updateSettings({ mitmCertInstalled: true }).catch(() => { });
-
-  // On Windows, use real PID from health check (launcher exits immediately after UAC)
+  // On Windows, use real PID from health check (node detached, serverProcess.pid may differ)
   if (IS_WIN && health.pid) {
     serverPid = health.pid;
     fs.writeFileSync(PID_FILE, String(serverPid));
@@ -552,8 +560,42 @@ async function stopMitm(sudoPassword) {
     serverPid = null;
   }
 
-  console.log("Removing DNS entry...");
-  await removeDNSEntry(sudoPassword);
+  if (IS_WIN) {
+    // Cleanup: remove DNS entries + urlacl — single UAC prompt
+    const hostsFile = path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts");
+    const TARGET_HOSTS_WIN = ["daily-cloudcode-pa.googleapis.com", "cloudcode-pa.googleapis.com"];
+    const esc = (s) => s.replace(/'/g, "''");
+    const hostsPsPath = esc(hostsFile);
+
+    const content = fs.readFileSync(hostsFile, "utf8");
+    const filtered = content.split(/\r?\n/).filter(l => !TARGET_HOSTS_WIN.some(h => l.includes(h))).join("\r\n");
+    const tmpHosts = path.join(os.tmpdir(), "hosts_filtered.tmp");
+    fs.writeFileSync(tmpHosts, filtered, "utf8");
+
+    const cleanupScript = `
+# Remove DNS entries
+Copy-Item -Path '${esc(tmpHosts)}' -Destination '${hostsPsPath}' -Force
+& ipconfig /flushdns | Out-Null
+Remove-Item '${esc(tmpHosts)}' -ErrorAction SilentlyContinue
+
+# Remove urlacl
+& netsh http delete urlacl url=https://+:${MITM_PORT}/ 2>&1 | Out-Null
+`.trim();
+    const tmpCleanup = path.join(os.tmpdir(), `mitm_cleanup_${Date.now()}.ps1`);
+    fs.writeFileSync(tmpCleanup, cleanupScript, "utf8");
+    await new Promise((resolve) => {
+      const p = spawn("powershell", [
+        "-NoProfile", "-WindowStyle", "Hidden",
+        "-Command",
+        `Start-Process powershell -ArgumentList '-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File \\"${esc(tmpCleanup)}\\"' -Verb RunAs -Wait; Remove-Item '${esc(tmpCleanup)}' -ErrorAction SilentlyContinue`
+      ], { stdio: "ignore", windowsHide: true });
+      p.on("close", resolve);
+      p.on("error", resolve);
+    });
+  } else {
+    console.log("Removing DNS entry...");
+    await removeDNSEntry(sudoPassword);
+  }
 
   try { fs.unlinkSync(PID_FILE); } catch { /* ignore */ }
 

package/cli.js

@@ -360,11 +360,10 @@ fi
     }
 
     const spawnOpts = platform === "win32"
-      ? { stdio: "ignore", windowsHide: true }
-      : { detached: true, stdio: "ignore" };
+      ? { stdio: "ignore", shell: true }   // cmd /c start opens new window
+      : { stdio: "inherit" };              // show progress in current terminal
     const child = spawn(shellCmd[0], shellCmd[1], spawnOpts);
-    child.unref();
-    process.exit(0);
+    child.on("close", () => process.exit(0));
   } catch (err) {
     console.error(`⚠️  Update failed: ${err.message}`);
     console.log(`   Run manually: npm install -g ${pkg.name}@latest\n`);

package/package.json

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

package/src/cli/tray/tray.js

@@ -5,16 +5,18 @@ const path = require("path");
 let trayInstance = null;
 
 /**
- * Get icon base64 from file or use embedded fallback
+ * Get icon base64 from file — use .ico on Windows, .png on macOS/Linux
  */
 function getIconBase64() {
+  const isWin = process.platform === "win32";
+  const iconFile = isWin ? "icon.ico" : "icon.png";
   try {
-    const iconPath = path.join(__dirname, "icon.png");
+    const iconPath = path.join(__dirname, iconFile);
     if (fs.existsSync(iconPath)) {
       return fs.readFileSync(iconPath).toString("base64");
     }
   } catch (e) {}
-  // Fallback: minimal green dot icon
+  // Fallback: minimal green dot icon (PNG)
   return "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAALEwAACxMBAJqcGAAAAHpJREFUOE9jYBgFgwEwMjIy/Gdg+P8fyP4PxP8ZGBgEcBnGyMjIsICBgSEAhyH/gfgBUNN8XJoZsdkCVL8Ah+b/QPwbqvkBMvk/AwMDAzYX/GdgYAhAN+A/SICRWAMYGfFEJSMjzriEiwDR/xmIa2RkZCSqnZERb3QCAAo3KxzxbKe1AAAAAElFTkSuQmCC";
 }