panrouter 1.9.0 → 2.0.0

package/cli.mjs

@@ -2,14 +2,6 @@
 
 /**
  * Pan Router CLI — 一键安装 + 启动
- *
- * 用法:
- *   panrouter                   # 一键安装 + 前台启动
- *   panrouter --install         # 只安装配置
- *   panrouter --server          # 只启动代理（前台）
- *   panrouter --tray            # 以托盘模式启动（隐藏窗口）
- *   panrouter --tray-install    # 安装 + 配置 + 托盘启动
- *   panrouter --help            # 帮助
  */
 
 import { execSync, spawn } from "node:child_process";
@@ -48,7 +40,7 @@ function runSilent(cmd) {
   }
 }
 
-// ─── 1. 检查 / 安装 Claude Code ──────────────────────────────────────────
+// ─── 1. 安装与配置 ──────────────────────────────────────────
 
 function installClaudeCode() {
   log("..", "正在检查 Claude Code...", "yellow");
@@ -56,7 +48,6 @@ function installClaudeCode() {
     log("OK", "Claude Code 已就绪", "green");
     return true;
   }
-
   log("..", "正在安装 Claude Code...", "yellow");
   if (!run("npm install -g @anthropic-ai/claude-code")) {
     log("!!", "Claude Code 安装失败", "red");
@@ -66,20 +57,10 @@ function installClaudeCode() {
   return true;
 }
 
-// ─── 2. 写入配置文件 ─────────────────────────────────────────────────────
-
 function writeConfig() {
   log("..", "正在写入配置...", "yellow");
-
-  if (!fs.existsSync(CLAUDE_DIR)) {
-    fs.mkdirSync(CLAUDE_DIR, { recursive: true });
-  }
-
-  // 备份
-  if (fs.existsSync(SETTINGS_PATH)) {
-    fs.copyFileSync(SETTINGS_PATH, BACKUP_PATH);
-    log("OK", "原配置已备份", "green");
-  }
+  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: {
@@ -91,13 +72,10 @@ function writeConfig() {
     },
     hasCompletedOnboarding: true,
   };
-
   fs.writeFileSync(SETTINGS_PATH, JSON.stringify(config, null, 2), "utf-8");
-  log("OK", "配置文件已写入 ~/.claude/settings.json", "green");
+  log("OK", "配置文件已写入", "green");
 }
 
-// ─── 3. 启动代理服务器（后台运行） ───────────────────────────────────────
-
 async function isPortOpen() {
   return new Promise(rs => {
     const req = http.get("http://127.0.0.1:50816/health", () => {});
@@ -107,10 +85,10 @@ async function isPortOpen() {
   });
 }
 
+// ─── 2. 启动服务（前台黑框） ────────────────────────────────
+
 async function startServer() {
   const serverPath = path.join(__dirname, "server.mjs");
-
-  // 关掉旧的 Pan Router
   try {
     if (process.platform === "win32") {
       execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
@@ -120,7 +98,6 @@ async function startServer() {
   } catch {}
 
   log("..", "正在启动 Pan Router（端口 50816）...", "yellow");
-
   if (process.platform === "win32") {
     execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
   } else {
@@ -128,79 +105,71 @@ async function startServer() {
     child.unref();
   }
 
-  // 等待服务启动
   for (let i = 0; i < 15; i++) {
-    if (await isPortOpen()) { break; }
+    if (await isPortOpen()) break;
     await new Promise(rs => setTimeout(rs, 1000));
   }
-
-  log("OK", "Pan Router 已启动（端口 50816）", "green");
-  console.log("\n  现在可以运行: \x1b[33mclaude \"你好\"\x1b[0m\n");
+  log("OK", "Pan Router 已启动！现在可以运行 claude 了", "green");
 }
 
-// ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
+// ─── 3. 托盘模式（后台静默） ────────────────────────────────
 
-function startTray() {
+async function startTray() {
+  const serverPath = path.join(__dirname, "server.mjs");
   const vbsPath = path.join(__dirname, "panrouter-tray.vbs");
 
-  if (!fs.existsSync(vbsPath)) {
-    log("!!", "未找到 panrouter-tray.vbs", "red");
-    process.exit(1);
-  }
-
-  log("..", "正在以托盘模式启动 Pan Router...", "yellow");
+  log("..", "正在启动代理并加载托盘...", "yellow");
 
-  // 直接调用 wscript，去掉多余的 cmd.exe 嵌套层级，更稳定
-  const child = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
-    cwd: __dirname,
-    stdio: "ignore",
-    windowsHide: true,
-    detached: true,
-    shell: false,
+  // 【核心修复1】：由 Node 主进程直接启动 Server，确保 API 百分百可用
+  const srv = spawn(process.execPath, [serverPath], {
+      cwd: __dirname,
+      stdio: "ignore",
+      detached: true,
+      windowsHide: true
   });
-  child.unref();
+  srv.unref();
+
+  // 【核心修复2】：将 Node 的绝对路径通过环境变量塞给 VBS/PowerShell
+  process.env.PANROUTER_NODE_PATH = process.execPath;
+
+  // 启动托盘 UI
+  if (fs.existsSync(vbsPath)) {
+    const tray = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
+      cwd: __dirname,
+      stdio: "ignore",
+      windowsHide: true,
+      detached: true,
+      env: process.env // 传递环境变量
+    });
+    tray.unref();
+  }
 
-  log("OK", "Pan Router 托盘已启动", "green");
-  console.log("   图标在右下角, 右键可进行管理");
+  // 验证端口
+  let ok = false;
+  for (let i = 0; i < 15; i++) {
+    if (await isPortOpen()) { ok = true; break; }
+    await new Promise(rs => setTimeout(rs, 1000));
+  }
+
+  if (ok) {
+    log("OK", "Pan Router 代理已在后台运行 (端口: 50816)！", "green");
+    console.log("   托盘图标应该已出现。如果系统原因导致图标没出来，代理依然可用。");
+  } else {
+    log("!!", "代理启动超时，请检查端口 50816 是否被占用", "red");
+  }
 }
 
-// ─── 主流程 ──────────────────────────────────────────────────────────────
+// ─── 主流程 ──────────────────────────────────────────────────
 
 function printBanner() {
-  console.log(`
-\x1b[36m============================================\x1b[0m
-\x1b[36m  Pan Router - Claude Code 一键安装\x1b[0m
-\x1b[36m  无需 API Key，开箱即用\x1b[0m
-\x1b[36m============================================\x1b[0m
-  `);
+  console.log(`\n\x1b[36m=== Pan Router - Claude Code 代理 ===\x1b[0m\n`);
 }
 
 async function main() {
   const args = process.argv.slice(2);
 
   if (args.includes("--help") || args.includes("-h")) {
-    console.log(`
-  pan-router — Claude Code 免费 AI 路由代理
-
-  \x1b[33m用法:\x1b[0m
-    panrouter                一键安装 + 前台启动
-    panrouter --install      只安装配置
-    panrouter --server       只启动代理（前台窗口）
-    panrouter --tray         以托盘模式启动（右下角隐藏图标）
-    panrouter --tray-install 安装配置 + 托盘启动
-    panrouter --help         显示帮助
-
-  \x1b[33m托盘模式:\x1b[0m
-    在系统通知区（右下角）显示图标，右键菜单:
-    - 启动/重启服务
-    - 开关开机自启动
-    - 退出关闭服务器和托盘
-    左键点击图标显示菜单
-
-  \x1b[33m配置:\x1b[0m
-    代理运行在 http://127.0.0.1:50816
-    Claude Code 自动使用，无需额外设置
-    `);
+    console.log("用法:\n  panrouter --server       (带命令行窗口运行)\n  panrouter --tray         (后台隐藏运行 + 托盘)\n  panrouter --tray-install (安装配置 + 托盘)");
     return;
   }
 
@@ -208,7 +177,6 @@ async function main() {
     printBanner();
     if (!installClaudeCode()) process.exit(1);
     writeConfig();
-    console.log("\n  ✓ 安装完成，运行 \x1b[33mpanrouter --server\x1b[0m 启动代理\n");
     return;
   }
 
@@ -218,7 +186,7 @@ async function main() {
   }
 
   if (args.includes("--tray") || args.includes("-t")) {
-    startTray();
+    await startTray();
     return;
   }
 
@@ -226,11 +194,10 @@ async function main() {
     printBanner();
     if (!installClaudeCode()) process.exit(1);
     writeConfig();
-    startTray();
+    await startTray();
     return;
   }
 
-  // 默认：全流程
   printBanner();
   if (!installClaudeCode()) process.exit(1);
   writeConfig();

package/package.json

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

package/tray-daemon.ps1

@@ -1,72 +1,100 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘守护脚本
-  去除了导致 UI 假死的同步网络请求，增加了稳定的重试和容错机制。
+  Pan Router 托盘守护脚本 (终极稳固版)
 #>
 
-Add-Type -AssemblyName System.Windows.Forms
-Add-Type -AssemblyName System.Drawing
-
-# 抑制全局报错弹窗，防止后台服务因为意外报错直接死掉
 $ErrorActionPreference = "SilentlyContinue"
 
+# 增加调试日志功能（记录在系统临时目录，遇到问题能查原因）
+$logFile = "$env:TEMP\panrouter_tray_debug.log"
+"--- $(Get-Date -Format 'HH:mm:ss') Tray Script Started ---" | Out-File $logFile -Append
+
+try {
+    Add-Type -AssemblyName System.Windows.Forms
+    Add-Type -AssemblyName System.Drawing
+} catch {
+    "Failed to load assemblies: $($_.Exception.Message)" | Out-File $logFile -Append
+    Exit
+}
+
 $scriptPath = $MyInvocation.MyCommand.Path
 $scriptDir = Split-Path $scriptPath -Parent
 $serverPath = Join-Path $scriptDir "server.mjs"
-$nodePath = (Get-Command node -ErrorAction SilentlyContinue).Source
 
-# 如果系统环境没装 Node，直接静默退出
-if (-not $nodePath) { Exit }
+# 接收从 Node CLI 传来的绝对路径，如果没有则降级使用 "node"
+$nodePath = $env:PANROUTER_NODE_PATH
+if ([string]::IsNullOrWhiteSpace($nodePath)) {
+    $nodePath = "node"
+}
+"Node Path identified as: $nodePath" | Out-File $logFile -Append
 
-# ─── 核心功能：杀旧启新 ──────────────────────────────
+# ─── 定义重启服务的逻辑 ────────────────────────────────────
 function Restart-Server {
-    # 强制清理旧的代理进程
+    "Executing Restart-Server..." | Out-File $logFile -Append
     try {
-        wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null | ForEach-Object {
-            if ($_ -match '(\d+),.*?server\.mjs') {
-                Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue
-            }
-        }
+        # 使用更为稳健的 WMI 查询关闭进程
+        Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" |
+            Where-Object { $_.CommandLine -match "server\.mjs" } |
+            ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
     } catch {}
 
-    # 无黑框启动新进程
     try {
-        Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden -PassThru -NoNewWindow | Out-Null
-    } catch {}
+        Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden
+        "Server process spawned successfully." | Out-File $logFile -Append
+    } catch {
+        "Server start error: $($_.Exception.Message)" | Out-File $logFile -Append
+    }
 }
 
-# 启动时立刻执行一次
-Restart-Server
+# ─── 保证服务在运行（用于应对开机自启动的情况） ───────────
+$isRunning = $false
+try {
+    $procs = Get-WmiObject Win32_Process -Filter "Name = 'node.exe'"
+    foreach ($p in $procs) {
+        if ($p.CommandLine -match "server\.mjs") {
+            $isRunning = $true
+            break
+        }
+    }
+} catch {}
 
-# ─── 绘制托盘图标 ────────────────────────────────────────
-$bmp = New-Object System.Drawing.Bitmap(16, 16)
-$g = [System.Drawing.Graphics]::FromImage($bmp)
-$g.SmoothingMode = 'HighQuality'
-$g.Clear([System.Drawing.Color]::Transparent)
-$brush = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::FromArgb(0, 120, 215))
-$g.FillEllipse($brush, 0, 0, 15, 15)
-$font = New-Object System.Drawing.Font("Segoe UI", 8.5, [System.Drawing.FontStyle]::Bold)
-$fg = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::White)
-$g.DrawString("P", $font, $fg, 3, 1.5)
+if (-not $isRunning) {
+    "Server not running on load, starting..." | Out-File $logFile -Append
+    Restart-Server
+}
 
-$hIcon = $bmp.GetHicon()
-$icon = [System.Drawing.Icon]::FromHandle($hIcon)
+# ─── 绘制托盘图标 ──────────────────────────────────────────
+try {
+    $bmp = New-Object System.Drawing.Bitmap(16, 16)
+    $g = [System.Drawing.Graphics]::FromImage($bmp)
+    $g.SmoothingMode = 'HighQuality'
+    $g.Clear([System.Drawing.Color]::Transparent)
+    $brush = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::FromArgb(0, 120, 215))
+    $g.FillEllipse($brush, 0, 0, 15, 15)
+    $font = New-Object System.Drawing.Font("Segoe UI", 8, [System.Drawing.FontStyle]::Bold)
+    $fg = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::White)
+    $g.DrawString("P", $font, $fg, 3, 2)
+
+    $hIcon = $bmp.GetHicon()
+    $icon = [System.Drawing.Icon]::FromHandle($hIcon)
+} catch {
+    "Icon drawing error: $($_.Exception.Message)" | Out-File $logFile -Append
+    Exit
+}
 
-# ─── 初始化托盘对象 ──────────────────────────────────
+# ─── 初始化托盘菜单 ────────────────────────────────────────
 $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
 $notifyIcon.Icon = $icon
 $notifyIcon.Text = "Pan Router (端口: 50816)"
 
 $menu = New-Object System.Windows.Forms.ContextMenuStrip
 
-# 标题 (不可点)
 $titleItem = New-Object System.Windows.Forms.ToolStripMenuItem("Pan Router | :50816")
 $titleItem.Enabled = $false
 $titleItem.Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold)
 $menu.Items.Add($titleItem) | Out-Null
 $menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
 
-# 重启服务选项
 $restartItem = New-Object System.Windows.Forms.ToolStripMenuItem("重启后台服务")
 $restartItem.Add_Click({
     Restart-Server
@@ -74,10 +102,9 @@ $restartItem.Add_Click({
 })
 $menu.Items.Add($restartItem) | Out-Null
 
-# 开机自启动选项
 $autoItem = New-Object System.Windows.Forms.ToolStripMenuItem("开机自启动")
 try {
-    $regKey = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter -ErrorAction SilentlyContinue
+    $regKey = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter
     $autoItem.Checked = ($regKey -ne $null)
 } catch {}
 
@@ -95,39 +122,32 @@ $autoItem.Add_Click({
 $menu.Items.Add($autoItem) | Out-Null
 $menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
 
-# 退出选项
 $exitItem = New-Object System.Windows.Forms.ToolStripMenuItem("退出")
 $exitItem.Add_Click({
     $notifyIcon.Visible = $false
-    try { wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null | ForEach-Object { if ($_ -match '(\d+),.*?server\.mjs') { Stop-Process -Id $Matches[1] -Force -ErrorAction SilentlyContinue } } } catch {}
+    try {
+        Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object { $_.CommandLine -match "server\.mjs" } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
+    } catch {}
     [System.Windows.Forms.Application]::Exit()
 })
 $menu.Items.Add($exitItem) | Out-Null
 
 $notifyIcon.ContextMenuStrip = $menu
 
-# ─── 优化左键操作 ────────────────────────────────────
 $notifyIcon.Add_MouseClick({
     if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
-        # 利用反射直接呼出右键菜单，取消容易卡死的网络检查
         $mi = [System.Windows.Forms.NotifyIcon].GetMethod("ShowContextMenu", [System.Reflection.BindingFlags]::NonPublic -bor [System.Reflection.BindingFlags]::Instance)
         $mi.Invoke($notifyIcon, $null)
     }
 })
 
-# ─── 启动与保持运行 ──────────────────────────────────
 $notifyIcon.Visible = $true
 
-# 使用 ApplicationContext 保持消息循环，防止脚本在执行完后意外释放托盘图标
+"UI setup completed, entering ApplicationContext loop." | Out-File $logFile -Append
+
 $appContext = New-Object System.Windows.Forms.ApplicationContext
 [System.Windows.Forms.Application]::Run($appContext)
 
-# 清理资源
+"Exiting..." | Out-File $logFile -Append
 $notifyIcon.Visible = $false
 $notifyIcon.Dispose()
-$font.Dispose()
-$fg.Dispose()
-$brush.Dispose()
-$g.Dispose()
-[System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
-$icon.Dispose()