tt-help-cli-ycl 1.4.73 → 1.4.74

package/package.json

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

package/src/watch/public/app.js

@@ -3510,13 +3510,17 @@ function renderWatchdogDashboard(clients, clientCommands) {
     if (uid) userClients[uid] = c;
   });
 
-  // 收集所有卡片：在线客户端 + 离线但有命令配置的 userId
+  // 收集所有卡片：全部注册客户端 + 未上线但有命令配置的 userId
   var allCards = [];
   clients.forEach(function (c) {
     allCards.push(renderClientCard(c, clientCommands));
   });
   for (var uid in clientCommands) {
-    if (!userClients[uid]) {
+    if (
+      !userClients[uid] &&
+      clientCommands[uid] &&
+      clientCommands[uid].length > 0
+    ) {
       allCards.push(renderOfflineCard(uid, clientCommands[uid]));
     }
   }
@@ -3526,11 +3530,40 @@ function renderWatchdogDashboard(clients, clientCommands) {
   if (fingerprint === _wdLastRendered) return;
   _wdLastRendered = fingerprint;
 
+  // 注入动画样式（仅首次）
+  if (!document.getElementById("wdAnimStyle")) {
+    var style = document.createElement("style");
+    style.id = "wdAnimStyle";
+    style.textContent =
+      "@keyframes wdFlash{0%{color:#4ade80}50%{color:#60a5fa}100%{color:inherit}}" +
+      ".wd-flash{animation:wdFlash 1.5s ease}";
+    document.head.appendChild(style);
+  }
+
+  // 重建前扫描旧值（按 data-wd-key 索引）
+  var prevVals = {};
+  var oldCells = el.querySelectorAll("[data-wd-key]");
+  for (var i = 0; i < oldCells.length; i++) {
+    prevVals[oldCells[i].getAttribute("data-wd-key")] = oldCells[i].textContent;
+  }
+
   el.innerHTML = styled(
     "div",
     "display:grid;grid-template-columns:repeat(auto-fill,minmax(550px,1fr));gap:24px",
     allCards.join(""),
   );
+
+  // 只对变化的值加闪烁动画
+  var newCells = el.querySelectorAll("[data-wd-key]");
+  for (var i = 0; i < newCells.length; i++) {
+    var key = newCells[i].getAttribute("data-wd-key");
+    if (
+      prevVals[key] !== undefined &&
+      prevVals[key] !== newCells[i].textContent
+    ) {
+      newCells[i].className = "wd-flash";
+    }
+  }
 }
 
 function renderOfflineCard(userId, cmds) {
@@ -3766,6 +3799,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     var uptime = p ? p.uptimeDisplay || p.uptimeSeconds + "s" : "-";
     var restart = p && p.restartCount > 0 ? String(p.restartCount) : "0";
 
+    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",
@@ -3789,12 +3823,27 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
               )
             : ""),
       ) +
-        styled("span", "color:#888", pid) +
-        styled("span", "color:#aaa", mem) +
-        styled("span", "color:#888", uptime) +
-        styled(
+        tag(
+          "span",
+          { style: "color:#888", "data-wd-key": prefix + "-pid" },
+          pid,
+        ) +
+        tag(
+          "span",
+          { style: "color:#aaa", "data-wd-key": prefix + "-mem" },
+          mem,
+        ) +
+        tag(
+          "span",
+          { style: "color:#888", "data-wd-key": prefix + "-up" },
+          uptime,
+        ) +
+        tag(
           "span",
-          "color:" + (p && p.restartCount > 0 ? "#f87171" : "#555"),
+          {
+            style: "color:" + (p && p.restartCount > 0 ? "#f87171" : "#555"),
+            "data-wd-key": prefix + "-rst",
+          },
           restart,
         ) +
         styled(
@@ -3862,6 +3911,8 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
   // 未匹配到的运行中进程（孤儿）
   match.unmatched.forEach(function (p) {
     var sc = p.status === "running" ? "#4ade80" : "#f87171";
+    var oid = p.pid || p.cmdId || "?";
+    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",
@@ -3870,14 +3921,26 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
         "color:#666;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:monospace",
         "⚡ " + (p.name || p.cmdId),
       ) +
-        styled("span", "color:#888", p.pid || "-") +
-        styled(
+        tag(
           "span",
-          "color:#aaa",
+          { style: "color:#888", "data-wd-key": opre + "-pid" },
+          p.pid || "-",
+        ) +
+        tag(
+          "span",
+          { style: "color:#aaa", "data-wd-key": opre + "-mem" },
           p.memoryMB != null ? p.memoryMB + "MB" : "-",
         ) +
-        styled("span", "color:#888", p.uptimeDisplay || p.uptimeSeconds + "s") +
-        styled("span", "color:#555", "0") +
+        tag(
+          "span",
+          { style: "color:#888", "data-wd-key": opre + "-up" },
+          p.uptimeDisplay || p.uptimeSeconds + "s",
+        ) +
+        tag(
+          "span",
+          { style: "color:#555", "data-wd-key": opre + "-rst" },
+          "0",
+        ) +
         styled("span", "color:#555;font-size:9px", "孤立"),
     );
   });
@@ -4072,17 +4135,40 @@ function wdToggleClientCmd(userId, idx) {
   wdSaveClientCmds(userId, myCmds);
 }
 
+var _wdSaving = false;
+
+function wdShowSaving() {
+  _wdSaving = true;
+  var el = document.getElementById("wdSavingTip");
+  if (!el) {
+    el = document.createElement("div");
+    el.id = "wdSavingTip";
+    el.style.cssText =
+      "position:fixed;top:60px;right:20px;background:#f59e0b;color:#000;padding:8px 16px;border-radius:6px;font-size:12px;font-weight:600;z-index:9998;pointer-events:none";
+    document.body.appendChild(el);
+  }
+  el.textContent = "⏳ 处理中...";
+  el.style.display = "block";
+}
+function wdHideSaving() {
+  _wdSaving = false;
+  var el = document.getElementById("wdSavingTip");
+  if (el) el.style.display = "none";
+}
+
 async function wdSaveClientCmds(userId, commands) {
+  wdShowSaving();
   try {
     await fetch("/api/watchdog/client-commands", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ userId: userId, commands: commands }),
     });
+    wdHideSaving();
     fetchWatchdogData();
   } catch (e) {
+    wdHideSaving();
     alert("保存失败: " + e.message);
-    // 失败时立即刷新恢复按钮状态
     fetchWatchdogData();
   }
 }
@@ -4092,9 +4178,23 @@ function wdDeleteClient(userId) {
     !confirm(
       "确定删除 " +
         userId +
-        " 的所有命令配置？\n\n删除后该客户端将不再出现在列表中。",
+        " 及其所有命令配置？\n\n删除后该客户端将从列表中移除。",
     )
   )
     return;
-  wdSaveClientCmds(userId, []);
+  wdShowSaving();
+  fetch("/api/watchdog/delete-client", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ userId: userId }),
+  })
+    .then(function () {
+      wdHideSaving();
+      fetchWatchdogData();
+    })
+    .catch(function (e) {
+      wdHideSaving();
+      alert("删除失败: " + e.message);
+      fetchWatchdogData();
+    });
 }

package/src/watch/public/index.html

@@ -577,9 +577,9 @@
             placeholder="默认">
         </div>
         <div>
-          <label style="display:block;color:#888;font-size:10px;margin-bottom:2px">用户编号</label>
-          <input id="wdCfgUserId"
-            style="width:100%;padding:6px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:4px;font-size:11px;box-sizing:border-box"
+          <label style="display:block;color:#888;font-size:10px;margin-bottom:2px">用户编号（不可修改）</label>
+          <input id="wdCfgUserId" readonly
+            style="width:100%;padding:6px;background:#1a1a2a;border:1px solid #333;color:#666;border-radius:4px;font-size:11px;box-sizing:border-box;cursor:not-allowed"
             placeholder="自动生成">
         </div>
         <div>

package/src/watch/watchdog-server.js

@@ -134,7 +134,17 @@ function setClientCommands(userId, commands) {
   });
   const cfg = loadConfig();
   if (!cfg.clientCommands) cfg.clientCommands = {};
-  cfg.clientCommands[userId] = cleaned;
+  if (cleaned.length === 0) {
+    delete cfg.clientCommands[userId];
+    console.error(
+      `[watchdog ${new Date().toLocaleTimeString("zh-CN", { hour12: false })}] ${userId} 命令已清空，卡片已删除`,
+    );
+  } else {
+    cfg.clientCommands[userId] = cleaned;
+    console.error(
+      `[watchdog ${new Date().toLocaleTimeString("zh-CN", { hour12: false })}] ${userId} 命令已更新: ${cleaned.length} 条`,
+    );
+  }
   saveConfig(cfg);
 }
 
@@ -279,8 +289,33 @@ async function handleAnalyzeLogs(params, body, res) {
     sendJSON(res, 200, { llmAnalysis });
   } catch (e) {
     console.error(`[watchdog] LLM 分析失败: ${e.message}`);
-    sendJSON(res, 500, { error: e.message });
+    sendJSON(res, 200, { llmAnalysis: [] });
+  }
+}
+
+async function handleDeleteClient(params, body, res) {
+  const userId = body.userId;
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  // 1. 删除命令配置
+  const cfg = loadConfig();
+  if (cfg.clientCommands) delete cfg.clientCommands[userId];
+  if (cfg.clientConfigs) delete cfg.clientConfigs[userId];
+  saveConfig(cfg);
+  // 2. 从内存客户端列表中移除所有匹配的客户端
+  let removed = 0;
+  for (const [clientId, info] of clients) {
+    if ((info.config && info.config.userId) === userId) {
+      clients.delete(clientId);
+      removed++;
+    }
   }
+  console.error(
+    `[watchdog] ${userId} 已删除（${removed}个客户端，命令+配置已清除）`,
+  );
+  sendJSON(res, 200, { ok: true, removed });
 }
 
 // ── 公开 ──
@@ -340,5 +375,9 @@ export async function tryHandleWatchdogRoute(
     await handleAnalyzeLogs(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/delete-client") {
+    await handleDeleteClient(params, body, res);
+    return true;
+  }
   return false;
 }

package/src/watchdog/agent.js

@@ -42,9 +42,21 @@ function applyClientConfig(newCfg) {
     ];
     let changed = false;
     for (const f of fields) {
-      if (newCfg[f] !== undefined && newCfg[f] !== cfg[f]) {
-        cfg[f] = newCfg[f];
-        changed = true;
+      if (newCfg[f] !== undefined) {
+        var newVal = newCfg[f],
+          oldVal = cfg[f];
+        // 忽略无意义的零值/空值（避免每次心跳都写文件）
+        if (
+          (typeof newVal === "number" &&
+            newVal === 0 &&
+            oldVal === undefined) ||
+          (typeof newVal === "string" && newVal === "" && oldVal === undefined)
+        )
+          continue;
+        if (newVal !== oldVal) {
+          cfg[f] = newVal;
+          changed = true;
+        }
       }
     }
     if (changed) {

package/src/watchdog/llm-analyzer.js

@@ -1,21 +1,12 @@
 /**
  * LLM 日志分析模块 — 供服务端调用（传入 llmFetch），或客户端独立使用（读环境变量）
- *
- * 分析结果通过心跳上报到 watch 服务端展示。
  */
 
 // ── 分析入口 ──
 
-/**
- * 对所有进程的日志调用 LLM 分析
- * @param {Array} processLogs — [{cmdId, logs[], uptimeSeconds, restartCount}]
- * @param {Function} [llmFetch] — 可选，服务端传入的 llmFetch；不传则读环境变量
- * @returns {Promise<Array<{cmdId, severity, summary, suggestions}>>}
- */
 export async function analyzeProcessLogs(processLogs, llmFetch) {
   if (!processLogs || processLogs.length === 0) return [];
 
-  // 如果没有传入 llmFetch，使用内置的轻量调用（客户端模式）
   if (!llmFetch) {
     llmFetch = await createStandaloneFetch();
     if (!llmFetch) return [];
@@ -41,7 +32,7 @@ export async function analyzeProcessLogs(processLogs, llmFetch) {
   return results;
 }
 
-// ── 客户端独立模式（从环境变量读配置） ──
+// ── 客户端独立模式 ──
 
 async function createStandaloneFetch() {
   try {
@@ -59,8 +50,6 @@ async function createStandaloneFetch() {
     const model = process.env.LLM_MODEL || fileCfg.llmModel || "auto";
     if (!apiKey) { console.error("[llm-analyzer] 未配置 LLM_API_KEY"); return null; }
     console.error(`[llm-analyzer] 客户端模式: ${model} @ ${url}`);
-
-    // 返回兼容 llmFetch 签名的函数
     return async ({ messages, max_tokens = 256, temperature = 0.1 }) => {
       const resp = await fetch(url, {
         method: "POST",
@@ -79,34 +68,13 @@ async function createStandaloneFetch() {
     return null;
   }
 }
-            },
-          ],
-          256,
-        );
-        const parsed = parseResponse(content);
-        console.error(
-          `[llm-analyzer] ${proc.cmdId.substring(0, 30)} → ${parsed.severity}: ${parsed.summary}`,
-        );
-        results.push({ cmdId: proc.cmdId, ...parsed });
-      } catch (e) {
-        console.error(
-          `[llm-analyzer] ${proc.cmdId.substring(0, 30)} 失败: ${e.message}`,
-        );
-      }
-    }
-    return results;
-  } catch (e) {
-    console.error(`[llm-analyzer] 异常: ${e.message}`);
-    return [];
-  }
-}
 
-function buildPrompt(cmdId, logs, uptimeSeconds, restartCount) {
-  const uptime =
-    uptimeSeconds >= 3600
-      ? Math.round(uptimeSeconds / 3600) + "h"
-      : uptimeSeconds + "s";
+// ── Prompt ──
 
+function buildPrompt(cmdId, logs, uptimeSeconds, restartCount) {
+  const uptime = uptimeSeconds >= 3600
+    ? Math.round(uptimeSeconds / 3600) + "h"
+    : uptimeSeconds + "s";
   return `你是 TikTok 数据采集工具的运维助手。以下是进程 "${cmdId}" 的最近 10 分钟日志，请分析是否有异常。
 
 进程信息:
@@ -127,38 +95,20 @@ ${logs || "(无日志)"}
 - 每个 suggestions 是简洁可操作的建议，不超过 3 条`;
 }
 
-// ── 响应解析 ──
+// ── 解析 ──
 
 function parseResponse(content) {
   try {
     const parsed = JSON.parse(content);
-    return {
-      severity: parsed.severity || "ok",
-      summary: parsed.summary || "",
-      suggestions: Array.isArray(parsed.suggestions)
-        ? parsed.suggestions.slice(0, 3)
-        : [],
-    };
+    return { severity: parsed.severity || "ok", summary: parsed.summary || "", suggestions: Array.isArray(parsed.suggestions) ? parsed.suggestions.slice(0, 3) : [] };
   } catch {
-    // 尝试提取 JSON 块
     const match = content.match(/\{[\s\S]*\}/);
     if (match) {
       try {
         const parsed = JSON.parse(match[0]);
-        return {
-          severity: parsed.severity || "ok",
-          summary: parsed.summary || "",
-          suggestions: Array.isArray(parsed.suggestions)
-            ? parsed.suggestions.slice(0, 3)
-            : [],
-        };
+        return { severity: parsed.severity || "ok", summary: parsed.summary || "", suggestions: Array.isArray(parsed.suggestions) ? parsed.suggestions.slice(0, 3) : [] };
       } catch {}
     }
-    // 解析失败：将原始内容作为 summary
-    return {
-      severity: "warn",
-      summary: content.substring(0, 100),
-      suggestions: [],
-    };
+    return { severity: "warn", summary: content.substring(0, 100), suggestions: [] };
   }
 }