panrouter 1.7.0 → 1.7.2

package/cli.mjs

@@ -140,17 +140,6 @@ async function startServer() {
 
 // ─── 4. 以托盘模式启动 ──────────────────────────────────────────────────
 
-/**
- * 启动 daemon (Node 常驻进程, 管理 server + PS tray)
- *
- *   cli.mjs ─→ node daemon.mjs (detached, hidden)
- *                ├─ 启动 server.mjs (子进程, detached, hidden)
- *                └─ 启动 powershell tray-daemon.ps1 (子进程, hidden)
- *                └─ 保持存活, 30s 健康检查
- *
- *   key: 用 process.execPath (绝对路径) 启动
- *   避免 VBS/WScript/CMD 的 PATH 查找问题
- */
 function startTray() {
   const daemonPath = path.join(__dirname, "daemon.mjs");
 
@@ -170,8 +159,15 @@ function startTray() {
   });
   child.unref();
 
-  log("OK", "Pan Router 托盘已启动", "green");
-  console.log("   图标出现在右下角后, 即可运行 claude");
+  log("OK", "Pan Router 托盘服务已启动", "green");
+  console.log("");
+  console.log("  \x1b[33m实时查看日志:\x1b[0m");
+  console.log("    powershell -Command \"Get-Content -Wait -Tail 20 $env:TEMP\\panrouter-daemon.log\"");
+  console.log("");
+  console.log("  \x1b[33m查看全部日志:\x1b[0m");
+  console.log("    notepad %TEMP%\\panrouter-daemon.log");
+  console.log("");
+  console.log("  若 10 秒后图标未出现，请查看日志并反馈");
 }
 
 // ─── 主流程 ──────────────────────────────────────────────────────────────

package/daemon.mjs

@@ -69,26 +69,49 @@ function isOnline() {
   log(`Server online=${ready}`);
 
   // ─── 4. 用 VBS 启动 PS 托盘 ─────────────────────
-  // 关键: spawn 的 detached 进程没有 Window Station 访问权限,
-  // 无法创建 NotifyIcon。WScript.Shell.Run 0 是可靠的解决方式。
+  log("Starting PS tray via VBS...");
+
   if (fs.existsSync(trayPsPath)) {
+    log(`trayPsPath exists: ${trayPsPath}`);
+
     // 创建临时的 VBS 启动器
     const vbsContent = `Set WshShell = CreateObject("WScript.Shell")
+Set FSO = CreateObject("Scripting.FileSystemObject")
+' 写诊断日志
+On Error Resume Next
+Dim f : Set f = FSO.OpenTextFile("${(process.env.TEMP || "/tmp").replace(/\\/g, "\\\\")}\\panrouter-vbs.log", 2, True)
+f.WriteLine Now & " VBS started"
+f.Close
+' 启动 PS 托盘
 WshShell.Run "powershell -ExecutionPolicy Bypass -WindowStyle Hidden -STA -File """ & "${trayPsPath.replace(/\\/g, "\\\\")}" & """", 0, False
+If Err.Number <> 0 Then
+  Set f = FSO.OpenTextFile("${(process.env.TEMP || "/tmp").replace(/\\/g, "\\\\")}\\panrouter-vbs.log", 8, True)
+  f.WriteLine Now & " ERROR: " & Err.Description
+  f.Close
+End If
 `;
     const vbsPath = path.join(process.env.TEMP || "/tmp", "panrouter-tray-launcher.vbs");
-    try { fs.writeFileSync(vbsPath, vbsContent, "utf8"); } catch {}
+    try {
+      fs.writeFileSync(vbsPath, vbsContent, "utf8");
+      log(`VBS written: ${vbsPath}`);
+    } catch (e) {
+      log(`VBS write FAILED: ${e.message}`);
+    }
 
-    log(`VBS launcher: ${vbsPath}`);
+    log(`VBS content:\n${vbsContent}`);
 
-    // wscript //B = 批处理模式, 无交互
-    const vbs = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
-      stdio: "ignore", windowsHide: true, shell: false,
-    });
-    vbs.unref();
-    log(`VBS launched`);
+    // 先试 wscript //B
+    try {
+      const vbs = spawn("wscript.exe", ["//B", "//NoLogo", vbsPath], {
+        stdio: "ignore", windowsHide: true, shell: false,
+      });
+      vbs.unref();
+      log(`VBS spawned via wscript`);
+    } catch (e) {
+      log(`VBS via wscript FAILED: ${e.message}`);
+    }
   } else {
-    log(`WARN: ${trayPsPath} not found`);
+    log(`WARN: tray-daemon.ps1 NOT FOUND at ${trayPsPath}`);
   }
 
   // ─── 5. 保持存活 ────────────────────────────────

package/package.json

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