npm - panrouter - Versions diffs - 2.0.1 → 3.1.0 - Mend

panrouter 2.0.1 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/cli.mjs CHANGED Viewed

@@ -1,9 +1,5 @@
 #!/usr/bin/env node
-/**
- * Pan Router CLI — 一键安装 + 启动
- */
 import { execSync, spawn } from "node:child_process";
 import http from "node:http";
 import fs from "node:fs";
@@ -14,7 +10,6 @@ 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" };
@@ -22,46 +17,28 @@ function log(label, msg, color = "") {
   console.log(`${c}[${label}]${colors.reset} ${msg}`);
 }
-function run(cmd) {
-  try {
-    execSync(cmd, { stdio: "inherit" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function runSilent(cmd) {
-  try {
-    execSync(cmd, { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-// ─── 1. 安装与配置 ──────────────────────────────────────────
 function installClaudeCode() {
   log("..", "正在检查 Claude Code...", "yellow");
-  if (runSilent("claude --version")) {
+  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;
+    }
   }
-  log("..", "正在安装 Claude Code...", "yellow");
-  if (!run("npm install -g @anthropic-ai/claude-code")) {
-    log("!!", "Claude Code 安装失败", "red");
-    return false;
-  }
-  log("OK", "Claude Code 安装成功", "green");
-  return true;
 }
 function writeConfig() {
-  log("..", "正在写入配置...", "yellow");
+  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",
@@ -73,7 +50,7 @@ function writeConfig() {
     hasCompletedOnboarding: true,
   };
   fs.writeFileSync(SETTINGS_PATH, JSON.stringify(config, null, 2), "utf-8");
-  log("OK", "配置文件已写入", "green");
+  log("OK", "配置完成", "green");
 }
 async function isPortOpen() {
@@ -85,8 +62,6 @@ async function isPortOpen() {
   });
 }
-// ─── 2. 启动服务（前台黑框） ────────────────────────────────
 async function startServer() {
   const serverPath = path.join(__dirname, "server.mjs");
   try {
@@ -97,111 +72,94 @@ async function startServer() {
     }
   } catch {}
-  log("..", "正在启动 Pan Router（端口 50816）...", "yellow");
+  log("..", "正在启动代理...", "yellow");
   if (process.platform === "win32") {
     execSync(`start "Pan Router" cmd /c "node ${serverPath} & pause"`, { stdio: "pipe" });
   } else {
-    const child = spawn("node", [serverPath], { cwd: __dirname, stdio: "ignore", detached: true });
-    child.unref();
+    spawn("node", [serverPath], { cwd: __dirname, stdio: "ignore", detached: true }).unref();
   }
   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 运行中，可以执行 claude 命令了", "green");
 }
-// ─── 3. 托盘模式（后台静默） ────────────────────────────────
 async function startTray() {
   const serverPath = path.join(__dirname, "server.mjs");
-  const vbsPath = path.join(__dirname, "panrouter-tray.vbs");
+  const psPath = path.join(__dirname, "tray-daemon.ps1");
+  log("..", "正在后台启动代理...", "yellow");
-  log("..", "正在启动代理并加载托盘...", "yellow");
+  // 1. 由主程序直接启动 Node 代理，彻底杜绝 PowerShell 启动慢导致的超时
+  try {
+    if (process.platform === "win32") {
+      execSync('taskkill /f /fi "WINDOWTITLE eq Pan Router*" >nul 2>&1', { stdio: "pipe" });
+    }
+  } catch {}
-  // 【核心修复1】：由 Node 主进程直接启动 Server，确保 API 百分百可用
   const srv = spawn(process.execPath, [serverPath], {
-      cwd: __dirname,
-      stdio: "ignore",
-      detached: true,
-      windowsHide: true
+    cwd: __dirname,
+    stdio: "ignore",
+    windowsHide: true,
+    detached: true
   });
   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();
-  }
-  // 验证端口
+  // 2. 验证端口（由于是直接用 Node 启动，这步通常 1 秒内就会通过）
   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", "Pan Router 代理已在后台运行 (端口: 50816)！", "green");
-    console.log("   托盘图标应该已出现。如果系统原因导致图标没出来，代理依然可用。");
+    log("OK", "代理服务已就绪！(端口 50816)", "green");
   } else {
-    log("!!", "代理启动超时，请检查端口 50816 是否被占用", "red");
+    log("!!", "服务启动超时，但仍将尝试加载托盘", "red");
   }
-}
-// ─── 主流程 ──────────────────────────────────────────────────
+  // 3. 独立拉起系统托盘
+  log("..", "正在加载系统托盘...", "yellow");
+  const tray = spawn("powershell.exe", [
+    "-NoProfile",
+    "-ExecutionPolicy", "Bypass",
+    "-WindowStyle", "Hidden",
+    "-File", psPath
+  ], {
+    cwd: __dirname,
+    stdio: "ignore",
+    windowsHide: true,
+    detached: true,
+    env: { ...process.env, PANROUTER_NODE: process.execPath }
+  });
+  tray.unref();
-function printBanner() {
-  console.log(`\n\x1b[36m=== Pan Router - Claude Code 代理 ===\x1b[0m\n`);
+  console.log("   API 代理已立即可用。托盘图标稍后将在右下角显示。");
 }
 async function main() {
   const args = process.argv.slice(2);
   if (args.includes("--help") || args.includes("-h")) {
     console.log("用法:\n  panrouter --server       (带命令行窗口运行)\n  panrouter --tray         (后台隐藏运行 + 托盘)\n  panrouter --tray-install (安装配置 + 托盘)");
     return;
   }
-  if (args.includes("--install") || args.includes("-i")) {
-    printBanner();
-    if (!installClaudeCode()) process.exit(1);
-    writeConfig();
-    return;
-  }
+  if (args.includes("--server") || args.includes("-s")) { await startServer(); return; }
+  if (args.includes("--tray") || args.includes("-t")) { await startTray(); return; }
-  if (args.includes("--server") || args.includes("-s")) {
-    await startServer();
-    return;
-  }
-  if (args.includes("--tray") || args.includes("-t")) {
-    await startTray();
-    return;
-  }
+  console.log(`\n\x1b[36m=== Pan Router - Claude Code ===\x1b[0m\n`);
+  if (!installClaudeCode()) return process.exit(1);
+  writeConfig();
   if (args.includes("--tray-install") || args.includes("-ti")) {
-    printBanner();
-    if (!installClaudeCode()) process.exit(1);
-    writeConfig();
     await startTray();
-    return;
+  } else {
+    await startServer();
   }
-  printBanner();
-  if (!installClaudeCode()) process.exit(1);
-  writeConfig();
-  await startServer();
 }
 main();

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "2.0.1",
+  "version": "3.1.0",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -9,8 +9,7 @@
   "files": [
     "cli.mjs",
     "server.mjs",
-    "tray-daemon.ps1",
-    "panrouter-tray.vbs"
+    "tray-daemon.ps1"
   ],
   "license": "MIT"
 }

package/tray-daemon.ps1 CHANGED Viewed

@@ -1,166 +1,107 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘守护脚本 (终极稳固版)
+  Pan Router 托盘守护脚本 (极简直连版)
 #>
 $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
-}
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+[System.Windows.Forms.Application]::EnableVisualStyles()
-$scriptPath = $MyInvocation.MyCommand.Path
-$scriptDir = Split-Path $scriptPath -Parent
+$scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
 $serverPath = Join-Path $scriptDir "server.mjs"
-# 接收从 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 {
-        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
-        "Server process spawned successfully." | Out-File $logFile -Append
-    } catch {
-        "Server start error: $($_.Exception.Message)" | Out-File $logFile -Append
-    }
+# 拿到 Node 路径
+$nodePath = $env:PANROUTER_NODE
+if ([string]::IsNullOrWhiteSpace($nodePath)) { $nodePath = "node" }
+# ─── 管理后台代理 ──────────────────────────────────────────
+function Start-Backend {
+    # 杀掉旧代理
+    Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" |
+        Where-Object CommandLine -match "server\.mjs" |
+        ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
+    # 启动新代理
+    Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden
 }
-# ─── 保证服务在运行（用于应对开机自启动的情况） ───────────
-$isRunning = $false
+# 【核心修复】：不要盲目重启！检查端口如果已经通了，直接跳过耗时的杀进程步骤
+$portOpen = $false
 try {
-    $procs = Get-WmiObject Win32_Process -Filter "Name = 'node.exe'"
-    foreach ($p in $procs) {
-        if ($p.CommandLine -match "server\.mjs") {
-            $isRunning = $true
-            break
-        }
-    }
+    $tcp = New-Object System.Net.Sockets.TcpClient
+    $ar = $tcp.BeginConnect("127.0.0.1", 50816, $null, $null)
+    $portOpen = $ar.AsyncWaitHandle.WaitOne(500, $false)
+    $tcp.Close()
 } catch {}
-if (-not $isRunning) {
-    "Server not running on load, starting..." | Out-File $logFile -Append
-    Restart-Server
+if (-not $portOpen) {
+    Start-Backend
 }
-# ─── 绘制托盘图标 (增加极强容错) ──────────────────────────
+# ─── 初始化托盘 ────────────────────────────────────────────
+$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+$notifyIcon.Text = "Pan Router (:50816)"
+# 绘图报错是导致图标出不来的元凶之一，这里做强兜底
 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)
-    # 【修复1】改用通用系统字体，防止系统中缺少 Segoe UI 导致报错闪退
-    $font = New-Object System.Drawing.Font([System.Drawing.FontFamily]::GenericSansSerif, 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)
-    "Custom icon drawn." | Out-File $logFile -Append
+    $g.Clear([System.Drawing.Color]::FromArgb(0, 120, 215))
+    $font = New-Object System.Drawing.Font("Arial", 8, [System.Drawing.FontStyle]::Bold)
+    $g.DrawString("P", $font, [System.Drawing.Brushes]::White, 2, 1)
+    $notifyIcon.Icon = [System.Drawing.Icon]::FromHandle($bmp.GetHicon())
 } catch {
-    "Icon drawing error: $($_.Exception.Message). Using fallback icon." | Out-File $logFile -Append
-    # 【修复2】万一画图依然失败绝对不能 Exit，用系统自带程序图标兜底显示
-    $icon = [System.Drawing.SystemIcons]::Application
+    # 终极兜底：如果上面的画图代码因为 GDI 环境被拦，直接用系统自带的安全盾牌图标
+    $notifyIcon.Icon = [System.Drawing.SystemIcons]::Shield
 }
-# ─── 创建隐藏主窗口 (防止消息循环异常退出) ─────────────────
-# 【修复3】提供一个实质性的隐藏窗体，避免部分系统回收无窗体的托盘进程
-$mainForm = New-Object System.Windows.Forms.Form
-$mainForm.Text = "PanRouterHidden"
-$mainForm.ShowInTaskbar = $false
-$mainForm.WindowState = [System.Windows.Forms.FormWindowState]::Minimized
-$mainForm.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow
-$mainForm.Opacity = 0
-$mainForm.Add_Load({ $mainForm.Hide() })
-# ─── 初始化托盘菜单 ────────────────────────────────────────
-$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 = $menu.Items.Add("Pan Router | :50816")
 $titleItem.Enabled = $false
-$titleItem.Font = New-Object System.Drawing.Font([System.Drawing.FontFamily]::GenericSansSerif, 9, [System.Drawing.FontStyle]::Bold)
-$menu.Items.Add($titleItem) | Out-Null
-$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
+$menu.Items.Add("-") | Out-Null
-$restartItem = New-Object System.Windows.Forms.ToolStripMenuItem("重启后台服务")
+$restartItem = $menu.Items.Add("重启服务")
 $restartItem.Add_Click({
-    Restart-Server
-    $notifyIcon.ShowBalloonTip(2000, "Pan Router", "后台代理服务已重新启动 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
+    Start-Backend
+    $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务已重启", [System.Windows.Forms.ToolTipIcon]::Info)
 })
-$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
-    $autoItem.Checked = ($regKey -ne $null)
-} catch {}
+$autoItem = $menu.Items.Add("开机自启动")
+try { $autoItem.Checked = (Get-ItemProperty "HKCU:\Software\Microsoft\Windows\CurrentVersion\Run" -Name PanRouter) -ne $null } catch {}
 $autoItem.Add_Click({
     if ($autoItem.Checked) {
         reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /f 2>&1 | Out-Null
         $autoItem.Checked = $false
     } else {
-        $vbsPath = Join-Path $scriptDir "panrouter-tray.vbs"
-        $cmd = "wscript.exe //B //NoLogo `"$vbsPath`""
+        $cmd = "powershell.exe -WindowStyle Hidden -ExecutionPolicy Bypass -File `"$($MyInvocation.MyCommand.Path)`""
         reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v PanRouter /t REG_SZ /d $cmd /f 2>&1 | Out-Null
         $autoItem.Checked = $true
     }
 })
-$menu.Items.Add($autoItem) | Out-Null
-$menu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator)) | Out-Null
-$exitItem = New-Object System.Windows.Forms.ToolStripMenuItem("退出")
+$menu.Items.Add("-") | Out-Null
+$exitItem = $menu.Items.Add("退出")
 $exitItem.Add_Click({
     $notifyIcon.Visible = $false
-    try {
-        Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object { $_.CommandLine -match "server\.mjs" } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
-    } catch {}
-    $mainForm.Close()
+    Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object CommandLine -match "server\.mjs" | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
+    [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.ContextMenuStrip.Show([System.Windows.Forms.Cursor]::Position)
     }
 })
 $notifyIcon.Visible = $true
-"UI setup completed, entering Application loop." | Out-File $logFile -Append
-# 运行消息循环，绑定到隐藏窗体以锁死进程不被误杀
-[System.Windows.Forms.Application]::Run($mainForm)
-"Exiting..." | Out-File $logFile -Append
-$notifyIcon.Visible = $false
-$notifyIcon.Dispose()
+# 保持进程存活的最纯粹方式
+$ctx = New-Object System.Windows.Forms.ApplicationContext
+[System.Windows.Forms.Application]::Run($ctx)

package/panrouter-tray.vbs DELETED Viewed

@@ -1,13 +0,0 @@
-' Pan Router Tray Launcher
-' 由 cli.mjs --tray 通过 cmd /c start /B 启动
-' 与 daemon 进程树无关, 独立 Window Station
-Dim WshShell, FSO, ScriptDir
-Set WshShell = CreateObject("WScript.Shell")
-Set FSO = CreateObject("Scripting.FileSystemObject")
-ScriptDir = FSO.GetParentFolderName(WScript.ScriptFullName)
-' 后台隐藏启动 PS 托盘 (自包含: 启动 server + 图标 + 菜单)
-' 0 = 隐藏窗口, False = 不等待返回
-WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & ScriptDir & "\tray-daemon.ps1" & """", 0, False