tt-help-cli-ycl 1.4.71 → 1.4.72

package/package.json

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

package/src/watch/watchdog-server.js

@@ -196,6 +196,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,6 +248,27 @@ 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) {
@@ -277,5 +299,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