panrouter 5.0.3 → 5.1.1

package/package.json

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

package/pool-worker.mjs

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 
 /**
- * Pan Router Pool Worker
- * 将当前设备自动注册为集群算力节点。
- * 启动 server.mjs → 拉起 cloudflared 匿名隧道 → 心跳上报主控中心。
+ * Pan Router Pool Worker — 事件驱动版
+ *
+ * 以 Sidecar 模式运行，守护 cloudflared 隧道进程。
+ * 状态改变时才通知主控（事件驱动），崩溃自动复活，关机优雅告别。
  */
 
 import { spawn, spawnSync } from "node:child_process";
@@ -23,16 +24,66 @@ const NODE_ID = os.hostname() + "-worker-" + Math.floor(Math.random() * 1000);
 const SERVER_PORT = 50816;
 const PID_FILE = path.join(os.tmpdir(), "panrouter-pool-worker.pid");
 
-let currentTunnelUrl = "";
-let cloudflared = null;
-let heartbeatTimer = null;
+let cfProcess = null;
+let isShuttingDown = false;
+let currentUrl = "";
 
 function log(msg, type = "INFO") {
-  const icons = { INFO: "▪", OK: "✅", ERR: "❌", HART: "💓" };
+  const icons = { INFO: "▪", OK: "✅", ERR: "❌", HART: "💓", WARN: "⚠️", OFF: "🔻", ON: "🟢" };
   console.log(`${icons[type] || "▪"} [节点] ${msg}`);
 }
 
-// ─── 检查端口是否已占用 ──────────────────────────────────────────────────────
+// ─── 通知主控 ────────────────────────────────────────────────────────────────
+function notifyHub(status, url = "") {
+  const payload = JSON.stringify({ nodeId: NODE_ID, status, url });
+  const req = https.request(MAIN_HUB_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Content-Length": Buffer.byteLength(payload),
+      "x-secret-token": AUTH_SECRET,
+    },
+  });
+  req.on("error", () => {});
+  req.write(payload);
+  req.end();
+}
+
+// 可等待的 notify — 用于首次上线确认
+function notifyHubWait(status, url = "") {
+  return new Promise((resolve) => {
+    const payload = JSON.stringify({ nodeId: NODE_ID, status, url });
+    const req = https.request(MAIN_HUB_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(payload),
+        "x-secret-token": AUTH_SECRET,
+      },
+    }, (res) => resolve(res.statusCode === 200));
+    req.on("error", () => resolve(false));
+    req.setTimeout(5000, () => { req.destroy(); resolve(false); });
+    req.write(payload);
+    req.end();
+  });
+}
+
+// 首次上线确认 — 失败则重试，最多 5 次
+async function confirmOnline(url, retries = 5) {
+  const ok = await notifyHubWait("online", url);
+  if (ok) {
+    log("主控已确认节点注册", "OK");
+    return;
+  }
+  if (retries > 0) {
+    log(`注册尚未确认，3 秒后重试 (剩余 ${retries} 次)`, "INFO");
+    await new Promise((r) => setTimeout(r, 3000));
+    return confirmOnline(url, retries - 1);
+  }
+  log("注册确认已达最大重试次数", "WARN");
+}
+
+// ─── 检查端口 ────────────────────────────────────────────────────────────────
 function isPortOpen(port) {
   return new Promise((resolve) => {
     const req = http.get(`http://127.0.0.1:${port}/health`, () => {});
@@ -42,16 +93,15 @@ function isPortOpen(port) {
   });
 }
 
-// ─── 检查 cloudflared 是否可用 ────────────────────────────────────────────────
+// ─── 查找 cloudflared ────────────────────────────────────────────────────────
 function findCloudflared() {
   const candidates = ["cloudflared", "cloudflared.exe"];
   for (const name of candidates) {
     try {
       const r = spawnSync(name, ["--version"], { stdio: "pipe", timeout: 3000 });
       if (r.status === 0) return name;
-    } catch { /* try next */ }
+    } catch { /* next */ }
   }
-  // 常见安装路径兜底
   const fallbackPaths = [
     path.join(process.env.USERPROFILE || "", "AppData", "Local", "cloudflared", "cloudflared.exe"),
     path.join(process.env.LOCALAPPDATA || "", "cloudflared", "cloudflared.exe"),
@@ -63,11 +113,10 @@ function findCloudflared() {
   return null;
 }
 
-// ─── 启动 server.mjs ─────────────────────────────────────────────────────────
+// ─── 确保 server.mjs 在运行 ──────────────────────────────────────────────
 async function ensureServer() {
-  const isOpen = await isPortOpen(SERVER_PORT);
-  if (isOpen) {
-    log(`端口 ${SERVER_PORT} 已有服务在运行，跳过启动`, "OK");
+  if (await isPortOpen(SERVER_PORT)) {
+    log(`端口 ${SERVER_PORT} 已有服务在运行`, "OK");
     return true;
   }
 
@@ -86,7 +135,6 @@ async function ensureServer() {
   });
   child.unref();
 
-  // 等待端口就绪
   for (let i = 0; i < 15; i++) {
     if (await isPortOpen(SERVER_PORT)) {
       log(`代理服务已就绪 (端口 ${SERVER_PORT})`, "OK");
@@ -99,141 +147,112 @@ async function ensureServer() {
   return false;
 }
 
-// ─── 启动 cloudflared 隧道 ────────────────────────────────────────────────────
+// ─── 隧道守护 ────────────────────────────────────────────────────────────────
 function startTunnel() {
+  if (isShuttingDown) return;
+
   const cfPath = findCloudflared();
   if (!cfPath) {
-    log("未找到 cloudflared，请先安装：\n  Windows: scoop install cloudflared\n  Termux: pkg install cloudflared\n  macOS: brew install cloudflared", "ERR");
-    return false;
+    log("未找到 cloudflared，请先安装", "ERR");
+    return;
   }
 
   log("正在请求匿名公网入口...");
 
-  // 清理旧进程
-  if (cloudflared) {
-    try { cloudflared.kill(); } catch {}
-  }
-
-  cloudflared = spawn(cfPath, ["tunnel", "--url", `http://127.0.0.1:${SERVER_PORT}`], {
+  cfProcess = spawn(cfPath, ["tunnel", "--url", `http://127.0.0.1:${SERVER_PORT}`], {
     stdio: ["ignore", "pipe", "pipe"],
     windowsHide: true,
   });
 
-  cloudflared.stderr.on("data", (data) => {
+  cfProcess.stderr.on("data", (data) => {
     const text = data.toString();
+
+    // 抓取隧道 URL
     const match = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
-    if (match && match[0] !== currentTunnelUrl) {
-      currentTunnelUrl = match[0];
-      log(`成功获取公网入口: ${currentTunnelUrl}`, "OK");
-      pushToHub();
+    if (match && match[0] !== currentUrl) {
+      currentUrl = match[0];
+      log(`成功获取公网入口: ${currentUrl}`, "OK");
+      confirmOnline(currentUrl); // 确保主控注册成功（异步重试）
     }
-  });
 
-  cloudflared.on("exit", (code) => {
-    log(`cloudflared 进程退出 (code: ${code})`, code === 0 ? "INFO" : "ERR");
-    cloudflared = null;
+    // 网络波动提示
+    if (text.includes("connection lost") || text.includes("Retrying")) {
+      log("隧道网络不稳定，正在尝试重连...", "WARN");
+    }
   });
 
-  return true;
-}
-
-// ─── 心跳上报 ─────────────────────────────────────────────────────────────────
-function pushToHub() {
-  if (!currentTunnelUrl) return;
-
-  const payload = JSON.stringify({
-    nodeId: NODE_ID,
-    url: currentTunnelUrl,
-  });
+  cfProcess.on("close", (code) => {
+    log(`隧道进程断开退出 (code: ${code})`, "ERR");
+    cfProcess = null;
 
-  const req = https.request(
-    MAIN_HUB_URL,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "Content-Length": Buffer.byteLength(payload),
-        "x-secret-token": AUTH_SECRET,
-      },
-    },
-    (res) => {
-      let body = "";
-      res.on("data", (c) => (body += c));
-      res.on("end", () => {
-        log(`状态已同步至主控中心 (${res.statusCode})`, "HART");
-      });
+    // 通知主控剔除
+    if (currentUrl) {
+      notifyHub("offline");
+      currentUrl = "";
     }
-  );
 
-  req.on("error", (e) => log(`主控节点失联: ${e.message}`, "ERR"));
-  req.write(payload);
-  req.end();
-}
+    // 自动复活
+    if (!isShuttingDown) {
+      log("准备在 5 秒后自动重启隧道...", "WARN");
+      setTimeout(startTunnel, 5000);
+    }
+  });
 
-// ─── 写入 PID 文件 ────────────────────────────────────────────────────────────
-function writePid() {
-  try {
-    fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
-  } catch {}
+  cfProcess.on("error", (err) => {
+    log(`隧道进程异常: ${err.message}`, "ERR");
+  });
 }
 
-function readPid() {
-  try {
-    return parseInt(fs.readFileSync(PID_FILE, "utf-8").trim(), 10);
-  } catch {
-    return null;
-  }
-}
+// ─── 优雅退出 ────────────────────────────────────────────────────────────────
+function gracefulShutdown() {
+  if (isShuttingDown) return;
+  isShuttingDown = true;
 
-// ─── 停止 ─────────────────────────────────────────────────────────────────────
-function stop() {
-  log("正在停止节点服务...");
+  log("收到关机指令，正在安全退出...", "OFF");
 
-  if (heartbeatTimer) clearInterval(heartbeatTimer);
+  // 遗言：通知主控已离线
+  notifyHub("offline");
 
-  if (cloudflared) {
-    try { cloudflared.kill(); } catch {}
-    cloudflared = null;
+  // 杀掉隧道进程
+  if (cfProcess) {
+    cfProcess.kill("SIGINT");
+    cfProcess = null;
   }
 
-  try {
-    if (fs.existsSync(PID_FILE)) fs.unlinkSync(PID_FILE);
-  } catch {}
+  // 清理 PID 文件
+  try { fs.unlinkSync(PID_FILE); } catch {}
 
-  log("节点已断开集群", "OK");
+  // 不等确认，200ms 后直接走
+  setTimeout(() => {
+    log("节点已安全下线，再见！", "OFF");
+    process.exit(0);
+  }, 200);
 }
 
-// ─── 主流程 ────────────────────────────────────────────────────────────────────
+// ─── PID 文件 ────────────────────────────────────────────────────────────────
+function writePid() {
+  try { fs.writeFileSync(PID_FILE, String(process.pid), "utf-8"); } catch {}
+}
+
+// ─── 入口 ────────────────────────────────────────────────────────────────────
 export async function start() {
   log(`节点 ID: ${NODE_ID}`);
 
-  // 1. 确保 server.mjs 在运行
   const serverOk = await ensureServer();
   if (!serverOk) {
     log("无法启动代理服务，终止接入", "ERR");
     process.exit(1);
   }
 
-  // 2. 启动 cloudflared 隧道
-  const tunnelOk = startTunnel();
-  if (!tunnelOk) {
-    log("无法启动隧道，终止接入", "ERR");
-    process.exit(1);
-  }
-
-  // 3. 写 PID
   writePid();
+  startTunnel();
 
-  // 4. 启动心跳定时器 (每 60 秒)
-  heartbeatTimer = setInterval(pushToHub, 60000);
-
-  // 5. 优雅退出
-  process.on("SIGINT", () => { stop(); process.exit(0); });
-  process.on("SIGTERM", () => { stop(); process.exit(0); });
+  process.on("SIGINT", gracefulShutdown);
+  process.on("SIGTERM", gracefulShutdown);
 
-  log("节点已成功接入集群，等待主控中心调度...", "OK");
+  log("节点看门狗已启动，等待公网入口...", "ON");
 }
 
 export function stopWorker() {
-  stop();
+  gracefulShutdown();
 }