tt-help-cli-ycl 1.4.120 → 1.4.122

package/package.json

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

package/src/cli/attach.js

@@ -163,8 +163,16 @@ export async function handleAttach(options) {
         ) {
           throw new CDNBlockedError(data.error);
         }
-        // 其余失败（瞬时 503/5xx）返回 null，由服务端后续重新排队
-        return null;
+        // 其余失败（504 超时 / 503 / 502 / 500 等）：抛出带状态码与错误详情的异常，
+        // 让外层日志显示真实原因（如 page.goto 超时）而非笼统"未获取到用户信息"。
+        // 行为不变：failCount++、不标记 needRefresh、服务端后续重新排队重试。
+        const detail =
+          (data && typeof data.error === "string" && data.error) ||
+          res.statusText ||
+          "unknown";
+        const err = new Error(`webserver ${res.status}: ${detail}`);
+        err.statusCode = res.status;
+        throw err;
       }
       // 业务结果：TikTok 明确 statusCode（209002 验证码等）→ 返回上层走"已记录"分支
       if (data && data.error && data.tiktokStatusCode) {

package/src/cli/precheck.js

@@ -177,8 +177,16 @@ export async function handlePrecheck(options) {
           ) {
             throw new CDNBlockedError(data.error);
           }
-          // 其余失败（瞬时 503/5xx）返回 null，由服务端后续重新排队
-          return null;
+          // 其余失败（504 超时 / 503 / 502 / 500 等）：抛出带状态码与错误详情的异常，
+          // 让外层日志显示真实原因（如 page.goto 超时）而非笼统"未获取到用户信息"。
+          // 行为不变：failCount++、不标记 needRefresh、服务端后续重新排队重试。
+          const detail =
+            (data && typeof data.error === "string" && data.error) ||
+            res.statusText ||
+            "unknown";
+          const err = new Error(`webserver ${res.status}: ${detail}`);
+          err.statusCode = res.status;
+          throw err;
         }
         // 业务结果：TikTok 明确 statusCode（209002 验证码等）→ 返回上层走"已记录"分支
         if (data && data.error && data.tiktokStatusCode) {

package/src/watch/public/app.js

@@ -3989,86 +3989,182 @@ async function wdSetCountries() {
 
 // ── 登录检测端口配置区域（看门狗面板中每个客户端卡片） ──
 
+// userId -> 详情展开状态（跨刷新保留）
+var _wdLoginExpanded = {};
+
+function wdToggleLoginDetail(userId) {
+  _wdLoginExpanded[userId] = !_wdLoginExpanded[userId];
+  var el = document.getElementById("wdLoginDetail-" + wdEscId(userId));
+  if (el) {
+    el.style.display = _wdLoginExpanded[userId] ? "grid" : "none";
+  }
+}
+
+var _wdLoginStatusLabel = {
+  logged_in: ["已登录", "#4ade80"],
+  expired: ["已过期", "#fbbf24"],
+  error: ["失败", "#f87171"],
+  logged_out: ["未登录", "#f87171"],
+};
+
+function wdLoginStatusLabel(s) {
+  return _wdLoginStatusLabel[s] || ["未登录", "#888"];
+}
+
 function renderLoginSection(c, userId, loginPorts) {
   if (!userId) return "";
   var cfgEntry = (loginPorts && loginPorts[userId]) || {};
   var configured =
     cfgEntry.ports && cfgEntry.ports.length ? cfgEntry.ports : [];
   var report = c.loginReport || null;
-  var reportHtml;
+
+  // 配置按钮：只显示端口数量，完整列表放 title
+  var cfgBtn = tag(
+    "button",
+    {
+      onclick: "wdShowLoginPortsModal('" + esc(userId) + "')",
+      style:
+        "padding:2px 8px;font-size:11px;background:#333;color:#4ade80;" +
+        "border:1px solid #444;border-radius:3px;cursor:pointer",
+      title:
+        "配置要定期检测登录状态的 CDP 端口（逗号分隔，留空清空）\n当前: " +
+        (configured.length ? configured.join(",") : "无"),
+    },
+    (configured.length ? configured.length + "端口" : "未配置") + " ⚙️",
+  );
+
+  var head =
+    styled("span", "font-size:14px", "🔑") +
+    styled("span", "color:#888", "登录检测:") +
+    cfgBtn;
+
+  var wrapStyle =
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+    "display:flex;align-items:center;gap:8px;font-size:12px;flex-wrap:wrap";
+
   if (!report) {
-    reportHtml = styled(
-      "span",
-      "color:#555;margin-left:auto",
-      configured.length ? "等待客户端上报..." : "",
+    return styled(
+      "div",
+      wrapStyle,
+      head +
+        styled(
+          "span",
+          "color:#555;margin-left:auto",
+          configured.length ? "等待客户端上报..." : "",
+        ),
     );
-  } else if (report.error) {
-    var et = report.checkedAt
-      ? new Date(report.checkedAt).toLocaleTimeString("zh-CN")
-      : "?";
-    reportHtml =
-      styled("span", "color:#888;margin-left:auto", "最近检测(" + et + "): ") +
-      styled("span", "color:#f87171", "失败");
-  } else if (report.ports && report.ports.length) {
-    var et2 = report.checkedAt
-      ? new Date(report.checkedAt).toLocaleTimeString("zh-CN")
-      : "?";
-    var badges = report.ports
-      .map(function (r) {
-        var color =
-          r.status === "logged_in"
-            ? "#4ade80"
-            : r.status === "expired"
-              ? "#fbbf24"
-              : r.status === "error"
-                ? "#f87171"
-                : "#888";
-        var label =
-          r.status === "logged_in"
-            ? "已登录"
-            : r.status === "expired"
-              ? "已过期"
-              : r.status === "error"
-                ? "失败"
-                : "未登录";
-        var txt =
-          r.port +
-          " " +
-          label +
-          (r.status === "logged_in" && r.account ? " @" + r.account : "");
-        return styled(
+  }
+
+  var et = report.checkedAt
+    ? new Date(report.checkedAt).toLocaleTimeString("zh-CN", {
+        hour: "2-digit",
+        minute: "2-digit",
+      })
+    : "?";
+
+  if (report.error) {
+    return styled(
+      "div",
+      wrapStyle,
+      head +
+        styled(
           "span",
-          "color:" +
-            color +
-            ";background:#0d1117;border:1px solid #333;padding:1px 6px;border-radius:4px",
-          txt,
-        );
+          "color:#f87171;margin-left:auto",
+          "最近检测(" + et + ") 失败",
+        ),
+    );
+  }
+
+  var ports = Array.isArray(report.ports) ? report.ports : [];
+  if (!ports.length) {
+    return styled(
+      "div",
+      wrapStyle,
+      head + styled("span", "color:#555;margin-left:auto", "无结果"),
+    );
+  }
+
+  // 汇总统计 + 异常端口内联提示
+  var ok = 0;
+  var abnormal = [];
+  var hasError = false;
+  for (var i = 0; i < ports.length; i++) {
+    var r = ports[i];
+    if (r.status === "logged_in") {
+      ok++;
+    } else {
+      var lb = wdLoginStatusLabel(r.status);
+      abnormal.push({ port: r.port, label: lb[0] });
+      if (r.status === "error" || r.status === "logged_out") hasError = true;
+    }
+  }
+  var sumColor = abnormal.length
+    ? hasError
+      ? "#f87171"
+      : "#fbbf24"
+    : "#4ade80";
+  var summaryTxt =
+    ok + "/" + ports.length + " 已登录" + (abnormal.length ? "" : " ✓");
+  if (abnormal.length) {
+    var shown = abnormal
+      .slice(0, 3)
+      .map(function (a) {
+        return a.port + " " + a.label;
       })
-      .join(" ");
-    reportHtml =
-      styled("span", "color:#888;margin-left:auto", "最近检测(" + et2 + "): ") +
-      badges;
-  } else {
-    reportHtml = styled("span", "color:#555;margin-left:auto", "无结果");
+      .join(", ");
+    summaryTxt +=
+      " ⚠ " + shown + (abnormal.length > 3 ? " +" + (abnormal.length - 3) : "");
   }
+
+  // 明细（默认折叠，点汇总展开/收起）
+  var detailHtml = "";
+  for (var j = 0; j < ports.length; j++) {
+    var r2 = ports[j];
+    var lb2 = wdLoginStatusLabel(r2.status);
+    detailHtml += styled(
+      "div",
+      "display:flex;gap:6px;align-items:center;font-size:11px",
+      styled("span", "color:#888;min-width:42px", r2.port) +
+        styled("span", "color:" + lb2[1], lb2[0]) +
+        (r2.status === "logged_in" && r2.account
+          ? styled("span", "color:#4ade80", "@" + r2.account)
+          : ""),
+    );
+  }
+
   return styled(
     "div",
-    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
-      "display:flex;align-items:center;gap:8px;font-size:12px;flex-wrap:wrap",
-    styled("span", "font-size:14px", "🔑") +
-      styled("span", "color:#888", "登录检测:") +
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;font-size:12px",
+    styled(
+      "div",
+      "display:flex;align-items:center;gap:8px;flex-wrap:wrap",
+      head +
+        tag(
+          "span",
+          {
+            style:
+              "color:" +
+              sumColor +
+              ";margin-left:auto;cursor:pointer;text-decoration:underline dotted",
+            onclick: "wdToggleLoginDetail('" + esc(userId) + "')",
+            title: "点击展开/收起各端口明细",
+          },
+          summaryTxt,
+        ) +
+        styled("span", "color:#555", "最近 " + et),
+    ) +
       tag(
-        "button",
+        "div",
         {
-          onclick: "wdShowLoginPortsModal('" + esc(userId) + "')",
+          id: "wdLoginDetail-" + wdEscId(userId),
           style:
-            "padding:2px 8px;font-size:11px;background:#333;color:#4ade80;" +
-            "border:1px solid #444;border-radius:3px;cursor:pointer",
-          title: "配置要定期检测登录状态的 CDP 端口（逗号分隔，留空清空）",
+            "display:" +
+            (_wdLoginExpanded[userId] ? "grid" : "none") +
+            ";grid-template-columns:repeat(auto-fill,minmax(170px,1fr));" +
+            "gap:3px 16px;margin-top:6px;padding-top:6px;border-top:1px dashed #2a2a3a",
         },
-        (configured.length ? configured.join(",") : "未配置") + " ⚙️",
-      ) +
-      reportHtml,
+        detailHtml,
+      ),
   );
 }
 

package/src/watch/public/index.html

@@ -686,7 +686,7 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260816b"></script>
+  <script src="app.js?v=20260817"></script>
 </body>
 
 </html>

package/src/watchdog/agent.js

@@ -30,6 +30,7 @@ import { fileURLToPath } from "url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const homeDir = homedir() || process.env.HOME || process.env.USERPROFILE || "";
 const TT_HELP_CONFIG = join(homeDir, ".tt-help.json");
+const IS_WIN = process.platform === "win32";
 
 // ── 业务日志错误统计 → 触发节点切换 ──
 // 识别采集程序日志里已有的错误分类标签（explore 等已打标），连续错误达标则切换出口节点
@@ -612,9 +613,17 @@ export class WatchdogAgent {
       if (cfg.proxy) args.push("--proxy", cfg.proxy);
 
       const { stdout, stderr, code } = await new Promise((resolve) => {
-        const child = spawn(cmd, args, {
-          stdio: ["ignore", "pipe", "pipe"],
-        });
+        // Windows 下 tt-help 是 .cmd 包装，必须 shell:true 才能被 cmd.exe 解析
+        // （与 process-manager.startCommand 的 Windows 处理保持一致）
+        const child = IS_WIN
+          ? spawn([cmd, ...args].join(" "), {
+              stdio: ["ignore", "pipe", "pipe"],
+              shell: true,
+              windowsHide: true,
+            })
+          : spawn(cmd, args, {
+              stdio: ["ignore", "pipe", "pipe"],
+            });
         let out = "",
           err = "";
         child.stdout.on("data", (d) => (out += d));