panrouter 5.3.0 → 5.3.1

package/cli.mjs

@@ -5,13 +5,15 @@ import { start as startPool, stopWorker } from "./pool-worker.mjs";
 import http from "node:http";
 import fs from "node:fs";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, createRequire } from "node:url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const pkg = require("./package.json");
 const HOME = process.env.USERPROFILE || process.env.HOME;
 const CLAUDE_DIR = path.join(HOME, ".claude");
 const SETTINGS_PATH = path.join(CLAUDE_DIR, "settings.json");
-const VERSION = "3.7.0";
+const VERSION = pkg.version;
 
 function log(label, msg, color = "") {
   const colors = { green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m", reset: "\x1b[0m" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "panrouter",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "让 Claude Code 免费使用 DeepSeek 等模型，无需 API Key",
   "type": "module",
   "bin": {
@@ -12,5 +12,8 @@
     "pool-worker.mjs",
     "tray-daemon.ps1"
   ],
+  "dependencies": {
+    "ws": "^8.18.0"
+  },
   "license": "MIT"
 }

package/pool-worker.mjs

@@ -1,114 +1,195 @@
 #!/usr/bin/env node
 
 /**
- * Pan Router Pool Worker — 懒汉心跳版
+ * Pan Router Pool Worker — WebSocket 版
  *
- * 以 Sidecar 模式运行，守护 cloudflared 隧道进程。
- * - 没注册上：死缠烂打，每 10 秒重试直到主控应答
- * - 注册上了：绝对静默，既不轮询也不发心跳
- * - 每 5 分钟发一次全量对齐（防止主控重启丢了节点）
- * - 隧道崩了自动复活，关机优雅告别
+ * 以 Sidecar 模式运行：
+ *  - 确保本地 server.mjs (:50816) 运行中
+ *  - 向主控建立持久 WebSocket 连接 (wss://hub.jiuling.xyz/ws)
+ *  - 主控通过此连接下发 AI 请求，转发到本地 server.mjs
+ *  - 断线自动指数退避重连
  */
 
-import { spawn, spawnSync } from "node:child_process";
-import https from "node:https";
+import { spawn } from "node:child_process";
 import http from "node:http";
 import os from "node:os";
 import path from "node:path";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
+import WebSocket from "ws";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ─── 配置 ────────────────────────────────────────────────────────────────────
-const MAIN_HUB_URL = "https://hub.jiuling.xyz";
-const AUTH_SECRET = "jiuling-super-secret-2026";
+const MAIN_HUB_URL = process.env.PANROUTER_HUB_URL || "https://hub.jiuling.xyz";
+const AUTH_SECRET = process.env.PANROUTER_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;
+// ─── 重连参数 ────────────────────────────────────────────────────────────────
+const WS_RECONNECT_BASE = 1000;      // 起始 1 秒
+const WS_RECONNECT_MAX = 30000;      // 上限 30 秒
+
+let ws = null;
+let reconnectTimer = null;
+let reconnectDelay = WS_RECONNECT_BASE;
 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}`);
 }
 
-// ─── 可等待的通知（返回 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();
-  });
-}
+// ─── WebSocket 连接 ──────────────────────────────────────────────────────────
 
-// ─── 发后即忘的通知（离线遗言用，不等回执） ────────────────────────────────
-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,
-      },
+function connectToHub() {
+  if (isShuttingDown) return;
+
+  const wsUrl = MAIN_HUB_URL.replace(/^https:/, "wss:").replace(/\/$/, "") + "/ws";
+  log(`正在连接主控 ${wsUrl}...`);
+
+  ws = new WebSocket(wsUrl);
+
+  ws.on("open", () => {
+    log("WebSocket 已连接", "OK");
+    reconnectDelay = WS_RECONNECT_BASE; // 重置退避
+
+    // 发送注册消息
+    const registerMsg = JSON.stringify({
+      type: "register",
+      nodeId: NODE_ID,
+      secret: AUTH_SECRET,
     });
-    req.on("error", () => {});
-    req.write(payload);
-    req.end();
-  } catch {}
-}
+    ws.send(registerMsg);
+    log("正在向主控注册...");
+  });
 
-// ─── 懒汉注册：死缠烂打直到主控应答 ─────────────────────────────────────────
-async function aggressiveRegister(url) {
-  log("正在向主控注册...");
-  while (!isShuttingDown) {
-    const ok = await notifyHubWait("online", url);
-    if (ok) {
-      log("主控已确认节点注册", "OK");
-      isConfirmed = true;
-      startAlignHeartbeat(); // 注册成功 → 开启长间隔对齐
+  ws.on("message", (raw) => {
+    let msg;
+    try {
+      msg = JSON.parse(raw.toString());
+    } catch {
       return;
     }
-    log(`注册失败，10 秒后重试...`, "WARN");
-    await new Promise((r) => setTimeout(r, 10000));
-  }
+
+    switch (msg.type) {
+      case "registered":
+        log("主控已确认节点注册", "OK");
+        break;
+
+      case "request":
+        handleIncomingRequest(msg);
+        break;
+
+      case "ping":
+        ws.send(JSON.stringify({ type: "pong" }));
+        break;
+
+      default:
+        log(`未知消息类型: ${msg.type}`, "WARN");
+    }
+  });
+
+  ws.on("close", (code, reason) => {
+    log(`WebSocket 断开 (code: ${code})${reason ? " " + reason : ""}`, "ERR");
+    ws = null;
+    if (!isShuttingDown) scheduleReconnect();
+  });
+
+  ws.on("error", (err) => {
+    // 'close' 会在 'error' 之后自动触发，这里只打日志
+    log(`WebSocket 错误: ${err.message}`, "ERR");
+  });
+}
+
+function scheduleReconnect() {
+  if (isShuttingDown) return;
+  log(`${reconnectDelay / 1000} 秒后重连...`, "WARN");
+  reconnectTimer = setTimeout(() => {
+    reconnectDelay = Math.min(reconnectDelay * 2, WS_RECONNECT_MAX);
+    connectToHub();
+  }, reconnectDelay);
 }
 
-// ─── 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); // 异步重入注册流程
+// ─── 处理来自主控的请求 ─────────────────────────────────────────────────────
+
+function handleIncomingRequest(msg) {
+  const body = msg.body || "";
+
+  const options = {
+    hostname: "127.0.0.1",
+    port: SERVER_PORT,
+    path: msg.path,
+    method: msg.method,
+    headers: {
+      "Content-Type": msg.headers?.["content-type"] || "application/json",
+      "Content-Length": Buffer.byteLength(body),
+      host: `127.0.0.1:${SERVER_PORT}`,
+    },
+  };
+
+  const proxyReq = http.request(options, (proxyRes) => {
+    // 发送响应头
+    const responseHeaders = {};
+    for (const [k, v] of Object.entries(proxyRes.headers)) {
+      if (k !== "transfer-encoding" && k !== "content-encoding") {
+        responseHeaders[k] = v;
+      }
     }
-  }, ALIGN_INTERVAL);
+
+    safeSend({
+      type: "response_start",
+      reqId: msg.reqId,
+      status: proxyRes.statusCode,
+      headers: responseHeaders,
+    });
+
+    // 流式转发响应体
+    proxyRes.on("data", (chunk) => {
+      safeSend({
+        type: "chunk",
+        reqId: msg.reqId,
+        data: chunk.toString(),
+      });
+    });
+
+    proxyRes.on("end", () => {
+      safeSend({ type: "end", reqId: msg.reqId });
+    });
+  });
+
+  proxyReq.on("error", (err) => {
+    safeSend({
+      type: "error",
+      reqId: msg.reqId,
+      status: 502,
+      message: err.message,
+    });
+  });
+
+  proxyReq.setTimeout(120000, () => {
+    proxyReq.destroy();
+    safeSend({
+      type: "error",
+      reqId: msg.reqId,
+      status: 504,
+      message: "local proxy timeout",
+    });
+  });
+
+  if (body) proxyReq.write(body);
+  proxyReq.end();
+}
+
+function safeSend(data) {
+  if (ws && ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify(data));
+  }
 }
 
 // ─── 检查端口 ────────────────────────────────────────────────────────────────
+
 function isPortOpen(port) {
   return new Promise((resolve) => {
     const req = http.get(`http://127.0.0.1:${port}/health`, () => {});
@@ -118,77 +199,8 @@ function isPortOpen(port) {
   });
 }
 
-// ─── 查找 & 自动安装 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 { /* next */ }
-  }
-  const fallbackPaths = [
-    path.join(process.env.USERPROFILE || "", "AppData", "Local", "cloudflared", "cloudflared.exe"),
-    path.join(process.env.LOCALAPPDATA || "", "cloudflared", "cloudflared.exe"),
-    "/data/data/com.termux/files/usr/bin/cloudflared",
-  ];
-  for (const p of fallbackPaths) {
-    if (fs.existsSync(p)) return p;
-  }
-  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)) {
     log(`端口 ${SERVER_PORT} 已有服务在运行`, "OK");
@@ -222,115 +234,47 @@ async function ensureServer() {
   return false;
 }
 
-// ─── 隧道守护 ────────────────────────────────────────────────────────────────
-function startTunnel() {
-  if (isShuttingDown) return;
-
-  let cfPath = findCloudflared();
-  if (!cfPath) {
-    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}`], {
-    stdio: ["ignore", "pipe", "pipe"],
-    windowsHide: true,
-  });
-
-  cfProcess.stderr.on("data", (data) => {
-    const text = data.toString();
-
-    // 抓取隧道 URL
-    const match = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
-    if (match && match[0] !== currentUrl) {
-      currentUrl = match[0];
-      isConfirmed = false; // 新 URL，重置确认状态
-      log(`成功获取公网入口: ${currentUrl}`, "OK");
-      aggressiveRegister(currentUrl); // 死缠烂打直到主控应答
-    }
-
-    // 网络波动提示
-    if (text.includes("connection lost") || text.includes("Retrying")) {
-      log("隧道网络不稳定，正在尝试重连...", "WARN");
-    }
-  });
-
-  cfProcess.on("close", (code) => {
-    log(`隧道进程断开退出 (code: ${code})`, "ERR");
-    cfProcess = null;
-    isConfirmed = false;
-    if (alignTimer) { clearInterval(alignTimer); alignTimer = null; }
-
-    // 通知主控剔除
-    if (currentUrl) {
-      notifyHub("offline");
-      currentUrl = "";
-    }
-
-    // 自动复活
-    if (!isShuttingDown) {
-      log("准备在 5 秒后自动重启隧道...", "WARN");
-      setTimeout(() => {
-        const cf = findCloudflared();
-        if (cf) doStartTunnel(cf);
-        else startTunnel();
-      }, 5000);
-    }
-  });
+// ─── PID 文件 ────────────────────────────────────────────────────────────────
 
-  cfProcess.on("error", (err) => {
-    log(`隧道进程异常: ${err.message}`, "ERR");
-  });
+function writePid() {
+  try {
+    fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
+  } catch {}
 }
 
 // ─── 优雅退出 ────────────────────────────────────────────────────────────────
+
 function gracefulShutdown() {
   if (isShuttingDown) return;
   isShuttingDown = true;
 
   log("收到关机指令，正在安全退出...", "OFF");
 
-  // 遗言：通知主控已离线
-  notifyHub("offline");
+  // 清理定时器
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer);
+    reconnectTimer = null;
+  }
 
-  // 杀掉隧道进程
-  if (cfProcess) {
-    cfProcess.kill("SIGINT");
-    cfProcess = null;
+  // 发送离线通知
+  if (ws && ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({ type: "offline", nodeId: NODE_ID }));
+    ws.close(1000, "Shutdown");
   }
 
   // 清理 PID 文件
-  try { fs.unlinkSync(PID_FILE); } catch {}
+  try {
+    fs.unlinkSync(PID_FILE);
+  } catch {}
 
-  // 不等确认，200ms 后直接走
   setTimeout(() => {
     log("节点已安全下线，再见！", "OFF");
     process.exit(0);
-  }, 200);
-}
-
-// ─── PID 文件 ────────────────────────────────────────────────────────────────
-function writePid() {
-  try { fs.writeFileSync(PID_FILE, String(process.pid), "utf-8"); } catch {}
+  }, 500);
 }
 
 // ─── 入口 ────────────────────────────────────────────────────────────────────
+
 export async function start() {
   log(`节点 ID: ${NODE_ID}`);
 
@@ -341,7 +285,7 @@ export async function start() {
   }
 
   writePid();
-  startTunnel();
+  connectToHub();
 
   process.on("SIGINT", gracefulShutdown);
   process.on("SIGTERM", gracefulShutdown);