tt-help-cli-ycl 1.4.139 → 1.4.140

package/src/lib/tiktok-scraper.mjs

@@ -5,6 +5,7 @@ import {
   parseVideoInfo,
   isRetryableFailure,
   CDNBlockedError,
+  TikTokStatusError,
   detectAccessDenied,
 } from "./parse-ssr.mjs";
 
@@ -58,6 +59,30 @@ class PageSlot {
   }
 }
 
+/**
+ * 对 page.goto 抛出的错误做分类（goto 阶段失败时拿不到 HTML，
+ * detectAccessDenied 无法执行，必须在这里拦截风控类错误）。
+ * status 为导航期间捕获的最后一个 tiktok 响应状态码（可能为 null）：
+ * - 404 → TikTokStatusError（视频/用户不存在，业务结果）
+ * - 403/429/未知 → CDNBlockedError，由 webserver 走 CDN 冷却自愈链路
+ *   （503 + 冷却 + 躺平 + nginx failover），而不是 consecutiveErrors
+ *   浏览器重启链——重启对 IP/节点风控无效，只会形成死亡螺旋。
+ * - 其余（ERR_ABORTED / Target closed 等重启竞态产物）→ 返回 null，
+ *   原样冒泡交由 webserver 分类（503 retryable 且不计连续错误）。
+ */
+export function classifyGotoError(message, status) {
+  if (typeof message !== "string") return null;
+  if (message.includes("ERR_HTTP_RESPONSE_CODE_FAILURE")) {
+    if (status === 404) {
+      return new TikTokStatusError(404, "TikTok HTTP 404 (视频/用户不存在)");
+    }
+    return new CDNBlockedError(
+      `goto 非2xx (疑似 IP/节点风控, status=${status ?? "unknown"}): ${message.split("\n")[0]}`,
+    );
+  }
+  return null;
+}
+
 class PromiseQueue {
   constructor() {
     this._queue = [];
@@ -110,9 +135,14 @@ export class TikTokScraper {
     this.slotIdx = 0;
     this.lastWarmTime = 0;
     this.warmPromise = null;
+    // 关闭中标记：restart 时旧实例先 close，在途请求凭此立即失败（503），
+    // 而不是打到已销毁的 context 上报 "Cannot read properties of null"。
+    this.closing = false;
   }
 
   async init() {
+    // restart() = close() + init()：重建后恢复可用状态
+    this.closing = false;
     const executablePath = detectBrowser();
     if (!executablePath) {
       throw new Error(
@@ -143,6 +173,8 @@ export class TikTokScraper {
   }
 
   async close() {
+    // 先置关闭标记：在途请求的入口检查会立即失败，避免与关闭流程竞态
+    this.closing = true;
     if (this.browser) {
       const browser = this.browser;
       let closeTimedOut = false;
@@ -213,6 +245,10 @@ export class TikTokScraper {
   }
 
   async _ensurePage(slot) {
+    // 实例正在关闭/已关闭（restart 竞态）→ 抛可识别错误，webserver 返回 503 且不计连续错误
+    if (this.closing || !this.context) {
+      throw new Error("Server is shutting down");
+    }
     try {
       if (
         !slot.page.isClosed() &&
@@ -234,10 +270,32 @@ export class TikTokScraper {
 
     const page = await this._ensurePage(slot);
 
-    await page.goto("view-source:" + url, {
-      waitUntil: "domcontentloaded",
-      timeout: 15000,
-    });
+    // 捕获导航期间最后一个 tiktok 响应的真实状态码：
+    // Chromium 的 ERR_HTTP_RESPONSE_CODE_FAILURE 不携带状态码，
+    // 通过 response 事件补齐，用于区分 403/429 风控与 404 不存在。
+    let lastStatus = null;
+    const onResponse = (resp) => {
+      try {
+        if (resp.url().includes("tiktok.com")) lastStatus = resp.status();
+      } catch {}
+    };
+    page.on("response", onResponse);
+
+    try {
+      await page.goto("view-source:" + url, {
+        waitUntil: "domcontentloaded",
+        timeout: 15000,
+      });
+    } catch (e) {
+      // goto 阶段失败（HTTP 非 2xx 等）拿不到 HTML，detectAccessDenied 没机会执行。
+      // 分类后抛出：风控类 → CDNBlockedError（走 webserver 冷却自愈而非浏览器重启）；
+      // 404 → TikTokStatusError（业务结果）；其余（ERR_ABORTED 等竞态）→ 原样冒泡。
+      const classified = classifyGotoError(e?.message, lastStatus);
+      if (classified) throw classified;
+      throw e;
+    } finally {
+      page.off("response", onResponse);
+    }
 
     const content = await page.evaluate(() => {
       const rows = document.querySelectorAll("tr");

package/src/watch/public/app.js

@@ -3645,9 +3645,13 @@ function renderOfflineCard(
   loginPorts,
 ) {
   var cmdCount = cmds ? cmds.length : 0;
-  return styled(
+  return tag(
     "div",
-    "background:#1e1e2e;border:2px solid #f87171;border-radius:12px;padding:16px;opacity:0.9",
+    {
+      class: "wd-client-card",
+      style:
+        "background:#1e1e2e;border:2px solid #f87171;border-radius:12px;padding:16px;opacity:0.9",
+    },
     styled(
       "div",
       "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
@@ -3873,11 +3877,15 @@ function renderClientCard(
       ),
   );
 
-  return styled(
+  return tag(
     "div",
-    "background:#1e1e2e;border:2px solid " +
-      borderColor +
-      ";border-radius:12px;padding:16px",
+    {
+      class: "wd-client-card",
+      style:
+        "background:#1e1e2e;border:2px solid " +
+        borderColor +
+        ";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) +
@@ -4353,10 +4361,11 @@ function renderProxySection(c, userId) {
   var h = c.clashHealth;
   if (!h || !h.node) return "";
   var nodes = (h.meta && h.meta.healthyNodes) || [];
+  var delays = (h.meta && h.meta.healthyNodeDelays) || {};
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(h, nodes, userId, 0, hasNodes) +
-    renderNodeList(nodes, h.node, userId, 0)
+    renderNodeList(nodes, h.node, userId, 0, delays)
   );
 }
 
@@ -4364,10 +4373,11 @@ function renderProxySection(c, userId) {
 function renderProxyChannel(ch, userId) {
   if (!ch || !ch.node) return "";
   var nodes = (ch.meta && ch.meta.healthyNodes) || [];
+  var delays = (ch.meta && ch.meta.healthyNodeDelays) || {};
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(ch, nodes, userId, ch.port || 0, hasNodes) +
-    renderNodeList(nodes, ch.node, userId, ch.port || 0)
+    renderNodeList(nodes, ch.node, userId, ch.port || 0, delays)
   );
 }
 
@@ -4417,31 +4427,49 @@ function renderProxyLine(h, nodes, userId, port, hasNodes) {
 }
 
 /** 节点列表面板（默认隐藏） */
-function renderNodeList(nodes, currentNode, userId, port) {
+function renderNodeList(nodes, currentNode, userId, port, delays) {
   if (!nodes || !nodes.length) return "";
+  delays = delays || {};
 
   var items = "";
   for (var i = 0; i < nodes.length; i++) {
-    items += renderNodeItem(nodes[i], nodes[i] === currentNode, userId, port);
+    items += renderNodeItem(
+      nodes[i],
+      nodes[i] === currentNode,
+      userId,
+      port,
+      delays[nodes[i]],
+    );
   }
 
   var id = "wdNodes-" + wdEscId(userId) + "-" + port;
+  var expanded = _wdExpandedNodes[wdEscId(userId) + "-" + (port || 0)];
   return (
     '<div id="' +
     id +
     '" style="margin-top:4px;border:1px solid #2a2a3a;' +
-    'border-radius:6px;overflow:hidden;display:none">' +
+    "border-radius:6px;overflow:hidden;display:" +
+    (expanded ? "block" : "none") +
+    '">' +
     items +
     "</div>"
   );
 }
 
 /** 单个节点行 */
-function renderNodeItem(name, isActive, userId, port) {
+function renderNodeItem(name, isActive, userId, port, delay) {
   var color = isActive ? "#4ade80" : "#888";
   var bg = isActive ? "background:#1a3a2a;" : "";
   var dot = isActive ? "●" : "○";
   var textColor = isActive ? "#4ade80" : "#aaa";
+  var delayTag =
+    typeof delay === "number" && delay > 0
+      ? '<span style="color:' +
+        (isActive ? "#6ee7a0" : "#777") +
+        ';font-size:10px">' +
+        Math.round(delay) +
+        "ms</span>"
+      : "";
   var action = isActive
     ? '<span style="margin-left:auto;color:#555;font-size:10px">当前</span>'
     : "<button onclick=\"wdSwitchNode('" +
@@ -4455,7 +4483,7 @@ function renderNodeItem(name, isActive, userId, port) {
       'color:#fff;border:none;border-radius:2px;cursor:pointer">切换</button>';
 
   return (
-    '<div style="padding:3px 8px;display:flex;align-items:center;gap:6px;font-size:11px;' +
+    '<div class="wd-hover-row" style="padding:3px 8px;display:flex;align-items:center;gap:6px;font-size:11px;' +
     bg +
     '">' +
     '<span style="color:' +
@@ -4468,6 +4496,7 @@ function renderNodeItem(name, isActive, userId, port) {
     '">' +
     name +
     "</span>" +
+    delayTag +
     action +
     "</div>"
   );
@@ -4475,16 +4504,24 @@ function renderNodeItem(name, isActive, userId, port) {
 
 // ── 交互函数 ──
 
+// 节点列表面板展开状态（key: userId-port → true），自动刷新重渲染时保持展开
+var _wdExpandedNodes = {};
+
 function wdEscId(s) {
   return (s || "").replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 
 function wdToggleNodes(userId, port) {
-  var el = document.getElementById(
-    "wdNodes-" + wdEscId(userId) + "-" + (port || 0),
-  );
+  var key = wdEscId(userId) + "-" + (port || 0);
+  var el = document.getElementById("wdNodes-" + key);
   if (!el) return;
-  el.style.display = el.style.display === "none" ? "block" : "none";
+  var nowHidden = el.style.display === "none";
+  el.style.display = nowHidden ? "block" : "none";
+  if (nowHidden) {
+    _wdExpandedNodes[key] = true;
+  } else {
+    delete _wdExpandedNodes[key];
+  }
 }
 
 function wdSwitchNode(userId, node, port) {
@@ -4578,9 +4615,13 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
     var restart = p && p.restartCount > 0 ? String(p.restartCount) : "0";
 
     var prefix = "wd-" + esc(userId) + "-" + idx;
-    html += styled(
+    html += tag(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
+      {
+        class: "wd-hover-row",
+        style:
+          "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
+      },
       styled(
         "span",
         "color:" +
@@ -4710,9 +4751,13 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
     var sc = p.status === "running" ? "#4ade80" : "#f87171";
     var oid = p.pid || p.cmdId || "?";
     var opre = "wd-" + esc(userId) + "-orphan-" + esc(String(oid));
-    html += styled(
+    html += tag(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
+      {
+        class: "wd-hover-row",
+        style:
+          "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
+      },
       styled(
         "span",
         "color:#666;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:monospace",
@@ -4795,8 +4840,7 @@ function wdShowLogsModal(clientId, cmdId, title) {
   _wdLogs.deadline = Date.now() + 90000;
   _wdLogs.gotFirst = false;
   document.getElementById("wdLogsTitle").textContent = "📄 " + title;
-  document.getElementById("wdLogsStatus").textContent =
-    "⏳ 已请求客户端回传…";
+  document.getElementById("wdLogsStatus").textContent = "⏳ 已请求客户端回传…";
   document.getElementById("wdLogsContent").textContent =
     "等待客户端心跳回传日志…\n（心跳周期 ≤15s，最长等待 90s；拿到后会实时刷新）";
   document.getElementById("wdLogsModal").style.display = "flex";

package/src/watch/public/style.css

@@ -118,6 +118,24 @@ body {
   margin-top: 2px;
 }
 
+/* 看门狗面板：列表行 hover 高亮（内联背景用 !important 覆盖，移开后自动恢复） */
+.wd-hover-row {
+  transition: background 0.08s ease;
+}
+
+.wd-hover-row:hover {
+  background: rgba(96, 165, 250, 0.12) !important;
+}
+
+/* 看门狗面板：客户端卡片 hover 微亮（不改边框，保留离线红色警示） */
+.wd-client-card {
+  transition: background 0.15s ease;
+}
+
+.wd-client-card:hover {
+  background: #232338 !important;
+}
+
 .stat-card.clickable {
   cursor: pointer;
 }