@yina-npm/openrouterx 0.4.55 → 0.4.71

package/app/src/mitm/manager.js

@@ -15,91 +15,26 @@ const { installCert, uninstallCert } = require("./cert/install");
 const { isCertExpired } = require("./cert/rootCA");
 const { DATA_DIR, MITM_DIR } = require("./paths");
 const { log, err } = require("./logger");
+const { LSOF_BIN } = require("./config");
 
-const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20502";
+const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20128";
 
 function shellQuoteSingle(str) {
   if (str == null || str === "") return "''";
   return `'${String(str).replace(/'/g, "'\\''")}'`;
 }
 
-function normalizeHttpBaseUrl(input) {
-  const raw = input == null ? "" : String(input).trim();
-  if (!raw) return "";
-  try {
-    const u = new URL(raw.replace(/\/+$/, ""));
-    if (u.protocol !== "http:" && u.protocol !== "https:") return "";
-    return u.toString().replace(/\/+$/, "");
-  } catch {
-    return "";
-  }
-}
-
-function isLoopbackBaseUrl(baseUrl) {
-  try {
-    const host = new URL(baseUrl).hostname.toLowerCase();
-    return host === "localhost" || host === "127.0.0.1" || host === "::1";
-  } catch {
-    return false;
-  }
-}
-
-function readCurrentServerBaseUrl() {
-  try {
-    const file = path.join(DATA_DIR, "server.json");
-    if (!fs.existsSync(file)) return "";
-    const parsed = JSON.parse(fs.readFileSync(file, "utf8"));
-    return normalizeHttpBaseUrl(parsed && parsed.baseUrl);
-  } catch {
-    return "";
-  }
-}
-
-function canConnectBaseUrl(baseUrl, timeoutMs = 350) {
-  return new Promise((resolve) => {
-    let u;
-    try {
-      u = new URL(baseUrl);
-    } catch {
-      resolve(false);
-      return;
-    }
-
-    const port = Number(u.port || (u.protocol === "https:" ? 443 : 80));
-    const socket = net.connect({ host: u.hostname, port });
-    const done = (ok) => {
-      socket.removeAllListeners();
-      socket.destroy();
-      resolve(ok);
-    };
-    socket.setTimeout(timeoutMs, () => done(false));
-    socket.once("connect", () => done(true));
-    socket.once("error", () => done(false));
-  });
-}
-
 async function resolveMitmRouterBaseUrl() {
-  const currentServerBase = readCurrentServerBaseUrl();
-  if (!_getSettings) return currentServerBase || DEFAULT_MITM_ROUTER_BASE;
+  if (!_getSettings) return DEFAULT_MITM_ROUTER_BASE;
   try {
     const s = await _getSettings();
-    const configuredBase = normalizeHttpBaseUrl(s && s.mitmRouterBaseUrl);
-    if (!configuredBase) return currentServerBase || DEFAULT_MITM_ROUTER_BASE;
-
-    if (isLoopbackBaseUrl(configuredBase) && currentServerBase && configuredBase !== currentServerBase) {
-      const configuredAlive = await canConnectBaseUrl(configuredBase);
-      if (!configuredAlive && await canConnectBaseUrl(currentServerBase)) {
-        if (_updateSettings) {
-          _updateSettings({ mitmRouterBaseUrl: currentServerBase }).catch(() => { });
-        }
-        log(`🚀 MITM router base auto-corrected: ${configuredBase} → ${currentServerBase}`);
-        return currentServerBase;
-      }
-    }
-
-    return configuredBase;
+    const raw = s && s.mitmRouterBaseUrl != null ? String(s.mitmRouterBaseUrl).trim() : "";
+    if (!raw) return DEFAULT_MITM_ROUTER_BASE;
+    const u = new URL(raw);
+    if (u.protocol !== "http:" && u.protocol !== "https:") return DEFAULT_MITM_ROUTER_BASE;
+    return raw.replace(/\/+$/, "");
   } catch {
-    return currentServerBase || DEFAULT_MITM_ROUTER_BASE;
+    return DEFAULT_MITM_ROUTER_BASE;
   }
 }
 
@@ -126,9 +61,40 @@ function resolveBundledServerPath() {
   return fromCwd;
 }
 
-const SERVER_PATH = resolveBundledServerPath();
+// Copy bundled server.js into DATA_DIR so MITM doesn't lock node_modules
+// (prevents EBUSY on `npm i -g 9router@latest` while MITM is running).
+function ensureRuntimeServer(bundledPath) {
+  try {
+    if (!bundledPath || !fs.existsSync(bundledPath)) return bundledPath;
+
+    // Dev mode: source file has relative requires (./logger, ./config...),
+    // only the bundled file inside node_modules is self-contained + safe to copy.
+    if (!bundledPath.includes(`${path.sep}node_modules${path.sep}`)) {
+      return bundledPath;
+    }
+
+    const runtimeDir = path.join(DATA_DIR, "runtime", "mitm");
+    const runtimeServer = path.join(runtimeDir, "server.js");
+
+    // Skip copy if sizes match (bundle unchanged since last run)
+    if (fs.existsSync(runtimeServer)) {
+      try {
+        if (fs.statSync(bundledPath).size === fs.statSync(runtimeServer).size) return runtimeServer;
+      } catch { /* recopy */ }
+    }
+
+    fs.mkdirSync(runtimeDir, { recursive: true });
+    fs.copyFileSync(bundledPath, runtimeServer);
+    return runtimeServer;
+  } catch (e) {
+    try { log(`[MITM] runtime copy failed: ${e.message}`); } catch { /* ignore */ }
+    return bundledPath;
+  }
+}
+
+const SERVER_PATH = ensureRuntimeServer(resolveBundledServerPath());
 const ENCRYPT_ALGO = "aes-256-gcm";
-const ENCRYPT_SALT = "openrouterx-mitm-pwd";
+const ENCRYPT_SALT = "9router-mitm-pwd";
 
 function getProcessUsingPort443() {
   try {
@@ -143,7 +109,7 @@ function getProcessUsingPort443() {
         if (processMatch) return processMatch[1].replace(".exe", "");
       }
     } else {
-      const result = execSync("lsof -i :443", { encoding: "utf8", windowsHide: true });
+      const result = execSync(`${LSOF_BIN} -i :443`, { encoding: "utf8", windowsHide: true });
       const lines = result.trim().split("\n");
       if (lines.length > 1) return lines[1].split(/\s+/)[0];
     }
@@ -333,7 +299,7 @@ function getPort443Owner(sudoPassword) {
       });
     } else {
       // Only find process actually LISTENING on TCP port 443
-      exec("lsof -nP -iTCP:443 -sTCP:LISTEN -t", { windowsHide: true }, (err, stdout) => {
+      exec(`${LSOF_BIN} -nP -iTCP:443 -sTCP:LISTEN -t`, { windowsHide: true }, (err, stdout) => {
         if (err || !stdout?.trim()) return resolve(null);
         const pid = parseInt(stdout.trim().split("\n")[0], 10);
         if (!pid || isNaN(pid)) return resolve(null);
@@ -590,13 +556,10 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
     log(`[MITM] server.js missing at ${effectiveServerPath} → recopying`);
     effectiveServerPath = ensureRuntimeServer(resolveBundledServerPath());
     if (!effectiveServerPath || !fs.existsSync(effectiveServerPath)) {
-      throw new Error(`MITM server.js not found at ${effectiveServerPath}. Reinstall openrouterX.`);
+      throw new Error(`MITM server.js not found at ${effectiveServerPath}. Reinstall 9router.`);
     }
   }
   const mitmRouterBase = await resolveMitmRouterBaseUrl();
-  const mitmServerCwd = MITM_DIR || os.homedir();
-  fs.mkdirSync(mitmServerCwd, { recursive: true });
-  const agMockBootstrap = process.env.OPENROUTERX_AG_MOCK_BOOTSTRAP === "1" ? "1" : "0";
   log(`🚀 Starting server... (router: ${mitmRouterBase})`);
   if (IS_WIN) {
     // Check port 443 — ask user before killing
@@ -619,7 +582,6 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
       process.execPath,
       [effectiveServerPath],
       {
-        cwd: mitmServerCwd,
         detached: false,
         windowsHide: true,
         cwd: os.tmpdir(),
@@ -629,7 +591,6 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
           ROUTER_API_KEY: apiKey,
           NODE_ENV: "production",
           MITM_ROUTER_BASE: mitmRouterBase,
-          OPENROUTERX_AG_MOCK_BOOTSTRAP: agMockBootstrap,
         },
       }
     );
@@ -642,21 +603,19 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
       `HOME=${shellQuoteSingle(os.homedir())}`,
       `ROUTER_API_KEY=${shellQuoteSingle(apiKey)}`,
       `MITM_ROUTER_BASE=${shellQuoteSingle(mitmRouterBase)}`,
-      `OPENROUTERX_AG_MOCK_BOOTSTRAP=${shellQuoteSingle(agMockBootstrap)}`,
       "NODE_ENV=production",
       shellQuoteSingle(process.execPath),
       shellQuoteSingle(effectiveServerPath),
     ].join(" ");
     serverProcess = spawn(
       "sudo", ["-S", "-E", "sh", "-c", inlineCmd],
-      { cwd: mitmServerCwd, detached: false, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] }
+      { detached: false, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] }
     );
     serverProcess.stdin.write(`${sudoPassword}\n`);
     serverProcess.stdin.end();
   } else {
     // Docker/minimal images: no sudo — same as Windows-style direct spawn
     serverProcess = spawn(process.execPath, [effectiveServerPath], {
-      cwd: mitmServerCwd,
       detached: false,
       windowsHide: true,
       cwd: os.tmpdir(),
@@ -666,7 +625,6 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
         ROUTER_API_KEY: apiKey,
         NODE_ENV: "production",
         MITM_ROUTER_BASE: mitmRouterBase,
-        OPENROUTERX_AG_MOCK_BOOTSTRAP: agMockBootstrap,
       },
     });
   }
@@ -677,6 +635,25 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
     mitmLastStartTime = Date.now();
   }
 
+  // Set NODE_EXTRA_CA_CERTS so Node-based GUI apps (Electron/AG language_server) trust MITM cert
+  if (IS_MAC) {
+    const rootCAPath = path.join(MITM_DIR, "rootCA.crt");
+    if (fs.existsSync(rootCAPath)) {
+      exec(`launchctl setenv NODE_EXTRA_CA_CERTS "${rootCAPath}"`, { windowsHide: true }, (e) => {
+        if (e) log(`[launchctl] Failed to set NODE_EXTRA_CA_CERTS: ${e.message}`);
+        else log(`[launchctl] NODE_EXTRA_CA_CERTS set to ${rootCAPath}`);
+      });
+    }
+  } else if (IS_WIN) {
+    const rootCAPath = path.join(MITM_DIR, "rootCA.crt");
+    if (fs.existsSync(rootCAPath)) {
+      exec(`setx NODE_EXTRA_CA_CERTS "${rootCAPath}"`, { windowsHide: true }, (e) => {
+        if (e) log(`[setx] Failed to set NODE_EXTRA_CA_CERTS: ${e.message}`);
+        else log(`[setx] NODE_EXTRA_CA_CERTS set for current user`);
+      });
+    }
+  }
+
   let startError = null;
   if (serverProcess) {
     serverProcess.stdout.on("data", (data) => {
@@ -788,6 +765,19 @@ async function stopServer(sudoPassword) {
     await removeAllDNSEntries(sudoPassword);
   }
 
+  // Unset NODE_EXTRA_CA_CERTS so apps don't keep trusting stale MITM cert
+  if (IS_MAC) {
+    exec(`launchctl unsetenv NODE_EXTRA_CA_CERTS`, { windowsHide: true }, (e) => {
+      if (e) log(`[launchctl] Failed to unset NODE_EXTRA_CA_CERTS: ${e.message}`);
+      else log(`[launchctl] NODE_EXTRA_CA_CERTS unset`);
+    });
+  } else if (IS_WIN) {
+    exec(`reg delete HKCU\\Environment /F /V NODE_EXTRA_CA_CERTS`, { windowsHide: true }, (e) => {
+      if (e) log(`[reg] Failed to unset NODE_EXTRA_CA_CERTS: ${e.message}`);
+      else log(`[reg] NODE_EXTRA_CA_CERTS unset`);
+    });
+  }
+
   try { fs.unlinkSync(PID_FILE); } catch { /* ignore */ }
   await saveMitmSettings(false, null);
   mitmIsRestarting = false;
@@ -858,7 +848,4 @@ module.exports = {
   restoreToolDNS,
   hasDnsPrivilege,
   removeAllDNSEntriesSync,
-  resolveMitmRouterBaseUrl,
-  normalizeHttpBaseUrl,
-  readCurrentServerBaseUrl,
 };

package/app/src/mitm/paths.js

@@ -2,17 +2,28 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 
-const APP_DATA_DIR_NAME = "openrouterx";
+const APP_NAME = "9router";
 
-function getDataDir() {
-  if (process.env.DATA_DIR) return process.env.DATA_DIR;
+function defaultDir() {
   if (process.platform === "win32") {
-    return path.join(
-      process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"),
-      APP_DATA_DIR_NAME
-    );
+    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), APP_NAME);
+  }
+  return path.join(os.homedir(), `.${APP_NAME}`);
+}
+
+function getDataDir() {
+  const configured = process.env.DATA_DIR;
+  if (!configured) return defaultDir();
+  try {
+    fs.mkdirSync(configured, { recursive: true });
+    return configured;
+  } catch (e) {
+    if (e?.code === "EACCES" || e?.code === "EPERM") {
+      console.warn(`[DATA_DIR] '${configured}' not writable → fallback ~/.${APP_NAME}`);
+      return defaultDir();
+    }
+    throw e;
   }
-  return path.join(os.homedir(), `.${APP_DATA_DIR_NAME}`);
 }
 
 const DATA_DIR = getDataDir();