tt-help-cli-ycl 1.4.78 → 1.4.80

package/src/lib/args.js

@@ -407,6 +407,7 @@ function parseWebserverArgs(args) {
   let webserverPort = 3000;
   let webserverPoolSize = 0;
   let webserverProxy = null;
+  let webserverLog = false;
   // 默认汇报到 ~/.tt-help.json 中配置的 server 地址
   let webserverNotify = defaultServer;
 
@@ -418,6 +419,8 @@ function parseWebserverArgs(args) {
       webserverPoolSize = parseInt(args[++i]) || 0;
     } else if (arg === "--proxy") {
       webserverProxy = args[++i] || null;
+    } else if (arg === "--log") {
+      webserverLog = true;
     } else if (arg === "--notify") {
       const next = args[i + 1];
       // 没写地址或下一个是别的参数 → 使用配置中的 server 地址
@@ -434,6 +437,7 @@ function parseWebserverArgs(args) {
     webserverPort,
     webserverPoolSize,
     webserverProxy,
+    webserverLog,
     webserverNotify,
     urls: [],
     outputFile: null,
@@ -659,6 +663,7 @@ function parseClashDaemonArgs(args) {
   let interval = 30;
   let benchmark = 40;
   let dryRun = false;
+  let country = null;
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -666,6 +671,8 @@ function parseClashDaemonArgs(args) {
       interval = parseInt(args[++i]) || 30;
     } else if (arg === "--benchmark") {
       benchmark = parseInt(args[++i]) || 40;
+    } else if (arg === "--country") {
+      country = args[++i] || null;
     } else if (arg === "--dry-run") {
       dryRun = true;
     }
@@ -675,6 +682,7 @@ function parseClashDaemonArgs(args) {
     subcommand: "clash-daemon",
     interval,
     benchmark,
+    country,
     "dry-run": dryRun,
     urls: [],
     outputFormat: "json",

package/src/lib/constants.js

@@ -247,6 +247,7 @@ const HELP_TEXT = [
   "      -p, --port <端口号>    监听端口，默认 3000",
   "      --pool-size <数量>     浏览器页面池大小，默认 8",
   "      --proxy <地址>         HTTP 代理（如 127.0.0.1:7897）",
+  "      --log                   显示 API 成功日志（默认不显示，错误日志始终输出）",
   "      --notify [地址]         验证码通知，默认 http://117.71.53.99:17301",
   "    API:",
   "      GET  /health            健康检查",
@@ -255,6 +256,7 @@ const HELP_TEXT = [
   "      POST /api/tiktok/video  获取视频信息 { videoUrl: string }",
   "      POST /api/tiktok/lookup 同时获取视频和作者信息 { videoUrl: string }",
   "    示例: tt-help webserver -p 3000 --pool-size 8 --proxy 127.0.0.1:7897 --notify",
+  "          tt-help webserver -p 3000 --log",
   "",
   "  comments [选项]",
   "    评论采集：从视频评论中发现新用户，来源标记为 comment",
@@ -385,6 +387,26 @@ const HELP_TEXT = [
   "          tt-help watchdog --server http://117.71.53.99:17301",
   "          tt-help watchdog -i 30 --client-id my-server-01",
   "",
+  "  tt-help clash-daemon [选项]",
+  "    Clash Verge 代理节点健康守护：定时巡检 TikTok 可达性，异常时自动切换节点",
+  "    看门狗启动时会自动拉起此守护进程",
+  "    选项:",
+  "      --interval <秒>          巡检间隔，默认 30 秒",
+  "      --benchmark <分钟>       全量测速间隔，默认 40 分钟",
+  "      --country <国家代码>     只保留指定国家节点，默认不过滤",
+  "                               支持: US, GB, DE, FR, JP, KR, SG, HK, TW, RU 等",
+  "      --dry-run                只检测不切换（调试用）",
+  "    看门狗运行时可通过 /tmp/clash-cmd.json 发命令动态调整：",
+  '      {"action":"switchNode","node":"节点名"}         一次性切换到指定节点（不干扰自检）',
+  '      {"action":"setCountryFilter","country":"US"}   切换国家过滤',
+  '      {"action":"setCountryFilter","country":null}    取消过滤',
+  '      {"action":"runBenchmark"}                      手动触发全量测速',
+  '      {"action":"setInterval","seconds":60}         修改巡检间隔',
+  "    示例: tt-help clash-daemon",
+  "          tt-help clash-daemon --country US",
+  "          tt-help clash-daemon --interval 15 --benchmark 20 --country US",
+  "          tt-help clash-daemon --dry-run",
+  "",
   "  config  [show|set|unset|reset]",
   "    config                    查看当前配置",
   "    config set <key> <value>  设置配置（key: proxy, server, browser, userId, maxFollowing, maxFollowers, maxVideos, maxComments）",
@@ -400,6 +422,7 @@ const HELP_TEXT = [
   "        tt-help explore --webserver http://127.0.0.1:3000 --location DE,ES,FR",
   "        tt-help refresh --server http://127.0.0.1:3001 --port 9222",
   "        tt-help webserver -p 3000 --pool-size 8 --proxy 127.0.0.1:7897",
+  "        tt-help webserver -p 3000 --log",
   "        tt-help config set server http://127.0.0.1:3001",
   "        tt-help attach -p 5 -i 10",
   "        tt-help watch -o data/result.db",

package/src/lib/shop-scraper.mjs

@@ -26,14 +26,31 @@ const PDP_HEADERS = {
   "Accept-Language": "en-US,en;q=0.9",
 };
 
-// 浏览器解验证码后缓存的 Cookie，给 undici 复用
-let cachedCookies = null;
-let cookiesExpireAt = 0;
-const COOKIE_TTL_MS = 30 * 60 * 1000; // Cookie 有效期 30 分钟
-
-function getCookieHeader() {
-  if (!cachedCookies || Date.now() > cookiesExpireAt) return null;
-  return cachedCookies.map((c) => `${c.name}=${c.value}`).join("; ");
+// 浏览器解验证码后缓存的 Cookie，按代理节点隔离（避免切节点后旧 Cookie 被冲掉）
+const cookieCache = new Map(); // proxyUrl → { cookies, expireAt }
+const COOKIE_TTL_MS = 60 * 60 * 1000; // Cookie 有效期 60 分钟
+
+/** 按代理节点获取缓存的 Cookie，过期自动清除 */
+function getCookieHeader(proxyUrl) {
+  const entry = cookieCache.get(proxyUrl);
+  if (!entry || Date.now() > entry.expireAt) {
+    if (entry) cookieCache.delete(proxyUrl);
+    return null;
+  }
+  return entry.cookies.map((c) => `${c.name}=${c.value}`).join("; ");
+}
+
+/** 按代理节点缓存 Cookie */
+function setCachedCookies(proxyUrl, cookies) {
+  cookieCache.set(proxyUrl, {
+    cookies,
+    expireAt: Date.now() + COOKIE_TTL_MS,
+  });
+}
+
+/** 清除指定代理节点的 Cookie */
+function clearCachedCookies(proxyUrl) {
+  cookieCache.delete(proxyUrl);
 }
 
 /**
@@ -140,14 +157,13 @@ export async function resolveCaptchaWithBrowser(url, proxyUrl) {
   }
 
   if (solved) {
-    // 提取 Cookie 给 undici 复用
+    // 提取 Cookie，按代理节点缓存（切回同一节点时可复用）
     try {
       const cookies = await page.context().cookies();
       if (cookies.length > 0) {
-        cachedCookies = cookies;
-        cookiesExpireAt = Date.now() + COOKIE_TTL_MS;
+        setCachedCookies(proxyUrl, cookies);
         console.error(
-          `[shop-scraper] Captcha solved, cached ${cookies.length} cookies for undici reuse`,
+          `[shop-scraper] Captcha solved, cached ${cookies.length} cookies for proxy ${proxyUrl} (TTL ${COOKIE_TTL_MS / 60000}min)`,
         );
       }
     } catch (e) {
@@ -177,7 +193,7 @@ export async function getProductInfo(url, proxyUrl, options = {}) {
   for (let attempt = 1; attempt <= 3; attempt++) {
     try {
       const headers = { ...PDP_HEADERS };
-      const cookieStr = getCookieHeader();
+      const cookieStr = getCookieHeader(proxy);
       if (cookieStr) {
         headers["Cookie"] = cookieStr;
       }
@@ -195,14 +211,15 @@ export async function getProductInfo(url, proxyUrl, options = {}) {
     } catch (err) {
       lastError = err;
 
-      // Captcha：清除过期 Cookie，弹浏览器重新获取
+      // Captcha：清除当前代理节点的过期 Cookie，弹浏览器重新获取
       if (
         err.message?.includes("Blocked by TikTok") &&
         options.captchaFallback
       ) {
-        console.error("[shop-scraper] Captcha hit, clearing cached cookies...");
-        cachedCookies = null;
-        cookiesExpireAt = 0;
+        console.error(
+          `[shop-scraper] Captcha on ${proxy}, clearing cached cookies...`,
+        );
+        clearCachedCookies(proxy);
         console.error("[shop-scraper] Opening browser for manual captcha...");
         await resolveCaptchaWithBrowser(url, proxy);
         // 重试（带着新 Cookie）

package/src/watch/public/app.js

@@ -3811,10 +3811,160 @@ function renderClientCard(c, clientCommands) {
     header +
       styled("div", "color:#888;font-size:12px", osStr) +
       styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
+      renderProxySection(c, userId) +
       renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis),
   );
 }
 
+// ── 代理节点区域（看门狗面板中每个客户端卡片） ──
+
+function renderProxySection(c, userId) {
+  var h = c.clashHealth;
+  if (!h || !h.node) return "";
+
+  var nodes = (h.meta && h.meta.healthyNodes) || [];
+  var hasNodes = nodes.length > 0;
+
+  return (
+    renderProxyLine(h, nodes, userId, hasNodes) +
+    renderNodeList(nodes, h.node, userId, hasNodes)
+  );
+}
+
+/** 代理状态行：当前节点 + 健康状态 + 展开按钮 */
+function renderProxyLine(h, nodes, userId, hasNodes) {
+  var dot = h.healthy ? "#4ade80" : "#f87171";
+  var status = h.healthy
+    ? (h.timeTotal || 0).toFixed(1) +
+      "s " +
+      ((h.sizeDownload || 0) / 1024).toFixed(0) +
+      "KB"
+    : h.error || "异常";
+
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+      "display:flex;align-items:center;gap:8px;font-size:12px",
+    styled("span", "color:" + dot + ";font-size:14px", "●") +
+      styled("span", "color:#e0e0e0;font-weight:bold", h.node) +
+      styled("span", "color:#666", "| " + status) +
+      (hasNodes
+        ? tag(
+            "button",
+            {
+              onclick: "wdToggleNodes('" + esc(userId) + "')",
+              style:
+                "margin-left:auto;padding:2px 8px;font-size:11px;background:#333;" +
+                "color:#60a5fa;border:1px solid #444;border-radius:3px;cursor:pointer",
+              title: "查看可用节点列表",
+            },
+            nodes.length + " 个节点 ▸",
+          )
+        : ""),
+  );
+}
+
+/** 节点列表面板（默认隐藏） */
+function renderNodeList(nodes, currentNode, userId, hasNodes) {
+  if (!hasNodes) return "";
+
+  var items = "";
+  for (var i = 0; i < nodes.length; i++) {
+    items += renderNodeItem(nodes[i], nodes[i] === currentNode, userId);
+  }
+
+  var id = "wdNodes-" + wdEscId(userId);
+  return (
+    '<div id="' +
+    id +
+    '" style="margin-top:4px;border:1px solid #2a2a3a;' +
+    'border-radius:6px;overflow:hidden;display:none">' +
+    items +
+    "</div>"
+  );
+}
+
+/** 单个节点行 */
+function renderNodeItem(name, isActive, userId) {
+  var color = isActive ? "#4ade80" : "#888";
+  var bg = isActive ? "background:#1a3a2a;" : "";
+  var dot = isActive ? "●" : "○";
+  var textColor = isActive ? "#4ade80" : "#aaa";
+  var action = isActive
+    ? '<span style="margin-left:auto;color:#555;font-size:10px">当前</span>'
+    : "<button onclick=\"wdSwitchNode('" +
+      esc(userId) +
+      "','" +
+      esc(name) +
+      "')\" " +
+      'style="margin-left:auto;padding:1px 6px;font-size:10px;background:#2563eb;' +
+      'color:#fff;border:none;border-radius:2px;cursor:pointer">切换</button>';
+
+  return (
+    '<div style="padding:3px 8px;display:flex;align-items:center;gap:6px;font-size:11px;' +
+    bg +
+    '">' +
+    '<span style="color:' +
+    color +
+    '">' +
+    dot +
+    "</span>" +
+    '<span style="color:' +
+    textColor +
+    '">' +
+    name +
+    "</span>" +
+    action +
+    "</div>"
+  );
+}
+
+// ── 交互函数 ──
+
+function wdEscId(s) {
+  return (s || "").replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+
+function wdToggleNodes(userId) {
+  var el = document.getElementById("wdNodes-" + wdEscId(userId));
+  if (!el) return;
+  el.style.display = el.style.display === "none" ? "block" : "none";
+}
+
+function wdSwitchNode(userId, node) {
+  if (
+    !confirm(
+      "确定要将 " +
+        userId +
+        " 的代理切换到: " +
+        node +
+        " ？\n\n切换后自动巡检会继续运行。",
+    )
+  )
+    return;
+
+  fetch("/api/watchdog/switch-node", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ userId: userId, node: node }),
+  })
+    .then(function (r) {
+      return r.json();
+    })
+    .then(function (d) {
+      alert(
+        d.ok
+          ? "已发送切换指令: " +
+              node +
+              "\n\n客户端将在下次心跳时执行（约15秒内）。"
+          : "失败: " + (d.error || "未知错误"),
+      );
+    })
+    .catch(function (e) {
+      alert("请求失败: " + e.message);
+    });
+}
+
 // 统一的命令行视图：每条命令一行，含运行状态
 function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
   var match = matchProcsToCmds(myCmds, procs);

package/src/watch/public/index.html

@@ -612,7 +612,7 @@
     </div>
   </div>
 
-  <script src="app.js"></script>
+  <script src="app.js?v=20260808c"></script>
 </body>
 
 </html>

package/src/watch/watchdog-server.js

@@ -26,6 +26,10 @@ const CLIENT_CLEANUP_MS = 24 * 60 * 60 * 1000; // 离线超过 24h 清理
 const llmCache = new Map();
 const LLM_CACHE_TTL = 15 * 60 * 1000; // 15 分钟过期
 
+// Clash 命令队列：userId → [{ action, node, ... }]
+// 看门狗客户端下次心跳时取走，取走后清空
+const clashCmdQueue = new Map();
+
 // ── 配置文件读写 ──
 
 function loadConfig() {
@@ -92,6 +96,7 @@ function getOnlineClients() {
       config: info.config || {},
       processes,
       llmAnalysis,
+      clashHealth: info.clashHealth || null,
       lastHeartbeat: info.lastHeartbeat,
       registeredAt: info.registeredAt,
       online,
@@ -240,20 +245,28 @@ async function handleHeartbeat(params, body, res) {
     osInfo: body.osInfo || {},
     config: body.config || {},
     processes: body.processes || [],
+    clashHealth: body.clashHealth || null,
   });
 
   // 按 userId 返回该客户端的专属命令列表
   const userId = (body.config && body.config.userId) || "";
   const commands = getClientCommands(userId);
 
+  // 取出待下发的 Clash 命令（一次性，取走即清空）
+  const clashCommands = clashCmdQueue.get(userId) || [];
+  if (clashCommands.length > 0) {
+    clashCmdQueue.delete(userId);
+  }
+
   const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
   console.error(
-    `[watchdog ${ts}] 心跳: ${clientId} (${body.hostname || "?"}, user=${userId || "?"}) ${body.processes?.length || 0}进程, 返回${commands.length}条命令`,
+    `[watchdog ${ts}] 心跳: ${clientId} (${body.hostname || "?"}, user=${userId || "?"}) ${body.processes?.length || 0}进程, 返回${commands.length}条命令${clashCommands.length ? ", " + clashCommands.length + "条Clash命令" : ""}`,
   );
 
   sendJSON(res, 200, {
     ok: true,
     commands,
+    clashCommands: clashCommands.length > 0 ? clashCommands : undefined,
     clientConfig: getClientConfigStored(userId),
     serverTime: Date.now(),
   });
@@ -377,6 +390,20 @@ async function handleClearLlmAnalysis(params, body, res) {
   sendJSON(res, 200, { ok: true, cleared });
 }
 
+async function handleSwitchNode(params, body, res) {
+  const { userId, node } = body || {};
+  if (!userId || !node) {
+    sendJSON(res, 400, { error: "缺少 userId 或 node" });
+    return;
+  }
+  // 加入 Clash 命令队列，客户端下次心跳时取走
+  const queue = clashCmdQueue.get(userId) || [];
+  queue.push({ action: "switchNode", node });
+  clashCmdQueue.set(userId, queue);
+  console.error(`[watchdog] ${userId} 节点切换已入队: → ${node}`);
+  sendJSON(res, 200, { ok: true, message: `将在下次心跳时切换到 ${node}` });
+}
+
 // ── 公开 ──
 
 export function registerWatchdogRoutes(httpServer) {
@@ -442,5 +469,9 @@ export async function tryHandleWatchdogRoute(
     await handleClearLlmAnalysis(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/switch-node") {
+    await handleSwitchNode(params, body, res);
+    return true;
+  }
   return false;
 }

package/src/watchdog/agent.js

@@ -176,6 +176,11 @@ export class WatchdogAgent {
       this.processManager.checkThresholds();
     }, 5000);
 
+    // 假死检测：每 60s 检查各进程是否有日志输出，超 30 分钟无日志则重启
+    this.staleTimer = setInterval(() => {
+      this.processManager.checkStaleProcesses();
+    }, 60000);
+
     // LLM 日志分析（每 10 分钟调服务端接口）
     this._startLlmAnalyzer();
 
@@ -196,6 +201,10 @@ export class WatchdogAgent {
       clearInterval(this.thresholdTimer);
       this.thresholdTimer = null;
     }
+    if (this.staleTimer) {
+      clearInterval(this.staleTimer);
+      this.staleTimer = null;
+    }
     if (this.llmAnalyzerTimer) {
       clearInterval(this.llmAnalyzerTimer);
       this.llmAnalyzerTimer = null;
@@ -264,7 +273,7 @@ export class WatchdogAgent {
       const data = await resp.json();
       this.consecutiveFailures = 0;
 
-      // 同步命令
+      // 同步进程命令
       if (Array.isArray(data.commands)) {
         const prev = this.processManager.runningCount;
         await this.processManager.syncCommands(data.commands);
@@ -276,6 +285,15 @@ export class WatchdogAgent {
         }
       }
 
+      // 处理 Clash daemon 命令（写 clash-cmd.json，daemon 轮询拾取）
+      if (Array.isArray(data.clashCommands) && data.clashCommands.length > 0) {
+        const ipc = await import("../clash/ipc.js");
+        for (const cmd of data.clashCommands) {
+          ipc.writeCommand(cmd);
+          console.error(`[watchdog] 下发 Clash 命令: ${JSON.stringify(cmd)}`);
+        }
+      }
+
       // 服务端下发的客户端配置（远程修改 ~/.tt-help.json）
       if (data.clientConfig) {
         applyClientConfig(data.clientConfig);
@@ -409,7 +427,7 @@ export class WatchdogAgent {
 
     console.error(`[watchdog] 启动代理守护: ${daemonPath}`);
     try {
-      const child = spawn(process.execPath, [daemonPath], {
+      const child = spawn(process.execPath, [daemonPath, "--country", "US"], {
         stdio: ["ignore", "pipe", "pipe"],
         detached: false,
       });

package/src/watchdog/process-manager.js

@@ -22,6 +22,7 @@ const MAX_RESTART = 3;
 const MAX_LOG_LINES = 500; // 每个进程最多保留的日志行数
 const IS_WIN = process.platform === "win32";
 const SPAWN_STAGGER_MS = 30000; // 批量启动时每个进程间隔 30 秒，避免抢网络
+const STALE_LOG_TIMEOUT_MS = 30 * 60 * 1000; // 30 分钟无日志输出视为假死
 
 // 从命令行中提取 CDP 端口列表（解析 --base-port 和 --port-count）
 function extractCdpPorts(cmdLine) {
@@ -215,6 +216,7 @@ export class ProcessManager extends EventEmitter {
         if (info) {
           info.logs.push(short);
           if (info.logs.length > MAX_LOG_LINES) info.logs.shift();
+          info.lastLogTime = Date.now(); // 记录最后日志时间，用于假死检测
         }
       }
     });
@@ -267,6 +269,7 @@ export class ProcessManager extends EventEmitter {
       restartCount: 0,
       stopped: false,
       logs: [],
+      lastLogTime: Date.now(), // 初始化为启动时间，用于假死检测
     });
   }
 
@@ -384,6 +387,60 @@ export class ProcessManager extends EventEmitter {
     return result;
   }
 
+  /**
+   * 检测假死进程：超过 STALE_LOG_TIMEOUT_MS 无日志输出则自动重启
+   * @returns {Array<{cmdId:string, silentMinutes:number}>} 被重启的进程列表
+   */
+  checkStaleProcesses() {
+    const now = Date.now();
+    const restarted = [];
+
+    for (const [cmdId, info] of this.processes) {
+      if (info.stopped || !info.child) continue;
+      // 启动不到 STALE_LOG_TIMEOUT_MS 的进程跳过（给启动留足时间）
+      const uptime = now - info.startTime;
+      if (uptime < STALE_LOG_TIMEOUT_MS) continue;
+
+      const lastLog = info.lastLogTime || info.startTime;
+      const silentMs = now - lastLog;
+      if (silentMs < STALE_LOG_TIMEOUT_MS) continue;
+
+      const silentMin = Math.round(silentMs / 60000);
+      console.error(
+        `[watchdog] 命令 ${cmdId} 已 ${silentMin} 分钟无日志输出（疑似假死），重启...`,
+      );
+
+      // 保存 cmdDef 和 restartCount，因为 stopCommand 会 delete
+      const cmdDef = info.cmdDef;
+      const restartCount = (info.restartCount || 0) + 1;
+
+      if (restartCount > MAX_RESTART) {
+        console.error(
+          `[watchdog] 命令 ${cmdId} 已达最大重启次数 (${MAX_RESTART})，不再自动重启`,
+        );
+        continue;
+      }
+
+      // 停止旧进程
+      this.stopCommand(cmdId);
+
+      // 重启（继承 restartCount）
+      const def = { ...cmdDef, _staleRestart: true };
+      this.startCommand(def);
+      const newInfo = this.processes.get(cmdId);
+      if (newInfo) {
+        newInfo.restartCount = restartCount;
+      }
+
+      console.error(
+        `[watchdog] 命令 ${cmdId} 假死重启完成 (${restartCount}/${MAX_RESTART})`,
+      );
+      restarted.push({ cmdId, silentMinutes: silentMin });
+    }
+
+    return restarted;
+  }
+
   /**
    * 与期望命令列表同步：
    * - 启动期望列表中已启用但未运行的命令