panrouter 5.1.1 → 5.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "5.1.1",
+  "version": "5.3.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,33 +26,20 @@ 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,
-    },
-  });
-  req.on("error", () => {});
-  req.write(payload);
-  req.end();
-}
-
-// 可等待的 notify — 用于首次上线确认
+// ─── 可等待的通知（返回 true=200 应答） ─────────────────────────────────────
 function notifyHubWait(status, url = "") {
   return new Promise((resolve) => {
     const payload = JSON.stringify({ nodeId: NODE_ID, status, url });
@@ -68,19 +58,54 @@ function notifyHubWait(status, url = "") {
   });
 }
 
-// 首次上线确认 — 失败则重试，最多 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);
+// ─── 发后即忘的通知（离线遗言用，不等回执） ────────────────────────────────
+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));
   }
-  log("注册确认已达最大重试次数", "WARN");
+}
+
+// ─── 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);
 }
 
 // ─── 检查端口 ────────────────────────────────────────────────────────────────
@@ -93,7 +118,7 @@ function isPortOpen(port) {
   });
 }
 
-// ─── 查找 cloudflared ────────────────────────────────────────────────────────
+// ─── 查找 & 自动安装 cloudflared ────────────────────────────────────────────
 function findCloudflared() {
   const candidates = ["cloudflared", "cloudflared.exe"];
   for (const name of candidates) {
@@ -113,6 +138,56 @@ function findCloudflared() {
   return null;
 }
 
+async function installCloudflared() {
+  log("正在自动安装 cloudflared...");
+  const platform = process.platform;
+  try {
+    if (platform === "win32") {
+      const dir = path.join(process.env.USERPROFILE || "C:/Users/default", "AppData", "Local", "cloudflared");
+      const exe = path.join(dir, "cloudflared.exe");
+      if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+      log("正在下载 cloudflared (Windows)...");
+      const url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe";
+      spawnSync("curl.exe", ["-L", "-o", exe, url], { stdio: "pipe", timeout: 120000 });
+      if (fs.existsSync(exe)) {
+        // 添加至用户 PATH（下次终端生效）
+        const currentPath = process.env.PATH || "";
+        if (!currentPath.includes(dir)) {
+          try {
+            spawnSync("powershell.exe", [
+              "-Command", `[Environment]::SetEnvironmentVariable("Path", [Environment]::GetEnvironmentVariable("Path","User") + ";${dir}", "User")`
+            ], { stdio: "pipe", timeout: 10000 });
+          } catch {}
+        }
+        log("cloudflared 安装完成", "OK");
+        return exe;
+      }
+    } else if (platform === "darwin") {
+      log("正在通过 Homebrew 安装 cloudflared...");
+      spawnSync("brew", ["install", "cloudflare/cloudflare/cloudflared"], { stdio: "inherit", timeout: 120000 });
+      const r = spawnSync("which", ["cloudflared"], { stdio: "pipe", timeout: 5000 });
+      if (r.status === 0) { log("cloudflared 安装完成", "OK"); return "cloudflared"; }
+    } else {
+      // Linux / Termux
+      const isTermux = fs.existsSync("/data/data/com.termux");
+      if (isTermux) {
+        log("正在通过 pkg 安装 cloudflared (Termux)...");
+        spawnSync("pkg", ["install", "cloudflared", "-y"], { stdio: "inherit", timeout: 120000 });
+      } else {
+        log("正在下载 cloudflared (Linux)...");
+        const url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64";
+        spawnSync("curl", ["-L", "-o", "/usr/local/bin/cloudflared", url], { stdio: "pipe", timeout: 120000 });
+        spawnSync("chmod", ["+x", "/usr/local/bin/cloudflared"], { stdio: "pipe", timeout: 5000 });
+      }
+      const r = spawnSync("which", ["cloudflared"], { stdio: "pipe", timeout: 5000 });
+      if (r.status === 0) { log("cloudflared 安装完成", "OK"); return "cloudflared"; }
+    }
+  } catch (e) {
+    log(`自动安装失败: ${e.message}`, "ERR");
+  }
+  return null;
+}
+
 // ─── 确保 server.mjs 在运行 ──────────────────────────────────────────────
 async function ensureServer() {
   if (await isPortOpen(SERVER_PORT)) {
@@ -151,12 +226,26 @@ async function ensureServer() {
 function startTunnel() {
   if (isShuttingDown) return;
 
-  const cfPath = findCloudflared();
+  let cfPath = findCloudflared();
   if (!cfPath) {
-    log("未找到 cloudflared，请先安装", "ERR");
+    log("未找到 cloudflared，尝试自动安装...");
+    // 异步安装，不阻塞隧道循环
+    installCloudflared().then((installed) => {
+      if (installed) {
+        log("安装成功，正在启动隧道...");
+        doStartTunnel(installed);
+      } else {
+        log("自动安装失败，请手动安装 cloudflared", "ERR");
+      }
+    });
     return;
   }
 
+  doStartTunnel(cfPath);
+}
+
+function doStartTunnel(cfPath) {
+
   log("正在请求匿名公网入口...");
 
   cfProcess = spawn(cfPath, ["tunnel", "--url", `http://127.0.0.1:${SERVER_PORT}`], {
@@ -171,8 +260,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");
-      confirmOnline(currentUrl); // 确保主控注册成功（异步重试）
+      aggressiveRegister(currentUrl); // 死缠烂打直到主控应答
     }
 
     // 网络波动提示
@@ -184,6 +274,8 @@ function startTunnel() {
   cfProcess.on("close", (code) => {
     log(`隧道进程断开退出 (code: ${code})`, "ERR");
     cfProcess = null;
+    isConfirmed = false;
+    if (alignTimer) { clearInterval(alignTimer); alignTimer = null; }
 
     // 通知主控剔除
     if (currentUrl) {
@@ -194,7 +286,11 @@ function startTunnel() {
     // 自动复活
     if (!isShuttingDown) {
       log("准备在 5 秒后自动重启隧道...", "WARN");
-      setTimeout(startTunnel, 5000);
+      setTimeout(() => {
+        const cf = findCloudflared();
+        if (cf) doStartTunnel(cf);
+        else startTunnel();
+      }, 5000);
     }
   });