9router 0.3.14 → 0.3.15

package/app/src/mitm/cert/generate.js

@@ -1,6 +1,6 @@
 const path = require("path");
 const fs = require("fs");
-const os = require("os");
+const { MITM_DIR } = require("../paths");
 
 const TARGET_HOST = "daily-cloudcode-pa.googleapis.com";
 
@@ -8,7 +8,7 @@ const TARGET_HOST = "daily-cloudcode-pa.googleapis.com";
  * Generate self-signed SSL certificate using selfsigned (pure JS, no openssl needed)
  */
 async function generateCert() {
-  const certDir = path.join(os.homedir(), ".9router", "mitm");
+  const certDir = MITM_DIR;
   const keyPath = path.join(certDir, "server.key");
   const certPath = path.join(certDir, "server.crt");
 

package/app/src/mitm/manager.js

@@ -10,11 +10,12 @@ const { addDNSEntry, removeDNSEntry, checkDNSEntry } = require("./dns/dnsConfig"
 const IS_WIN = process.platform === "win32";
 const { generateCert } = require("./cert/generate");
 const { installCert } = require("./cert/install");
+const { MITM_DIR } = require("./paths");
 
 const MITM_PORT = 443;
 // Windows: node listens on 8443, netsh portproxy forwards 443→8443
 const MITM_WIN_NODE_PORT = 8443;
-const PID_FILE = path.join(os.homedir(), ".9router", "mitm", ".mitm.pid");
+const PID_FILE = path.join(MITM_DIR, ".mitm.pid");
 
 // Resolve server.js path robustly:
 // __dirname is unreliable inside Next.js bundles, so we use DATA_DIR env or
@@ -328,8 +329,7 @@ async function getMitmStatus() {
   }
 
   const dnsConfigured = checkDNSEntry();
-  const certDir = path.join(os.homedir(), ".9router", "mitm");
-  const certExists = fs.existsSync(path.join(certDir, "server.crt"));
+  const certExists = fs.existsSync(path.join(MITM_DIR, "server.crt"));
 
   return { running, pid, dnsConfigured, certExists };
 }
@@ -393,7 +393,7 @@ async function startMitm(apiKey, sudoPassword) {
   }
 
   // 1. Generate SSL certificate if not exists (no elevation needed)
-  const certPath = path.join(os.homedir(), ".9router", "mitm", "server.crt");
+  const certPath = path.join(MITM_DIR, "server.crt");
   if (!fs.existsSync(certPath)) {
     console.log("Generating SSL certificate...");
     await generateCert();

package/app/src/mitm/paths.js

@@ -0,0 +1,16 @@
+const path = require("path");
+const os = require("os");
+
+// Single source of truth for data directory — matches localDb.js logic
+function getDataDir() {
+  if (process.env.DATA_DIR) return process.env.DATA_DIR;
+  if (process.platform === "win32") {
+    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "9router");
+  }
+  return path.join(os.homedir(), ".9router");
+}
+
+const DATA_DIR = getDataDir();
+const MITM_DIR = path.join(DATA_DIR, "mitm");
+
+module.exports = { DATA_DIR, MITM_DIR };

package/app/src/mitm/server.js

@@ -3,8 +3,6 @@ const fs = require("fs");
 const path = require("path");
 const dns = require("dns");
 const { promisify } = require("util");
-const os = require("os");
-
 // Configuration
 const INTERNAL_REQUEST_HEADER = { name: "x-request-source", value: "local" };
 const TARGET_HOSTS = [
@@ -14,10 +12,11 @@ const TARGET_HOSTS = [
 const LOCAL_PORT = 443;
 const ROUTER_URL = "http://localhost:20128/v1/chat/completions";
 const API_KEY = process.env.ROUTER_API_KEY;
-const DB_FILE = path.join(os.homedir(), ".9router", "db.json");
+const { DATA_DIR, MITM_DIR } = require("./paths");
+const DB_FILE = path.join(DATA_DIR, "db.json");
 
 // Toggle logging (set true to enable file logging for debugging)
-const ENABLE_FILE_LOG = true;
+const ENABLE_FILE_LOG = false;
 
 if (!API_KEY) {
   console.error("❌ ROUTER_API_KEY required");
@@ -25,7 +24,7 @@ if (!API_KEY) {
 }
 
 // Load SSL certificates
-const certDir = path.join(os.homedir(), ".9router", "mitm");
+const certDir = MITM_DIR;
 let sslOptions;
 try {
   sslOptions = {
@@ -92,17 +91,18 @@ function collectBodyRaw(req) {
   });
 }
 
-function extractModel(body) {
-  try {
-    return JSON.parse(body.toString()).model || null;
-  } catch {
-    return null;
-  }
+// Extract model from URL path (Gemini format: /v1beta/models/gemini-2.0-flash:generateContent)
+// Fallback to body.model (OpenAI format)
+function extractModel(url, body) {
+  const urlMatch = url.match(/\/models\/([^/:]+)/);
+  if (urlMatch) return urlMatch[1];
+  try { return JSON.parse(body.toString()).model || null; } catch { return null; }
 }
 
 function getMappedModel(model) {
   if (!model) return null;
   try {
+    if (!fs.existsSync(DB_FILE)) return null;
     const db = JSON.parse(fs.readFileSync(DB_FILE, "utf-8"));
     return db.mitmAlias?.antigravity?.[model] || null;
   } catch {
@@ -200,8 +200,8 @@ const server = https.createServer(sslOptions, async (req, res) => {
     return passthrough(req, res, bodyBuffer);
   }
 
-  const model = extractModel(bodyBuffer);
-  console.log(`📡 ${model} (passthrough)`);
+  const model = extractModel(req.url, bodyBuffer);
+  console.log(`📡 intercepted: ${req.url} | model: ${model}`);
   const mappedModel = getMappedModel(model);
 
   if (!mappedModel) {

package/package.json

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