9router 0.3.8 → 0.3.9

package/app/src/mitm/manager.js

@@ -423,6 +423,11 @@ async function startMitm(apiKey, sudoPassword) {
         `if (-not (Select-String -Path '${hostsPsPath}' -Pattern '${h}' -Quiet)) { Add-Content -Path '${hostsPsPath}' -Value "127.0.0.1 ${h}" }`
       ).join("\n");
 
+      const ts = Date.now();
+      const tmpSetup = path.join(os.tmpdir(), `mitm_setup_${ts}.ps1`);
+      const tmpDone = path.join(os.tmpdir(), `mitm_done_${ts}.tmp`);
+      const tmpDonePsPath = esc(tmpDone);
+
       const setupScript = `
 # 1. Install cert to Root store
 $certCheck = & certutil -store Root 'daily-cloudcode-pa.googleapis.com' 2>&1
@@ -435,23 +440,34 @@ ${dnsAddLines}
 # 3. Grant current user permission to bind port 443 (no more UAC needed after this)
 $sid = [System.Security.Principal.WindowsIdentity]::GetCurrent().User.Value
 & netsh http add urlacl url=https://+:443/ sddl="D:(A;;GX;;;$sid)" | Out-Null
+
+# 4. Write sentinel file so JS knows setup is complete
+Set-Content -Path '${tmpDonePsPath}' -Value 'done' -Force
 `.trim();
 
-      const tmpSetup = path.join(os.tmpdir(), `mitm_setup_${Date.now()}.ps1`);
       fs.writeFileSync(tmpSetup, setupScript, "utf8");
 
-      // Run elevated — this is the ONLY UAC prompt
+      // Trigger elevated script — UAC will appear for user to confirm
+      spawn("powershell", [
+        "-NoProfile", "-NonInteractive",
+        "-Command",
+        `Start-Process powershell -ArgumentList '-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File \\"${esc(tmpSetup)}\\"' -Verb RunAs`
+      ], { stdio: "ignore", windowsHide: true }).unref();
+
+      // Poll sentinel file — wait up to 60s for user to confirm UAC + script to finish
       await new Promise((resolve, reject) => {
-        const launcher = spawn("powershell", [
-          "-NoProfile", "-NonInteractive", "-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 });
-        launcher.on("close", (code) => {
-          if (code === 0) resolve();
-          else reject(new Error(`Setup script failed with code ${code}`));
-        });
-        launcher.on("error", reject);
+        const deadline = Date.now() + 60000;
+        const interval = setInterval(() => {
+          if (fs.existsSync(tmpDone)) {
+            clearInterval(interval);
+            try { fs.unlinkSync(tmpDone); } catch { /* ignore */ }
+            try { fs.unlinkSync(tmpSetup); } catch { /* ignore */ }
+            resolve();
+          } else if (Date.now() > deadline) {
+            clearInterval(interval);
+            reject(new Error("Setup timed out. Please confirm the UAC prompt and try again."));
+          }
+        }, 500);
       });
 
       if (_updateSettings) await _updateSettings({ mitmWinSetupDone: true, mitmCertInstalled: true }).catch(() => { });

package/package.json

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