tt-help-cli-ycl 1.4.171 → 1.4.172

package/package.json

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

package/src/watch/public/app.js

@@ -4192,6 +4192,49 @@ function esc(s) {
 
 var _wdLastRendered = "";
 
+// ── 看门狗客户端卡片折叠（默认只显示头部，点击展开全部；内存态，刷新重置） ──
+var _wdCardExpandAll = false; // 全局默认态（顶栏「全部展开/收起」切换）
+var _wdCardExpanded = {}; // 单卡覆盖：userId → true/false（点过单卡按钮才有）
+
+function wdCardIsExpanded(userId) {
+  return _wdCardExpanded[userId] !== undefined
+    ? _wdCardExpanded[userId]
+    : _wdCardExpandAll;
+}
+
+// 单卡展开/收起：直接切 DOM 不重渲染（数据变化重建时按此状态生成）
+function wdToggleCardBody(userId) {
+  var body = document.getElementById("wdCardBody-" + wdEscId(userId));
+  if (!body) return;
+  var expand = body.style.display === "none";
+  body.style.display = expand ? "" : "none";
+  _wdCardExpanded[userId] = expand;
+  var btn = document.getElementById("wdCardToggle-" + wdEscId(userId));
+  if (btn) {
+    btn.textContent = expand ? "▲ 收起" : "▼ 展开";
+    btn.title = expand ? "收起卡片" : "展开卡片";
+  }
+}
+
+// 顶栏总开关：重置单卡覆盖，全部统一切换
+function wdToggleAllCards() {
+  _wdCardExpandAll = !_wdCardExpandAll;
+  _wdCardExpanded = {};
+  var bodies = document.querySelectorAll("[id^='wdCardBody-']");
+  for (var i = 0; i < bodies.length; i++) {
+    bodies[i].style.display = _wdCardExpandAll ? "" : "none";
+    var btn = document.getElementById(
+      bodies[i].id.replace("wdCardBody-", "wdCardToggle-"),
+    );
+    if (btn) {
+      btn.textContent = _wdCardExpandAll ? "▲ 收起" : "▼ 展开";
+      btn.title = _wdCardExpandAll ? "收起卡片" : "展开卡片";
+    }
+  }
+  var label = document.getElementById("wdToggleAllLabel");
+  if (label) label.textContent = _wdCardExpandAll ? "⊟ 全部收起" : "⊞ 全部展开";
+}
+
 function renderWatchdogDashboard(
   clients,
   clientCommands,
@@ -4242,9 +4285,9 @@ function renderWatchdogDashboard(
       b.hostname ||
       ""
     ).toLowerCase();
-    // 在线优先
+    // 在线优先；名称用自然数字序（F-2 排在 F-10 前）
     if (a.online !== b.online) return a.online ? -1 : 1;
-    return nameA.localeCompare(nameB);
+    return nameA.localeCompare(nameB, undefined, { numeric: true });
   });
 
   // 构建 userId → 在线客户端 映射
@@ -4281,7 +4324,9 @@ function renderWatchdogDashboard(
     }
   }
   offlineUids.sort(function (a, b) {
-    return a.toLowerCase().localeCompare(b.toLowerCase());
+    return a
+      .toLowerCase()
+      .localeCompare(b.toLowerCase(), undefined, { numeric: true });
   });
   offlineUids.forEach(function (uid) {
     allCards.push(
@@ -4348,6 +4393,18 @@ function renderOfflineCard(
   autoUpgrades,
 ) {
   var cmdCount = cmds ? cmds.length : 0;
+  var expanded = wdCardIsExpanded(userId);
+  var toggleBtn = tag(
+    "button",
+    {
+      id: "wdCardToggle-" + wdEscId(userId),
+      onclick: "wdToggleCardBody('" + esc(userId) + "')",
+      style:
+        "padding:2px 8px;font-size:11px;background:#333;color:#888;border:1px solid #444;border-radius:3px;cursor:pointer",
+      title: expanded ? "收起卡片" : "展开卡片",
+    },
+    expanded ? "▲ 收起" : "▼ 展开",
+  );
   return tag(
     "div",
     {
@@ -4411,20 +4468,28 @@ function renderOfflineCard(
                 title: "删除此客户端配置",
               },
               "删除",
-            ),
+            ) +
+            toggleBtn,
         ),
     ) +
-      styled(
+      tag(
         "div",
-        "color:#555;font-size:12px",
-        "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
-      ) +
-      renderCountrySection({}, userId, clashCountries) +
-      renderErrorTriggerSection({}, userId, errorTriggers) +
-      renderSwitchRestartSection({}, userId, switchRestarts) +
-      renderAutoUpgradeSection({}, userId, autoUpgrades) +
-      renderLoginSection({}, userId, loginPorts) +
-      renderCmdRows(cmds || [], userId, [], false),
+        {
+          id: "wdCardBody-" + wdEscId(userId),
+          style: expanded ? "" : "display:none",
+        },
+        styled(
+          "div",
+          "color:#555;font-size:12px",
+          "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
+        ) +
+          renderCountrySection({}, userId, clashCountries) +
+          renderErrorTriggerSection({}, userId, errorTriggers) +
+          renderSwitchRestartSection({}, userId, switchRestarts) +
+          renderAutoUpgradeSection({}, userId, autoUpgrades) +
+          renderLoginSection({}, userId, loginPorts) +
+          renderCmdRows(cmds || [], userId, [], false),
+      ),
   );
 }
 
@@ -4474,6 +4539,20 @@ function renderClientCard(
   var myCmds = userId && clientCommands[userId] ? clientCommands[userId] : [];
   var online = c.online;
 
+  // 折叠状态：默认只显示头部，点展开按钮看全部（需在 header 组装前定义）
+  var expanded = wdCardIsExpanded(userId);
+  var toggleBtn = tag(
+    "button",
+    {
+      id: "wdCardToggle-" + wdEscId(userId),
+      onclick: "wdToggleCardBody('" + esc(userId) + "')",
+      style:
+        "padding:2px 8px;font-size:11px;background:#333;color:#888;border:1px solid #444;border-radius:3px;cursor:pointer",
+      title: expanded ? "收起卡片" : "展开卡片",
+    },
+    expanded ? "▲ 收起" : "▼ 展开",
+  );
+
   var osStr = [
     os.platform,
     os.release,
@@ -4578,6 +4657,11 @@ function renderClientCard(
               : "color:#fca5a5;font-size:12px",
             "最后心跳 " + lastSeen,
           ) +
+          styled(
+            "span",
+            "color:#888;font-size:13px",
+            "进程 " + procs.length,
+          ) +
           (!online && userId
             ? tag(
                 "button",
@@ -4589,7 +4673,8 @@ function renderClientCard(
                 },
                 "删除",
               )
-            : ""),
+            : "") +
+          toggleBtn,
       ),
   );
 
@@ -4603,15 +4688,33 @@ function renderClientCard(
         ";border-radius:12px;padding:16px",
     },
     header +
-      styled("div", "color:#888;font-size:12px", osStr) +
-      styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
-      renderCountrySection(c, userId, clashCountries) +
-      renderErrorTriggerSection(c, userId, errorTriggers) +
-      renderSwitchRestartSection(c, userId, switchRestarts) +
-      renderAutoUpgradeSection(c, userId, autoUpgrades) +
-      renderLoginSection(c, userId, loginPorts) +
-      renderProxySection(c, userId) +
-      renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis, c.clientId),
+      tag(
+        "div",
+        {
+          id: "wdCardBody-" + wdEscId(userId),
+          style: expanded ? "" : "display:none",
+        },
+        styled("div", "color:#888;font-size:12px", osStr) +
+          styled(
+            "div",
+            "color:#888;font-size:12px;margin-bottom:6px",
+            infoLine,
+          ) +
+          renderCountrySection(c, userId, clashCountries) +
+          renderErrorTriggerSection(c, userId, errorTriggers) +
+          renderSwitchRestartSection(c, userId, switchRestarts) +
+          renderAutoUpgradeSection(c, userId, autoUpgrades) +
+          renderLoginSection(c, userId, loginPorts) +
+          renderProxySection(c, userId) +
+          renderCmdRows(
+            myCmds,
+            userId,
+            procs,
+            online,
+            c.llmAnalysis,
+            c.clientId,
+          ),
+      ),
   );
 }
 
@@ -5395,7 +5498,7 @@ function renderLoginSection(c, userId, loginPorts) {
         style:
           "padding:2px 8px;font-size:11px;background:#333;color:#4ade80;" +
           "border:1px solid #444;border-radius:3px;cursor:pointer",
-        title: "立即重检一次登录状态（绕过 2h 周期，结果随心跳自动刷新）",
+        title: "立即重检上次未通过的端口（全部已登录则跳过；结果随心跳自动刷新）",
       },
       "重检",
     );

package/src/watch/public/index.html

@@ -644,6 +644,10 @@
         <div class="label">命令池</div>
         <div class="value slate" id="wdCmdCount">0</div>
       </div>
+      <div class="stat-card clickable" onclick="wdToggleAllCards()" style="background:rgba(96,165,250,0.05)">
+        <div class="label" id="wdToggleAllLabel" style="font-size:18px">⊞</div>
+        <div class="value" style="font-size:11px;color:#60a5fa">全部展开</div>
+      </div>
       <div class="stat-card clickable" onclick="fetchWatchdogData()" style="background:rgba(96,165,250,0.05)">
         <div class="label" style="font-size:18px">🔄</div>
         <div class="value" style="font-size:11px;color:#60a5fa">刷新</div>

package/src/watchdog/agent.js

@@ -284,6 +284,7 @@ export class WatchdogAgent {
     this.loginReport = null; // 最近一次登录检测结果（随心跳上报）
     this._loginChecking = false; // 防重入
     this._lastLoginCheckAt = 0; // 上次检测时间戳
+    this._loginRecheckPending = false; // 服务端下发的手动重检待执行标记
     this.loginCheckTimer = null;
     this.running = false;
     this.heartbeatTimer = null;
@@ -915,10 +916,14 @@ export class WatchdogAgent {
           );
         }
       }
-      // 服务端下发「立即重检」：清零上次检测时间，60s 调度器下一跳即执行
+      // 服务端下发「立即重检」：标记待重检 + 清零上次检测时间，60s 调度器下一跳执行
+      // （重检只检上次未通过的端口，范围在调度器消费时按最新 loginReport 计算）
       if (data.loginRecheck) {
+        this._loginRecheckPending = true;
         this._lastLoginCheckAt = 0;
-        console.error("[watchdog] 服务端下发登录重检，下一跳立即执行");
+        console.error(
+          "[watchdog] 服务端下发登录重检，下一跳立即执行（仅上次未通过的端口）",
+        );
       }
 
       // 心跳日志：仅状态变化或每 10 次打印一次
@@ -980,18 +985,102 @@ export class WatchdogAgent {
     if (!this.running || this._loginChecking) return;
     if (!Array.isArray(this.loginPorts) || this.loginPorts.length === 0) return;
     if (Date.now() - this._lastLoginCheckAt < this.loginCheckIntervalMs) return;
+
+    // 手动重检：只检上次未通过的端口；无有效历史结果退化为全量，全部已登录则跳过
+    let ports = this.loginPorts;
+    if (this._loginRecheckPending) {
+      this._loginRecheckPending = false;
+      const resolved = this._resolveRecheckPorts();
+      if (resolved) {
+        if (resolved.length === 0) {
+          console.error("[watchdog] 重检跳过: 上次全部已登录，无需重检");
+          return; // 不占位，2h 周期照常
+        }
+        ports = resolved;
+        console.error(
+          `[watchdog] 手动重检: 仅检测上次未通过的端口 (${ports.join(",")})`,
+        );
+      }
+      // resolved === null → 无有效历史结果，保持全量
+    }
+
     this._lastLoginCheckAt = Date.now(); // 先占位，防 60s tick 重入
-    this._runLoginCheck().catch((e) => {
+    this._runLoginCheck(ports).catch((e) => {
       console.error(`[watchdog] 登录检测执行失败: ${e.message}`);
     });
   }
 
+  /**
+   * 计算手动重检端口范围：上次检测未通过（status !== "logged_in"）的端口，
+   * 含配置了但上次没检到的端口（同样视为未通过）。
+   * @returns {number[]|null} 端口子集；null = 无有效历史结果（调用方退化为全量）
+   */
+  _resolveRecheckPorts() {
+    const report = this.loginReport;
+    if (
+      !report ||
+      report.error ||
+      !Array.isArray(report.ports) ||
+      report.ports.length === 0
+    ) {
+      return null;
+    }
+    const last = new Map(report.ports.map((r) => [Number(r.port), r.status]));
+    return this.loginPorts.filter((p) => last.get(Number(p)) !== "logged_in");
+  }
+
+  /**
+   * 合并登录检测结果：本次检测过的端口用新结果，未检端口保留上次结果。
+   * 全量检测时未检端口为空，行为等同整体替换（与合并前一致）。
+   * @param {Array|null} results 本次端口级结果（null = 无结果，仅保留旧数据）
+   * @param {number[]} checkedPorts 本次实际检测的端口
+   * @param {string} [error] 本次检测的整级错误（可选）
+   */
+  _mergeLoginReport(results, checkedPorts, error) {
+    const prev =
+      this.loginReport && Array.isArray(this.loginReport.ports)
+        ? this.loginReport.ports
+        : [];
+    const checked = new Set(checkedPorts.map(Number));
+    const order = this.loginPorts.map(Number);
+    const byPort = new Map();
+    // 未被本次覆盖的配置端口保留旧结果（配置外残留丢弃，全量检测时行为等同整体替换）
+    for (const r of prev) {
+      const key = Number(r.port);
+      if (!checked.has(key) && order.includes(key)) byPort.set(key, r);
+    }
+    if (Array.isArray(results)) {
+      for (const r of results) byPort.set(Number(r.port), r);
+    }
+    const ports = [...byPort.values()].sort((a, b) => {
+      const ia = order.indexOf(Number(a.port));
+      const ib = order.indexOf(Number(b.port));
+      return (ia < 0 ? order.length : ia) - (ib < 0 ? order.length : ib);
+    });
+    const report = { ports, checkedAt: Date.now() };
+    if (error) report.error = error;
+    return report;
+  }
+
+  /**
+   * 整级失败时的 loginReport：子集重检失败保留未检端口历史结果，全量检测失败整体记错（原行为）
+   */
+  _failedLoginReport(checkedPorts, error) {
+    if (checkedPorts.length < this.loginPorts.length) {
+      return this._mergeLoginReport(null, checkedPorts, error);
+    }
+    return { error, checkedAt: Date.now() };
+  }
+
   /**
    * 执行一次登录检测：spawn 子进程跑 tt-help login-check（一次性短任务，不进 ProcessManager）
    */
-  async _runLoginCheck() {
+  async _runLoginCheck(portsOverride) {
     this._loginChecking = true;
-    const ports = this.loginPorts;
+    const ports =
+      Array.isArray(portsOverride) && portsOverride.length > 0
+        ? portsOverride
+        : this.loginPorts;
     console.error(`[watchdog] 开始登录检测 (端口: ${ports.join(",")})...`);
     try {
       // 全局安装用 tt-help 命令；源码模式用 node cli.js
@@ -1050,7 +1139,7 @@ export class WatchdogAgent {
           // stdout 不是 JSON → 走错误分支
         }
         if (partial) {
-          this.loginReport = { ports: partial, checkedAt: Date.now() };
+          this.loginReport = this._mergeLoginReport(partial, ports);
           console.error(
             `[watchdog] 登录检测完成(部分失败): ${
               String(stderr)
@@ -1063,16 +1152,16 @@ export class WatchdogAgent {
           );
           return;
         }
-        this.loginReport = {
-          error: `exit ${code}: ${String(stderr).slice(-500)}`,
-          checkedAt: Date.now(),
-        };
+        this.loginReport = this._failedLoginReport(
+          ports,
+          `exit ${code}: ${String(stderr).slice(-500)}`,
+        );
         console.error(`[watchdog] 登录检测失败: ${this.loginReport.error}`);
         return;
       }
       const parsed = JSON.parse(String(stdout).trim());
       if (!Array.isArray(parsed)) throw new Error("结果不是数组");
-      this.loginReport = { ports: parsed, checkedAt: Date.now() };
+      this.loginReport = this._mergeLoginReport(parsed, ports);
       const summary = parsed
         .map(
           (r) =>
@@ -1081,7 +1170,7 @@ export class WatchdogAgent {
         .join(" ");
       console.error(`[watchdog] 登录检测完成: ${summary}`);
     } catch (e) {
-      this.loginReport = { error: e.message, checkedAt: Date.now() };
+      this.loginReport = this._failedLoginReport(ports, e.message);
       console.error(`[watchdog] 登录检测异常: ${e.message}`);
     } finally {
       this._loginChecking = false;