panrouter 6.3.4 → 6.3.6

package/package.json

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

package/pool-worker.mjs

@@ -145,6 +145,10 @@ function connectToHub() {
         ws.send(JSON.stringify({ type: "pong" }));
         break;
 
+      case "test":
+        handleTestRequest(msg);
+        break;
+
       case "upgrade":
         handleUpgrade();
         break;
@@ -266,6 +270,17 @@ async function doRestart() {
 // ─── 处理来自主控的请求 ─────────────────────────────────────────────────────
 
 function handleIncomingRequest(msg) {
+  // ponytail: 不阻塞请求，但如果 watchdog 标记了挂了就先重启
+  if (!_serverReady) {
+    isPortOpen(SERVER_PORT).then(open => {
+      if (!open) {
+        log(`9router 不在线，尝试重启`, "WARN");
+        killPort(SERVER_PORT);
+        trySpawn9router();
+      }
+    });
+  }
+
   const body = msg.body || "";
 
   const options = {
@@ -337,6 +352,29 @@ function safeSend(data) {
   }
 }
 
+// ─── 节点连通性测试 ─────────────────────────────────────────────────────────
+
+function handleTestRequest(msg) {
+  const testReq = http.request({
+    hostname: "127.0.0.1",
+    port: SERVER_PORT,
+    path: "/dashboard",
+    method: "GET",
+    timeout: 8000,
+  }, (res) => {
+    // 只要收到响应就算通
+    let body = "";
+    res.on("data", (c) => body += c);
+    res.on("end", () => {
+      safeSend({ type: "test_result", reqId: msg.reqId, ok: true, status: res.statusCode, detail: body.slice(0, 200) });
+    });
+  });
+  testReq.on("error", (err) => {
+    safeSend({ type: "test_result", reqId: msg.reqId, ok: false, error: err.message });
+  });
+  testReq.end();
+}
+
 // ─── 心跳保活（每 25 秒发送 ping，避免 Cloudflare 闲置超时） ─────────────────
 
 function startHeartbeat() {
@@ -413,7 +451,7 @@ function ensureServer() {
 function _ensureServer() {
   const setupScript = path.join(__dirname, "setup-9router.cjs");
   if (!fs.existsSync(setupScript)) {
-    log("找不到 setup-9router.cjs，直接尝试启动 9router", "WARN");
+    log("找不到 setup-9router.cjs，直接启动 9router", "WARN");
     trySpawn9router();
     poll9router();
     return;
@@ -423,19 +461,23 @@ function _ensureServer() {
   const child = spawn(process.execPath, [setupScript], {
     cwd: __dirname, stdio: "inherit",
   });
+  // 等安装完再启动 9router — 统一用 --tray 模式，setup 自己开的 cmd 窗口让它去
   child.on("exit", () => {
-    log("部署脚本完成，正在启动 9router...");
+    log("安装完成，正在启动 9router...");
     trySpawn9router();
   });
-
   poll9router();
 }
 
 function trySpawn9router() {
   try {
-    const r = spawn("npx", ["--yes", "9router"], {
-      detached: true, stdio: "ignore", shell: true,
+    // ponytail: --tray 跳过 TTY 菜单（否则无 TTY 环境 3 秒自杀）
+    //          --skip-update 跳过 npm registry 检查（手机网络不稳定）
+    //          不用 npx，9router 已被 setup-9router.cjs 全局安装
+    const r = spawn("9router", ["--tray", "--skip-update"], {
+      detached: true, stdio: ["ignore", "ignore", "pipe"], shell: true,
     });
+    r.stderr?.on("data", (d) => log(`9router 错误: ${d.toString().trim()}`, "ERR"));
     r.unref();
   } catch (e) {
     log(`启动 9router 失败: ${e.message}`, "ERR");
@@ -443,14 +485,47 @@ function trySpawn9router() {
 }
 
 async function poll9router() {
-  for (let i = 0; ; i++) {
+  const deadline = Date.now() + 30000;
+  while (Date.now() < deadline) {
     if (await isPortOpen(SERVER_PORT)) {
       _serverReady = true;
       log(`9router 已就绪 (端口 ${SERVER_PORT})`, "OK");
-      return;
+      return true;
+    }
+    await new Promise((r) => setTimeout(r, 1000));
+  }
+  log(`等待 9router 超时，继续后台重试`, "WARN");
+  return false;
+}
+
+// ponytail: 每隔 30 秒检查 9router 是否活着，死了就重启
+let watchdogTimer = null;
+
+function startWatchdog() {
+  if (watchdogTimer) return;
+  watchdogTimer = setInterval(async () => {
+    if (await isPortOpen(SERVER_PORT)) return;
+    log(`9router 无响应，正在重启...`, "WARN");
+    _serverReady = false;
+    killPort(SERVER_PORT);
+    trySpawn9router();
+    // 等待最多 15 秒
+    for (let i = 0; i < 15; i++) {
+      await new Promise((r) => setTimeout(r, 1000));
+      if (await isPortOpen(SERVER_PORT)) {
+        _serverReady = true;
+        log(`9router 已恢复`, "OK");
+        return;
+      }
     }
-    if (i < 60) await new Promise((r) => setTimeout(r, 1000));
-    else await new Promise((r) => setTimeout(r, 5000));
+    log(`9router 重启失败，下次再试`, "ERR");
+  }, 30000);
+}
+
+function stopWatchdog() {
+  if (watchdogTimer) {
+    clearInterval(watchdogTimer);
+    watchdogTimer = null;
   }
 }
 
@@ -488,6 +563,7 @@ function gracefulShutdown() {
 
   log("收到关机指令，正在安全退出...", "OFF");
 
+  stopWatchdog();
   stopHeartbeat();
   if (reconnectTimer) {
     clearTimeout(reconnectTimer);
@@ -528,11 +604,12 @@ export async function start() {
 
   log("节点看门狗已启动，等待公网入口...", "ON");
 
-  // 等 9router 起来后检查状态
+  // 等 9router 起来后打开守护
   const checkReady = setInterval(async () => {
     if (_serverReady || (await isPortOpen(SERVER_PORT))) {
       _serverReady = true;
       clearInterval(checkReady);
+      startWatchdog();
       log("9router 已就绪，节点可正常处理请求", "ON");
     }
   }, 3000);