panrouter 5.1.0 → 5.2.0

package/package.json

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

package/pool-worker.mjs

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
 
 /**
- * Pan Router Pool Worker — 事件驱动版
+ * Pan Router Pool Worker — 懒汉心跳版
  *
  * 以 Sidecar 模式运行，守护 cloudflared 隧道进程。
- * 状态改变时才通知主控（事件驱动），崩溃自动复活，关机优雅告别。
+ * - 没注册上：死缠烂打，每 10 秒重试直到主控应答
+ * - 注册上了：绝对静默，既不轮询也不发心跳
+ * - 每 5 分钟发一次全量对齐（防止主控重启丢了节点）
+ * - 隧道崩了自动复活，关机优雅告别
  */
 
 import { spawn, spawnSync } from "node:child_process";
@@ -23,30 +26,86 @@ const AUTH_SECRET = "jiuling-super-secret-2026";
 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");
+const ALIGN_INTERVAL = 5 * 60 * 1000; // 5 分钟全量对齐
 
 let cfProcess = null;
 let isShuttingDown = false;
+let isConfirmed = false; // 主控是否已确认注册
 let currentUrl = "";
+let alignTimer = null;
 
 function log(msg, type = "INFO") {
   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,
-    },
+// ─── 可等待的通知（返回 true=200 应答） ─────────────────────────────────────
+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();
   });
-  req.on("error", () => {}); // 不等待确认
-  req.write(payload);
-  req.end();
+}
+
+// ─── 发后即忘的通知（离线遗言用，不等回执） ────────────────────────────────
+function notifyHub(status, url = "") {
+  try {
+    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();
+  } catch {}
+}
+
+// ─── 懒汉注册：死缠烂打直到主控应答 ─────────────────────────────────────────
+async function aggressiveRegister(url) {
+  log("正在向主控注册...");
+  while (!isShuttingDown) {
+    const ok = await notifyHubWait("online", url);
+    if (ok) {
+      log("主控已确认节点注册", "OK");
+      isConfirmed = true;
+      startAlignHeartbeat(); // 注册成功 → 开启长间隔对齐
+      return;
+    }
+    log(`注册失败，10 秒后重试...`, "WARN");
+    await new Promise((r) => setTimeout(r, 10000));
+  }
+}
+
+// ─── 5 分钟全量对齐心跳（主控重启后自动恢复） ──────────────────────────────
+function startAlignHeartbeat() {
+  if (alignTimer) clearInterval(alignTimer);
+  alignTimer = setInterval(async () => {
+    if (isShuttingDown || !currentUrl) return;
+    const ok = await notifyHubWait("online", currentUrl);
+    if (ok) {
+      log("全量对齐完成", "HART");
+    } else {
+      log("全量对齐失败，主控可能已重启，重新注册...", "WARN");
+      isConfirmed = false;
+      aggressiveRegister(currentUrl); // 异步重入注册流程
+    }
+  }, ALIGN_INTERVAL);
 }
 
 // ─── 检查端口 ────────────────────────────────────────────────────────────────
@@ -137,8 +196,9 @@ function startTunnel() {
     const match = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
     if (match && match[0] !== currentUrl) {
       currentUrl = match[0];
+      isConfirmed = false; // 新 URL，重置确认状态
       log(`成功获取公网入口: ${currentUrl}`, "OK");
-      notifyHub("online", currentUrl);
+      aggressiveRegister(currentUrl); // 死缠烂打直到主控应答
     }
 
     // 网络波动提示
@@ -150,6 +210,8 @@ function startTunnel() {
   cfProcess.on("close", (code) => {
     log(`隧道进程断开退出 (code: ${code})`, "ERR");
     cfProcess = null;
+    isConfirmed = false;
+    if (alignTimer) { clearInterval(alignTimer); alignTimer = null; }
 
     // 通知主控剔除
     if (currentUrl) {