panrouter 3.5.0 → 3.7.0

package/cli.mjs

@@ -10,6 +10,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const HOME = process.env.USERPROFILE || process.env.HOME;
 const CLAUDE_DIR = path.join(HOME, ".claude");
 const SETTINGS_PATH = path.join(CLAUDE_DIR, "settings.json");
+const BACKUP_PATH = path.join(CLAUDE_DIR, "settings.json.panrouter.backup");
 
 function log(label, msg, color = "") {
   const colors = { green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m", reset: "\x1b[0m" };
@@ -17,28 +18,13 @@ function log(label, msg, color = "") {
   console.log(`${c}[${label}]${colors.reset} ${msg}`);
 }
 
-function installClaudeCode() {
-  log("..", "正在检查 Claude Code...", "yellow");
-  try {
-    execSync("claude --version", { stdio: "pipe" });
-    log("OK", "Claude Code 已就绪", "green");
-    return true;
-  } catch {
-    log("..", "正在安装 Claude Code...", "yellow");
-    try {
-      execSync("npm install -g @anthropic-ai/claude-code", { stdio: "inherit" });
-      log("OK", "Claude Code 安装成功", "green");
-      return true;
-    } catch {
-      log("!!", "Claude Code 安装失败", "red");
-      return false;
-    }
-  }
-}
+// ─── 配置 ────────────────────────────────────────────────
 
 function writeConfig() {
   log("..", "正在配置 Claude Code 路由...", "yellow");
   if (!fs.existsSync(CLAUDE_DIR)) fs.mkdirSync(CLAUDE_DIR, { recursive: true });
+  if (fs.existsSync(SETTINGS_PATH)) fs.copyFileSync(SETTINGS_PATH, BACKUP_PATH);
+
   const config = {
     env: {
       ANTHROPIC_BASE_URL: "http://127.0.0.1:50816",
@@ -53,6 +39,27 @@ function writeConfig() {
   log("OK", "配置完成", "green");
 }
 
+// ─── 安装 Claude Code ────────────────────────────────────
+
+function ensureClaudeCode() {
+  try {
+    execSync("claude --version", { stdio: "pipe" });
+    return true; // 已装
+  } catch {
+    log("..", "正在安装 Claude Code...", "yellow");
+    try {
+      execSync("npm install -g @anthropic-ai/claude-code", { stdio: "inherit", timeout: 120000 });
+      log("OK", "Claude Code 安装成功", "green");
+      return true;
+    } catch {
+      log("!!", "Claude Code 安装失败", "red");
+      return false;
+    }
+  }
+}
+
+// ─── 端口检测 ────────────────────────────────────────────
+
 async function isPortOpen() {
   return new Promise(rs => {
     const req = http.get("http://127.0.0.1:50816/health", () => {});
@@ -62,125 +69,205 @@ async function isPortOpen() {
   });
 }
 
+// ─── 启动前台服务 ────────────────────────────────────────
+
 async function startServer() {
   const serverPath = path.join(__dirname, "server.mjs");
   try {
-    if (process.platform === "win32") {
-      execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
-    } else {
-      execSync("pkill -f 'node.*server.mjs' 2>/dev/null", { stdio: "pipe" });
-    }
+    execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
   } catch {}
 
   log("..", "正在启动代理...", "yellow");
-  if (process.platform === "win32") {
-    execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
-  } else {
-    spawn("node", [serverPath], { cwd: __dirname, stdio: "ignore", detached: true }).unref();
-  }
+  execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
 
   for (let i = 0; i < 15; i++) {
     if (await isPortOpen()) break;
     await new Promise(rs => setTimeout(rs, 1000));
   }
-  log("OK", "Pan Router 运行中，可以执行 claude 命令了", "green");
+  log("OK", "Pan Router 运行中", "green");
 }
 
+// ─── 启动托盘（后台） ────────────────────────────────────
+
 async function startTray() {
   const serverPath = path.join(__dirname, "server.mjs");
   const psPath = path.join(__dirname, "tray-daemon.ps1");
-  log("..", "正在后台启动代理...", "yellow");
 
-  // 【核心修复】：直接在原文件上追加 UTF-8 BOM 头，彻底修复乱码并保持原目录路径不变
+  // 给 PS 脚本加 BOM（中文系统兼容）
   try {
-    const psContent = fs.readFileSync(psPath, "utf8");
-    if (!psContent.startsWith("")) {
+    const content = fs.readFileSync(psPath, "utf8");
+    if (content.charCodeAt(0) !== 0xFEFF) {
       const bom = Buffer.from([0xEF, 0xBB, 0xBF]);
-      fs.writeFileSync(psPath, Buffer.concat([bom, Buffer.from(psContent, "utf8")]));
-    }
-  } catch (e) {
-    // 忽略权限问题
-  }
-
-  try {
-    if (process.platform === "win32") {
-      execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
+      fs.writeFileSync(psPath, Buffer.concat([bom, Buffer.from(content, "utf8")]));
     }
   } catch {}
 
+  // 清理旧进程
+  try { execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" }); } catch {}
+
+  // 启动 server（隐藏）
   const srv = spawn(process.execPath, [serverPath], {
-    cwd: __dirname,
-    stdio: "ignore",
-    windowsHide: true,
-    detached: true
+    cwd: __dirname, stdio: "ignore", windowsHide: true, detached: true,
   });
   srv.unref();
 
+  // 启动托盘（隐藏）
+  const tray = spawn("powershell.exe", [
+    "-NoProfile", "-STA", "-ExecutionPolicy", "Bypass",
+    "-WindowStyle", "Hidden", "-File", `"${psPath}"`,
+  ], {
+    cwd: __dirname, stdio: "ignore", windowsHide: true, shell: true,
+    env: { ...process.env, PANROUTER_NODE: process.execPath },
+  });
+  tray.unref();
+
+  // 验证端口
   let ok = false;
   for (let i = 0; i < 15; i++) {
-    if (await isPortOpen()) {
-      ok = true;
-      break;
-    }
+    if (await isPortOpen()) { ok = true; break; }
     await new Promise(rs => setTimeout(rs, 1000));
   }
 
   if (ok) {
-    log("OK", "代理服务已就绪！(端口 50816)", "green");
+    log("OK", "Pan Router 已在后台运行（托盘在右下角）", "green");
   } else {
-    log("!!", "服务启动超时，但仍将尝试加载托盘", "red");
+    log("!!", "代理启动超时，请检查端口 50816", "red");
   }
+}
 
-  log("..", "正在加载系统托盘...", "yellow");
+// ─── 停止 ────────────────────────────────────────────────
 
-  const tray = spawn("powershell.exe", [
-    "-NoProfile",
-    "-STA",
-    "-ExecutionPolicy", "Bypass",
-    "-WindowStyle", "Hidden",
-    "-File", `"${psPath}"`
-  ], {
-    cwd: __dirname,
-    stdio: ['ignore', 'pipe', 'pipe'],
-    windowsHide: true,
-    shell: true,
-    env: { ...process.env, PANROUTER_NODE: process.execPath }
-  });
+function stopAll() {
+  log("..", "正在停止...", "yellow");
+  try { execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" }); } catch {}
+  try { execSync("taskkill /f /im powershell.exe >nul 2>&1", { stdio: "pipe" }); } catch {}
+  // 杀 server.mjs 相关 node 进程
+  try {
+    const out = execSync(
+      'wmic process where "name=\'node.exe\'" get ProcessId,CommandLine /format:csv 2>nul',
+      { encoding: "utf8", windowsHide: true, timeout: 3000 }
+    );
+    for (const line of out.split("\n")) {
+      if (line.includes("server.mjs")) {
+        const m = line.match(/(\d+),.*?server\.mjs/);
+        if (m) try { process.kill(parseInt(m[1]), "SIGKILL"); } catch {}
+      }
+    }
+  } catch {}
+  log("OK", "已停止", "green");
+}
+
+// ─── 状态 ────────────────────────────────────────────────
 
-  let psOutput = "";
-  tray.stdout.on("data", d => psOutput += d.toString());
-  tray.stderr.on("data", d => psOutput += d.toString());
+async function showStatus() {
+  const online = await isPortOpen();
+  const version = "3.6.0";
+  console.log(`\n  Pan Router v${version}`);
+  console.log(`  端口 50816: ${online ? "✓ 运行中" : "✗ 未启动"}`);
+  if (online) {
+    try {
+      const out = execSync(
+        'wmic process where "name=\'node.exe\'" get ProcessId,CommandLine /format:csv 2>nul',
+        { encoding: "utf8", windowsHide: true, timeout: 3000 }
+      );
+      for (const line of out.split("\n")) {
+        if (line.includes("server.mjs")) {
+          const m = line.match(/(\d+),.*?server\.mjs/);
+          if (m) console.log(`  PID: ${m[1]}`);
+        }
+      }
+    } catch {}
+  }
+  console.log("");
+}
+
+// ─── 版本 ────────────────────────────────────────────────
+
+function showVersion() {
+  console.log("3.6.0");
+}
 
-  await new Promise(rs => setTimeout(rs, 2500));
+// ─── 日志 ────────────────────────────────────────────────
 
-  if (tray.exitCode !== null) {
-    log("!!", "托盘进程未能驻留，发生闪退！", "red");
-    console.log(`\n\x1b[31m=== PowerShell 启动失败原因 ===\x1b[0m\n${psOutput || "(无输出)"}\n\x1b[31m===============================\x1b[0m\n`);
+function openLogs() {
+  const logPath = path.join(process.env.TEMP || "/tmp", "panrouter_tray.log");
+  if (fs.existsSync(logPath)) {
+    execSync(`notepad "${logPath}"`, { stdio: "inherit" });
   } else {
-    tray.unref();
-    console.log("   托盘图标应该已在右下角显示。");
+    log("!!", "日志文件不存在", "red");
   }
 }
 
+// ─── 主流程 ──────────────────────────────────────────────
+
 async function main() {
   const args = process.argv.slice(2);
+
+  // --help
   if (args.includes("--help") || args.includes("-h")) {
-    console.log("用法:\n  panrouter --server       (带命令行窗口运行)\n  panrouter --tray         (后台隐藏运行 + 托盘)\n  panrouter --tray-install (安装配置 + 托盘)");
+    console.log(`
+  Pan Router — Claude Code 免费路由代理
+
+  用法:
+    panrouter                安装/配置 → 启动托盘（最常用）
+    panrouter --setup        只配置 Claude Code 路由
+    panrouter --server       前台窗口模式启动
+    panrouter --stop         停止所有
+    panrouter --status       查看运行状态
+    panrouter --logs         查看日志
+    panrouter --version      版本号
+    panrouter --help         帮助
+    `);
     return;
   }
 
-  if (args.includes("--server") || args.includes("-s")) { await startServer(); return; }
-  if (args.includes("--tray") || args.includes("-t")) { await startTray(); return; }
+  // --version
+  if (args.includes("--version") || args.includes("-v")) {
+    showVersion();
+    return;
+  }
 
-  console.log(`\n\x1b[36m=== Pan Router - Claude Code ===\x1b[0m\n`);
-  if (!installClaudeCode()) return process.exit(1);
-  writeConfig();
+  // --status
+  if (args.includes("--status")) {
+    await showStatus();
+    return;
+  }
 
-  if (args.includes("--tray-install") || args.includes("-ti")) {
-    await startTray();
-  } else {
+  // --logs
+  if (args.includes("--logs")) {
+    openLogs();
+    return;
+  }
+
+  // --stop
+  if (args.includes("--stop")) {
+    stopAll();
+    return;
+  }
+
+  // --setup（只配置）
+  if (args.includes("--setup")) {
+    writeConfig();
+    return;
+  }
+
+  // --server（前台窗口）
+  if (args.includes("--server") || args.includes("-s")) {
     await startServer();
+    return;
+  }
+
+  // --tray（显式指定，兼容旧指令）
+  if (args.includes("--tray") || args.includes("-t")) {
+    writeConfig();
+    await startTray();
+    return;
   }
+
+  // 默认：安装 + 配置 + 托盘
+  if (!ensureClaudeCode()) process.exit(1);
+  writeConfig();
+  await startTray();
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "3.5.0",
+  "version": "3.7.0",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {

package/tray-daemon.ps1

@@ -15,6 +15,8 @@ try {
 
     $scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
     $serverPath = Join-Path $scriptDir "server.mjs"
+    # 【修复1】：在全局作用域提前把准确的脚本路径存下来，防止在 Click 事件块内丢失
+    $trayScriptPath = $MyInvocation.MyCommand.Path
 
     $nodePath = $env:PANROUTER_NODE
     if ([string]::IsNullOrWhiteSpace($nodePath)) {
@@ -102,7 +104,8 @@ try {
             reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
             $autoItem.Checked = $false
         } else {
-            $cmd = "powershell.exe -WindowStyle Hidden -ExecutionPolicy Bypass -File `"$($MyInvocation.MyCommand.Path)`""
+            # 【修复2】：写入注册表时，务必加上 -STA 参数防止 UI 闪退，并使用刚刚存好的 $trayScriptPath
+            $cmd = "powershell.exe -WindowStyle Hidden -STA -ExecutionPolicy Bypass -File `"$trayScriptPath`""
             reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d $cmd /f 2>&1 | Out-Null
             $autoItem.Checked = $true
         }