tt-help-cli-ycl 1.4.74 → 1.4.75

package/package.json

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

package/src/watch/public/app.js

@@ -3503,27 +3503,52 @@ function renderWatchdogDashboard(clients, clientCommands) {
     return;
   }
 
+  // 排序：按名称升序，离线排最后
+  var sortedClients = clients.slice().sort(function (a, b) {
+    var nameA = (
+      (a.config && a.config.userId) ||
+      a.hostname ||
+      ""
+    ).toLowerCase();
+    var nameB = (
+      (b.config && b.config.userId) ||
+      b.hostname ||
+      ""
+    ).toLowerCase();
+    // 在线优先
+    if (a.online !== b.online) return a.online ? -1 : 1;
+    return nameA.localeCompare(nameB);
+  });
+
   // 构建 userId → 在线客户端 映射
   var userClients = {};
-  clients.forEach(function (c) {
+  sortedClients.forEach(function (c) {
     var uid = (c.config && c.config.userId) || "";
     if (uid) userClients[uid] = c;
   });
 
   // 收集所有卡片：全部注册客户端 + 未上线但有命令配置的 userId
   var allCards = [];
-  clients.forEach(function (c) {
+  sortedClients.forEach(function (c) {
     allCards.push(renderClientCard(c, clientCommands));
   });
+  // 离线卡也按名称排序
+  var offlineUids = [];
   for (var uid in clientCommands) {
     if (
       !userClients[uid] &&
       clientCommands[uid] &&
       clientCommands[uid].length > 0
     ) {
-      allCards.push(renderOfflineCard(uid, clientCommands[uid]));
+      offlineUids.push(uid);
     }
   }
+  offlineUids.sort(function (a, b) {
+    return a.toLowerCase().localeCompare(b.toLowerCase());
+  });
+  offlineUids.forEach(function (uid) {
+    allCards.push(renderOfflineCard(uid, clientCommands[uid]));
+  });
 
   // 数据指纹：只有变化时才重建卡片 HTML
   var fingerprint = JSON.stringify(allCards);
@@ -3570,7 +3595,7 @@ function renderOfflineCard(userId, cmds) {
   var cmdCount = cmds ? cmds.length : 0;
   return styled(
     "div",
-    "background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:16px;opacity:0.9",
+    "background:#1e1e2e;border:2px solid #f87171;border-radius:12px;padding:16px;opacity:0.9",
     styled(
       "div",
       "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
@@ -3581,7 +3606,7 @@ function renderOfflineCard(userId, cmds) {
           "span",
           {
             style:
-              "color:#60a5fa;font-size:14px;font-weight:bold;cursor:pointer",
+              "color:#f87171;font-size:16px;font-weight:bold;cursor:pointer",
             onclick: "wdShowConfigModal('" + esc(userId) + "')",
             title: "点击编辑客户端配置",
           },
@@ -3592,28 +3617,38 @@ function renderOfflineCard(userId, cmds) {
             {
               onclick: "wdShowConfigModal('" + esc(userId) + "')",
               style:
-                "padding:1px 5px;font-size:10px;background:transparent;color:#60a5fa;border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
+                "padding:1px 5px;font-size:12px;background:transparent;color:#f87171;border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
               title: "编辑客户端配置",
             },
             "⚙️",
           ) +
+          tag(
+            "button",
+            {
+              onclick: "wdClearLlm('" + esc(userId) + "')",
+              style:
+                "padding:1px 5px;font-size:11px;background:transparent;color:#888;border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
+              title: "清除此客户端的 LLM 分析提示",
+            },
+            "🧹",
+          ) +
           styled(
             "span",
-            "color:#555;font-size:11px;margin-left:8px",
+            "color:#555;font-size:12px;margin-left:8px",
             "(未上线)",
           ),
       ) +
         styled(
           "div",
           "display:flex;gap:10px;align-items:center",
-          styled("span", "color:#f87171", "● 离线") +
-            styled("span", "color:#555;font-size:10px", "—") +
+          styled("span", "color:#f87171;font-size:13px", "● 离线") +
+            styled("span", "color:#555;font-size:12px", "—") +
             tag(
               "button",
               {
                 onclick: "wdDeleteClient('" + esc(userId) + "')",
                 style:
-                  "padding:2px 8px;font-size:10px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer",
+                  "padding:2px 8px;font-size:12px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer",
                 title: "删除此客户端配置",
               },
               "删除",
@@ -3622,7 +3657,7 @@ function renderOfflineCard(userId, cmds) {
     ) +
       styled(
         "div",
-        "color:#555;font-size:10px",
+        "color:#555;font-size:12px",
         "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
       ) +
       renderCmdRows(cmds || [], userId, [], false),
@@ -3665,6 +3700,7 @@ function renderClientCard(c, clientCommands) {
     procs = c.processes || [];
   var userId = cfg.userId || "";
   var myCmds = userId && clientCommands[userId] ? clientCommands[userId] : [];
+  var online = c.online;
 
   var osStr = [
     os.platform,
@@ -3683,11 +3719,15 @@ function renderClientCard(c, clientCommands) {
     (os.nodeVersion || "?") +
     " | 运行 " +
     (os.uptime != null ? Math.round(os.uptime / 3600) + "h" : "?");
-  var onlineBadge = c.online
+  var onlineBadge = online
     ? styled("span", "color:#4ade80", "● 在线")
     : styled("span", "color:#f87171", "● 离线");
   var lastSeen = new Date(c.lastHeartbeat).toLocaleTimeString("zh-CN");
 
+  // 离线时标题和边框变红
+  var titleColor = online ? "#60a5fa" : "#f87171";
+  var borderColor = online ? "#333" : "#f87171";
+
   var header = styled(
     "div",
     "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
@@ -3697,7 +3737,10 @@ function renderClientCard(c, clientCommands) {
       tag(
         "span",
         {
-          style: "color:#60a5fa;font-size:14px;font-weight:bold;cursor:pointer",
+          style:
+            "color:" +
+            titleColor +
+            ";font-size:16px;font-weight:bold;cursor:pointer",
           onclick: "wdShowConfigModal('" + esc(userId) + "')",
           title: "点击编辑客户端配置",
         },
@@ -3708,30 +3751,44 @@ function renderClientCard(c, clientCommands) {
           {
             onclick: "wdShowConfigModal('" + esc(userId) + "')",
             style:
-              "padding:1px 5px;font-size:10px;background:transparent;color:#60a5fa;border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
+              "padding:1px 5px;font-size:12px;background:transparent;color:" +
+              titleColor +
+              ";border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
             title: "编辑客户端配置",
           },
           "⚙️",
         ) +
+        (userId
+          ? tag(
+              "button",
+              {
+                onclick: "wdClearLlm('" + esc(userId) + "')",
+                style:
+                  "padding:1px 5px;font-size:11px;background:transparent;color:#888;border:1px solid #333;border-radius:3px;cursor:pointer;margin-left:6px",
+                title: "清除此客户端的 LLM 分析提示",
+              },
+              "🧹",
+            )
+          : "") +
         styled(
           "span",
-          "color:#555;font-size:10px;margin-left:8px",
+          "color:#555;font-size:12px;margin-left:8px",
           c.hostname || "",
         ),
     ) +
       styled(
         "div",
         "display:flex;gap:10px;align-items:center",
-        styled("span", "color:#888;font-size:11px", c.ip) +
+        styled("span", "color:#888;font-size:13px", c.ip) +
           onlineBadge +
-          styled("span", "color:#666;font-size:10px", lastSeen) +
-          (!c.online && userId
+          styled("span", "color:#666;font-size:12px", lastSeen) +
+          (!online && userId
             ? tag(
                 "button",
                 {
                   onclick: "wdDeleteClient('" + esc(userId) + "')",
                   style:
-                    "padding:2px 8px;font-size:10px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer;margin-left:6px",
+                    "padding:2px 8px;font-size:12px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer;margin-left:6px",
                   title: "删除此客户端配置",
                 },
                 "删除",
@@ -3742,11 +3799,13 @@ function renderClientCard(c, clientCommands) {
 
   return styled(
     "div",
-    "background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:16px",
+    "background:#1e1e2e;border:2px solid " +
+      borderColor +
+      ";border-radius:12px;padding:16px",
     header +
-      styled("div", "color:#888;font-size:10px", osStr) +
-      styled("div", "color:#888;font-size:10px;margin-bottom:6px", infoLine) +
-      renderCmdRows(myCmds, userId, procs, c.online, c.llmAnalysis),
+      styled("div", "color:#888;font-size:12px", osStr) +
+      styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
+      renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis),
   );
 }
 
@@ -3761,7 +3820,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
       "display:flex;justify-content:space-between;align-items:center;margin-bottom:6px",
       styled(
         "span",
-        "font-size:11px;color:#888",
+        "font-size:13px;color:#888",
         "命令 (" + myCmds.length + "条)",
       ) +
         tag(
@@ -3769,7 +3828,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
           {
             onclick: "wdShowAddModal('" + esc(userId) + "')",
             style:
-              "padding:4px 10px;background:#4ade80;color:#000;border:none;border-radius:4px;cursor:pointer;font-size:11px;font-weight:600",
+              "padding:4px 10px;background:#4ade80;color:#000;border:none;border-radius:4px;cursor:pointer;font-size:13px;font-weight:600",
           },
           "+ 添加",
         ),
@@ -3779,7 +3838,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
   // 表头
   html += styled(
     "div",
-    "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;color:#666;font-size:9px;border-bottom:1px solid #222",
+    "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;color:#666;font-size:11px;border-bottom:1px solid #222",
     "<span>命令行</span><span>PID</span><span>内存</span><span>运行</span><span>重启</span><span>操作</span>",
   );
 
@@ -3802,7 +3861,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     var prefix = "wd-" + esc(userId) + "-" + idx;
     html += styled(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:10px;border-top:1px solid #1a1a2a",
+      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
       styled(
         "span",
         "color:" +
@@ -3818,7 +3877,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
           (c.name
             ? styled(
                 "span",
-                "color:#555;font-size:8px;margin-left:4px;font-family:monospace",
+                "color:#555;font-size:10px;margin-left:4px;font-family:monospace",
                 c.cmd.substring(0, 30) + (c.cmd.length > 30 ? "..." : ""),
               )
             : ""),
@@ -3856,7 +3915,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
                   onclick:
                     "wdToggleClientCmd('" + esc(userId) + "'," + idx + ")",
                   style:
-                    "padding:1px 5px;font-size:9px;background:" +
+                    "padding:1px 5px;font-size:11px;background:" +
                     (c.enabled ? "#f59e0b" : "#4ade80") +
                     ";color:#000;border:none;border-radius:2px;cursor:pointer",
                   title: c.enabled ? "停止" : "启动",
@@ -3869,7 +3928,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
               {
                 onclick: "wdShowEditModal('" + esc(userId) + "'," + idx + ")",
                 style:
-                  "padding:1px 5px;font-size:9px;background:#60a5fa;color:#fff;border:none;border-radius:2px;cursor:pointer",
+                  "padding:1px 5px;font-size:11px;background:#60a5fa;color:#fff;border:none;border-radius:2px;cursor:pointer",
                 title: "编辑",
               },
               "✎",
@@ -3879,7 +3938,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
               {
                 onclick: "wdRemoveClientCmd('" + esc(userId) + "'," + idx + ")",
                 style:
-                  "padding:1px 5px;font-size:9px;background:#991b1b;color:#fff;border:none;border-radius:2px;cursor:pointer",
+                  "padding:1px 5px;font-size:11px;background:#991b1b;color:#fff;border:none;border-radius:2px;cursor:pointer",
                 title: "删除",
               },
               "✕",
@@ -3902,7 +3961,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
           : "";
       html += styled(
         "div",
-        "font-size:9px;color:#666;padding:1px 0 3px 8px;border-top:1px dashed #1a1a2a",
+        "font-size:11px;color:#666;padding:1px 0 3px 8px;border-top:1px dashed #1a1a2a",
         styled("span", "color:" + sevColor, "🤖 " + ai.summary) + tip,
       );
     }
@@ -3915,7 +3974,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     var opre = "wd-" + esc(userId) + "-orphan-" + esc(String(oid));
     html += styled(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:10px;border-top:1px solid #1a1a2a;opacity:0.5",
+      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
       styled(
         "span",
         "color:#666;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:monospace",
@@ -3941,7 +4000,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
           { style: "color:#555", "data-wd-key": opre + "-rst" },
           "0",
         ) +
-        styled("span", "color:#555;font-size:9px", "孤立"),
+        styled("span", "color:#555;font-size:11px", "孤立"),
     );
   });
 
@@ -4173,6 +4232,32 @@ async function wdSaveClientCmds(userId, commands) {
   }
 }
 
+function wdClearLlm(userId) {
+  if (
+    !confirm(
+      "清除 " +
+        userId +
+        " 的所有 LLM 分析提示？\n\n下次 agent 心跳或分析周期会自动重新生成。",
+    )
+  )
+    return;
+  wdShowSaving();
+  fetch("/api/watchdog/clear-llm", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ userId: userId }),
+  })
+    .then(function () {
+      wdHideSaving();
+      fetchWatchdogData();
+    })
+    .catch(function (e) {
+      wdHideSaving();
+      alert("清除失败: " + e.message);
+      fetchWatchdogData();
+    });
+}
+
 function wdDeleteClient(userId) {
   if (
     !confirm(

package/src/watch/public/style.css

@@ -9,6 +9,7 @@ body {
   background: #0f0f13;
   color: #e0e0e0;
   padding: 16px;
+  font-size: 14px;
 }
 
 .header {
@@ -65,13 +66,13 @@ body {
 }
 
 .stat-card .label {
-  font-size: 12px;
+  font-size: 14px;
   color: #888;
   margin-bottom: 8px;
 }
 
 .stat-card .value {
-  font-size: 28px;
+  font-size: 32px;
   font-weight: 700;
 }
 

package/src/watch/watchdog-server.js

@@ -17,6 +17,10 @@ const clients = new Map();
 const CLIENT_TIMEOUT_MS = 60 * 1000;
 const CLIENT_CLEANUP_MS = 24 * 60 * 60 * 1000; // 离线超过 24h 清理
 
+// LLM 分析缓存：cmdId → { severity, summary, suggestions, cachedAt }
+const llmCache = new Map();
+const LLM_CACHE_TTL = 15 * 60 * 1000; // 15 分钟过期
+
 // ── 配置文件读写 ──
 
 function loadConfig() {
@@ -56,9 +60,24 @@ function getOnlineClients() {
       console.error(`[watchdog] 清理离线客户端: ${clientId}`);
     }
   }
+  // 清理过期缓存
+  for (const [cmdId, entry] of llmCache) {
+    if (now - entry.cachedAt > LLM_CACHE_TTL) llmCache.delete(cmdId);
+  }
   const result = [];
   for (const [clientId, info] of clients) {
     const online = now - info.lastHeartbeat < CLIENT_TIMEOUT_MS;
+    // 合并：agent 上报的 llmAnalysis + 服务端缓存（以服务端缓存为准，更新）
+    const processes = info.processes || [];
+    const cachedAnalysis = [];
+    for (const p of processes) {
+      if (p.cmdId && llmCache.has(p.cmdId)) {
+        cachedAnalysis.push(llmCache.get(p.cmdId));
+      }
+    }
+    // 优先用服务端缓存（更新），fallback 到 agent 上报的
+    const llmAnalysis =
+      cachedAnalysis.length > 0 ? cachedAnalysis : info.llmAnalysis || [];
     result.push({
       clientId,
       hostname: info.hostname || "unknown",
@@ -66,7 +85,8 @@ function getOnlineClients() {
       ttHelpVersion: info.ttHelpVersion || "unknown",
       osInfo: info.osInfo || {},
       config: info.config || {},
-      processes: info.processes || [],
+      processes,
+      llmAnalysis,
       lastHeartbeat: info.lastHeartbeat,
       registeredAt: info.registeredAt,
       online,
@@ -286,6 +306,11 @@ async function handleAnalyzeLogs(params, body, res) {
     console.error(
       `[watchdog] LLM 分析完成: ${llmAnalysis.map((r) => r.severity).join(",")}`,
     );
+    // 写入服务端缓存，前端直接读取，不再依赖 agent 转发
+    const now = Date.now();
+    for (const item of llmAnalysis) {
+      llmCache.set(item.cmdId, { ...item, cachedAt: now });
+    }
     sendJSON(res, 200, { llmAnalysis });
   } catch (e) {
     console.error(`[watchdog] LLM 分析失败: ${e.message}`);
@@ -318,6 +343,35 @@ async function handleDeleteClient(params, body, res) {
   sendJSON(res, 200, { ok: true, removed });
 }
 
+async function handleClearLlmAnalysis(params, body, res) {
+  const userId = body.userId;
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  // 收集该 userId 下所有客户端进程的 cmdId，从缓存中清除
+  let cleared = 0;
+  for (const [clientId, info] of clients) {
+    const uid = (info.config && info.config.userId) || "";
+    if (uid !== userId) continue;
+    for (const p of info.processes || []) {
+      if (p.cmdId && llmCache.has(p.cmdId)) {
+        llmCache.delete(p.cmdId);
+        cleared++;
+      }
+    }
+  }
+  // 同时清除 agent 上报的 llmAnalysis（如果存在）
+  for (const [clientId, info] of clients) {
+    const uid = (info.config && info.config.userId) || "";
+    if (uid === userId && info.llmAnalysis) {
+      info.llmAnalysis = [];
+    }
+  }
+  console.error(`[watchdog] ${userId} LLM 分析已清除（${cleared}条缓存）`);
+  sendJSON(res, 200, { ok: true, cleared });
+}
+
 // ── 公开 ──
 
 export function registerWatchdogRoutes(httpServer) {
@@ -379,5 +433,9 @@ export async function tryHandleWatchdogRoute(
     await handleDeleteClient(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/clear-llm") {
+    await handleClearLlmAnalysis(params, body, res);
+    return true;
+  }
   return false;
 }

package/src/watchdog/agent.js

@@ -212,7 +212,7 @@ export class WatchdogAgent {
       // 同步命令
       if (Array.isArray(data.commands)) {
         const prev = this.processManager.runningCount;
-        this.processManager.syncCommands(data.commands);
+        await this.processManager.syncCommands(data.commands);
         const now = this.processManager.runningCount;
         if (prev !== now) {
           console.error(

package/src/watchdog/process-manager.js

@@ -19,6 +19,7 @@ import { join } from "path";
 const MAX_RESTART = 3;
 const MAX_LOG_LINES = 500; // 每个进程最多保留的日志行数
 const IS_WIN = process.platform === "win32";
+const SPAWN_STAGGER_MS = 30000; // 批量启动时每个进程间隔 30 秒，避免抢网络
 
 // 从命令行中提取 CDP 端口列表（解析 --base-port 和 --port-count）
 function extractCdpPorts(cmdLine) {
@@ -385,9 +386,10 @@ export class ProcessManager extends EventEmitter {
    * 与期望命令列表同步：
    * - 启动期望列表中已启用但未运行的命令
    * - 停止正在运行但不在期望列表中的命令
+   * - 批量启动时每个进程间隔 SPAWN_STAGGER_MS，避免同时抢网络
    * @param {Array} expectedCmds - 服务端返回的命令列表，格式 [{cmd, maxUptimeSeconds, maxMemoryMB}]
    */
-  syncCommands(expectedCmds) {
+  async syncCommands(expectedCmds) {
     if (!Array.isArray(expectedCmds)) return;
 
     // 标准化：使用服务端分配的 id，无 id 时用命令行截断兜底
@@ -428,12 +430,26 @@ export class ProcessManager extends EventEmitter {
       }
     }
 
-    // 启动缺失的，并更新已有进程的阈值
+    // 收集需要新启动的命令
+    const toStart = normalized.filter((cmd) => !runningIds.has(cmd.id));
+
+    if (toStart.length > 1) {
+      console.error(
+        `[watchdog] 批量启动 ${toStart.length} 个命令（间隔 ${SPAWN_STAGGER_MS / 1000}s）...`,
+      );
+    }
+
+    // 启动缺失的，错峰延迟
+    for (let i = 0; i < toStart.length; i++) {
+      if (i > 0) {
+        await new Promise((r) => setTimeout(r, SPAWN_STAGGER_MS));
+      }
+      this.startCommand(toStart[i]);
+    }
+
+    // 更新已有进程的阈值（可能被管理员修改了）
     for (const cmd of normalized) {
-      if (!runningIds.has(cmd.id)) {
-        this.startCommand(cmd);
-      } else {
-        // 更新阈值（可能被管理员修改了）
+      if (runningIds.has(cmd.id)) {
         const info = this.processes.get(cmd.id);
         if (info) info.thresholds = cmd.thresholds;
       }