tt-help-cli-ycl 1.4.75 → 1.4.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.75",
+  "version": "1.4.76",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/watch/public/app.js

@@ -1,3 +1,9 @@
+// === 2026-08-07 变更 ===
+// 1. renderWatchdogDashboard: 客户端按名称排序（在线优先，离线排最后）
+// 2. renderClientCard / renderOfflineCard: 离线客户端红色标题+红色边框
+// 3. 整体字体调大一号（12px→14px, 14px→16px, 10px→12px 等）
+// 4. 新增 wdClearLlm() + 🧹 按钮（清除指定客户端 LLM 分析提示）
+// 5. renderCmdRows 新增 llmAnalysis 参数，显示 🤖 AI 分析行
 const COLORS = [
   "#fe2c55",
   "#60a5fa",

package/src/watch/watchdog-server.js

@@ -3,6 +3,11 @@
  *
  * 独立模块。每条命令是完整命令行字符串（如 "tt-help explore --location DE"），
  * 按 userId（~/.tt-help.json 的 userId 字段）分组存储。
+ *
+ * === 2026-08-07 变更 ===
+ * 1. 新增 llmCache 内存缓存，handleAnalyzeLogs 分析完成后写入缓存
+ * 2. getOnlineClients() 优先用缓存填充 llmAnalysis（不再依赖 agent 转发）
+ * 3. 新增 POST /api/watchdog/clear-llm 端点，手动清除指定客户端的 LLM 提示
  */
 
 import { readFileSync, writeFileSync, existsSync } from "fs";

package/src/watchdog/agent.js

@@ -7,7 +7,12 @@
  *   3. 处理信号优雅退出
  */
 
-import { getSystemInfo, getClientConfig, getLocalIP } from "./reporter.js";
+import {
+  getSystemInfo,
+  getClientConfig,
+  getLocalIP,
+  getClashHealth,
+} from "./reporter.js";
 import { ProcessManager } from "./process-manager.js";
 import {
   getVersion,
@@ -16,12 +21,46 @@ import {
   startUpgradeChecker,
 } from "./upgrader.js";
 import { writeFileSync, existsSync, readFileSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
+import { spawn } from "child_process";
+import { join, dirname } from "path";
+import { homedir, tmpdir } from "os";
+import { fileURLToPath } from "url";
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
 const homeDir = homedir() || process.env.HOME || process.env.USERPROFILE || "";
 const TT_HELP_CONFIG = join(homeDir, ".tt-help.json");
 
+/** 自动发现 daemon.js 路径 */
+function findDaemonPath() {
+  // 1. 从 ~/.tt-help.json 读取配置
+  try {
+    if (existsSync(TT_HELP_CONFIG)) {
+      const cfg = JSON.parse(readFileSync(TT_HELP_CONFIG, "utf-8"));
+      if (cfg.clashDaemonPath && existsSync(cfg.clashDaemonPath)) {
+        return cfg.clashDaemonPath;
+      }
+    }
+  } catch {}
+
+  // 2. 相对于 tiktok-cli 同级目录
+  const candidates = [
+    join(__dirname, "..", "..", "..", "clash-verge-explore", "daemon.js"),
+    join(__dirname, "..", "..", "..", "..", "clash-verge-explore", "daemon.js"),
+    join(process.cwd(), "..", "clash-verge-explore", "daemon.js"),
+  ];
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  return null;
+}
+
+// daemon 路径（启动时解析一次）
+let _daemonPath = null;
+function getDaemonPath() {
+  if (_daemonPath === null) _daemonPath = findDaemonPath();
+  return _daemonPath;
+}
+
 /** 将服务端下发的配置合并写回 ~/.tt-help.json */
 function applyClientConfig(newCfg) {
   try {
@@ -92,6 +131,11 @@ export class WatchdogAgent {
     this._heartbeatSeq = 0; // 心跳序号
     this._lastProcCount = -1; // 上次进程数
     this._lastCmdCount = -1; // 上次命令数
+    // clash daemon 集成
+    this.clashDaemon = null; // daemon 子进程引用
+    this.gracePeriodMs = 120_000; // 启动宽限期 2 分钟
+    this.startTime = 0; // 启动时间戳
+    this._graceEnded = false; // 宽限期是否已结束
   }
 
   /**
@@ -100,6 +144,7 @@ export class WatchdogAgent {
   async start() {
     if (this.running) return;
     this.running = true;
+    this.startTime = Date.now();
 
     console.error(
       `[watchdog] 启动 — 客户端: ${this.clientId}, 版本: ${this.ttHelpVersion}, 间隔: ${this.intervalMs / 1000}s`,
@@ -111,6 +156,9 @@ export class WatchdogAgent {
     // 注册信号处理
     this._setupSignalHandlers();
 
+    // 启动 clash daemon（保代理通道）
+    this._spawnClashDaemon();
+
     // 首次立即发送心跳
     await this._sendHeartbeat();
 
@@ -152,6 +200,8 @@ export class WatchdogAgent {
       this.upgradeChecker.stop();
       this.upgradeChecker = null;
     }
+    // 停止 clash daemon
+    this._killClashDaemon();
     this.processManager.stopAll();
     console.error("[watchdog] 看门狗已停止");
   }
@@ -178,6 +228,7 @@ export class WatchdogAgent {
       config: getClientConfig(),
       processes: this.processManager.getProcessesStatus(),
       llmAnalysis: this._llmResults,
+      clashHealth: getClashHealth(), // daemon 写入的代理健康状态
     };
   }
 
@@ -244,6 +295,29 @@ export class WatchdogAgent {
       console.error(
         `[watchdog] 心跳失败 (${this.consecutiveFailures}/${this.maxFailures}): ${e.message}`,
       );
+
+      // 启动宽限期：daemon 可能还在切节点，心跳失败不计入自杀计数
+      if (!this._graceEnded) {
+        const elapsed = Date.now() - this.startTime;
+        if (elapsed < this.gracePeriodMs) {
+          const remain = Math.round((this.gracePeriodMs - elapsed) / 1000);
+          // daemon 已报告健康 → 提前结束宽限期
+          const health = getClashHealth();
+          if (health && health.healthy) {
+            this._graceEnded = true;
+            console.error(`[watchdog] 代理已健康，宽限期提前结束`);
+            this.consecutiveFailures = 0;
+            return;
+          }
+          console.error(
+            `[watchdog] 宽限期内 (剩余${remain}s)，等待 daemon 修复代理...`,
+          );
+          return;
+        }
+        this._graceEnded = true;
+        console.error(`[watchdog] 宽限期结束，恢复正常心跳失败计数`);
+      }
+
       if (this.consecutiveFailures >= this.maxFailures) {
         console.error("[watchdog] 连续心跳失败次数过多，看门狗退出");
         await this.stop();
@@ -315,6 +389,76 @@ export class WatchdogAgent {
     });
   }
 
+  /**
+   * 启动 clash daemon 子进程
+   * daemon 负责代理节点健康巡检和故障切换，watchdog 不阻塞等待
+   */
+  _spawnClashDaemon() {
+    const daemonPath = getDaemonPath();
+    if (!daemonPath) {
+      console.error("[watchdog] 未找到 clash daemon (daemon.js)，跳过代理守护");
+      console.error(
+        "[watchdog] 提示: 在 ~/.tt-help.json 中设置 clashDaemonPath",
+      );
+      return;
+    }
+
+    console.error(`[watchdog] 启动代理守护: ${daemonPath}`);
+    try {
+      const child = spawn(process.execPath, [daemonPath], {
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: false,
+      });
+
+      child.stdout?.on("data", (d) => {
+        // daemon 日志通过 stderr 输出，stdout 静默
+      });
+
+      child.stderr?.on("data", (d) => {
+        const msg = d.toString().trim();
+        if (msg) {
+          console.error(`[clash-daemon] ${msg.substring(0, 300)}`);
+        }
+      });
+
+      child.on("exit", (code, signal) => {
+        console.error(
+          `[watchdog] clash daemon 退出 (code=${code}, signal=${signal})`,
+        );
+        this.clashDaemon = null;
+      });
+
+      child.on("error", (err) => {
+        console.error(`[watchdog] clash daemon 启动失败: ${err.message}`);
+        this.clashDaemon = null;
+      });
+
+      this.clashDaemon = child;
+    } catch (e) {
+      console.error(`[watchdog] clash daemon 启动异常: ${e.message}`);
+    }
+  }
+
+  /**
+   * 停止 clash daemon 子进程
+   */
+  _killClashDaemon() {
+    if (!this.clashDaemon) return;
+    try {
+      this.clashDaemon.kill("SIGTERM");
+      setTimeout(() => {
+        try {
+          if (this.clashDaemon && this.clashDaemon.exitCode === null) {
+            this.clashDaemon.kill("SIGKILL");
+          }
+        } catch {}
+      }, 3000);
+    } catch (e) {
+      console.error(`[watchdog] 停止 clash daemon 失败: ${e.message}`);
+    }
+    this.clashDaemon = null;
+  }
+
   /**
    * 信号处理
    */

package/src/watchdog/process-manager.js

@@ -16,6 +16,8 @@ import { writeFileSync, unlinkSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 
+// === 2026-08-07 变更 ===
+// syncCommands 改为 async，批量启动时每个进程间隔 SPAWN_STAGGER_MS（30s），避免抢网络
 const MAX_RESTART = 3;
 const MAX_LOG_LINES = 500; // 每个进程最多保留的日志行数
 const IS_WIN = process.platform === "win32";

package/src/watchdog/reporter.js

@@ -6,10 +6,11 @@
 import os from "os";
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
-import { homedir } from "os";
+import { homedir, tmpdir } from "os";
 
 const homeDir = homedir() || process.env.HOME || process.env.USERPROFILE || "";
 const CONFIG_PATH = join(homeDir, ".tt-help.json");
+const CLASH_HEALTH_FILE = join(tmpdir(), "clash-health.json");
 
 /**
  * 获取系统信息
@@ -67,3 +68,25 @@ export function getLocalIP() {
   }
   return "127.0.0.1";
 }
+
+/**
+ * 读取 clash daemon 写入的健康状态文件
+ * @returns {object|null} { node, healthy, httpCode, timeTotal, lastCheck, lastSwitch } 或 null
+ */
+export function getClashHealth() {
+  try {
+    if (existsSync(CLASH_HEALTH_FILE)) {
+      const raw = readFileSync(CLASH_HEALTH_FILE, "utf-8");
+      const data = JSON.parse(raw);
+      // 检查数据是否过期（超过 2 分钟没更新视为 stale）
+      const age = Date.now() - new Date(data.lastCheck || 0).getTime();
+      if (age > 120_000) {
+        return { ...data, stale: true, ageSeconds: Math.round(age / 1000) };
+      }
+      return { ...data, stale: false };
+    }
+  } catch {
+    // 文件不存在或解析失败
+  }
+  return null;
+}