tt-help-cli-ycl 1.4.79 → 1.4.82

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;
+  }
+
   /**
    * 与期望命令列表同步：
    * - 启动期望列表中已启用但未运行的命令

package/src/webserver/server.mjs

@@ -72,11 +72,18 @@ const SCRAPER_CONFIG = {
   maxRequestsPerPage: 50,
   proxyServer: null,
   captchaNotifyUrl: null,
+  enableLog: false,
 };
 
+// 仅 --log 模式下输出成功日志；错误日志始终输出
+function apiLog(msg) {
+  if (SCRAPER_CONFIG.enableLog) console.error(msg);
+}
+
 let scraperInstance = null;
 let scraperClosing = false;
 let scraperInitPromise = null;
+let restartPromise = null; // 防重入：同一时间只允许一个 restartScraper
 let consecutiveErrors = 0;
 const MAX_CONSECUTIVE_ERRORS = 10;
 let warmTimer = null;
@@ -127,20 +134,34 @@ function recordRequest(success) {
 
 function isDegraded() {
   // 仅当 scraper 正在恢复/关闭中才算降级，初始冷状态不算
-  return scraperClosing || scraperInitPromise !== null;
+  return (
+    scraperClosing || scraperInitPromise !== null || restartPromise !== null
+  );
 }
 
 async function restartScraper(reason) {
-  console.error(`[webserver] 重启 scraper: ${reason}`);
-  if (scraperInstance) {
-    try {
-      await scraperInstance.close();
-    } catch {}
-    scraperInstance = null;
+  // 防重入：已有重启在进行中，等它完成即可
+  if (restartPromise) {
+    console.error(`[webserver] 重启已在执行中，跳过本次: ${reason}`);
+    return restartPromise;
+  }
+  restartPromise = (async () => {
+    console.error(`[webserver] 重启 scraper: ${reason}`);
+    if (scraperInstance) {
+      try {
+        await scraperInstance.close();
+      } catch {}
+      scraperInstance = null;
+    }
+    scraperInitPromise = null;
+    consecutiveErrors = 0;
+    console.error(`[webserver] 重启 scraper 完成`);
+  })();
+  try {
+    await restartPromise;
+  } finally {
+    restartPromise = null;
   }
-  scraperInitPromise = null;
-  consecutiveErrors = 0;
-  // 下次请求时懒初始化
 }
 
 async function warmScraper() {
@@ -215,7 +236,7 @@ async function handleTiktokUser(req, res) {
     });
   }
 
-  console.error(
+  apiLog(
     `[webserver] user OK | ${clientIP} | @${body.uniqueId} | ${elapsed}ms | verified=${result.verified} followers=${result.followerCount}`,
   );
   recordRequest(true);
@@ -244,7 +265,7 @@ async function handleTiktokVideo(req, res) {
     });
   }
 
-  console.error(
+  apiLog(
     `[webserver] video OK | ${clientIP} | @${result.author?.uniqueId || "?"} | ${elapsed}ms | plays=${result.stats?.playCount}`,
   );
   recordRequest(true);
@@ -273,7 +294,7 @@ async function handleTiktokLookup(req, res) {
     });
   }
 
-  console.error(
+  apiLog(
     `[webserver] lookup OK | ${clientIP} | @${result.user?.uniqueId || "?"} | ${elapsed}ms | videoId=${result.video?.id}`,
   );
   recordRequest(true);
@@ -299,7 +320,7 @@ async function handleTiktokProduct(req, res) {
         captchaFallback: false,
       },
     );
-    console.error(
+    apiLog(
       `[webserver] product OK | ${clientIP} | rating=${result.rating ?? "-"} sold=${result.soldCount ?? "-"} name=${(result.productName || "").slice(0, 40)}`,
     );
     recordRequest(true);
@@ -457,6 +478,7 @@ export async function startWebserver(
   poolSize = 0,
   proxyServer = null,
   captchaNotifyUrl = null,
+  enableLog = false,
 ) {
   if (poolSize > 0) {
     SCRAPER_CONFIG.poolSize = poolSize;
@@ -467,6 +489,7 @@ export async function startWebserver(
   if (captchaNotifyUrl) {
     SCRAPER_CONFIG.captchaNotifyUrl = captchaNotifyUrl;
   }
+  SCRAPER_CONFIG.enableLog = !!enableLog;
   const server = http.createServer(async (req, res) => {
     const url = new URL(req.url, `http://127.0.0.1:${port}`);
 

package/src/clash/health-checker.js

@@ -1,248 +0,0 @@
-/**
- * 节点健康检测模块
- *
- * 职责：
- *   1. 检测 Clash Verge 进程是否存活
- *   2. 检测当前节点对目标 URL 是否健康
- *   3. 故障切换：从健康节点列表中随机选取并切换
- *   4. 健康节点列表持久化
- */
-
-import { spawnSync } from "child_process";
-import * as api from "./api.js";
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { join } from "path";
-import { tmpdir } from "os";
-
-const HEALTHY_FILE = join(tmpdir(), "clash-healthy-nodes.json");
-
-// ====== 可配置参数 ======
-export const CONFIG = {
-  testUrl: "https://www.tiktok.com/explore",
-  proxyUrl: "http://127.0.0.1:7897",
-  apiPort: 9097,
-  groupName: "GLOBAL",
-  curlTimeout: 12,
-  minPageSize: 50 * 1024,
-};
-
-// ====== 进程检测（跨平台 mac/win） ======
-
-const IS_WIN = process.platform === "win32";
-
-export function checkClashAlive() {
-  try {
-    if (IS_WIN) {
-      const result = spawnSync(
-        "tasklist",
-        ["/FI", "IMAGENAME eq verge-mihomo.exe", "/NH"],
-        {
-          encoding: "utf-8",
-          timeout: 5000,
-          stdio: ["pipe", "pipe", "pipe"],
-        },
-      );
-      if (result.stdout && result.stdout.includes("verge-mihomo.exe"))
-        return true;
-    } else {
-      const result = spawnSync("pgrep", ["-x", "verge-mihomo"], {
-        encoding: "utf-8",
-        timeout: 5000,
-        stdio: ["pipe", "pipe", "pipe"],
-      });
-      if (result.status === 0 && result.stdout.trim()) return true;
-    }
-  } catch {
-    /* fallthrough */
-  }
-
-  try {
-    const curlExe = IS_WIN ? "curl.exe" : "curl";
-    const result = spawnSync(
-      curlExe,
-      ["-s", "--max-time", "3", `http://127.0.0.1:${CONFIG.apiPort}/version`],
-      {
-        encoding: "utf-8",
-        timeout: 5000,
-        stdio: ["pipe", "pipe", "pipe"],
-      },
-    );
-    return result.stdout.includes('"version"');
-  } catch {
-    return false;
-  }
-}
-
-// ====== 节点健康检测 ======
-
-export function checkNodeHealth(url = CONFIG.testUrl) {
-  const args = [
-    "-s",
-    "-w",
-    "\n__CURL_META__%{http_code}|%{time_total}|%{size_download}",
-    "--proxy",
-    CONFIG.proxyUrl,
-    "--max-time",
-    String(CONFIG.curlTimeout),
-    "-L",
-    "-A",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36",
-    url,
-  ];
-
-  const result = spawnSync("curl", args, {
-    encoding: "utf-8",
-    timeout: (CONFIG.curlTimeout + 5) * 1000,
-    stdio: ["pipe", "pipe", "pipe"],
-    maxBuffer: 10 * 1024 * 1024,
-  });
-
-  const stdout = result.stdout || "";
-  const sentinel = "__CURL_META__";
-  const idx = stdout.lastIndexOf(sentinel);
-
-  let body = "",
-    metaLine = "";
-  if (idx >= 0) {
-    body = stdout.substring(0, idx).trimEnd();
-    metaLine = stdout.substring(idx + sentinel.length).trim();
-  }
-
-  const parts = metaLine.split("|");
-  const httpCode = parseInt(parts[0]) || 0;
-  const timeTotal = parseFloat(parts[1]) || 0;
-  const sizeDownload = parseInt(parts[2]) || 0;
-
-  let title = "";
-  const titleMatch = body.match(/<title>([^<]*)<\/title>/i);
-  if (titleMatch) title = titleMatch[1].trim();
-
-  let error = null;
-  if (result.error) {
-    error = result.error.message || "spawn error";
-  } else if (result.status !== 0) {
-    error = `curl exit ${result.status}`;
-  }
-
-  const healthy =
-    error === null &&
-    httpCode === 200 &&
-    sizeDownload >= CONFIG.minPageSize &&
-    title.includes("TikTok") &&
-    !title.startsWith("About |") &&
-    !body.includes("SlardarWAF") &&
-    !body.includes("_wafchallengeid");
-
-  return { healthy, httpCode, timeTotal, sizeDownload, title, error };
-}
-
-// ====== 健康节点列表持久化 ======
-
-export function loadHealthyList() {
-  try {
-    if (existsSync(HEALTHY_FILE)) {
-      const data = JSON.parse(readFileSync(HEALTHY_FILE, "utf-8"));
-      return {
-        updated: data.updated || "",
-        nodes: Array.isArray(data.nodes) ? data.nodes : [],
-      };
-    }
-  } catch (e) {
-    console.error(`[health] 读取健康列表失败: ${e.message}`);
-  }
-  return { updated: "", nodes: [] };
-}
-
-export function saveHealthyList(nodes) {
-  try {
-    const data = { updated: new Date().toISOString(), nodes };
-    writeFileSync(HEALTHY_FILE, JSON.stringify(data, null, 2), "utf-8");
-  } catch (e) {
-    console.error(`[health] 保存健康列表失败: ${e.message}`);
-  }
-}
-
-// ====== 故障切换 ======
-
-export function pickFailoverNode(currentNode, healthyNodes) {
-  if (!healthyNodes || healthyNodes.length === 0) return null;
-  const candidates = healthyNodes.filter((n) => n !== currentNode);
-  if (candidates.length === 0) {
-    console.error(
-      `[health] 健康列表中无可用候选节点（共${healthyNodes.length}个），保持在当前节点`,
-    );
-    return null;
-  }
-  const idx = Math.floor(Math.random() * candidates.length);
-  return candidates[idx];
-}
-
-export async function switchToNode(nodeName) {
-  try {
-    await api.switchProxy(CONFIG.groupName, nodeName);
-    await new Promise((r) => setTimeout(r, 600));
-    const current = await api.getCurrentNode(CONFIG.groupName);
-    if (current !== nodeName) {
-      console.error(`[health] 切换验证失败: 期望 ${nodeName}, 实际 ${current}`);
-      return false;
-    }
-    return true;
-  } catch (e) {
-    console.error(`[health] 切换节点失败: ${e.message}`);
-    return false;
-  }
-}
-
-// ====== 便捷入口 ======
-
-export async function runHealthCheck() {
-  if (!checkClashAlive()) {
-    return { action: "skipped", detail: "Clash Verge 未运行" };
-  }
-
-  const health = checkNodeHealth();
-  if (health.healthy) {
-    return {
-      action: "ok",
-      detail: `${health.timeTotal.toFixed(1)}s ${(health.sizeDownload / 1024).toFixed(0)}KB`,
-    };
-  }
-
-  const reason = health.error
-    ? `错误: ${health.error}`
-    : `HTTP ${health.httpCode} ${(health.sizeDownload / 1024).toFixed(0)}KB "${health.title}"`;
-
-  let currentNode = "";
-  try {
-    currentNode = await api.getCurrentNode(CONFIG.groupName);
-  } catch (e) {
-    return { action: "failed", detail: `无法获取当前节点: ${e.message}` };
-  }
-
-  const { nodes: healthyNodes } = loadHealthyList();
-  if (healthyNodes.length === 0) {
-    return { action: "failed", detail: `${reason} — 健康列表为空，无法切换` };
-  }
-
-  const target = pickFailoverNode(currentNode, healthyNodes);
-  if (!target) {
-    return { action: "failed", detail: `${reason} — 无可用候选节点` };
-  }
-
-  const switched = await switchToNode(target);
-  if (!switched) {
-    return { action: "failed", detail: `${reason} → 切换到 ${target} 失败` };
-  }
-
-  const newHealth = checkNodeHealth();
-  if (newHealth.healthy) {
-    return {
-      action: "switched",
-      detail: `${currentNode} → ${target} (${newHealth.timeTotal.toFixed(1)}s ${(newHealth.sizeDownload / 1024).toFixed(0)}KB)`,
-    };
-  }
-  return {
-    action: "switched",
-    detail: `${currentNode} → ${target} (切换后仍异常: ${newHealth.httpCode} ${(newHealth.sizeDownload / 1024).toFixed(0)}KB)`,
-  };
-}