panrouter 3.4.0 → 3.6.0

package/cli.mjs

@@ -91,17 +91,15 @@ async function startTray() {
   const psPath = path.join(__dirname, "tray-daemon.ps1");
   log("..", "正在后台启动代理...", "yellow");
 
-  // 【终极编码修复】：PowerShell 在中文系统下默认以 GBK 解析无 BOM 的 UTF-8 文件，导致中文吞掉相邻的引号。
-  // 方案：将脚本内容强制加上 UTF-8 BOM 头 (EF BB BF)，存入临时文件后再让 PowerShell 执行。
-  let runPsPath = psPath;
+  // 【核心修复】：直接在原文件上追加 UTF-8 BOM 头，彻底修复乱码并保持原目录路径不变
   try {
-    const tempDir = process.env.TEMP || process.env.TMP || __dirname;
-    runPsPath = path.join(tempDir, "panrouter_tray_run.ps1");
     const psContent = fs.readFileSync(psPath, "utf8");
-    const bom = Buffer.from([0xEF, 0xBB, 0xBF]);
-    fs.writeFileSync(runPsPath, Buffer.concat([bom, Buffer.from(psContent, "utf8")]));
+    if (!psContent.startsWith("")) {
+      const bom = Buffer.from([0xEF, 0xBB, 0xBF]);
+      fs.writeFileSync(psPath, Buffer.concat([bom, Buffer.from(psContent, "utf8")]));
+    }
   } catch (e) {
-    runPsPath = psPath;
+    // 忽略权限问题
   }
 
   try {
@@ -140,7 +138,7 @@ async function startTray() {
     "-STA",
     "-ExecutionPolicy", "Bypass",
     "-WindowStyle", "Hidden",
-    "-File", `"${runPsPath}"`
+    "-File", `"${psPath}"`
   ], {
     cwd: __dirname,
     stdio: ['ignore', 'pipe', 'pipe'],
@@ -157,8 +155,7 @@ async function startTray() {
 
   if (tray.exitCode !== null) {
     log("!!", "托盘进程未能驻留，发生闪退！", "red");
-    console.log(`\n\x1b[31m=== PowerShell 启动失败原因 ===\x1b[0m\n${psOutput || "(无报错输出，可能是被杀毒软件静默拦截)"}\n\x1b[31m===============================\x1b[0m\n`);
-    console.log("提示：如果代理可用，你可以暂时无视此错误。");
+    console.log(`\n\x1b[31m=== PowerShell 启动失败原因 ===\x1b[0m\n${psOutput || "(无输出)"}\n\x1b[31m===============================\x1b[0m\n`);
   } else {
     tray.unref();
     console.log("   托盘图标应该已在右下角显示。");

package/package.json

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

package/tray-daemon.ps1

@@ -1,8 +1,8 @@
 <#
 .SYNOPSIS
-  Pan Router 托盘守护脚本 (终极原生挂载版 + 日志诊断)
+  Pan Router 托盘守护脚本 (终极完美版)
 #>
-$ErrorActionPreference = "Stop" # 遇到错误直接抛出，由 try-catch 捕获写日志
+$ErrorActionPreference = "Stop"
 
 $logFile = "$env:TEMP\panrouter_tray.log"
 "--- $(Get-Date -Format 'HH:mm:ss') 托盘脚本启动 ---" | Out-File $logFile
@@ -15,11 +15,16 @@ try {
 
     $scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
     $serverPath = Join-Path $scriptDir "server.mjs"
+    # 【修复1】：在全局作用域提前把准确的脚本路径存下来，防止在 Click 事件块内丢失
+    $trayScriptPath = $MyInvocation.MyCommand.Path
 
-    # 拿到 Node 路径
     $nodePath = $env:PANROUTER_NODE
-    if ([string]::IsNullOrWhiteSpace($nodePath)) { $nodePath = "node" }
+    if ([string]::IsNullOrWhiteSpace($nodePath)) {
+        $nodeCmd = Get-Command node -ErrorAction SilentlyContinue
+        if ($nodeCmd) { $nodePath = $nodeCmd.Source } else { $nodePath = "node" }
+    }
     "2. Node 路径: $nodePath" | Out-File $logFile -Append
+    "   Server 路径: $serverPath" | Out-File $logFile -Append
 
     # ─── 管理后台代理 ──────────────────────────────────────────
     function Start-Backend {
@@ -28,7 +33,22 @@ try {
             Where-Object CommandLine -match "server\.mjs" |
             ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }
 
-        Start-Process -FilePath $nodePath -ArgumentList "`"$serverPath`"" -WorkingDirectory $scriptDir -WindowStyle Hidden
+        try {
+            $psi = New-Object System.Diagnostics.ProcessStartInfo
+            $psi.FileName = $nodePath
+            $psi.Arguments = "`"$serverPath`""
+            $psi.WorkingDirectory = $scriptDir
+            $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
+            $psi.CreateNoWindow = $true
+            $psi.UseShellExecute = $false
+            $psi.RedirectStandardOutput = $true
+            $psi.RedirectStandardError = $true
+
+            $proc = [System.Diagnostics.Process]::Start($psi)
+            "-> Node 服务进程已原生启动 (PID: $($proc.Id))" | Out-File $logFile -Append
+        } catch {
+            "-> Node 进程启动失败: $($_.Exception.Message)" | Out-File $logFile -Append
+        }
     }
 
     # 检查端口
@@ -40,7 +60,7 @@ try {
         $tcp.Close()
         "3. 端口探测完成，已开放状态: $portOpen" | Out-File $logFile -Append
     } catch {
-        "3. 端口探测报错 (忽略并继续): $($_.Exception.Message)" | Out-File $logFile -Append
+        "3. 端口探测报错: $($_.Exception.Message)" | Out-File $logFile -Append
     }
 
     if (-not $portOpen) {
@@ -51,7 +71,6 @@ try {
     $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)
@@ -59,26 +78,22 @@ try {
         $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())
-        "4. 自定义图标绘制成功" | Out-File $logFile -Append
     } catch {
-        "4. 画图异常，改用原生盾牌图标: $($_.Exception.Message)" | Out-File $logFile -Append
         $notifyIcon.Icon = [System.Drawing.SystemIcons]::Shield
     }
 
     # ─── 原生菜单配置 (ContextMenu) ────────────────────────────
-    # 【核心修复】：使用原生的 ContextMenu 代替极易失去焦点的 ContextMenuStrip
     $menu = New-Object System.Windows.Forms.ContextMenu
 
     $titleItem = New-Object System.Windows.Forms.MenuItem("Pan Router | :50816")
     $titleItem.Enabled = $false
     $menu.MenuItems.Add($titleItem) | Out-Null
-
     $menu.MenuItems.Add("-") | Out-Null
 
     $restartItem = New-Object System.Windows.Forms.MenuItem("重启服务")
     $restartItem.Add_Click({
         Start-Backend
-        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务已重启", [System.Windows.Forms.ToolTipIcon]::Info)
+        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "后台代理服务已重新启动 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
     })
     $menu.MenuItems.Add($restartItem) | Out-Null
 
@@ -89,19 +104,18 @@ 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
         }
     })
     $menu.MenuItems.Add($autoItem) | Out-Null
-
     $menu.MenuItems.Add("-") | Out-Null
 
     $exitItem = New-Object System.Windows.Forms.MenuItem("退出")
     $exitItem.Add_Click({
         $notifyIcon.Visible = $false
-        "-> 执行退出清理" | Out-File $logFile -Append
         Get-WmiObject Win32_Process -Filter "Name = 'node.exe'" | Where-Object CommandLine -match "server\.mjs" | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }
         [System.Windows.Forms.Application]::Exit()
     })
@@ -112,7 +126,6 @@ try {
     "5. 托盘图标已绑定并设置为可见" | Out-File $logFile -Append
 
     # ─── 隐形实体主窗口 ─────────────────────────────────────────
-    # 【核心修复】：挂载真实的 Form 窗口，防止 Windows 将该 PowerShell UI 线程当做垃圾回收掉
     $form = New-Object System.Windows.Forms.Form
     $form.ShowInTaskbar = $false
     $form.WindowState = [System.Windows.Forms.FormWindowState]::Minimized
@@ -123,10 +136,7 @@ try {
     })
 
     [System.Windows.Forms.Application]::Run($form)
-
-    "7. 程序正常退出" | Out-File $logFile -Append
 } catch {
     "【致命报错】无法完成执行:" | Out-File $logFile -Append
     $_.Exception.Message | Out-File $logFile -Append
-    $_.Exception.StackTrace | Out-File $logFile -Append
 }