@yina-npm/openrouterx 0.4.32 → 0.4.35

package/app/node_modules/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.2.4",
+  "version": "16.2.6",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -97,7 +97,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.2.4",
+    "@next/env": "16.2.6",
     "@swc/helpers": "0.5.15",
     "baseline-browser-mapping": "^2.9.19",
     "caniuse-lite": "^1.0.30001579",
@@ -128,14 +128,14 @@
   },
   "optionalDependencies": {
     "sharp": "^0.34.5",
-    "@next/swc-darwin-arm64": "16.2.4",
-    "@next/swc-darwin-x64": "16.2.4",
-    "@next/swc-linux-arm64-gnu": "16.2.4",
-    "@next/swc-linux-arm64-musl": "16.2.4",
-    "@next/swc-linux-x64-gnu": "16.2.4",
-    "@next/swc-linux-x64-musl": "16.2.4",
-    "@next/swc-win32-arm64-msvc": "16.2.4",
-    "@next/swc-win32-x64-msvc": "16.2.4"
+    "@next/swc-darwin-arm64": "16.2.6",
+    "@next/swc-darwin-x64": "16.2.6",
+    "@next/swc-linux-arm64-gnu": "16.2.6",
+    "@next/swc-linux-arm64-musl": "16.2.6",
+    "@next/swc-linux-x64-gnu": "16.2.6",
+    "@next/swc-linux-x64-musl": "16.2.6",
+    "@next/swc-win32-arm64-msvc": "16.2.6",
+    "@next/swc-win32-x64-msvc": "16.2.6"
   },
   "devDependencies": {
     "@babel/core": "7.26.10",
@@ -169,11 +169,11 @@
     "@modelcontextprotocol/sdk": "1.18.1",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.2.4",
-    "@next/polyfill-module": "16.2.4",
-    "@next/polyfill-nomodule": "16.2.4",
-    "@next/react-refresh-utils": "16.2.4",
-    "@next/swc": "16.2.4",
+    "@next/font": "16.2.6",
+    "@next/polyfill-module": "16.2.6",
+    "@next/polyfill-nomodule": "16.2.6",
+    "@next/react-refresh-utils": "16.2.6",
+    "@next/swc": "16.2.6",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.58.2",
     "@rspack/core": "1.6.7",

package/app/node_modules/sharp/node_modules/semver/internal/re.js

@@ -136,7 +136,7 @@ createToken('LOOSE', `^${src[t.LOOSEPLAIN]}$`)
 createToken('GTLT', '((?:<|>)?=?)')
 
 // Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Note that "x.x" is a valid xRange identifier, meaning "any version"
 // Only the first item is strictly required.
 createToken('XRANGEIDENTIFIERLOOSE', `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`)
 createToken('XRANGEIDENTIFIER', `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`)

package/app/node_modules/sharp/node_modules/semver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "7.7.4",
+  "version": "7.8.0",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "4.29.0",
+    "@npmcli/template-oss": "5.0.0",
     "benchmark": "^2.1.4",
     "tap": "^16.0.0"
   },
@@ -52,7 +52,7 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.29.0",
+    "version": "5.0.0",
     "engines": ">=10",
     "distPaths": [
       "classes/",

package/app/package.json

@@ -1,13 +1,13 @@
 {
   "name": "9router-app",
-  "version": "0.4.32",
+  "version": "0.4.35",
   "description": "9Router web dashboard",
   "private": true,
   "scripts": {
-    "dev": "next dev --webpack --port 20128",
+    "dev": "next dev --webpack --port 20502",
     "build": "NODE_ENV=production next build --webpack",
     "start": "NODE_ENV=production next start",
-    "dev:bun": "bun --bun next dev --webpack --port 20128",
+    "dev:bun": "bun --bun next dev --webpack --port 20502",
     "build:bun": "NODE_ENV=production bun --bun next build --webpack",
     "start:bun": "NODE_ENV=production bun ./.next/standalone/server.js"
   },

package/app/server.js

@@ -9,7 +9,7 @@ const currentPort = parseInt(process.env.PORT, 10) || 3000
 const hostname = process.env.HOSTNAME || '0.0.0.0'
 
 let keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10)
-const nextConfig = {"env":{},"typescript":{"ignoreBuildErrors":false},"typedRoutes":false,"distDir":"./.next","cleanDistDir":true,"assetPrefix":"","cacheMaxMemorySize":52428800,"configOrigin":"next.config.mjs","useFileSystemPublicRoutes":true,"generateEtags":true,"pageExtensions":["tsx","ts","jsx","js"],"poweredByHeader":true,"compress":true,"images":{"deviceSizes":[640,750,828,1080,1200,1920,2048,3840],"imageSizes":[32,48,64,96,128,256,384],"path":"/_next/image","loader":"default","loaderFile":"","domains":[],"disableStaticImages":false,"minimumCacheTTL":14400,"formats":["image/webp"],"maximumRedirects":3,"maximumResponseBody":50000000,"dangerouslyAllowLocalIP":false,"dangerouslyAllowSVG":false,"contentSecurityPolicy":"script-src 'none'; frame-src 'none'; sandbox;","contentDispositionType":"attachment","localPatterns":[{"pathname":"**","search":""}],"remotePatterns":[],"qualities":[75],"unoptimized":true,"customCacheHandler":false},"devIndicators":{"position":"bottom-left"},"onDemandEntries":{"maxInactiveAge":60000,"pagesBufferLength":5},"basePath":"","sassOptions":{},"trailingSlash":false,"i18n":null,"productionBrowserSourceMaps":false,"excludeDefaultMomentLocales":true,"reactProductionProfiling":false,"reactStrictMode":null,"reactMaxHeadersLength":6000,"httpAgentOptions":{"keepAlive":true},"logging":{"serverFunctions":true,"browserToTerminal":"warn"},"compiler":{},"expireTime":31536000,"staticPageGenerationTimeout":60,"output":"standalone","modularizeImports":{"@mui/icons-material":{"transform":"@mui/icons-material/{{member}}"},"lodash":{"transform":"lodash/{{member}}"}},"outputFileTracingRoot":"/Users/bytedance/Documents/9router/","cacheComponents":false,"cacheLife":{"default":{"stale":300,"revalidate":900,"expire":4294967294},"seconds":{"stale":30,"revalidate":1,"expire":60},"minutes":{"stale":300,"revalidate":60,"expire":3600},"hours":{"stale":300,"revalidate":3600,"expire":86400},"days":{"stale":300,"revalidate":86400,"expire":604800},"weeks":{"stale":300,"revalidate":604800,"expire":2592000},"max":{"stale":300,"revalidate":2592000,"expire":31536000}},"cacheHandlers":{},"experimental":{"appNewScrollHandler":false,"useSkewCookie":false,"cssChunking":true,"multiZoneDraftMode":false,"appNavFailHandling":false,"prerenderEarlyExit":true,"serverMinification":true,"linkNoTouchStart":false,"caseSensitiveRoutes":false,"cachedNavigations":false,"partialFallbacks":false,"dynamicOnHover":false,"varyParams":false,"prefetchInlining":false,"preloadEntriesOnStart":true,"clientRouterFilter":true,"clientRouterFilterRedirects":false,"fetchCacheKeyPrefix":"","proxyPrefetch":"flexible","optimisticClientCache":true,"manualClientBasePath":false,"cpus":9,"memoryBasedWorkersCount":false,"imgOptConcurrency":null,"imgOptTimeoutInSeconds":7,"imgOptMaxInputPixels":268402689,"imgOptSequentialRead":null,"imgOptSkipMetadata":null,"isrFlushToDisk":true,"workerThreads":false,"optimizeCss":false,"nextScriptWorkers":false,"scrollRestoration":false,"externalDir":false,"disableOptimizedLoading":false,"gzipSize":true,"craCompat":false,"esmExternals":true,"fullySpecified":false,"swcTraceProfiling":false,"forceSwcTransforms":false,"largePageDataBytes":128000,"typedEnv":false,"parallelServerCompiles":false,"parallelServerBuildTraces":false,"ppr":false,"authInterrupts":false,"webpackMemoryOptimizations":false,"optimizeServerReact":true,"strictRouteTypes":false,"viewTransition":false,"removeUncaughtErrorAndRejectionListeners":false,"validateRSCRequestHeaders":false,"staleTimes":{"dynamic":0,"static":300},"reactDebugChannel":true,"serverComponentsHmrCache":true,"staticGenerationMaxConcurrency":8,"staticGenerationMinPagesPerWorker":25,"transitionIndicator":false,"gestureTransition":false,"inlineCss":false,"useCache":false,"globalNotFound":false,"browserDebugInfoInTerminal":"warn","lockDistDir":true,"proxyClientMaxBodySize":10485760,"hideLogsAfterAbort":false,"mcpServer":true,"turbopackFileSystemCacheForDev":true,"turbopackFileSystemCacheForBuild":false,"turbopackInferModuleSideEffects":true,"turbopackPluginRuntimeStrategy":"childProcesses","optimizePackageImports":["lucide-react","date-fns","lodash-es","ramda","antd","react-bootstrap","ahooks","@ant-design/icons","@headlessui/react","@headlessui-float/react","@heroicons/react/20/solid","@heroicons/react/24/solid","@heroicons/react/24/outline","@visx/visx","@tremor/react","rxjs","@mui/material","@mui/icons-material","recharts","react-use","effect","@effect/schema","@effect/platform","@effect/platform-node","@effect/platform-browser","@effect/platform-bun","@effect/sql","@effect/sql-mssql","@effect/sql-mysql2","@effect/sql-pg","@effect/sql-sqlite-node","@effect/sql-sqlite-bun","@effect/sql-sqlite-wasm","@effect/sql-sqlite-react-native","@effect/rpc","@effect/rpc-http","@effect/typeclass","@effect/experimental","@effect/opentelemetry","@material-ui/core","@material-ui/icons","@tabler/icons-react","mui-core","react-icons/ai","react-icons/bi","react-icons/bs","react-icons/cg","react-icons/ci","react-icons/di","react-icons/fa","react-icons/fa6","react-icons/fc","react-icons/fi","react-icons/gi","react-icons/go","react-icons/gr","react-icons/hi","react-icons/hi2","react-icons/im","react-icons/io","react-icons/io5","react-icons/lia","react-icons/lib","react-icons/lu","react-icons/md","react-icons/pi","react-icons/ri","react-icons/rx","react-icons/si","react-icons/sl","react-icons/tb","react-icons/tfi","react-icons/ti","react-icons/vsc","react-icons/wi"],"trustHostHeader":false,"isExperimentalCompile":false},"htmlLimitedBots":"[\\w-]+-Google|Google-[\\w-]+|Chrome-Lighthouse|Slurp|DuckDuckBot|baiduspider|yandex|sogou|bitlybot|tumblr|vkShare|quora link preview|redditbot|ia_archiver|Bingbot|BingPreview|applebot|facebookexternalhit|facebookcatalog|Twitterbot|LinkedInBot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|Yeti|googleweblight","bundlePagesRouterDependencies":false,"configFileName":"next.config.mjs","serverExternalPackages":["better-sqlite3"],"turbopack":{"root":"/Users/bytedance/Documents/9router/"},"distDirRoot":".next","_originalRewrites":{"beforeFiles":[],"afterFiles":[{"source":"/v1/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1/v1","destination":"/api/v1"},{"source":"/codex/:path*","destination":"/api/v1/responses"},{"source":"/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1","destination":"/api/v1"}],"fallback":[]}}
+const nextConfig = {"env":{},"typescript":{"ignoreBuildErrors":false},"typedRoutes":false,"distDir":"./.next","cleanDistDir":true,"assetPrefix":"","cacheMaxMemorySize":52428800,"configOrigin":"next.config.mjs","useFileSystemPublicRoutes":true,"generateEtags":true,"pageExtensions":["tsx","ts","jsx","js"],"poweredByHeader":true,"compress":true,"images":{"deviceSizes":[640,750,828,1080,1200,1920,2048,3840],"imageSizes":[32,48,64,96,128,256,384],"path":"/_next/image","loader":"default","loaderFile":"","domains":[],"disableStaticImages":false,"minimumCacheTTL":14400,"formats":["image/webp"],"maximumRedirects":3,"maximumResponseBody":50000000,"dangerouslyAllowLocalIP":false,"dangerouslyAllowSVG":false,"contentSecurityPolicy":"script-src 'none'; frame-src 'none'; sandbox;","contentDispositionType":"attachment","localPatterns":[{"pathname":"**","search":""}],"remotePatterns":[],"qualities":[75],"unoptimized":true,"customCacheHandler":false},"devIndicators":{"position":"bottom-left"},"onDemandEntries":{"maxInactiveAge":60000,"pagesBufferLength":5},"basePath":"","sassOptions":{},"trailingSlash":false,"i18n":null,"productionBrowserSourceMaps":false,"excludeDefaultMomentLocales":true,"reactProductionProfiling":false,"reactStrictMode":null,"reactMaxHeadersLength":6000,"httpAgentOptions":{"keepAlive":true},"logging":{"serverFunctions":true,"browserToTerminal":"warn"},"compiler":{},"expireTime":31536000,"staticPageGenerationTimeout":60,"output":"standalone","modularizeImports":{"@mui/icons-material":{"transform":"@mui/icons-material/{{member}}"},"lodash":{"transform":"lodash/{{member}}"}},"outputFileTracingRoot":"/Users/mac/Documents/9router/","cacheComponents":false,"cacheLife":{"default":{"stale":300,"revalidate":900,"expire":4294967294},"seconds":{"stale":30,"revalidate":1,"expire":60},"minutes":{"stale":300,"revalidate":60,"expire":3600},"hours":{"stale":300,"revalidate":3600,"expire":86400},"days":{"stale":300,"revalidate":86400,"expire":604800},"weeks":{"stale":300,"revalidate":604800,"expire":2592000},"max":{"stale":300,"revalidate":2592000,"expire":31536000}},"cacheHandlers":{},"experimental":{"appNewScrollHandler":false,"useSkewCookie":false,"cssChunking":true,"multiZoneDraftMode":false,"appNavFailHandling":false,"prerenderEarlyExit":true,"serverMinification":true,"linkNoTouchStart":false,"caseSensitiveRoutes":false,"cachedNavigations":false,"partialFallbacks":false,"dynamicOnHover":false,"varyParams":false,"prefetchInlining":false,"preloadEntriesOnStart":true,"clientRouterFilter":true,"clientRouterFilterRedirects":false,"fetchCacheKeyPrefix":"","proxyPrefetch":"flexible","optimisticClientCache":true,"manualClientBasePath":false,"cpus":7,"memoryBasedWorkersCount":false,"imgOptConcurrency":null,"imgOptTimeoutInSeconds":7,"imgOptMaxInputPixels":268402689,"imgOptSequentialRead":null,"imgOptSkipMetadata":null,"isrFlushToDisk":true,"workerThreads":false,"optimizeCss":false,"nextScriptWorkers":false,"scrollRestoration":false,"externalDir":false,"disableOptimizedLoading":false,"gzipSize":true,"craCompat":false,"esmExternals":true,"fullySpecified":false,"swcTraceProfiling":false,"forceSwcTransforms":false,"largePageDataBytes":128000,"typedEnv":false,"parallelServerCompiles":false,"parallelServerBuildTraces":false,"ppr":false,"authInterrupts":false,"webpackMemoryOptimizations":false,"optimizeServerReact":true,"strictRouteTypes":false,"viewTransition":false,"removeUncaughtErrorAndRejectionListeners":false,"validateRSCRequestHeaders":false,"staleTimes":{"dynamic":0,"static":300},"reactDebugChannel":true,"serverComponentsHmrCache":true,"staticGenerationMaxConcurrency":8,"staticGenerationMinPagesPerWorker":25,"transitionIndicator":false,"gestureTransition":false,"inlineCss":false,"useCache":false,"globalNotFound":false,"browserDebugInfoInTerminal":"warn","lockDistDir":true,"proxyClientMaxBodySize":10485760,"hideLogsAfterAbort":false,"mcpServer":true,"turbopackFileSystemCacheForDev":true,"turbopackFileSystemCacheForBuild":false,"turbopackInferModuleSideEffects":true,"turbopackPluginRuntimeStrategy":"childProcesses","optimizePackageImports":["lucide-react","date-fns","lodash-es","ramda","antd","react-bootstrap","ahooks","@ant-design/icons","@headlessui/react","@headlessui-float/react","@heroicons/react/20/solid","@heroicons/react/24/solid","@heroicons/react/24/outline","@visx/visx","@tremor/react","rxjs","@mui/material","@mui/icons-material","recharts","react-use","effect","@effect/schema","@effect/platform","@effect/platform-node","@effect/platform-browser","@effect/platform-bun","@effect/sql","@effect/sql-mssql","@effect/sql-mysql2","@effect/sql-pg","@effect/sql-sqlite-node","@effect/sql-sqlite-bun","@effect/sql-sqlite-wasm","@effect/sql-sqlite-react-native","@effect/rpc","@effect/rpc-http","@effect/typeclass","@effect/experimental","@effect/opentelemetry","@material-ui/core","@material-ui/icons","@tabler/icons-react","mui-core","react-icons/ai","react-icons/bi","react-icons/bs","react-icons/cg","react-icons/ci","react-icons/di","react-icons/fa","react-icons/fa6","react-icons/fc","react-icons/fi","react-icons/gi","react-icons/go","react-icons/gr","react-icons/hi","react-icons/hi2","react-icons/im","react-icons/io","react-icons/io5","react-icons/lia","react-icons/lib","react-icons/lu","react-icons/md","react-icons/pi","react-icons/ri","react-icons/rx","react-icons/si","react-icons/sl","react-icons/tb","react-icons/tfi","react-icons/ti","react-icons/vsc","react-icons/wi"],"trustHostHeader":false,"isExperimentalCompile":false},"htmlLimitedBots":"[\\w-]+-Google|Google-[\\w-]+|Chrome-Lighthouse|Slurp|DuckDuckBot|baiduspider|yandex|sogou|bitlybot|tumblr|vkShare|quora link preview|redditbot|ia_archiver|Bingbot|BingPreview|applebot|facebookexternalhit|facebookcatalog|Twitterbot|LinkedInBot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|Yeti|googleweblight","bundlePagesRouterDependencies":false,"configFileName":"next.config.mjs","serverExternalPackages":["better-sqlite3"],"turbopack":{"root":"/Users/mac/Documents/9router/"},"distDirRoot":".next","_originalRewrites":{"beforeFiles":[],"afterFiles":[{"source":"/v1/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1/v1","destination":"/api/v1"},{"source":"/codex/:path*","destination":"/api/v1/responses"},{"source":"/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1","destination":"/api/v1"}],"fallback":[]}}
 
 process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig)
 

package/app/src/lib/updater/updater.js

@@ -19,7 +19,7 @@ const lingerMs = parseInt(process.env.UPDATER_LINGER_MS || "30000", 10);
 const waitMinMs = parseInt(process.env.UPDATER_WAIT_MIN_MS || "3000", 10);
 const waitMaxMs = parseInt(process.env.UPDATER_WAIT_MAX_MS || "15000", 10);
 const waitCheckMs = parseInt(process.env.UPDATER_WAIT_CHECK_MS || "500", 10);
-const appPort = parseInt(process.env.UPDATER_APP_PORT || "20128", 10);
+const appPort = parseInt(process.env.UPDATER_APP_PORT || "20502", 10);
 
 // Data directory (match mitm/paths.js logic)
 function getDataDir() {

package/app/src/mitm/config.js

@@ -36,6 +36,7 @@ const MODEL_SYNONYMS = {
     "gemini-default": "gemini-3-flash",
     "gemini-3-flash-agent": "gemini-3-flash",
     "gemini-3.1-flash-lite": "gemini-3-flash",
+    "tab_flash_lite_preview": "gemini-3-flash",
     "gemini-2.5-flash-lite": "gemini-3-flash",
     "gemini-2.5-flash": "gemini-3-flash",
     __defaults: {

package/app/src/mitm/dns/dnsConfig.js

@@ -50,6 +50,10 @@ const MAC_ANTIGRAVITY_LEGACY_SHARED_IP_PREFIXES = [
 ];
 const REQUIRED_HOST_LOOPBACKS = IS_WIN ? ["127.0.0.1"] : ["127.0.0.1", "::1"];
 
+function isMacAntigravityPfRedirectEnabled(env = process.env) {
+  return String(env.OPENROUTERX_MITM_ANTIGRAVITY_PF || "").trim() === "1";
+}
+
 function lineHasHostEntry(line, address, host) {
   const trimmed = String(line || "").trim();
   if (!trimmed || trimmed.startsWith("#")) return false;
@@ -187,6 +191,11 @@ function getMacLegacyAntigravityAliases() {
 
 async function enableMacAntigravityRedirect(sudoPassword) {
   if (!IS_MAC) return;
+  if (!isMacAntigravityPfRedirectEnabled()) {
+    await disableMacAntigravityRedirect(sudoPassword);
+    log("🌐 PF antigravity: skipped (hosts-only mode; set OPENROUTERX_MITM_ANTIGRAVITY_PF=1 to opt in)");
+    return;
+  }
   const ips = await getMacAntigravityRedirectIPs();
   if (ips.length === 0) return;
 
@@ -405,4 +414,5 @@ module.exports = {
   checkAllDNSStatus,
   getMissingHostsEntries,
   hostHasRequiredLoopbacks,
+  isMacAntigravityPfRedirectEnabled,
 };

package/app/src/mitm/handlers/base.js

@@ -1,6 +1,6 @@
 const { log, err } = require("../logger");
 
-const DEFAULT_LOCAL_ROUTER = "http://localhost:20128";
+const DEFAULT_LOCAL_ROUTER = "http://localhost:20502";
 const ROUTER_BASE = String(process.env.MITM_ROUTER_BASE || DEFAULT_LOCAL_ROUTER)
   .trim()
   .replace(/\/+$/, "") || DEFAULT_LOCAL_ROUTER;
@@ -12,17 +12,25 @@ const STRIP_HEADERS = new Set([
   "content-type", "authorization"
 ]);
 
+function normalizeRouterPath(path) {
+  const rawPath = String(path || "").trim() || "/v1/chat/completions";
+  if (rawPath === "/v1") return "/api/v1";
+  if (rawPath.startsWith("/v1/")) return `/api${rawPath}`;
+  return rawPath;
+}
+
 /**
  * Send body to OpenrouterX at the given path and return the fetch Response object.
  * Optionally forwards client headers (stripped of hop-by-hop / overridden keys).
  */
 async function fetchRouter(openaiBody, path = "/v1/chat/completions", clientHeaders = {}) {
+  const routerPath = normalizeRouterPath(path);
   const forwarded = {};
   for (const [k, v] of Object.entries(clientHeaders)) {
     if (!STRIP_HEADERS.has(k.toLowerCase())) forwarded[k] = v;
   }
 
-  const response = await fetch(`${ROUTER_BASE}${path}`, {
+  const response = await fetch(`${ROUTER_BASE}${routerPath}`, {
     method: "POST",
     headers: {
       ...forwarded,
@@ -65,4 +73,4 @@ async function pipeSSE(routerRes, res, dumper) {
   }
 }
 
-module.exports = { fetchRouter, pipeSSE };
+module.exports = { fetchRouter, normalizeRouterPath, pipeSSE };

package/app/src/mitm/manager.js

@@ -16,24 +16,90 @@ const { isCertExpired } = require("./cert/rootCA");
 const { DATA_DIR, MITM_DIR } = require("./paths");
 const { log, err } = require("./logger");
 
-const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20128";
+const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20502";
 
 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() {
-  if (!_getSettings) return DEFAULT_MITM_ROUTER_BASE;
+  const currentServerBase = readCurrentServerBaseUrl();
+  if (!_getSettings) return currentServerBase || DEFAULT_MITM_ROUTER_BASE;
   try {
     const s = await _getSettings();
-    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(/\/+$/, "");
+    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;
   } catch {
-    return DEFAULT_MITM_ROUTER_BASE;
+    return currentServerBase || DEFAULT_MITM_ROUTER_BASE;
   }
 }
 
@@ -792,4 +858,7 @@ module.exports = {
   restoreToolDNS,
   hasDnsPrivilege,
   removeAllDNSEntriesSync,
+  resolveMitmRouterBaseUrl,
+  normalizeHttpBaseUrl,
+  readCurrentServerBaseUrl,
 };

package/app/src/mitm/server.js

@@ -2,11 +2,13 @@ const https = require("https");
 const fs = require("fs");
 const path = require("path");
 const dns = require("dns");
+const os = require("os");
 const zlib = require("zlib");
 const { promisify } = require("util");
 const { execSync } = require("child_process");
 const { log, err, dumpRequest, createResponseDumper } = require("./logger");
 const { TARGET_HOSTS, URL_PATTERNS, MODEL_SYNONYMS, getToolForHost } = require("./config");
+const { pickReachableAddress, createLocalAliasResolutionError } = require("./upstreamResolver");
 const {
   createLocalAntigravityLoadCodeAssistPayload,
   createLocalAntigravityOnboardUserPayload,
@@ -78,38 +80,82 @@ try {
 
 const cachedTargetIPs = {};
 const CACHE_TTL_MS = 5 * 60 * 1000;
+const PUBLIC_DNS_SERVERS = ["8.8.8.8", "1.1.1.1"];
+const DNS_QUERY_TIMEOUT_MS = 1500;
+const GOOGLE_FRONTEND_FALLBACK_HOSTS = ["storage.googleapis.com", "www.gstatic.com"];
+const GOOGLE_HOST_SUFFIXES = [".googleapis.com", ".google.com", ".gstatic.com"];
+const PASSTHROUGH_CONNECT_TIMEOUT_MS = 15000;
 
 function getLocalIPv4Aliases() {
-  if (process.platform !== "darwin") return [];
+  const addresses = [];
+  for (const iface of Object.values(os.networkInterfaces())) {
+    for (const address of iface || []) {
+      if (address.family === "IPv4" || address.family === 4) addresses.push(address.address);
+    }
+  }
+  if (process.platform !== "darwin") return [...new Set(addresses)];
   try {
     const out = execSync("ifconfig lo0", { encoding: "utf8", windowsHide: true });
-    return [...out.matchAll(/^\s+inet\s+(\d+\.\d+\.\d+\.\d+)\s+/gm)].map((m) => m[1]);
+    addresses.push(...[...out.matchAll(/^\s+inet\s+(\d+\.\d+\.\d+\.\d+)\s+/gm)].map((m) => m[1]));
   } catch {
-    return [];
+    // Best effort; networkInterfaces still covers normal local addresses.
   }
+  return [...new Set(addresses)];
 }
 
-async function resolveTargetIP(hostname) {
+async function resolveTargetIP(hostname, options = {}) {
+  const avoidAddresses = options.avoidAddresses || [];
+  const force = options.force === true || avoidAddresses.length > 0;
   const cached = cachedTargetIPs[hostname];
-  const localAliases = new Set(getLocalIPv4Aliases());
-  if (cached && Date.now() - cached.ts < CACHE_TTL_MS && !localAliases.has(cached.ip)) return cached.ip;
-  const resolver = new dns.Resolver();
-  resolver.setServers(["8.8.8.8"]);
-  const resolve4 = promisify(resolver.resolve4.bind(resolver));
-  let addresses;
-  try {
-    addresses = await resolve4(hostname);
-  } catch (primaryError) {
-    const lookup = promisify(dns.lookup);
-    const records = await lookup(hostname, { family: 4, all: true }).catch(() => []);
-    addresses = records.map((record) => record.address).filter((addr) => !localAliases.has(addr));
-    if (addresses.length === 0) throw primaryError;
+  const localAliases = getLocalIPv4Aliases();
+  if (!force && cached && Date.now() - cached.ts < CACHE_TTL_MS) {
+    const ip = pickReachableAddress([cached.ip], { localAddresses: localAliases });
+    if (ip) return ip;
+  }
+  const addresses = await resolveIPv4Candidates(hostname);
+  let ip = pickReachableAddress(addresses, { localAddresses: localAliases, avoidAddresses });
+  if (!ip && isGoogleHost(hostname)) {
+    const fallbackAddresses = (await Promise.all(
+      GOOGLE_FRONTEND_FALLBACK_HOSTS.map((host) => resolveIPv4Candidates(host).catch(() => []))
+    )).flat();
+    ip = pickReachableAddress(fallbackAddresses, { localAddresses: localAliases, avoidAddresses });
+    if (ip) log(`⏩ upstream fallback | ${hostname} via Google frontend ${ip}`);
   }
-  const ip = addresses.find((addr) => !localAliases.has(addr)) || addresses[0];
+  if (!ip) throw createLocalAliasResolutionError(hostname, addresses, { localAddresses: localAliases, avoidAddresses });
   cachedTargetIPs[hostname] = { ip, ts: Date.now() };
   return cachedTargetIPs[hostname].ip;
 }
 
+function isGoogleHost(hostname) {
+  return GOOGLE_HOST_SUFFIXES.some((suffix) => hostname === suffix.slice(1) || hostname.endsWith(suffix));
+}
+
+async function resolveIPv4Candidates(hostname) {
+  const attempts = await Promise.all(PUBLIC_DNS_SERVERS.map(async (server) => {
+    const resolver = new dns.Resolver();
+    resolver.setServers([server]);
+    const resolve4 = promisify(resolver.resolve4.bind(resolver));
+    return withTimeout(resolve4(hostname), DNS_QUERY_TIMEOUT_MS).catch(() => []);
+  }));
+  const addresses = [...new Set(attempts.flat())];
+  if (addresses.length > 0) return addresses;
+
+  const lookup = promisify(dns.lookup);
+  const records = await lookup(hostname, { family: 4, all: true }).catch(() => []);
+  if (records.length === 0) throw new Error(`DNS resolve failed for ${hostname}`);
+  return [...new Set(records.map((record) => record.address))];
+}
+
+function withTimeout(promise, timeoutMs) {
+  let timeout;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timeout = setTimeout(() => reject(new Error("DNS query timed out")), timeoutMs);
+    }),
+  ]).finally(() => clearTimeout(timeout));
+}
+
 function collectBodyRaw(req) {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -273,78 +319,95 @@ async function passthrough(req, res, bodyBuffer, onResponse, transformResponse)
   const originalHost = (req.headers.host || TARGET_HOSTS[0]).split(":")[0];
   const targetHost = HOST_REWRITE[originalHost] || originalHost;
   const dumper = ENABLE_FILE_LOG && shouldDumpRequest(req) ? createResponseDumper(req, "passthrough") : null;
-  let targetIP;
-  try {
-    targetIP = await resolveTargetIP(targetHost);
-  } catch (e) {
+  const writeResolveError = (e) => {
     err(`Passthrough resolve error for ${targetHost}: ${e.code || e.message}`);
     if (dumper) { dumper.writeChunk(`\n[ERROR] resolve ${targetHost}: ${e.message}\n`); dumper.end(); }
     if (!res.headersSent) res.writeHead(502, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({ error: { message: `DNS resolve failed for ${targetHost}`, type: "mitm_dns_error" } }));
-    return;
-  }
-
-  const forwardReq = https.request({
-    hostname: targetIP,
-    port: 443,
-    path: req.url,
-    method: req.method,
-    headers: { ...req.headers, host: targetHost },
-    servername: targetHost,
-    rejectUnauthorized: false
-  }, (forwardRes) => {
-    // When transformResponse is provided, buffer the full response so we can
-    // modify it before sending to the client.
-    const shouldBuffer = transformResponse != null;
-    if (!shouldBuffer) res.writeHead(forwardRes.statusCode, forwardRes.headers);
-
-    if (!onResponse && !dumper && !shouldBuffer) {
-      forwardRes.pipe(res);
+    res.end(JSON.stringify({ error: { message: e.message || `DNS resolve failed for ${targetHost}`, type: "mitm_dns_error" } }));
+  };
+
+  const startForward = async (attempt = 0, avoidAddresses = []) => {
+    let targetIP;
+    try {
+      targetIP = await resolveTargetIP(targetHost, { force: attempt > 0, avoidAddresses });
+    } catch (e) {
+      writeResolveError(e);
       return;
     }
 
-    const chunks = [];
-    forwardRes.on("data", chunk => {
-      if (dumper) dumper.writeChunk(chunk);
-      if (onResponse || shouldBuffer) chunks.push(chunk);
-      if (!shouldBuffer) res.write(chunk);
-    });
-    forwardRes.on("end", () => {
-      const rawBuffer = Buffer.concat(chunks);
-
-      if (shouldBuffer) {
-        try {
-          const modified = transformResponse(rawBuffer, forwardRes.headers);
-          // Update Content-Length if present to match modified body
-          const headers = { ...forwardRes.headers };
-          if (headers["content-length"] != null) {
-            headers["content-length"] = String(Buffer.byteLength(modified));
+    const forwardReq = https.request({
+      hostname: targetIP,
+      port: 443,
+      path: req.url,
+      method: req.method,
+      headers: { ...req.headers, host: targetHost },
+      servername: targetHost,
+      rejectUnauthorized: false
+    }, (forwardRes) => {
+      // When transformResponse is provided, buffer the full response so we can
+      // modify it before sending to the client.
+      const shouldBuffer = transformResponse != null;
+      if (!shouldBuffer) res.writeHead(forwardRes.statusCode, forwardRes.headers);
+
+      if (!onResponse && !dumper && !shouldBuffer) {
+        forwardRes.pipe(res);
+        return;
+      }
+
+      const chunks = [];
+      forwardRes.on("data", chunk => {
+        if (dumper) dumper.writeChunk(chunk);
+        if (onResponse || shouldBuffer) chunks.push(chunk);
+        if (!shouldBuffer) res.write(chunk);
+      });
+      forwardRes.on("end", () => {
+        const rawBuffer = Buffer.concat(chunks);
+
+        if (shouldBuffer) {
+          try {
+            const modified = transformResponse(rawBuffer, forwardRes.headers);
+            // Update Content-Length if present to match modified body
+            const headers = { ...forwardRes.headers };
+            if (headers["content-length"] != null) {
+              headers["content-length"] = String(Buffer.byteLength(modified));
+            }
+            res.writeHead(forwardRes.statusCode, headers);
+            res.end(modified);
+          } catch (e) {
+            err(`transformResponse error: ${e.message}`);
+            if (!res.headersSent) res.writeHead(502);
+            res.end("Bad Gateway");
           }
-          res.writeHead(forwardRes.statusCode, headers);
-          res.end(modified);
-        } catch (e) {
-          err(`transformResponse error: ${e.message}`);
-          if (!res.headersSent) res.writeHead(502);
-          res.end("Bad Gateway");
+        } else {
+          res.end();
         }
-      } else {
-        res.end();
-      }
 
-      if (dumper) dumper.end();
-      if (onResponse) try { onResponse(rawBuffer, forwardRes.headers); } catch { /* ignore */ }
+        if (dumper) dumper.end();
+        if (onResponse) try { onResponse(rawBuffer, forwardRes.headers); } catch { /* ignore */ }
+      });
     });
-  });
 
-  forwardReq.on("error", (e) => {
-    err(`Passthrough error: ${e.message}`);
-    if (dumper) { dumper.writeChunk(`\n[ERROR] ${e.message}\n`); dumper.end(); }
-    if (!res.headersSent) res.writeHead(502);
-    res.end("Bad Gateway");
-  });
+    forwardReq.on("error", (e) => {
+      if (attempt === 0 && (e.code === "EADDRNOTAVAIL" || /secure TLS connection/i.test(e.message || ""))) {
+        delete cachedTargetIPs[targetHost];
+        log(`⏩ passthrough retry | ${targetHost} | ${targetIP} failed: ${e.code || e.message}`);
+        startForward(1, [targetIP]);
+        return;
+      }
+      err(`Passthrough error: ${e.message}`);
+      if (dumper) { dumper.writeChunk(`\n[ERROR] ${e.message}\n`); dumper.end(); }
+      if (!res.headersSent) res.writeHead(502);
+      res.end("Bad Gateway");
+    });
+    forwardReq.setTimeout(PASSTHROUGH_CONNECT_TIMEOUT_MS, () => {
+      forwardReq.destroy(new Error(`Passthrough timed out connecting to ${targetHost}`));
+    });
+
+    if (bodyBuffer.length > 0) forwardReq.write(bodyBuffer);
+    forwardReq.end();
+  };
 
-  if (bodyBuffer.length > 0) forwardReq.write(bodyBuffer);
-  forwardReq.end();
+  await startForward();
 }
 
 // ── Request handler ───────────────────────────────────────────