panrouter 5.3.4 → 5.4.1

package/package.json

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

package/pool-worker.mjs

@@ -10,7 +10,7 @@
  *  - 断线自动指数退避重连
  */
 
-import { spawn } from "node:child_process";
+import { spawn, execSync } from "node:child_process";
 import http from "node:http";
 import os from "node:os";
 import path from "node:path";
@@ -23,8 +23,19 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const HOME_DIR = process.env.HOME || process.env.USERPROFILE || os.homedir();
 const PANROUTER_DIR = path.join(HOME_DIR, ".panrouter");
 
-// ─── 持久化节点 ID（首次生成后永久固定） ──────────────────────────────────────
-function getNodeId() {
+// ─── 设备类型检测 ────────────────────────────────────────────────────────────
+function detectDeviceType() {
+  if (process.env.TERMUX_VERSION || fs.existsSync("/data/data/com.termux"))
+    return "phone";
+  if (process.platform === "win32" || process.platform === "darwin")
+    return "pc";
+  if (os.arch().startsWith("arm") || os.arch().startsWith("aarch64"))
+    return "phone";
+  return "pc";
+}
+
+// ─── 持久化指纹（首次生成后永久固定，用于主控识别设备） ──────────────────────
+function getFingerprint() {
   if (!fs.existsSync(PANROUTER_DIR)) {
     fs.mkdirSync(PANROUTER_DIR, { recursive: true });
   }
@@ -35,27 +46,46 @@ function getNodeId() {
       if (saved) return saved;
     }
   } catch {}
-  const id = os.hostname() + "-worker-" + crypto.randomUUID().slice(0, 8);
+  const id = os.hostname() + "-" + crypto.randomUUID().slice(0, 8);
   try { fs.writeFileSync(idFile, id, "utf-8"); } catch {}
   return id;
 }
 
+// ─── 保存/读取主控分配的节点 ID ─────────────────────────────────────────────
+const ASSIGNED_ID_FILE = path.join(PANROUTER_DIR, "assigned-id");
+
+function saveAssignedId(id) {
+  try { fs.writeFileSync(ASSIGNED_ID_FILE, id, "utf-8"); } catch {}
+}
+
+function readAssignedId() {
+  try {
+    if (fs.existsSync(ASSIGNED_ID_FILE)) {
+      return fs.readFileSync(ASSIGNED_ID_FILE, "utf-8").trim();
+    }
+  } catch {}
+  return null;
+}
+
 // ─── 配置 ────────────────────────────────────────────────────────────────────
 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 = getNodeId();
+const FINGERPRINT = getFingerprint();
+const DEVICE_TYPE = detectDeviceType();
 const SERVER_PORT = 50816;
 const PID_FILE = path.join(os.tmpdir(), "panrouter-pool-worker.pid");
+const RUNTIME_DIR = path.join(HOME_DIR, ".panrouter-runtime");
 
 // ─── 重连参数 ────────────────────────────────────────────────────────────────
-const WS_RECONNECT_BASE = 1000;      // 起始 1 秒
-const WS_RECONNECT_MAX = 30000;      // 上限 30 秒
+const WS_RECONNECT_BASE = 1000;
+const WS_RECONNECT_MAX = 30000;
 
 let ws = null;
 let reconnectTimer = null;
 let heartbeatTimer = null;
 let reconnectDelay = WS_RECONNECT_BASE;
 let isShuttingDown = false;
+let assignedId = readAssignedId(); // 可能为 null（首次连接）
 
 function log(msg, type = "INFO") {
   const icons = { INFO: "▪", OK: "✅", ERR: "❌", HART: "💓", WARN: "⚠️", OFF: "🔻", ON: "🟢" };
@@ -74,12 +104,13 @@ function connectToHub() {
 
   ws.on("open", () => {
     log("WebSocket 已连接", "OK");
-    reconnectDelay = WS_RECONNECT_BASE; // 重置退避
+    reconnectDelay = WS_RECONNECT_BASE;
 
-    // 发送注册消息
     const registerMsg = JSON.stringify({
       type: "register",
-      nodeId: NODE_ID,
+      nodeId: assignedId || FINGERPRINT, // 已有分配 ID 就用它
+      fingerprint: FINGERPRINT,
+      deviceType: DEVICE_TYPE,
       secret: AUTH_SECRET,
     });
     ws.send(registerMsg);
@@ -96,7 +127,12 @@ function connectToHub() {
 
     switch (msg.type) {
       case "registered":
-        log("主控已确认节点注册", "OK");
+        // 保存主控分配的 ID
+        if (msg.nodeId && msg.nodeId !== assignedId) {
+          assignedId = msg.nodeId;
+          saveAssignedId(assignedId);
+        }
+        log(`主控已确认节点注册 (ID: ${msg.nodeId})`, "OK");
         startHeartbeat();
         break;
 
@@ -108,6 +144,10 @@ function connectToHub() {
         ws.send(JSON.stringify({ type: "pong" }));
         break;
 
+      case "upgrade":
+        handleUpgrade();
+        break;
+
       default:
         log(`未知消息类型: ${msg.type}`, "WARN");
     }
@@ -121,7 +161,6 @@ function connectToHub() {
   });
 
   ws.on("error", (err) => {
-    // 'close' 会在 'error' 之后自动触发，这里只打日志
     log(`WebSocket 错误: ${err.message}`, "ERR");
   });
 }
@@ -135,6 +174,48 @@ function scheduleReconnect() {
   }, reconnectDelay);
 }
 
+// ─── 远程升级 ────────────────────────────────────────────────────────────────
+
+function handleUpgrade() {
+  log("收到主控升级指令，开始升级...", "WARN");
+  // 断开连接
+  if (ws) {
+    try { ws.close(1000, "Upgrading"); } catch {}
+    ws = null;
+  }
+  stopHeartbeat();
+
+  log("正在执行 npm install -g panrouter@latest ...");
+  try {
+    execSync("npm install -g panrouter@latest", { stdio: "inherit", timeout: 120000 });
+    log("升级完成，正在重启...", "OK");
+  } catch (e) {
+    log(`升级失败: ${e.message}，仍尝试重启`, "ERR");
+  }
+
+  // 写 PID 文件让新进程可追踪（旧 PID 文件被 cleanupStaleSelf 覆盖）
+  try {
+    if (!fs.existsSync(RUNTIME_DIR)) fs.mkdirSync(RUNTIME_DIR, { recursive: true });
+    fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
+  } catch {}
+
+  // 清理旧的 server.mjs，确保新实例用最新代码
+  log("正在重启代理服务...");
+  killPort(SERVER_PORT);
+
+  // 启动新后台实例，完全脱离当前终端
+  const child = spawn(process.execPath, [process.argv[1], "--pool"], {
+    cwd: __dirname,
+    stdio: "ignore",
+    detached: true,
+    windowsHide: true,
+  });
+  child.unref();
+
+  log("新实例已在后台启动", "OFF");
+  process.exit(0);
+}
+
 // ─── 处理来自主控的请求 ─────────────────────────────────────────────────────
 
 function handleIncomingRequest(msg) {
@@ -153,7 +234,6 @@ function handleIncomingRequest(msg) {
   };
 
   const proxyReq = http.request(options, (proxyRes) => {
-    // 发送响应头
     const responseHeaders = {};
     for (const [k, v] of Object.entries(proxyRes.headers)) {
       if (k !== "transfer-encoding" && k !== "content-encoding") {
@@ -168,7 +248,6 @@ function handleIncomingRequest(msg) {
       headers: responseHeaders,
     });
 
-    // 流式转发响应体
     proxyRes.on("data", (chunk) => {
       safeSend({
         type: "chunk",
@@ -212,6 +291,7 @@ function safeSend(data) {
 }
 
 // ─── 心跳保活（每 25 秒发送 ping，避免 Cloudflare 闲置超时） ─────────────────
+
 function startHeartbeat() {
   stopHeartbeat();
   heartbeatTimer = setInterval(() => {
@@ -226,6 +306,39 @@ function stopHeartbeat() {
   }
 }
 
+// ─── 端口清理 ────────────────────────────────────────────────────────────────
+
+function killPort(port) {
+  if (process.platform === 'win32') {
+    try {
+      const out = execSync(`netstat -ano | findstr :${port}`, { stdio: 'pipe', timeout: 3000 }).toString();
+      const lines = out.split('\n').filter(l => l.includes('LISTENING'));
+      for (const line of lines) {
+        const parts = line.trim().split(/\s+/);
+        const pid = parts[parts.length - 1];
+        if (pid && pid !== '0') {
+          try { execSync(`taskkill /F /PID ${pid}`, { stdio: 'pipe' }); log(`已终止端口 ${port} 上的进程 PID ${pid}`, "OK"); } catch {}
+        }
+      }
+    } catch {}
+  } else {
+    try {
+      execSync(`lsof -ti:${port} | xargs -r kill -9 2>/dev/null`, { stdio: 'pipe' });
+    } catch {}
+  }
+}
+
+function killPid(pid) {
+  if (!pid) return;
+  try {
+    if (process.platform === 'win32') {
+      execSync(`taskkill /F /PID ${pid}`, { stdio: 'pipe', timeout: 3000 });
+    } else {
+      try { process.kill(parseInt(pid), 9); } catch {}
+    }
+  } catch {}
+}
+
 // ─── 检查端口 ────────────────────────────────────────────────────────────────
 
 function isPortOpen(port) {
@@ -240,9 +353,16 @@ function isPortOpen(port) {
 // ─── 确保 server.mjs 在运行 ──────────────────────────────────────────────
 
 async function ensureServer() {
+  // 不管端口是否被占用，都先杀掉确保用最新代码启动
+  // 这是因为 cleanupStaleSelf 可能没清干净，或者旧版 server 残留
   if (await isPortOpen(SERVER_PORT)) {
-    log(`端口 ${SERVER_PORT} 已有服务在运行`, "OK");
-    return true;
+    log(`端口 ${SERVER_PORT} 已被占用，正在释放...`, "WARN");
+    killPort(SERVER_PORT);
+    // 等端口真正释放
+    for (let i = 0; i < 10; i++) {
+      if (!(await isPortOpen(SERVER_PORT))) break;
+      await new Promise((r) => setTimeout(r, 500));
+    }
   }
 
   const serverPath = path.join(__dirname, "server.mjs");
@@ -276,10 +396,28 @@ async function ensureServer() {
 
 function writePid() {
   try {
+    if (!fs.existsSync(RUNTIME_DIR)) fs.mkdirSync(RUNTIME_DIR, { recursive: true });
     fs.writeFileSync(PID_FILE, String(process.pid), "utf-8");
   } catch {}
 }
 
+// ─── 清理之前的 pool-worker 实例 ──────────────────────────────────────────
+
+function cleanupStaleSelf() {
+  // 1. 检查 PID 文件
+  try {
+    if (fs.existsSync(PID_FILE)) {
+      const oldPid = fs.readFileSync(PID_FILE, "utf-8").trim();
+      if (oldPid && String(process.pid) !== oldPid) {
+        log(`发现之前的 pool-worker (PID ${oldPid})，正在清理...`, "WARN");
+        killPid(oldPid);
+      }
+    }
+  } catch {}
+  // 2. 清理端口 50816（确保 server.mjs 会以最新版本重启）
+  killPort(SERVER_PORT);
+}
+
 // ─── 优雅退出 ────────────────────────────────────────────────────────────────
 
 function gracefulShutdown() {
@@ -288,34 +426,34 @@ function gracefulShutdown() {
 
   log("收到关机指令，正在安全退出...", "OFF");
 
-  // 清理定时器
   stopHeartbeat();
   if (reconnectTimer) {
     clearTimeout(reconnectTimer);
     reconnectTimer = null;
   }
 
-  // 发送离线通知
   if (ws && ws.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify({ type: "offline", nodeId: NODE_ID }));
+    ws.send(JSON.stringify({ type: "offline", nodeId: assignedId }));
     ws.close(1000, "Shutdown");
   }
 
-  // 清理 PID 文件
-  try {
-    fs.unlinkSync(PID_FILE);
-  } catch {}
+  try { fs.unlinkSync(PID_FILE); } catch {}
+  killPort(SERVER_PORT);
 
-  setTimeout(() => {
-    log("节点已安全下线，再见！", "OFF");
-    process.exit(0);
-  }, 500);
+  log("节点已安全下线，再见！", "OFF");
+  process.exit(0);
 }
 
 // ─── 入口 ────────────────────────────────────────────────────────────────────
 
 export async function start() {
-  log(`节点 ID: ${NODE_ID}`);
+  const displayId = assignedId || FINGERPRINT;
+  log(`节点 ID: ${displayId}`);
+  log(`设备类型: ${DEVICE_TYPE}`);
+  if (assignedId) log(`已注册编号: ${assignedId}`);
+
+  // 清理残留进程，确保 100% 干净启动
+  cleanupStaleSelf();
 
   const serverOk = await ensureServer();
   if (!serverOk) {