tt-help-cli-ycl 1.4.71 → 1.4.73

package/package.json

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

package/src/watch/public/app.js

@@ -3448,6 +3448,7 @@ function styled(el, style, content) {
 function cmdObj(cmd) {
   if (typeof cmd === "string")
     return {
+      id: "",
       name: "",
       cmd: cmd,
       enabled: true,
@@ -3455,6 +3456,7 @@ function cmdObj(cmd) {
       maxMemoryMB: 0,
     };
   return {
+    id: cmd.id || "",
     name: cmd.name || "",
     cmd: cmd.cmd || "",
     enabled: cmd.enabled !== false,
@@ -3594,43 +3596,32 @@ function renderOfflineCard(userId, cmds) {
   );
 }
 
-// 匹配进程到命令（按命令行前缀匹配）
+// 匹配进程到命令（按唯一 ID 精确匹配）
 function matchProcsToCmds(myCmds, procs) {
   var matched = {}; // cmdIdx -> proc
   var unmatchedProcs = [];
+  // 建 ID → 命令索引 映射
+  var idToIdx = {};
+  myCmds.forEach(function (cmd, i) {
+    var c = cmdObj(cmd);
+    if (c.id) idToIdx[c.id] = i;
+  });
   procs.forEach(function (p) {
     var found = false;
-    for (var i = 0; i < myCmds.length; i++) {
-      var c = cmdObj(myCmds[i]);
-      var pName = p.name || p.cmdId || "";
-      if (
-        c.cmd &&
-        pName &&
-        (c.cmd.indexOf(pName.substring(0, 30)) === 0 ||
-          pName.indexOf(c.cmd.substring(0, 30)) === 0)
-      ) {
-        matched[i] = p;
-        found = true;
-        break;
-      }
+    if (p.cmdId && idToIdx[p.cmdId] !== undefined) {
+      matched[idToIdx[p.cmdId]] = p;
+      found = true;
     }
     if (!found) unmatchedProcs.push(p);
   });
   return { matched: matched, unmatched: unmatchedProcs };
 }
 
-// 根据命令行匹配 LLM 分析结果
-function findAnalysis(llmAnalysis, cmdLine) {
-  if (!llmAnalysis || !cmdLine) return null;
+// 按命令 ID 匹配 LLM 分析结果
+function findAnalysis(llmAnalysis, cmdId) {
+  if (!llmAnalysis || !cmdId) return null;
   for (var i = 0; i < llmAnalysis.length; i++) {
-    var a = llmAnalysis[i];
-    if (
-      a.cmdId &&
-      (a.cmdId.indexOf(cmdLine.substring(0, 30)) === 0 ||
-        cmdLine.indexOf(a.cmdId.substring(0, 30)) === 0)
-    ) {
-      return a;
-    }
+    if (llmAnalysis[i].cmdId === cmdId) return llmAnalysis[i];
   }
   return null;
 }
@@ -3848,7 +3839,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     );
 
     // AI 分析结果
-    var ai = findAnalysis(llmAnalysis, c.cmd);
+    var ai = findAnalysis(llmAnalysis, c.id);
     if (ai) {
       var sevColor =
         ai.severity === "error"
@@ -3956,19 +3947,22 @@ function wdModalSave() {
   var myCmds = (allCmds[_wdModalUserId] || []).slice();
 
   if (_wdModalEditIdx >= 0) {
-    // 编辑模式
+    // 编辑模式：保留已有 ID
     if (_wdModalEditIdx < myCmds.length) {
+      var oldObj = cmdObj(myCmds[_wdModalEditIdx]);
       myCmds[_wdModalEditIdx] = {
+        id: oldObj.id,
         name: name,
         cmd: cmd,
-        enabled: cmdObj(myCmds[_wdModalEditIdx]).enabled,
+        enabled: oldObj.enabled,
         maxUptimeSeconds: maxUp,
         maxMemoryMB: maxMem,
       };
     }
   } else {
-    // 添加模式
+    // 添加模式：生成新 ID
     myCmds.push({
+      id: String(Date.now()),
       name: name,
       cmd: cmd,
       enabled: true,
@@ -4059,6 +4053,7 @@ function wdToggleClientCmd(userId, idx) {
   var cmd = myCmds[idx];
   if (typeof cmd === "string") {
     myCmds[idx] = {
+      id: String(Date.now()),
       cmd: cmd,
       enabled: false,
       maxUptimeSeconds: 0,

package/src/watch/watchdog-server.js

@@ -84,12 +84,14 @@ function getOnlineClients() {
 function normalizeCmd(c) {
   if (typeof c === "string")
     return {
+      id: "",
       cmd: c.replace(/^[▶\n\r\s]+/, "").trim(),
       enabled: true,
       maxUptimeSeconds: 0,
       maxMemoryMB: 0,
     };
   return {
+    id: c.id || "",
     cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim(),
     enabled: c.enabled !== false,
     maxUptimeSeconds: c.maxUptimeSeconds || 0,
@@ -105,6 +107,7 @@ function getClientCommands(userId) {
     .map(normalizeCmd)
     .filter((c) => c.enabled && c.cmd)
     .map((c) => ({
+      id: c.id,
       cmd: c.cmd,
       maxUptimeSeconds: c.maxUptimeSeconds,
       maxMemoryMB: c.maxMemoryMB,
@@ -113,10 +116,21 @@ function getClientCommands(userId) {
 
 function setClientCommands(userId, commands) {
   if (!Array.isArray(commands)) return;
-  // 清洗每个命令中的非法前缀
-  const cleaned = commands.map((c) => {
-    if (typeof c === "string") return c.replace(/^[▶\n\r\s]+/, "").trim();
-    return { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+  let nextId = 1;
+  const cleaned = commands.map((c, idx) => {
+    if (typeof c === "string") {
+      const id = String(Date.now() + idx);
+      return {
+        id,
+        cmd: c.replace(/^[▶\n\r\s]+/, "").trim(),
+        enabled: true,
+        maxUptimeSeconds: 0,
+        maxMemoryMB: 0,
+      };
+    }
+    const obj = { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+    if (!obj.id) obj.id = String(Date.now() + nextId++);
+    return obj;
   });
   const cfg = loadConfig();
   if (!cfg.clientCommands) cfg.clientCommands = {};
@@ -196,6 +210,7 @@ async function handleHeartbeat(params, body, res) {
   // 按 userId 返回该客户端的专属命令列表
   const userId = (body.config && body.config.userId) || "";
   const commands = getClientCommands(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}条命令`,
@@ -247,11 +262,55 @@ async function handleClientConfig(params, body, res) {
   sendJSON(res, 200, { ok: true });
 }
 
+async function handleAnalyzeLogs(params, body, res) {
+  const { processLogs } = body;
+  if (!processLogs || !Array.isArray(processLogs) || processLogs.length === 0) {
+    sendJSON(res, 200, { llmAnalysis: [] });
+    return;
+  }
+  try {
+    const { analyzeProcessLogs } = await import("../watchdog/llm-analyzer.js");
+    const { llmFetch } = await import("./llm-config.js");
+    console.error(`[watchdog] LLM 分析 ${processLogs.length} 个进程日志...`);
+    const llmAnalysis = await analyzeProcessLogs(processLogs, llmFetch);
+    console.error(
+      `[watchdog] LLM 分析完成: ${llmAnalysis.map((r) => r.severity).join(",")}`,
+    );
+    sendJSON(res, 200, { llmAnalysis });
+  } catch (e) {
+    console.error(`[watchdog] LLM 分析失败: ${e.message}`);
+    sendJSON(res, 500, { error: e.message });
+  }
+}
+
 // ── 公开 ──
 
 export function registerWatchdogRoutes(httpServer) {
   console.error("[watchdog] 看门狗服务端模块已加载");
   console.error(`[watchdog] 配置文件: ${WATCHDOG_CONFIG_PATH}`);
+  // 自动迁移：为已有命令补充唯一 ID
+  migrateCommandIds();
+}
+
+// 为现有命令中未分配 ID 的自动补充 ID
+function migrateCommandIds() {
+  const cfg = loadConfig();
+  if (!cfg.clientCommands) return;
+  let migrated = 0;
+  for (const userId of Object.keys(cfg.clientCommands)) {
+    const cmds = cfg.clientCommands[userId];
+    if (!Array.isArray(cmds)) continue;
+    for (const c of cmds) {
+      if (typeof c === "object" && !c.id) {
+        c.id = String(Date.now() + migrated);
+        migrated++;
+      }
+    }
+  }
+  if (migrated > 0) {
+    saveConfig(cfg);
+    console.error(`[watchdog] 已为 ${migrated} 条旧命令补充 ID`);
+  }
 }
 
 export async function tryHandleWatchdogRoute(
@@ -277,5 +336,9 @@ export async function tryHandleWatchdogRoute(
     await handleClientConfig(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/analyze-logs") {
+    await handleAnalyzeLogs(params, body, res);
+    return true;
+  }
   return false;
 }

package/src/watchdog/agent.js

@@ -15,7 +15,6 @@ import {
   isGlobalInstall,
   startUpgradeChecker,
 } from "./upgrader.js";
-import { analyzeProcessLogs } from "./llm-analyzer.js";
 import { writeFileSync, existsSync, readFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
@@ -72,12 +71,12 @@ export class WatchdogAgent {
     this.heartbeatTimer = null;
     this.thresholdTimer = null;
     this.llmAnalyzerTimer = null;
-    this._llmResults = []; // 最近一次 LLM 分析结果
     this.processManager = new ProcessManager();
     this.consecutiveFailures = 0;
     this.maxFailures = 10;
     this.upgradeChecker = null;
     this.ttHelpVersion = getVersion();
+    this._llmResults = []; // 服务端返回的 LLM 分析结果
     this._heartbeatSeq = 0; // 心跳序号
     this._lastProcCount = -1; // 上次进程数
     this._lastCmdCount = -1; // 上次命令数
@@ -113,7 +112,7 @@ export class WatchdogAgent {
       this.processManager.checkThresholds();
     }, 5000);
 
-    // LLM 日志分析（每 10 分钟）
+    // LLM 日志分析（每 10 分钟调服务端接口）
     this._startLlmAnalyzer();
 
     // 自动升级检测（仅全局安装模式）
@@ -242,46 +241,35 @@ export class WatchdogAgent {
   }
 
   /**
-   * 启动 LLM 日志分析定时器（每 10 分钟）
+   * 启动 LLM 日志分析定时器（每 10 分钟调服务端接口）
    */
   _startLlmAnalyzer() {
-    // 首次 60s 后执行（等进程启动稳定），之后每 10 分钟
     const run = async () => {
       try {
-        console.error("[llm-analyzer] 定时触发...");
         const logs = this.processManager.getProcessesLogs();
-        if (logs.length === 0) {
+        if (logs.length === 0) return;
+        console.error(
+          `[llm-analyzer] 发送 ${logs.length} 个进程日志到服务端分析...`,
+        );
+        const resp = await fetch(
+          `${this.serverUrl}/api/watchdog/analyze-logs`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ processLogs: logs }),
+            signal: AbortSignal.timeout(60000),
+          },
+        );
+        if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+        const data = await resp.json();
+        if (data.llmAnalysis && data.llmAnalysis.length > 0) {
+          this._llmResults = data.llmAnalysis;
           console.error(
-            "[llm-analyzer] 无日志，跳过（进程可能无 stderr 输出）",
+            `[llm-analyzer] 分析完成: ${this._llmResults.map((r) => r.severity).join(",")}`,
           );
-          return;
-        }
-        console.error(`[llm-analyzer] 开始分析 ${logs.length} 个进程的日志...`);
-        this._llmResults = await analyzeProcessLogs(logs);
-        if (this._llmResults.length === 0) {
-          this._llmResults = [
-            {
-              cmdId: "_status",
-              severity: "warn",
-              summary: "LLM 分析未返回结果，请检查 LLM 配置",
-              suggestions: [],
-            },
-          ];
         }
-        const summary = this._llmResults
-          .map((r) => `${r.cmdId.substring(0, 30)}: ${r.severity}`)
-          .join(", ");
-        console.error(`[llm-analyzer] 分析完成: ${summary || "无异常"}`);
       } catch (e) {
-        console.error(`[llm-analyzer] 异常: ${e.message}`);
-        this._llmResults = [
-          {
-            cmdId: "_status",
-            severity: "error",
-            summary: "LLM 分析异常: " + e.message.substring(0, 80),
-            suggestions: [],
-          },
-        ];
+        console.error(`[llm-analyzer] 调用失败: ${e.message}`);
       }
     };
 

package/src/watchdog/llm-analyzer.js

@@ -1,79 +1,106 @@
 /**
- * LLM 日志分析模块 — 定期收集各进程日志，调用 LLM 分析错误并给出建议
+ * LLM 日志分析模块 — 供服务端调用（传入 llmFetch），或客户端独立使用（读环境变量）
  *
- * 每 10 分钟执行一次，分析结果通过心跳上报到 watch 服务端。
+ * 分析结果通过心跳上报到 watch 服务端展示。
  */
 
 // ── 分析入口 ──
 
 /**
  * 对所有进程的日志调用 LLM 分析
- * @param {Array<{cmdId:string, logs:string[], uptimeSeconds:number, restartCount:number}>} processLogs
- * @returns {Promise<Array<{cmdId:string, severity:string, summary:string, suggestions:string[]}>>}
+ * @param {Array} processLogs — [{cmdId, logs[], uptimeSeconds, restartCount}]
+ * @param {Function} [llmFetch] — 可选，服务端传入的 llmFetch；不传则读环境变量
+ * @returns {Promise<Array<{cmdId, severity, summary, suggestions}>>}
  */
-export async function analyzeProcessLogs(processLogs) {
+export async function analyzeProcessLogs(processLogs, llmFetch) {
   if (!processLogs || processLogs.length === 0) return [];
 
-  try {
-    const { llmFetch } = await import("../watch/llm-config.js");
-    console.error("[llm-analyzer] llmFetch 模块加载成功");
-    const results = [];
+  // 如果没有传入 llmFetch，使用内置的轻量调用（客户端模式）
+  if (!llmFetch) {
+    llmFetch = await createStandaloneFetch();
+    if (!llmFetch) return [];
+  }
 
-    for (const proc of processLogs) {
-      try {
+  const results = [];
+  for (const proc of processLogs) {
+    try {
+      console.error(`[llm-analyzer] 分析 ${proc.cmdId.substring(0, 40)}... (${proc.logs.length} 行日志)`);
+      const content = await llmFetch({
+        messages: [{ role: "user", content: buildPrompt(proc.cmdId, proc.logs.slice(-200).join("\n"), proc.uptimeSeconds, proc.restartCount) }],
+        max_tokens: 256,
+        temperature: 0.1,
+        enable_thinking: false,
+      });
+      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;
+}
+
+// ── 客户端独立模式（从环境变量读配置） ──
+
+async function createStandaloneFetch() {
+  try {
+    const { existsSync, readFileSync } = await import("fs");
+    const { join } = await import("path");
+    const { homedir } = await import("os");
+    const homeDir = homedir() || process.env.HOME || process.env.USERPROFILE || "";
+    let fileCfg = {};
+    try {
+      const cfgPath = join(homeDir, ".tt-help.json");
+      if (existsSync(cfgPath)) fileCfg = JSON.parse(readFileSync(cfgPath, "utf-8"));
+    } catch {}
+    const url = process.env.LLM_URL || fileCfg.llmUrl || "https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions";
+    const apiKey = process.env.LLM_API_KEY || fileCfg.llmApiKey || "";
+    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",
+        headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+        body: JSON.stringify({ model, messages, max_tokens, temperature }),
+        signal: AbortSignal.timeout(30000),
+      });
+      if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+      const result = await resp.json();
+      const content = result?.choices?.[0]?.message?.content;
+      if (!content) throw new Error("LLM 返回空内容");
+      return content;
+    };
+  } catch (e) {
+    console.error(`[llm-analyzer] 客户端模式初始化失败: ${e.message}`);
+    return null;
+  }
+}
+            },
+          ],
+          256,
+        );
+        const parsed = parseResponse(content);
         console.error(
-          `[llm-analyzer] 分析 ${proc.cmdId.substring(0, 40)}... (${proc.logs.length} 行日志)`,
+          `[llm-analyzer] ${proc.cmdId.substring(0, 30)} → ${parsed.severity}: ${parsed.summary}`,
         );
-        const analysis = await analyzeOneProcess(llmFetch, proc);
-        if (analysis) {
-          console.error(
-            `[llm-analyzer] ${proc.cmdId.substring(0, 30)} → ${analysis.severity}: ${analysis.summary}`,
-          );
-          results.push(analysis);
-        }
+        results.push({ cmdId: proc.cmdId, ...parsed });
       } catch (e) {
         console.error(
-          `[llm-analyzer] ${proc.cmdId.substring(0, 30)} 分析失败: ${e.message}`,
+          `[llm-analyzer] ${proc.cmdId.substring(0, 30)} 失败: ${e.message}`,
         );
       }
     }
-
     return results;
   } catch (e) {
-    console.error(`[llm-analyzer] llmFetch 加载失败: ${e.message}`);
+    console.error(`[llm-analyzer] 异常: ${e.message}`);
     return [];
   }
 }
 
-// ── 单进程分析 ──
-
-async function analyzeOneProcess(llmFetch, proc) {
-  const recentLogs = proc.logs.slice(-200).join("\n"); // 最多取最近 200 行
-  const prompt = buildPrompt(
-    proc.cmdId,
-    recentLogs,
-    proc.uptimeSeconds,
-    proc.restartCount,
-  );
-
-  const content = await llmFetch({
-    messages: [{ role: "user", content: prompt }],
-    max_tokens: 256,
-    temperature: 0.1,
-    enable_thinking: false,
-  });
-
-  const parsed = parseResponse(content);
-  return {
-    cmdId: proc.cmdId,
-    severity: parsed.severity || "ok",
-    summary: parsed.summary || "无异常",
-    suggestions: parsed.suggestions || [],
-  };
-}
-
-// ── Prompt 构建 ──
-
 function buildPrompt(cmdId, logs, uptimeSeconds, restartCount) {
   const uptime =
     uptimeSeconds >= 3600

package/src/watchdog/process-manager.js

@@ -114,6 +114,19 @@ function getProcessStats(pid) {
   }
 }
 
+// Windows: 从 cmd.exe 往下找真正的 node.exe PID（shell:true 时 cmd.exe 是中间层）
+function getChildPid(parentPid) {
+  try {
+    const out = execSync(
+      `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter 'ParentProcessId=${parentPid}' | Where-Object { $_.Name -notlike 'conhost*' } | Select-Object -First 1 -ExpandProperty ProcessId"`,
+      { encoding: "utf-8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"] },
+    ).trim();
+    return parseInt(out, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+
 export class ProcessManager extends EventEmitter {
   constructor() {
     super();
@@ -158,6 +171,19 @@ export class ProcessManager extends EventEmitter {
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
           });
+
+      // Windows: shell:true → child.pid 是 cmd.exe，延迟获取真实 node.exe PID（用于内存读取）
+      if (IS_WIN) {
+        setTimeout(() => {
+          const realPid = getChildPid(child.pid);
+          if (realPid > 0) {
+            const info = this.processes.get(id);
+            if (info && info.child === child) {
+              info._realPid = realPid;
+            }
+          }
+        }, 3000);
+      }
     } catch (e) {
       console.error(`[watchdog] 启动命令 ${id} 失败: ${e.message}`);
       this.processes.set(id, {
@@ -295,7 +321,10 @@ export class ProcessManager extends EventEmitter {
     const result = [];
     for (const [cmdId, info] of this.processes) {
       if (info.stopped) continue;
-      const pid = info.child?.pid || 0;
+      // Windows: 壳是 cmd.exe，真实业务进程是 node.exe（_realPid）
+      const pid = IS_WIN
+        ? info._realPid || info.child?.pid || 0
+        : info.child?.pid || 0;
       const stats = pid ? getProcessStats(pid) : null;
       const uptimeSeconds = Math.round((Date.now() - info.startTime) / 1000);
 
@@ -361,16 +390,16 @@ export class ProcessManager extends EventEmitter {
   syncCommands(expectedCmds) {
     if (!Array.isArray(expectedCmds)) return;
 
-    // 标准化：{cmd, maxUptimeSeconds, maxMemoryMB} → {id, name, command, args, enabled, thresholds}
+    // 标准化：使用服务端分配的 id，无 id 时用命令行截断兜底
     const normalized = expectedCmds
       .map((c) => {
         if (typeof c === "string")
           c = { cmd: c, maxUptimeSeconds: 0, maxMemoryMB: 0 };
-        // 清洗：去除可能混入的控制字符、状态图标等
         const cmdLine = (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim();
         if (!cmdLine) return null;
         const id =
-          cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine;
+          c.id ||
+          (cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine);
         return {
           id,
           name: id,
@@ -422,7 +451,8 @@ export class ProcessManager extends EventEmitter {
       if (info.stopped || !info.child) continue;
       const thresholds = info.thresholds || {};
       const uptimeSeconds = Math.round((now - info.startTime) / 1000);
-      const pid = info.child.pid;
+      // Windows: 用真实 node.exe PID 读内存
+      const pid = IS_WIN ? info._realPid || info.child.pid : info.child.pid;
 
       let reason = "";
       // 检查运行时长