panrouter 1.6.1 → 1.7.1

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,9 +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

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 
 /**
- * Pan Router Daemon (v4)
+ * Pan Router Daemon (v5)
  *
- * 一个 Node 进程同时:
- *   1. 隐藏启动 server.mjs（子进程）
- *   2. 隐藏启动 tray-daemon.ps1（子进程）
- *   3. 保持存活，守护两者
- *
- * 由 cli.mjs --tray 启动 (detached, 无窗口)。
+ *   1. spawn server.mjs (detached, hidden) — 正常
+ *   2. 用 VBS 启动 PS tray（解决 detached 进程无法创建通知图标的问题）
+ *   3. 保持存活，30s 健康检查
  */
 
 import { spawn, execSync } from "node:child_process";
@@ -20,16 +17,15 @@ import http from "node:http";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const serverPath = path.join(__dirname, "server.mjs");
 const trayPsPath = path.join(__dirname, "tray-daemon.ps1");
-const nodeExe = process.execPath;  // ← 绝对路径！不依赖 PATH
+const nodeExe = process.execPath;
 const logPath = path.join(process.env.TEMP || "/tmp", "panrouter-daemon.log");
 
 function log(msg) {
   try { fs.appendFileSync(logPath, `${new Date().toISOString().slice(11,19)} ${msg}\n`); } catch {}
 }
 
-log("=== Daemon v4 ===");
+log("=== Daemon v5 ===");
 log(`nodeExe=${nodeExe}`);
-log(`serverPath=${serverPath}`);
 
 // ─── 1. 杀旧 server ──────────────────────────────
 try {
@@ -40,19 +36,14 @@ try {
   for (const line of out.split("\n")) {
     if (line.includes("server.mjs")) {
       const m = line.match(/(\d+),.*?server\.mjs/);
-      if (m) { try { process.kill(parseInt(m[1]), "SIGKILL"); log(`Killed old server PID=${m[1]}`); } catch {} }
+      if (m) { try { process.kill(parseInt(m[1]), "SIGKILL"); log(`Killed old PID=${m[1]}`); } catch {} }
     }
   }
 } catch {}
 
 // ─── 2. 启动 server.mjs ──────────────────────────
-// 关键: 用 process.execPath (绝对路径), 不用 "node" (可能找不到 PATH)
 const server = spawn(nodeExe, [serverPath], {
-  cwd: __dirname,
-  stdio: "ignore",
-  windowsHide: true,
-  detached: true,
-  shell: false,
+  cwd: __dirname, stdio: "ignore", windowsHide: true, detached: true, shell: false,
 });
 server.unref();
 log(`Server spawned PID=${server.pid || "??"}`);
@@ -77,29 +68,56 @@ function isOnline() {
   }
   log(`Server online=${ready}`);
 
-  // ─── 4. 启动 PS 托盘 ────────────────────────────
+  // ─── 4. 用 VBS 启动 PS 托盘 ─────────────────────
+  log("Starting PS tray via VBS...");
+
   if (fs.existsSync(trayPsPath)) {
-    log("Starting PS tray...");
-    const ps = spawn("powershell.exe", [
-      "-NoProfile", "-ExecutionPolicy", "Bypass",
-      "-WindowStyle", "Hidden",
-      "-File", trayPsPath,
-    ], {
-      stdio: "ignore",
-      windowsHide: true,
-      shell: false,
-    });
-    ps.unref();
-    log(`PS spawned PID=${ps.pid || "??"}`);
+    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");
+      log(`VBS written: ${vbsPath}`);
+    } catch (e) {
+      log(`VBS write FAILED: ${e.message}`);
+    }
+
+    log(`VBS content:\n${vbsContent}`);
+
+    // 先试 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: tray-daemon.ps1 not found at ${trayPsPath}`);
+    log(`WARN: tray-daemon.ps1 NOT FOUND at ${trayPsPath}`);
   }
 
   // ─── 5. 保持存活 ────────────────────────────────
-  log("Daemon running, keeping session alive");
+  log("Daemon running");
   process.stdin.resume();
 
-  // 定时检查 server, 挂了就重启
   setInterval(() => {
     isOnline().then(ok => {
       if (!ok) {

package/package.json

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