tt-help-cli-ycl 1.3.82 → 1.3.84

package/src/cli/refresh.js

@@ -23,6 +23,7 @@ import {
   switchAccount,
 } from "../lib/browser/cdp.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
+import { createApiClient } from "../lib/api-client.js";
 import path from "path";
 import os from "os";
 
@@ -45,24 +46,6 @@ async function withRetry(label, fn) {
   }
 }
 
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    return res.json();
-  });
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    return res.json();
-  });
-}
-
 export async function handleRefresh(options) {
   const {
     explorePreset,
@@ -116,9 +99,6 @@ export async function handleRefresh(options) {
 
     setDelayConfig(explorePreset);
 
-    // 连接服务器验证
-    await apiGet(`${serverUrl}/api/stats`);
-
     console.error(`\n=== Refresh 模式（基于 explore） ===`);
     console.error(`服务器: ${serverUrl}`);
     console.error(`视频采集: ${exploreMaxVideos || 16}`);
@@ -175,6 +155,11 @@ export async function handleRefresh(options) {
       );
     }
 
+    const { apiGet, apiPost } = createApiClient({ meta: { port: cdpOptions.port } });
+
+    // 连接服务器验证
+    await apiGet(`${serverUrl}/api/stats`);
+
     browser = await ensureBrowserReadyCDP(cdpOptions);
     const { processExplore } = await import("../scraper/explore-core.js");
     const { isLoggedIn } = await import("../lib/browser/page.js");

package/src/lib/api-client.js

@@ -0,0 +1,101 @@
+import crypto from "node:crypto";
+
+const MAX_RETRY_WAIT = 5 * 60 * 1000;
+
+async function withRetry(label, fn, opts = {}) {
+  const { maxRetries, backoff: initialBackoff = 1000, log = true } = opts;
+
+  let backoff = initialBackoff;
+  let i = 0;
+
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      if (maxRetries !== undefined && i >= maxRetries) {
+        throw err;
+      }
+      if (log) {
+        console.error(
+          `[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`,
+        );
+      }
+      await new Promise((r) => setTimeout(r, backoff));
+      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
+      i++;
+    }
+  }
+}
+
+function buildHeaders(baseHeaders, clientId, meta) {
+  return {
+    ...baseHeaders,
+    "X-Client-Id": clientId,
+    "X-Client-Info": JSON.stringify(meta),
+  };
+}
+
+export function createApiClient(opts = {}) {
+  const clientId = crypto.randomUUID();
+  const {
+    checkStatus = false,
+    maxRetries,
+    backoff = 1000,
+    log = true,
+    meta = {},
+  } = opts;
+  const retryOpts = { maxRetries, backoff, log };
+
+  async function apiGet(url) {
+    return withRetry(`GET ${url}`, async () => {
+      const res = await fetch(url, {
+        headers: buildHeaders({}, clientId, meta),
+      });
+      if (checkStatus && !res.ok) {
+        const errText = await res.text();
+        throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
+      }
+      return res.json();
+    }, retryOpts);
+  }
+
+  async function apiPost(url, body) {
+    return withRetry(`POST ${url}`, async () => {
+      const res = await fetch(url, {
+        method: "POST",
+        headers: buildHeaders(
+          { "Content-Type": "application/json" },
+          clientId,
+          meta,
+        ),
+        body: JSON.stringify(body),
+      });
+      if (checkStatus && !res.ok) {
+        const errText = await res.text();
+        throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
+      }
+      return res.json();
+    }, retryOpts);
+  }
+
+  async function apiPut(url, body) {
+    return withRetry(`PUT ${url}`, async () => {
+      const res = await fetch(url, {
+        method: "PUT",
+        headers: buildHeaders(
+          { "Content-Type": "application/json" },
+          clientId,
+          meta,
+        ),
+        body: body ? JSON.stringify(body) : undefined,
+      });
+      if (checkStatus && !res.ok) {
+        const errText = await res.text();
+        throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
+      }
+      return res.json();
+    }, retryOpts);
+  }
+
+  return { apiGet, apiPost, apiPut };
+}

package/src/lib/api-interceptor-comment.js

@@ -12,35 +12,61 @@ import { delay } from "./delay.js";
  * @param {function} options.onCaptcha - 验证码检测回调 (page) => Promise<{detected: boolean}>
  * @returns {Promise<{comments: Array, total: number, captchaDetected: boolean, error: string|null}>}
  */
-async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log, onCaptcha } = {}) {
+async function fetchUserCommentsAPI(
+  page,
+  { maxComments = 100, log = console.log, onCaptcha } = {},
+) {
   // 先注册 API 拦截器，再点 tab（顺序不能反）
   let apiResolve = null;
   let apiRequestUrl = null;
-  const apiPromise = new Promise(r => { apiResolve = r; });
+  const apiPromise = new Promise((r) => {
+    apiResolve = r;
+  });
 
   const handler = async (response) => {
     const url = response.url();
-    if (response.status() === 200 && url.includes('/api/comment/list/') && !apiRequestUrl) {
+    if (
+      response.status() === 200 &&
+      url.includes("/api/comment/list/") &&
+      !apiRequestUrl
+    ) {
       apiRequestUrl = url;
       try {
-        apiResolve(await response.json());
+        // 超时保护：response.json() 内部调用 CDP Network.getResponseBody，
+        // 当页面刷新/验证码导致响应资源丢失时会挂起，需独立超时控制
+        apiResolve(
+          await Promise.race([
+            response.json(),
+            new Promise((_, reject) =>
+              setTimeout(
+                () => reject(new Error("Response body fetch timeout (60s)")),
+                60000,
+              ),
+            ),
+          ]),
+        );
       } catch (e) {
         apiResolve(null);
       }
     }
   };
 
-  page.on('response', handler);
+  page.on("response", handler);
 
   try {
     // 点击评论 tab 触发 API
-    log('  [API拦截] 点击评论 tab...');
+    log("  [API拦截] 点击评论 tab...");
     const tabs = page.locator('[class*="tabbar-item"]');
     const commentTab = tabs.filter({ hasText: /评论|Comment/ });
     const count = await commentTab.count();
 
     if (count === 0) {
-      return { comments: [], total: 0, captchaDetected: false, error: '未找到评论 tab' };
+      return {
+        comments: [],
+        total: 0,
+        captchaDetected: false,
+        error: "未找到评论 tab",
+      };
     }
 
     await commentTab.first().click({ force: true });
@@ -55,7 +81,12 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
 
     if (!data || !apiRequestUrl) {
       log(`  [API拦截] 点击评论 tab 后 ${elapsed}ms 未拿到 API 响应`);
-      return { comments: [], total: 0, captchaDetected: false, error: 'API 超时或未响应' };
+      return {
+        comments: [],
+        total: 0,
+        captchaDetected: false,
+        error: "API 超时或未响应",
+      };
     }
 
     // 验证码检测（API 拿完后检测）
@@ -65,7 +96,7 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
         const captchaResult = await onCaptcha(page);
         captchaDetected = !!captchaResult.detected;
         if (captchaDetected) {
-          log('  [API拦截] 检测到验证码');
+          log("  [API拦截] 检测到验证码");
         }
       } catch (e) {
         log(`  [API拦截] 验证码检测异常: ${e.message}`);
@@ -73,10 +104,16 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
     }
 
     const items = data.comments || [];
-    log(`  [API拦截] ${elapsed}ms 后拿到 ${items.length} 条评论 (total: ${data.total || '?'})`);
+    log(
+      `  [API拦截] ${elapsed}ms 后拿到 ${items.length} 条评论 (total: ${data.total || "?"})`,
+    );
 
     if (items.length >= maxComments) {
-      return { comments: items.slice(0, maxComments), total: data.total || 0, captchaDetected };
+      return {
+        comments: items.slice(0, maxComments),
+        total: data.total || 0,
+        captchaDetected,
+      };
     }
 
     // 翻页
@@ -86,7 +123,10 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
 
     while (hasMore && cursor && items.length < maxComments) {
       pageNum++;
-      const pageUrl = apiRequestUrl.replace(/cursor=([^&]+)/, `cursor=${cursor}`);
+      const pageUrl = apiRequestUrl.replace(
+        /cursor=([^&]+)/,
+        `cursor=${cursor}`,
+      );
 
       const pageData = await page.evaluate(async (u) => {
         try {
@@ -103,7 +143,9 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
       }
 
       const pageComments = pageData.comments || [];
-      log(`  [API拦截] 翻页 ${pageNum}: ${pageComments.length} 条 (累计: ${items.length + pageComments.length})`);
+      log(
+        `  [API拦截] 翻页 ${pageNum}: ${pageComments.length} 条 (累计: ${items.length + pageComments.length})`,
+      );
 
       items.push(...pageComments);
       cursor = pageData.cursor;
@@ -119,7 +161,7 @@ async function fetchUserCommentsAPI(page, { maxComments = 100, log = console.log
 
     return { comments: result, total: data.total || 0, captchaDetected };
   } finally {
-    page.off('response', handler);
+    page.off("response", handler);
   }
 }
 

package/src/lib/api-interceptor.js

@@ -134,7 +134,17 @@ async function fetchUserVideosAPI(page, username, maxVideos, log) {
       { timeout: 30000 },
     );
 
-    data = await response.json();
+    // 超时保护：response.json() 内部调用 CDP Network.getResponseBody，
+    // 当页面刷新/验证码导致响应资源丢失时会挂起，需独立超时控制
+    data = await Promise.race([
+      response.json(),
+      new Promise((_, reject) =>
+        setTimeout(
+          () => reject(new Error("Response body fetch timeout (60s)")),
+          60000,
+        ),
+      ),
+    ]);
   } catch (e) {
     interceptionError = e.message;
   } finally {

package/src/watch/data-store.js

@@ -1951,6 +1951,8 @@ export function createStore(filePath, options = {}) {
   let clientErrors = new Map();
   // 客户端登录状态：userId → boolean
   let clientLoginStatus = new Map();
+  // 活跃客户端追踪：clientId → { type, ip, port, userId, lastSeen }
+  let activeClients = new Map();
   // refill 锁：防止多个 claimNextJob 同时触发 LLM refill
   let refillLock = null; // Promise | null
   // LLM 采样偏移量记忆：按猜测国家记录上次查询位置，避免重复采样
@@ -3928,6 +3930,38 @@ Standards: 90-100=clear match, 70-89=likely, 50-69=possible, 20-49=low, 0-19=unl
     return Object.fromEntries(clientLoginStatus);
   }
 
+  function trackClient(clientId, info) {
+    const existing = activeClients.get(clientId);
+    if (existing) {
+      if (info.type) existing.type = info.type;
+      if (info.userId) existing.userId = info.userId;
+      if (info.ip) existing.ip = info.ip;
+      if (info.port !== undefined) existing.port = info.port;
+      existing.lastSeen = Date.now();
+    } else {
+      activeClients.set(clientId, {
+        ...info,
+        lastSeen: Date.now(),
+      });
+    }
+  }
+
+  function getActiveClients() {
+    const now = Date.now();
+    const stale = 2 * 60 * 1000;
+    for (const [id, info] of activeClients) {
+      if (now - info.lastSeen > stale) activeClients.delete(id);
+    }
+    return Array.from(activeClients.entries()).map(([clientId, info]) => ({
+      clientId,
+      type: info.type || "unknown",
+      ip: info.ip || "",
+      port: info.port || 0,
+      userId: info.userId || "",
+      lastSeen: info.lastSeen,
+    }));
+  }
+
   function getPendingUserUpdateTasks(limit, countries) {
     const targetCountries = countries
       ? countries.map((c) => String(c).trim().toUpperCase())
@@ -4493,6 +4527,8 @@ Standards: 90-100=clear match, 70-89=likely, 50-69=possible, 20-49=low, 0-19=unl
     deleteClientError,
     getClientErrors,
     getClientLoginStatus,
+    trackClient,
+    getActiveClients,
     registerVideos,
     getVideo,
     getVideos,

package/src/watch/public/app.js

@@ -221,6 +221,7 @@ function renderStats() {
   renderCountryChart(d.countryStats);
   renderSourceChart(d.sourceStats);
   renderTargetLocationFilter(d.targetCountryStats);
+  renderActiveClients(d.activeClients || []);
 }
 
 function renderTargetLocationFilter(targetCountryStats) {
@@ -237,6 +238,100 @@ function renderTargetLocationFilter(targetCountryStats) {
       .join("");
 }
 
+function formatRelativeTime(ts) {
+  const diff = Math.max(0, Date.now() - ts);
+  if (diff < 5000) return "刚刚";
+  const s = Math.round(diff / 1000);
+  if (s < 60) return s + " 秒前";
+  const m = Math.round(s / 60);
+  if (m < 60) return m + " 分钟前";
+  return Math.round(m / 60) + " 小时前";
+}
+
+function renderActiveClients(clients) {
+  const section = document.getElementById("activeClientsSection");
+  const bar = document.getElementById("activeClientsBar");
+  const table = document.getElementById("activeClientsTable");
+  const tbody = document.getElementById("activeClientsBody");
+  if (!section || !bar) return;
+
+  const types = ["explore", "refresh", "attach", "comments"];
+  const labels = { explore: "Explore", refresh: "Refresh", attach: "Attach", comments: "Comments" };
+  const grouped = {};
+  for (const c of clients) {
+    if (!grouped[c.type]) grouped[c.type] = [];
+    grouped[c.type].push(c);
+  }
+
+  const counts = {};
+  for (const t of types) counts[t] = (grouped[t] || []).length;
+  const total = clients.length;
+
+  if (total === 0) {
+    section.style.display = "none";
+    return;
+  }
+  section.style.display = "";
+
+  // 清除之前的选择状态
+  let selectedType = bar.dataset.selectedType || "";
+
+  const parts = ['<span class="bar-label">活跃客户端</span>'];
+  for (const t of types) {
+    const count = counts[t] || 0;
+    const cls = count > 0 ? "active" : "inactive";
+    const dot = count > 0 ? '<span class="dot"></span>' : "";
+    const sel = t === selectedType ? " selected" : "";
+    parts.push(
+      `<span class="client-badge ${cls}${sel}" data-type="${t}" onclick="toggleClientDetail('${t}')">${dot}${labels[t]}: ${count}</span>`,
+    );
+  }
+  bar.innerHTML = parts.join("\n");
+
+  // 如果有选中类型，刷新明细
+  if (selectedType && grouped[selectedType]) {
+    showClientDetail(selectedType, grouped[selectedType]);
+  } else {
+    table.style.display = "none";
+  }
+}
+
+function toggleClientDetail(type) {
+  const bar = document.getElementById("activeClientsBar");
+  if (bar.dataset.selectedType === type) {
+    bar.dataset.selectedType = "";
+    document.getElementById("activeClientsTable").style.display = "none";
+  } else {
+    bar.dataset.selectedType = type;
+  }
+  if (currentStats) renderActiveClients(currentStats.activeClients || []);
+}
+
+function showClientDetail(type, clients) {
+  const table = document.getElementById("activeClientsTable");
+  const tbody = document.getElementById("activeClientsBody");
+  table.style.display = "";
+  tbody.innerHTML = clients
+    .map((c) => {
+      const cid = c.clientId ? c.clientId.substring(0, 8) : "-";
+      const ipPort = c.ip
+        ? c.ip + (c.port ? ":" + c.port : "")
+        : "-";
+      const userId = c.userId || "-";
+      const last = formatRelativeTime(c.lastSeen);
+      return `<tr>
+        <td class="client-id">${cid}</td>
+        <td class="ip-port">${ipPort}</td>
+        <td class="ip-port">${c.port || "-"}</td>
+        <td class="user-id">${userId}</td>
+        <td class="last-seen">${last}</td>
+      </tr>`;
+    })
+    .join("");
+}
+
+window.toggleClientDetail = toggleClientDetail;
+
 function renderCountryChart(countries) {
   const el = document.getElementById("countryChart");
   const filtered = countries.filter((c) => c.country !== "未知");
@@ -1162,7 +1257,7 @@ function renderTargetTable() {
 
       return `<tr data-user="${u.uniqueId}">
       <td style="color:#9ca3af;font-size:12px;text-align:center" data-label="#">${i + 1}</td>
-      <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
+      <td class="user-id" data-label="用户名"><a href="https://www.tiktok.com/@${u.uniqueId}" target="_blank" style="color:#3b82f6;text-decoration:none">@${u.uniqueId}</a></td>
       <td data-label="昵称">${nick}</td>
       <td data-label="粉丝">${fans}</td>
       <td data-label="视频">${videos}</td>

package/src/watch/public/index.html

@@ -58,6 +58,21 @@
         <div class="value target" id="statTarget">0</div>
       </div>
     </div>
+    <div id="activeClientsSection" class="active-clients-section" style="display:none">
+      <div class="active-clients-bar" id="activeClientsBar"></div>
+      <table class="active-clients-table" id="activeClientsTable" style="display:none">
+        <thead>
+          <tr>
+            <th>Client ID</th>
+            <th>IP</th>
+            <th>端口</th>
+            <th>用户编号</th>
+            <th>最后活跃</th>
+          </tr>
+        </thead>
+        <tbody id="activeClientsBody"></tbody>
+      </table>
+    </div>
     <div class="client-errors-section" id="clientErrorsSection" style="display:none">
       <div class="section-header">
         <h3>客户端异常</h3>

package/src/watch/public/style.css

@@ -118,6 +118,113 @@ body {
   background: rgba(167, 139, 250, 0.15);
 }
 
+.active-clients-section {
+  background: #1a1a24;
+  border-radius: 8px;
+  padding: 12px 16px;
+  margin-bottom: 16px;
+}
+
+.active-clients-bar {
+  display: flex;
+  gap: 16px;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.active-clients-bar .bar-label {
+  font-size: 13px;
+  color: #888;
+  margin-right: 4px;
+}
+
+.active-clients-bar .client-badge {
+  font-size: 13px;
+  padding: 3px 10px;
+  border-radius: 12px;
+  cursor: pointer;
+  transition: background 0.2s;
+  white-space: nowrap;
+}
+
+.active-clients-bar .client-badge .dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-right: 4px;
+}
+
+.active-clients-bar .client-badge.active {
+  background: #1a2e1a;
+  color: #4ade80;
+}
+
+.active-clients-bar .client-badge.active:hover {
+  background: #224422;
+}
+
+.active-clients-bar .client-badge.active .dot {
+  background: #4ade80;
+}
+
+.active-clients-bar .client-badge.inactive {
+  background: #252536;
+  color: #64748b;
+}
+
+.active-clients-bar .client-badge.selected {
+  outline: 2px solid #60a5fa;
+}
+
+.active-clients-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 12px;
+  font-size: 13px;
+}
+
+.active-clients-table th {
+  text-align: left;
+  color: #888;
+  font-weight: 500;
+  padding: 6px 12px;
+  border-bottom: 1px solid #2a2a3a;
+}
+
+.active-clients-table td {
+  padding: 8px 12px;
+  border-bottom: 1px solid #1e1e2e;
+  color: #ccc;
+}
+
+.active-clients-table td.client-id {
+  font-family: monospace;
+  font-size: 12px;
+  color: #60a5fa;
+}
+
+.active-clients-table td.ip-port {
+  font-family: monospace;
+  font-size: 12px;
+  color: #facc15;
+}
+
+.active-clients-table td.user-id {
+  font-family: monospace;
+  font-size: 12px;
+  color: #c084fc;
+}
+
+.active-clients-table td.last-seen {
+  color: #94a3b8;
+  font-size: 12px;
+}
+
+.active-clients-table tr:hover td {
+  background: #1e1e2e;
+}
+
 .charts {
   display: grid;
   grid-template-columns: 1fr 1fr;

package/src/watch/server.js

@@ -89,6 +89,14 @@ function sendCSV(res, columns, rows) {
   res.end(body);
 }
 
+function inferClientType(routePath) {
+  if (routePath.startsWith("/api/redo-job")) return "refresh";
+  if (routePath.startsWith("/api/user-update-tasks")) return "attach";
+  if (routePath.startsWith("/api/comment-task")) return "comments";
+  if (routePath.startsWith("/api/job") || routePath.startsWith("/api/explore-new")) return "explore";
+  return null;
+}
+
 export function startWatchServer(
   dataAnchor,
   port = 3000,
@@ -112,6 +120,19 @@ export function startWatchServer(
     const server = http.createServer(async (req, res) => {
       const { path: routePath, params } = parseQuery(req.url);
 
+      // 客户端追踪：从 header 提取 clientId 和元数据，根据路由推断类型
+      const clientId = req.headers["x-client-id"] || "";
+      if (clientId) {
+        let meta = {};
+        try {
+          meta = JSON.parse(req.headers["x-client-info"] || "{}");
+        } catch {}
+        const ip = req.socket.remoteAddress || "";
+        const userId = params.userId || "";
+        const type = inferClientType(routePath);
+        store.trackClient(clientId, { ip, port: meta.port, userId, type });
+      }
+
       if (req.method === "POST" && routePath === "/api/users") {
         try {
           const { usernames, sources, guessedLocation } = await readBody(req);
@@ -382,6 +403,7 @@ export function startWatchServer(
         const stats = computeStatsIncremental(store);
         stats.targetLocations = DEFAULT_TARGET_LOCATIONS;
         stats.clientLoginStatus = store.getClientLoginStatus();
+        stats.activeClients = store.getActiveClients();
         stats.llmSampleOffsets = store.getLlmSampleOffsets(); // 添加偏移量状态
         sendJSON(res, 200, stats);
         return;