panrouter 1.1.1 → 1.1.2

package/package.json

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

package/tray-app.cs

@@ -0,0 +1,324 @@
+/* Pan Router Tray App
+ * 编译: csc /nologo /target:winexe /reference:System.Windows.Forms.dll /reference:System.Drawing.dll tray-app.cs
+ *
+ * 功能: 以系统托盘方式运行 panrouter 服务器, 无窗口
+ * 右键菜单: 状态, 开机自启动开关, 退出
+ */
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Net;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+
+public class PanRouterTrayApp
+{
+    private static NotifyIcon _notifyIcon;
+    private static Process _serverProcess;
+    private static string _serverPath;
+    private static string _appDir;
+    private static System.Threading.Timer _healthTimer;
+    private static StreamWriter _log;
+    private static readonly string _logPath = Path.Combine(Path.GetTempPath(), "panrouter-tray.log");
+
+    // ─── Win32 API: 隐藏窗口 ──────────────────────
+    [DllImport("user32.dll")]
+    private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+    private const int SW_HIDE = 0;
+
+    [STAThread]
+    public static void Main(string[] args)
+    {
+        // Parse args
+        foreach (var a in args)
+        {
+            if (a.StartsWith("--serverPath:", StringComparison.OrdinalIgnoreCase))
+                _serverPath = a.Substring("--serverPath:".Length).Trim('"');
+        }
+        if (string.IsNullOrEmpty(_serverPath) || !File.Exists(_serverPath))
+        {
+            MessageBox.Show("Pan Router: 找不到 server.mjs", "Pan Router", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+        _appDir = Path.GetDirectoryName(_serverPath);
+
+        // Open log
+        try
+        {
+            _log = new StreamWriter(_logPath, false, Encoding.UTF8);
+            _log.AutoFlush = true;
+            Log("=== PanRouter Tray App v1 ===");
+            Log("ServerPath: " + _serverPath);
+        }
+        catch { }
+
+        // Kill old servers
+        KillOldServers();
+
+        // Start hidden server
+        StartServer();
+
+        // Wait for ready
+        bool ready = false;
+        for (int i = 0; i < 20; i++)
+        {
+            Thread.Sleep(500);
+            if (IsOnline()) { ready = true; break; }
+        }
+        Log("Server ready=" + ready);
+
+        // Create tray icon
+        CreateTrayIcon();
+
+        // Show balloon
+        if (ready)
+            _notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", ToolTipIcon.Info);
+        else
+            _notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器启动异常，查看日志", ToolTipIcon.Warning);
+
+        // Health check every 30s
+        _healthTimer = new System.Threading.Timer(HealthCheck, null, 30000, 30000);
+
+        // Message loop
+        Application.Run();
+    }
+
+    private static void Log(string msg)
+    {
+        try { _log?.WriteLine(DateTime.Now.ToString("HH:mm:ss") + " " + msg); } catch { }
+    }
+
+    // ─── 杀掉旧服务器 ────────────────────────────
+    private static void KillOldServers()
+    {
+        try
+        {
+            // Use WMIC via command line to find node.exe processes running server.mjs
+            var psi = new ProcessStartInfo("wmic", "process where \"name='node.exe'\" get ProcessId,CommandLine /format:csv")
+            {
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true
+            };
+            using (var p = Process.Start(psi))
+            {
+                string output = p.StandardOutput.ReadToEnd();
+                p.WaitForExit(2000);
+
+                foreach (string line in output.Split('\n'))
+                {
+                    if (line.Contains("server.mjs"))
+                    {
+                        string[] parts = line.Split(',');
+                        if (parts.Length >= 3 && int.TryParse(parts[2].Trim(), out int pid))
+                        {
+                            Log("Killing old server PID=" + pid);
+                            try { Process.GetProcessById(pid)?.Kill(); } catch { }
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception ex) { Log("KillOld error: " + ex.Message); }
+    }
+
+    // ─── 启动隐藏服务器 ───────────────────────────
+    private static void StartServer()
+    {
+        try
+        {
+            _serverProcess = new Process();
+            _serverProcess.StartInfo.FileName = "node";
+            _serverProcess.StartInfo.Arguments = "\"" + _serverPath + "\"";
+            _serverProcess.StartInfo.WorkingDirectory = _appDir;
+            _serverProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            _serverProcess.StartInfo.CreateNoWindow = true;
+            _serverProcess.StartInfo.UseShellExecute = false;
+            // Read output so buffer never blocks
+            _serverProcess.StartInfo.RedirectStandardOutput = true;
+            _serverProcess.StartInfo.RedirectStandardError = true;
+            _serverProcess.OutputDataReceived += (s, e) => { if (!string.IsNullOrEmpty(e.Data)) Log("[srv] " + e.Data); };
+            _serverProcess.ErrorDataReceived += (s, e) => { if (!string.IsNullOrEmpty(e.Data)) Log("[srv-err] " + e.Data); };
+            _serverProcess.Start();
+            _serverProcess.BeginOutputReadLine();
+            _serverProcess.BeginErrorReadLine();
+            Log("Server started PID=" + _serverProcess.Id);
+        }
+        catch (Exception ex)
+        {
+            Log("StartServer FAILED: " + ex.Message);
+        }
+    }
+
+    // ─── 健康检查 ────────────────────────────────
+    private static bool IsOnline()
+    {
+        try
+        {
+            var req = WebRequest.CreateHttp("http://127.0.0.1:50816/health");
+            req.Timeout = 1500;
+            using (var resp = req.GetResponse()) { return true; }
+        }
+        catch { return false; }
+    }
+
+    private static void HealthCheck(object state)
+    {
+        try
+        {
+            if (!IsOnline())
+            {
+                Log("Health check FAILED, restarting...");
+                KillOldServers();
+                StartServer();
+                Thread.Sleep(3000);
+                if (IsOnline())
+                    _notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已自动重启 ✓", ToolTipIcon.Info);
+                else
+                    _notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器重启失败 ⚠", ToolTipIcon.Error);
+            }
+        }
+        catch (Exception ex) { Log("HealthCheck error: " + ex.Message); }
+    }
+
+    // ─── 创建托盘图标 ────────────────────────────
+    private static void CreateTrayIcon()
+    {
+        var bmp = new Bitmap(16, 16);
+        using (var g = Graphics.FromImage(bmp))
+        {
+            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+            g.Clear(Color.Transparent);
+            using (var brush = new SolidBrush(Color.FromArgb(0, 120, 215)))
+                g.FillEllipse(brush, 0, 0, 15, 15);
+            using (var font = new Font("Segoe UI", 8.5f, FontStyle.Bold))
+            using (var fg = new SolidBrush(Color.White))
+                g.DrawString("P", font, fg, 3, 1.5f);
+        }
+        var icon = Icon.FromHandle(bmp.GetHicon());
+
+        _notifyIcon = new NotifyIcon();
+        _notifyIcon.Icon = icon;
+        _notifyIcon.Text = "Pan Router\n端口 50816 | 运行中";
+        _notifyIcon.Visible = true;
+        Log("Tray icon created");
+
+        // Left click: balloon status
+        _notifyIcon.MouseClick += (s, e) =>
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                bool online = IsOnline();
+                _notifyIcon.ShowBalloonTip(2000, "Pan Router",
+                    online ? "运行正常 ✓ (端口 50816)" : "服务器未响应 ⚠",
+                    online ? ToolTipIcon.Info : ToolTipIcon.Error);
+            }
+        };
+
+        // Right-click menu
+        var menu = new ContextMenuStrip();
+
+        var titleItem = new ToolStripMenuItem("Pan Router - :50816") { Enabled = false };
+        titleItem.Font = new Font("Segoe UI", 9, FontStyle.Bold);
+        menu.Items.Add(titleItem);
+        menu.Items.Add(new ToolStripSeparator());
+
+        // Autostart
+        var autoItem = new ToolStripMenuItem("开机自启动");
+        autoItem.Checked = IsAutostart();
+        autoItem.Click += (s, e) =>
+        {
+            if (autoItem.Checked)
+            {
+                SetAutostart(false);
+                autoItem.Checked = false;
+                _notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", ToolTipIcon.Info);
+                Log("Autostart OFF");
+            }
+            else
+            {
+                SetAutostart(true);
+                autoItem.Checked = true;
+                _notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", ToolTipIcon.Info);
+                Log("Autostart ON");
+            }
+        };
+        menu.Items.Add(autoItem);
+        menu.Items.Add(new ToolStripSeparator());
+
+        // Exit
+        var exitItem = new ToolStripMenuItem("退出");
+        exitItem.Click += (s, e) =>
+        {
+            Log("Exit clicked");
+            Cleanup();
+            Application.Exit();
+        };
+        menu.Items.Add(exitItem);
+
+        _notifyIcon.ContextMenuStrip = menu;
+
+        // Cleanup on exit
+        Application.ApplicationExit += (s, e) => { Cleanup(); bmp.Dispose(); };
+    }
+
+    // ─── 开机自启动 ──────────────────────────────
+    private static bool IsAutostart()
+    {
+        try
+        {
+            using (var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Run"))
+                return key?.GetValue("PanRouter") != null;
+        }
+        catch { return false; }
+    }
+
+    private static void SetAutostart(bool enable)
+    {
+        try
+        {
+            using (var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Run", true))
+            {
+                if (enable)
+                {
+                    var exePath = Assembly.GetExecutingAssembly().Location;
+                    key.SetValue("PanRouter",
+                        $"\"{exePath}\" --serverPath:\"{_serverPath}\"");
+                }
+                else
+                {
+                    key.DeleteValue("PanRouter", false);
+                }
+            }
+        }
+        catch (Exception ex) { Log("Autostart error: " + ex.Message); }
+    }
+
+    // ─── 退出清理 ────────────────────────────────
+    private static void Cleanup()
+    {
+        try
+        {
+            Log("Cleanup starting...");
+            _healthTimer?.Dispose();
+            if (_serverProcess != null && !_serverProcess.HasExited)
+            {
+                Log("Killing server PID=" + _serverProcess.Id);
+                _serverProcess.Kill();
+                _serverProcess.WaitForExit(3000);
+                _serverProcess.Dispose();
+                Log("Server killed");
+            }
+            KillOldServers();
+            try { _log?.Close(); } catch { }
+        }
+        catch (Exception ex) { try { _log?.WriteLine("Cleanup error: " + ex.Message); } catch { } }
+    }
+}

package/tray-manager.ps1

@@ -5,219 +5,194 @@
   在通知区域(右下角)显示图标，隐藏命令窗口。
   右键菜单: 状态, 开机自启动开关, 退出
 
-  用法:
-    powershell -ExecutionPolicy Bypass -STA -File tray-manager.ps1 -ServerPath "server.mjs"
-#>
-
-param(
-    [string]$ServerPath
-)
+  用法(必须 STA):
+    powershell -ExecutionPolicy Bypass -STA -WindowStyle Hidden -File tray-manager.ps1 -ServerPath "server.mjs"
 
-# ─── 日志辅助 ──────────────────────────────────
-$logFile = "$env:TEMP\panrouter-tray.log"
-function Write-Log { param([string]$m) "$([DateTime]::Now.ToString('HH:mm:ss')) $m" | Out-File -Append -Encoding utf8 $logFile }
+  注意: 不能在脚本中弹任何对话框(隐藏窗口下没人点)
+#>
 
-try {
-    Write-Log "==== Pan Router Tray Started ===="
-    Write-Log "ServerPath: $ServerPath"
-    Write-Log "PSVersion: $($PSVersionTable.PSVersion)"
-
-    Add-Type -AssemblyName System.Windows.Forms
-    Add-Type -AssemblyName System.Drawing
-
-    # ─── 常量 ──────────────────────────────────
-    $scriptPath = $MyInvocation.MyCommand.Path
-    $autostartName = "PanRouter"
-    $runKeyPath = "Software\Microsoft\Windows\CurrentVersion\Run"
-
-    # ─── 生成图标 ──────────────────────────────
-    $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)
-    $font.Dispose(); $fg.Dispose(); $brush.Dispose(); $g.Dispose()
-    $hIcon = $bmp.GetHicon()
-    $icon = [System.Drawing.Icon]::FromHandle($hIcon)
-    $bmp.Dispose()
-    Write-Log "Icon created"
-
-    # ─── NotifyIcon ────────────────────────────
-    $notifyIcon = New-Object System.Windows.Forms.NotifyIcon
-    $notifyIcon.Icon = $icon
-    $notifyIcon.Text = "Pan Router`n端口 50816 | 运行中"
-    $notifyIcon.Visible = $true
-    Write-Log "NotifyIcon created and visible"
-
-    # ─── 用 UseShellExecute 启动服务器（避免输出缓冲死锁） ──
-    function Start-ServerNohup {
-        param([string]$ServerPath)
-        $serverDir = Split-Path $ServerPath -Parent
-        try {
-            $psi = New-Object System.Diagnostics.ProcessStartInfo
-            $psi.FileName = "node"
-            $psi.Arguments = "`"$ServerPath`""
-            $psi.WorkingDirectory = $serverDir
-            $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
-            $psi.CreateNoWindow = $true
-            # UseShellExecute=$true 避免重定向缓冲死锁
-            $psi.UseShellExecute = $true
-            $proc = [System.Diagnostics.Process]::Start($psi)
-            Write-Log "Server started PID=$($proc.Id)"
-            return $proc
-        } catch {
-            Write-Log "Server start FAILED: $_"
-            return $null
-        }
+param([string]$ServerPath)
+
+# ─── 启动即写日志 ──────────────────────────────
+$logPath = "$env:TEMP\panrouter-tray.log"
+"===" + (Get-Date -Format "HH:mm:ss") + " PanRouter Tray===" | Out-File $logPath
+function Log { param($m) (Get-Date -Format "HH:mm:ss") + " " + $m | Out-File -Append $logPath }
+
+Log "ServerPath=$ServerPath"
+Log "Args=$([environment]::CommandLine)"
+
+# ─── 加载 WinForms ─────────────────────────────
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+Log "Assemblies loaded"
+
+# ─── 常量 ──────────────────────────────────────
+$autostartName = "PanRouter"
+$runKeyPath = "Software\Microsoft\Windows\CurrentVersion\Run"
+$appDir = Split-Path $ServerPath -Parent
+$tooltipText = "Pan Router`n端口 50816 | 运行中"
+
+# ─── 生成图标 ──────────────────────────────────
+$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, 2, 2, 12, 12)
+$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, 4, 2.5)
+$font.Dispose(); $fg.Dispose(); $brush.Dispose(); $g.Dispose()
+$hIcon = $bmp.GetHicon()
+$icon = [System.Drawing.Icon]::FromHandle($hIcon)
+$bmp.Dispose()
+Log "Icon generated"
+
+# ─── NotifyIcon ────────────────────────────────
+$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+$notifyIcon.Icon = $icon
+$notifyIcon.Text = $tooltipText
+$notifyIcon.Visible = $true
+Log "NotifyIcon visible"
+
+# ─── 启动隐藏服务器 ────────────────────────────
+function Start-Server {
+    $psi = New-Object System.Diagnostics.ProcessStartInfo
+    $psi.FileName = "node"
+    $psi.Arguments = "`"$ServerPath`""
+    $psi.WorkingDirectory = $appDir
+    $psi.WindowStyle = [System.Diagnostics.ProcessWindowStyle]::Hidden
+    $psi.CreateNoWindow = $true
+    $psi.UseShellExecute = $true  # 关键: 不重定向输出, 无缓冲死锁
+    try {
+        $p = [System.Diagnostics.Process]::Start($psi)
+        Log "Server started PID=$($p.Id)"
+        return $p
+    } catch {
+        Log "Server start FAILED: $_"
+        return $null
     }
+}
 
-    # ─── 杀掉旧进程 (wmic 兼容 PS5.1) ──────────
-    function Stop-OldServer {
-        try {
-            $old = Get-WmiObject Win32_Process -Filter "Name='node.exe'" -ErrorAction Stop |
-                Where-Object { $_.CommandLine -match "server\.mjs" }
-            foreach ($p in $old) {
-                Write-Log "Killing old server PID=$($p.ProcessId)"
-                Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue
+# ─── 杀掉旧服务器 (wmic, 不依赖 CIM/WMI 版本) ─
+function Stop-OldServer {
+    try {
+        $wmicOut = & wmic process where "name='node.exe'" get ProcessId,CommandLine /format:csv 2>$null
+        foreach ($line in $wmicOut) {
+            if ($line -match '(\d+),.*?server\.mjs') {
+                $pid = $Matches[1]
+                Log "Kill old PID=$pid"
+                Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue
             }
-        } catch { Write-Log "Stop-OldServer: $_" }
-    }
+        }
+    } catch { Log "KillOld: $_" }
+}
 
-    # ─── 健康检查 ──────────────────────────────
-    function Test-Online {
-        try {
-            $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health")
-            $req.Timeout = 1500
-            $resp = $req.GetResponse()
-            $resp.Close()
-            return $true
-        } catch { return $false }
-    }
+# ─── 健康检查 ──────────────────────────────────
+function Test-Online {
+    try {
+        $req = [System.Net.WebRequest]::Create("http://127.0.0.1:50816/health")
+        $req.Timeout = 1500
+        $resp = $req.GetResponse()
+        $resp.Close()
+        return $true
+    } catch { return $false }
+}
 
-    # ─── 启动流程 ──────────────────────────────
-    Stop-OldServer
-    $serverProcess = Start-ServerNohup -ServerPath $ServerPath
+# ═══════════════ 主流程 ═══════════════
 
-    # 前台等待服务器就绪（超时 10 秒）
-    $ready = $false
-    for ($i = 0; $i -lt 20; $i++) {
-        Start-Sleep -Milliseconds 500
-        if (Test-Online) { $ready = $true; break }
-    }
-    Write-Log "Server ready=$ready"
-    if ($ready) {
-        $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
-    }
+# 1. 杀旧 + 启动
+Stop-OldServer
+$serverProcess = Start-Server
 
-    # ─── 后台定时健康检查 ──────────────────────
-    $healthTimer = New-Object System.Windows.Forms.Timer
-    $healthTimer.Interval = 30000
-    $healthTimer.Add_Tick({
-        if (-not (Test-Online)) {
-            Write-Log "Health check FAILED, restarting..."
-            Stop-OldServer
-            $script:serverProcess = Start-ServerNohup -ServerPath $ServerPath
-            Start-Sleep -Seconds 3
-            if (Test-Online) {
-                $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已自动重启", [System.Windows.Forms.ToolTipIcon]::Info)
-            }
-        }
-    })
-    $healthTimer.Start()
-    Write-Log "Health timer started"
-
-    # ─── 左键: 状态气泡 ────────────────────────
-    $notifyIcon.Add_MouseClick({
-        if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
-            $online = Test-Online
-            if ($online) {
-                $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
-            } else {
-                $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务器未响应 ⚠", [System.Windows.Forms.ToolTipIcon]::Error)
-            }
-        }
-    })
-
-    # ─── 右键菜单 ──────────────────────────────
-    $menu = New-Object System.Windows.Forms.ContextMenuStrip
-
-    $titleItem = New-Object System.Windows.Forms.ToolStripMenuItem
-    $titleItem.Text = "Pan Router - :50816"
-    $titleItem.Enabled = $false
-    $titleItem.Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold)
-    $menu.Items.Add($titleItem)
-    $menu.Items.Add("-")
-
-    $autoStartItem = New-Object System.Windows.Forms.ToolStripMenuItem
-    $autoStartItem.Text = "开机自启动"
-    $rk = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
-    $autoStartItem.Checked = ($rk.GetValue($autostartName) -ne $null)
-    $rk.Close()
-    $autoStartItem.Add_Click({
-        $rk2 = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
-        if ($autoStartItem.Checked) {
-            $rk2.DeleteValue($autostartName, $false)
-            $autoStartItem.Checked = $false
-            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info)
-            Write-Log "Autostart OFF"
+# 2. 前台等待就绪 (10秒超时)
+$ready = $false
+for ($i = 0; $i -lt 20; $i++) {
+    Start-Sleep -Milliseconds 500
+    if (Test-Online) { $ready = $true; break }
+}
+Log "Server ready=$ready"
+if ($ready) {
+    $notifyIcon.ShowBalloonTip(3000, "Pan Router", "服务器已就绪 (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
+}
+
+# 3. 右键菜单
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+
+$titleItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$titleItem.Text = "Pan Router - :50816"
+$titleItem.Enabled = $false
+$titleItem.Font = New-Object System.Drawing.Font("Segoe UI", 9, [System.Drawing.FontStyle]::Bold)
+$menu.Items.Add($titleItem)
+$menu.Items.Add("-")
+
+$autoStartItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$autoStartItem.Text = "开机自启动"
+$rk = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
+$autoStartItem.Checked = ($rk.GetValue($autostartName) -ne $null)
+$rk.Close()
+$autoStartItem.Add_Click({
+    $rk2 = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey($runKeyPath, $true)
+    if ($autoStartItem.Checked) {
+        $rk2.DeleteValue($autostartName, $false)
+        $autoStartItem.Checked = $false
+        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已关闭", [System.Windows.Forms.ToolTipIcon]::Info)
+        Log "Autostart OFF"
+    } else {
+        $cmd = "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$($MyInvocation.MyCommand.Path)`" -ServerPath `"$ServerPath`""
+        $rk2.SetValue($autostartName, $cmd)
+        $autoStartItem.Checked = $true
+        $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
+        Log "Autostart ON"
+    }
+    $rk2.Close()
+})
+$menu.Items.Add($autoStartItem)
+$menu.Items.Add("-")
+
+$exitItem = New-Object System.Windows.Forms.ToolStripMenuItem
+$exitItem.Text = "退出"
+$exitItem.Add_Click({
+    Log "Exit clicked"
+    $notifyIcon.Visible = $false
+    [System.Windows.Forms.Application]::Exit()
+})
+$menu.Items.Add($exitItem)
+
+$notifyIcon.ContextMenuStrip = $menu
+
+# 4. 左键: 状态
+$notifyIcon.Add_MouseClick({
+    if ($_.Button -eq [System.Windows.Forms.MouseButtons]::Left) {
+        if (Test-Online) {
+            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "运行正常 ✓ (端口 50816)", [System.Windows.Forms.ToolTipIcon]::Info)
         } else {
-            $cmd = "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File `"$scriptPath`" -ServerPath `"$ServerPath`""
-            $rk2.SetValue($autostartName, $cmd)
-            $autoStartItem.Checked = $true
-            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "开机自启动已开启 ✓", [System.Windows.Forms.ToolTipIcon]::Info)
-            Write-Log "Autostart ON"
+            $notifyIcon.ShowBalloonTip(2000, "Pan Router", "服务器未响应 ⚠", [System.Windows.Forms.ToolTipIcon]::Error)
         }
-        $rk2.Close()
-    })
-    $menu.Items.Add($autoStartItem)
-    $menu.Items.Add("-")
-
-    $exitItem = New-Object System.Windows.Forms.ToolStripMenuItem
-    $exitItem.Text = "退出"
-    $exitItem.Add_Click({
-        Write-Log "Exit clicked"
-        $notifyIcon.Visible = $false
-        [System.Windows.Forms.Application]::Exit()
-    })
-    $menu.Items.Add($exitItem)
-
-    $notifyIcon.ContextMenuStrip = $menu
-
-    # ─── 退出清理 ──────────────────────────────
-    $cleanup = {
-        try {
-            Write-Log "Cleanup started"
-            $healthTimer.Stop()
-            $healthTimer.Dispose()
-            if (-not $serverProcess.HasExited) {
-                $serverProcess.Kill()
-                $serverProcess.WaitForExit(3000)
-                $serverProcess.Dispose()
-                Write-Log "Server killed"
-            }
-            Stop-OldServer
-            Write-Log "Cleanup done"
-        } catch { Write-Log "Cleanup error: $_" }
     }
-
-    [System.Windows.Forms.Application]::ApplicationExit += {
-        & $cleanup
-        $notifyIcon.Dispose()
-        [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
-        $icon.Dispose()
+})
+
+# 5. 退出清理
+[System.Windows.Forms.Application]::ApplicationExit += {
+    Log "AppExit cleanup"
+    if ($serverProcess -and !$serverProcess.HasExited) {
+        $serverProcess.Kill()
+        $serverProcess.WaitForExit(3000)
+        Log "Server killed"
     }
+    Stop-OldServer
+    $notifyIcon.Dispose()
+    [System.Runtime.InteropServices.Marshal]::DestroyIcon($hIcon)
+    $icon.Dispose()
+}
 
-    Write-Log "Entering message loop"
-    [System.Windows.Forms.Application]::Run()
-    Write-Log "Message loop exited"
-    & $cleanup
+# 6. 运行消息循环
+Log "Entering message loop"
+[System.Windows.Forms.Application]::Run()
+Log "Message loop exited"
 
-} catch {
-    $errMsg = "UNHANDLED ERROR: $_"
-    Write-Log $errMsg
-    try { [System.Windows.Forms.MessageBox]::Show($errMsg, "Pan Router Error") } catch {}
-}
+# 7. 循环结束后再清理一次
+try {
+    if ($serverProcess -and !$serverProcess.HasExited) { $serverProcess.Kill() }
+    Stop-OldServer
+} catch {}