tt-help-cli-ycl 1.4.117 → 1.4.119

package/package.json

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

package/src/cli/login-check.js

@@ -0,0 +1,309 @@
+/**
+ * handleLoginCheck — 批量检测 CDP 端口对应浏览器是否登录 TikTok
+ *
+ * 流程（每端口）:
+ *   1. 探测端口是否已开（未开 → 标记 launched）
+ *   2. ensureBrowserReady：未开自动启动 Edge（带代理），已开直接 CDP 连接
+ *   3. 新开 target 检测（不动其他程序正在使用的页面）
+ *   4. 导航 tiktok.com → passport/web/account/info 主检测：
+ *      - 返回 username（登录号）→ 已登录（一步拿到账号）
+ *      - HTTP 200 无账号数据 → 未登录
+ *      - 异常/非 200 → 回退 isLoggedIn（cookie sessionid + DOM 验真）
+ *   5. 关闭自己开的 target；本次启动的浏览器 kill 进程，已启动的仅断 CDP
+ */
+
+import http from "http";
+import os from "os";
+import path from "path";
+import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
+import { isLoggedIn } from "../lib/browser/page.js";
+import { proxy as configuredProxy } from "../lib/constants.js";
+import { writeJson } from "./utils.js";
+
+const DEFAULT_BASE_PORT = 9222;
+const DEFAULT_PORT_COUNT = 10;
+const STARTUP_TIKTOK_URL = "https://www.tiktok.com/";
+const ACCOUNT_INFO_URL = "https://www.tiktok.com/passport/web/account/info/";
+const GOTO_TIMEOUT = 30000;
+const ACCOUNT_INFO_TIMEOUT = 10000;
+
+function checkPortOpen(port) {
+  return new Promise((resolve) => {
+    const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
+      res.on("data", () => {});
+      res.on("end", () => resolve(res.statusCode === 200));
+    });
+    req.on("error", () => resolve(false));
+    req.setTimeout(3000, () => {
+      resolve(false);
+      req.destroy();
+    });
+  });
+}
+
+function userDataDirForPort(port) {
+  // 与 open.js / explore.js 固定端口模式一致：每个端口独立 _p{port} 目录（含 9222）
+  return path.join(
+    os.homedir(),
+    "Library",
+    "Application Support",
+    `Microsoft Edge For Testing_p${port}`,
+  );
+}
+
+/**
+ * 通过 passport/web/account/info 判断登录并获取账号
+ * 在页面上下文执行 fetch，自动携带浏览器 cookie
+ * 返回结构（已登录）: data.data = { username(登录号), screen_name(昵称), user_id, sec_user_id, ... }
+ * @returns {{httpStatus: number, username: string|null, screenName: string|null, hasAccount: boolean, error?: string}}
+ */
+async function checkByAccountInfo(page) {
+  try {
+    return await page.evaluate(
+      async ({ url, timeout }) => {
+        try {
+          const controller = new AbortController();
+          const timer = setTimeout(() => controller.abort(), timeout);
+          const res = await fetch(url, {
+            signal: controller.signal,
+            credentials: "include",
+            headers: { accept: "application/json" },
+          });
+          clearTimeout(timer);
+          let data = null;
+          try {
+            data = await res.json();
+          } catch {
+            // 非 JSON 响应（如验证码页面），按异常处理
+          }
+          const d = data?.data || null;
+          return {
+            httpStatus: res.status,
+            // 登录号：username 优先（新版结构），unique_id 兼容旧结构
+            username: d?.username || d?.unique_id || null,
+            screenName: d?.screen_name || null,
+            hasAccount: !!d && !!(d.user_id || d.sec_user_id),
+            // 服务端明确报会话过期（未登录时同样返回该错误，需结合 cookie 区分）
+            expired: d?.name === "session_expired" || d?.error_code === 13,
+          };
+        } catch (e) {
+          return {
+            httpStatus: 0,
+            username: null,
+            screenName: null,
+            hasAccount: false,
+            expired: false,
+            error: e?.message || String(e),
+          };
+        }
+      },
+      { url: ACCOUNT_INFO_URL, timeout: ACCOUNT_INFO_TIMEOUT },
+    );
+  } catch (e) {
+    return {
+      httpStatus: 0,
+      username: null,
+      screenName: null,
+      hasAccount: false,
+      expired: false,
+      error: e?.message || String(e),
+    };
+  }
+}
+
+async function hasSessionIdCookie(page) {
+  try {
+    const cookies = await page.context().cookies("https://www.tiktok.com");
+    return cookies.some((c) => c.name === "sessionid");
+  } catch {
+    return false;
+  }
+}
+
+async function checkOnePort(port, proxyServer) {
+  const result = {
+    port,
+    status: "unknown", // logged_in | logged_out | error
+    account: null,
+    screenName: null,
+    launched: false, // 本次命令启动的浏览器
+    fallback: false, // 是否走了 DOM 回退
+    expired: false, // session 是否已过期
+    message: "",
+  };
+
+  let browser = null;
+  let page = null;
+
+  try {
+    const wasOpen = await checkPortOpen(port);
+    result.launched = !wasOpen;
+    if (!wasOpen) {
+      console.error(`[端口 ${port}] 未运行，启动浏览器探测...`);
+    }
+
+    const cdpOptions = {
+      port,
+      // 显式传 userDataDir，确保 9222 也走 _p9222（与 open/explore 一致）
+      userDataDir: userDataDirForPort(port),
+    };
+    if (proxyServer) cdpOptions.proxyServer = proxyServer;
+
+    // Edge 刚启动时 CDP 可能瞬时异常（setDownloadBehavior），重试连接
+    for (let attempt = 1; ; attempt++) {
+      try {
+        browser = await ensureBrowserReady(cdpOptions);
+        break;
+      } catch (e) {
+        if (e.message?.includes("setDownloadBehavior") && attempt < 3) {
+          console.error(
+            `[端口 ${port}] CDP 连接异常，等待后重试 ${attempt}/3...`,
+          );
+          await new Promise((r) => setTimeout(r, 5000));
+          continue;
+        }
+        throw e;
+      }
+    }
+
+    const ctx = browser.contexts()[0];
+    if (!ctx) throw new Error("浏览器无可用 context");
+    page = await ctx.newPage();
+
+    await page.goto(STARTUP_TIKTOK_URL, {
+      waitUntil: "domcontentloaded",
+      timeout: GOTO_TIMEOUT,
+    });
+
+    const info = await checkByAccountInfo(page);
+    if (info.username) {
+      result.status = "logged_in";
+      result.account = info.username;
+      result.screenName = info.screenName;
+    } else if (info.expired && info.httpStatus === 200) {
+      // 服务端报 session 过期：结合浏览器是否还持有 sessionid cookie 区分
+      // 有 cookie → 曾登录但已过期；无 cookie → 从未登录
+      const hasSession = await hasSessionIdCookie(page);
+      if (hasSession) {
+        result.status = "expired";
+        result.expired = true;
+      } else {
+        result.status = "logged_out";
+      }
+    } else if (info.httpStatus === 200 && !info.error) {
+      if (info.hasAccount && info.screenName) {
+        // 有账号数据但缺 username 字段（结构异常）→ 用昵称兜底
+        result.status = "logged_in";
+        result.screenName = info.screenName;
+      } else {
+        // 接口正常返回但没有账号数据 → 明确未登录
+        result.status = "logged_out";
+      }
+    } else {
+      // 接口异常（风控/网络/非 JSON）→ 回退 cookie + DOM 检测
+      result.fallback = true;
+      console.error(
+        `[端口 ${port}] account/info 不可用（${info.error || "HTTP " + info.httpStatus}），回退 cookie+DOM 检测...`,
+      );
+      result.status = (await isLoggedIn(page)) ? "logged_in" : "logged_out";
+    }
+  } catch (e) {
+    result.status = "error";
+    result.message = e?.message || String(e);
+  } finally {
+    try {
+      if (page) await page.close().catch(() => {});
+    } catch {
+      // ignore
+    }
+    try {
+      if (browser) await browser.close().catch(() => {});
+    } catch {
+      // ignore
+    }
+    if (result.launched) {
+      console.error(`[端口 ${port}] 关闭探测用浏览器...`);
+      await killEdgeProcesses(userDataDirForPort(port), port);
+    }
+  }
+  return result;
+}
+
+function printResult(r) {
+  const statusText = {
+    logged_in: "已登录",
+    logged_out: "未登录",
+    expired: "已过期",
+    error: "探测失败",
+  }[r.status];
+  const accountText =
+    r.status === "logged_in" && r.account ? `@${r.account}` : "-";
+  const nameText =
+    r.status === "logged_in" && r.screenName && r.screenName !== r.account
+      ? ` (${r.screenName})`
+      : "";
+  const extras = [];
+  if (r.launched) extras.push("启动探测");
+  if (r.expired) extras.push("session过期");
+  if (r.fallback) extras.push("DOM回退");
+  if (r.message) extras.push(r.message);
+  const extraText = extras.length > 0 ? `  [${extras.join(", ")}]` : "";
+  console.log(
+    `${String(r.port).padEnd(5)} ${statusText.padEnd(6)} ${accountText}${nameText}${extraText}`,
+  );
+}
+
+export async function handleLoginCheck(options = {}) {
+  const {
+    loginCheckPorts = null,
+    loginCheckJson = false,
+    loginCheckProxy = null,
+    loginCheckConcurrency = 1,
+  } = options;
+
+  const proxyServer = loginCheckProxy || configuredProxy;
+  if (proxyServer) {
+    console.error(`代理: ${proxyServer}`);
+  } else {
+    console.error(`代理: 未配置`);
+  }
+
+  const ports =
+    loginCheckPorts && loginCheckPorts.length > 0
+      ? [...new Set(loginCheckPorts)]
+      : Array.from(
+          { length: DEFAULT_PORT_COUNT },
+          (_, i) => DEFAULT_BASE_PORT + i,
+        );
+
+  const concurrency = Math.max(
+    1,
+    Math.min(loginCheckConcurrency || 1, ports.length),
+  );
+  console.error(`检测端口: ${ports.join(", ")}（并发 ${concurrency}）`);
+
+  const results = new Map();
+  const queue = [...ports];
+
+  async function worker() {
+    while (queue.length > 0) {
+      const port = queue.shift();
+      const r = await checkOnePort(port, proxyServer);
+      results.set(port, r);
+    }
+  }
+
+  await Promise.all(Array.from({ length: concurrency }, () => worker()));
+
+  const ordered = ports.map((p) => results.get(p)).filter(Boolean);
+
+  if (loginCheckJson) {
+    writeJson(ordered, null);
+  } else {
+    console.log(`\n端口    状态     账号`);
+    for (const r of ordered) printResult(r);
+  }
+
+  const failed = ordered.filter((r) => r.status === "error");
+  if (failed.length > 0) process.exitCode = 2;
+}

package/src/cli/watchdog.js

@@ -20,6 +20,7 @@ export async function handleWatchdog(options) {
     watchdogInterval,
     watchdogClientId,
     watchdogNoDaemon,
+    watchdogLoginIntervalSec,
   } = options;
 
   // 服务端地址：--server 参数 > ~/.tt-help.json watchdogServer > server > 默认值
@@ -58,6 +59,7 @@ export async function handleWatchdog(options) {
     clientId,
     intervalMs: intervalSec * 1000,
     spawnDaemon: !watchdogNoDaemon,
+    loginCheckIntervalMs: (watchdogLoginIntervalSec || 7200) * 1000,
   });
 
   await agent.start();

package/src/lib/args.js

@@ -720,6 +720,7 @@ function parseWatchdogArgs(args) {
   let watchdogInterval = 15;
   let watchdogClientId = null;
   let watchdogNoDaemon = false;
+  let watchdogLoginIntervalSec = 7200;
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -731,6 +732,8 @@ function parseWatchdogArgs(args) {
       watchdogClientId = args[++i];
     } else if (arg === "--no-daemon") {
       watchdogNoDaemon = true;
+    } else if (arg === "--login-interval") {
+      watchdogLoginIntervalSec = parseInt(args[++i]) || 7200;
     }
   }
 
@@ -740,6 +743,7 @@ function parseWatchdogArgs(args) {
     watchdogInterval,
     watchdogClientId,
     watchdogNoDaemon,
+    watchdogLoginIntervalSec,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,
@@ -1009,6 +1013,62 @@ function parsePrecheckArgs(args) {
   };
 }
 
+function parsePortsArg(str) {
+  const ports = [];
+  for (const part of str.split(",")) {
+    const p = part.trim();
+    if (!p) continue;
+    if (/^\d+-\d+$/.test(p)) {
+      const [a, b] = p.split("-").map(Number);
+      for (let x = Math.min(a, b); x <= Math.max(a, b); x++) ports.push(x);
+    } else if (/^\d+$/.test(p)) {
+      ports.push(Number(p));
+    }
+  }
+  return ports;
+}
+
+function parseLoginCheckArgs(args) {
+  let loginCheckPorts = null;
+  let loginCheckJson = false;
+  let loginCheckProxy = null;
+  let loginCheckConcurrency = 1;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--json") {
+      loginCheckJson = true;
+    } else if (arg === "--proxy" && i + 1 < args.length) {
+      loginCheckProxy = args[++i];
+    } else if (
+      (arg === "-c" || arg === "--concurrency") &&
+      i + 1 < args.length
+    ) {
+      loginCheckConcurrency = parseInt(args[++i], 10) || 1;
+    } else if (!arg.startsWith("-")) {
+      loginCheckPorts = parsePortsArg(arg);
+    }
+  }
+
+  return {
+    subcommand: "login-check",
+    loginCheckPorts,
+    loginCheckJson,
+    loginCheckProxy,
+    loginCheckConcurrency,
+    urls: [],
+    outputFormat: "json",
+    exploreCount: 0,
+    showConfig: false,
+    showHelp: false,
+    customProxy: null,
+    configAction: null,
+    configValue: null,
+    pipeMode: false,
+    filterStr: null,
+  };
+}
+
 function parseOpenArgs(args) {
   let openPort = null;
   let openList = false;
@@ -1559,6 +1619,10 @@ export function parseArgs() {
     return parseOpenArgs(args.slice(1));
   }
 
+  if (args.length > 0 && args[0] === "login-check") {
+    return parseLoginCheckArgs(args.slice(1));
+  }
+
   if (args.length > 0 && args[0] === "comments") {
     return parseCommentsArgs(args.slice(1));
   }

package/src/lib/constants.js

@@ -262,6 +262,17 @@ const HELP_TEXT = [
   "    示例: tt-help open 9222",
   "          tt-help open --list",
   "",
+  "  tt-help login-check [端口列表] [选项]",
+  "    批量检测 CDP 端口对应浏览器是否登录 TikTok，并返回登录账号",
+  "    端口列表: 逗号分隔，支持范围，如 9222,9223,9225-9227；默认 9222-9231",
+  "    未运行的端口自动启动浏览器探测，探测完成后关闭",
+  "    选项:",
+  "      --proxy <地址>            浏览器代理，默认使用配置文件 proxy",
+  "      -c, --concurrency <数量>  并发检测数，默认 1",
+  "      --json                    输出 JSON 格式",
+  "    示例: tt-help login-check 9222,9223,9224 --proxy http://127.0.0.1:7897",
+  "          tt-help login-check --json",
+  "",
   "  videostats  <db路径> -p <并发数>",
   "    批量刷新视频统计数据（playCount, diggCount, commentCount, shareCount, collectCount）",
   "    直接读取并更新 SQLite videos 表",

package/src/main.js

@@ -26,6 +26,7 @@ import { handleRawSync } from "./cli/raw-sync.js";
 import { handleSearch } from "./cli/search.js";
 import { handleWatchdog } from "./cli/watchdog.js";
 import { handleClashDaemon } from "./cli/clash-daemon.js";
+import { handleLoginCheck } from "./cli/login-check.js";
 
 async function main() {
   const parsed = parseArgs();
@@ -77,6 +78,8 @@ async function main() {
       return handleWatchdog(parsed);
     case "clash-daemon":
       return handleClashDaemon(parsed);
+    case "login-check":
+      return handleLoginCheck(parsed);
   }
 
   const {

package/src/npm-main.js

@@ -22,6 +22,7 @@ import {
 import { handleRawSync } from "./cli/raw-sync.js";
 import { handleSearch } from "./cli/search.js";
 import { handleWatchdog } from "./cli/watchdog.js";
+import { handleLoginCheck } from "./cli/login-check.js";
 
 function exitUnsupportedCommand(command) {
   console.error(
@@ -76,6 +77,8 @@ async function main() {
       return handleSearch(parsed);
     case "watchdog":
       return handleWatchdog(parsed);
+    case "login-check":
+      return handleLoginCheck(parsed);
   }
 
   const {

package/src/watch/data-store.js

@@ -668,7 +668,8 @@ function getTargetRefreshStats(hours = 24) {
     )
     .all(...targetLocations);
 
-  if (!totalRows.length) return { countries: [], total: 0, refreshed: 0 };
+  if (!totalRows.length)
+    return { countries: [], total: 0, refreshed: 0, pendingRefresh: 0 };
 
   // 按国家统计最近 N 小时内刷新过的数量
   const threshold = Date.now() - hours * 3600 * 1000;
@@ -688,17 +689,47 @@ function getTargetRefreshStats(hours = 24) {
   const refreshedMap = new Map();
   for (const r of refreshedRows) refreshedMap.set(r.country, r.cnt);
 
+  // 按国家统计待 Refresh 数量（pending_refresh = 1，等待 refresh 客户端处理）
+  const pendingRows = getDb()
+    .prepare(
+      `
+      SELECT location_created as country, COUNT(*) as cnt
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND pending_refresh = 1
+        AND location_created IN (${placeholders})
+      GROUP BY location_created
+    `,
+    )
+    .all(...targetLocations);
+  const pendingMap = new Map();
+  for (const r of pendingRows) pendingMap.set(r.country, r.cnt);
+
   const results = [];
   let totalAll = 0;
   let refreshedAll = 0;
+  let pendingAll = 0;
   for (const r of totalRows) {
     const refreshed = refreshedMap.get(r.country) || 0;
+    const pendingRefresh = pendingMap.get(r.country) || 0;
     totalAll += r.cnt;
     refreshedAll += refreshed;
-    results.push({ country: r.country, total: r.cnt, refreshed });
+    pendingAll += pendingRefresh;
+    results.push({
+      country: r.country,
+      total: r.cnt,
+      refreshed,
+      pendingRefresh,
+    });
   }
 
-  return { countries: results, total: totalAll, refreshed: refreshedAll };
+  return {
+    countries: results,
+    total: totalAll,
+    refreshed: refreshedAll,
+    pendingRefresh: pendingAll,
+  };
 }
 
 export function createStore(filePath, options = {}) {

package/src/watch/public/app.js

@@ -1706,7 +1706,7 @@ let currentTagsSeq = 0;
 const TAGS_PAGE_SIZE = 200;
 let cachedTagCountries = [];
 let currentRefreshHours = 24;
-let currentTargetRefreshHours = 24;
+let currentTargetRefreshHours = 48;
 
 function showTagsPage() {
   document.getElementById("mainPage").classList.add("hidden");
@@ -2087,6 +2087,7 @@ function renderTargetRefreshStats(data) {
       <thead><tr style="color:#888;text-align:left">
         <th style="padding:4px 8px">国家</th>
         <th style="padding:4px 8px;text-align:right">商家数</th>
+        <th style="padding:4px 8px;text-align:right">待Refresh</th>
         <th style="padding:4px 8px;text-align:right">${currentTargetRefreshHours}h已刷</th>
         <th style="padding:4px 8px;width:120px">进度</th>
       </tr></thead>
@@ -2098,6 +2099,7 @@ function renderTargetRefreshStats(data) {
     html += `<tr style="color:#ccc;border-top:1px solid #222">
       <td style="padding:4px 8px">${c.country}</td>
       <td style="padding:4px 8px;text-align:right">${c.total}</td>
+      <td style="padding:4px 8px;text-align:right;color:${c.pendingRefresh > 0 ? "#fbbf24" : "#9ca3af"}">${c.pendingRefresh || 0}</td>
       <td style="padding:4px 8px;text-align:right;color:${cpct >= 50 ? "#22c55e" : "#facc15"}">${c.refreshed}</td>
       <td style="padding:4px 8px">
         <div style="display:flex;align-items:center;gap:6px">
@@ -3436,6 +3438,7 @@ async function fetchWatchdogData() {
       _wdData.clientCommands || {},
       _wdData.clashCountries || {},
       _wdData.errorTriggers || {},
+      _wdData.loginPorts || {},
     );
   } catch (e) {
     document.getElementById("wdClientsList").textContent =
@@ -3488,6 +3491,7 @@ function renderWatchdogDashboard(
   clientCommands,
   clashCountries,
   errorTriggers,
+  loginPorts,
 ) {
   // 顶栏统计始终更新（textContent 不闪烁）
   var onlineCount = clients.filter(function (c) {
@@ -3546,7 +3550,13 @@ function renderWatchdogDashboard(
   var allCards = [];
   sortedClients.forEach(function (c) {
     allCards.push(
-      renderClientCard(c, clientCommands, clashCountries, errorTriggers),
+      renderClientCard(
+        c,
+        clientCommands,
+        clashCountries,
+        errorTriggers,
+        loginPorts,
+      ),
     );
   });
   // 离线卡也按名称排序
@@ -3570,6 +3580,7 @@ function renderWatchdogDashboard(
         clientCommands[uid],
         clashCountries,
         errorTriggers,
+        loginPorts,
       ),
     );
   });
@@ -3615,7 +3626,13 @@ function renderWatchdogDashboard(
   }
 }
 
-function renderOfflineCard(userId, cmds, clashCountries, errorTriggers) {
+function renderOfflineCard(
+  userId,
+  cmds,
+  clashCountries,
+  errorTriggers,
+  loginPorts,
+) {
   var cmdCount = cmds ? cmds.length : 0;
   return styled(
     "div",
@@ -3686,6 +3703,7 @@ function renderOfflineCard(userId, cmds, clashCountries, errorTriggers) {
       ) +
       renderCountrySection({}, userId, clashCountries) +
       renderErrorTriggerSection({}, userId, errorTriggers) +
+      renderLoginSection({}, userId, loginPorts) +
       renderCmdRows(cmds || [], userId, [], false),
   );
 }
@@ -3720,7 +3738,13 @@ function findAnalysis(llmAnalysis, cmdId) {
   return null;
 }
 
-function renderClientCard(c, clientCommands, clashCountries, errorTriggers) {
+function renderClientCard(
+  c,
+  clientCommands,
+  clashCountries,
+  errorTriggers,
+  loginPorts,
+) {
   var os = c.osInfo || {},
     cfg = c.config || {},
     procs = c.processes || [];
@@ -3833,6 +3857,7 @@ function renderClientCard(c, clientCommands, clashCountries, errorTriggers) {
       styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
       renderCountrySection(c, userId, clashCountries) +
       renderErrorTriggerSection(c, userId, errorTriggers) +
+      renderLoginSection(c, userId, loginPorts) +
       renderProxySection(c, userId) +
       renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis),
   );
@@ -3962,6 +3987,137 @@ async function wdSetCountries() {
   }
 }
 
+// ── 登录检测端口配置区域（看门狗面板中每个客户端卡片） ──
+
+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;
+  if (!report) {
+    reportHtml = 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(
+          "span",
+          "color:" +
+            color +
+            ";background:#0d1117;border:1px solid #333;padding:1px 6px;border-radius:4px",
+          txt,
+        );
+      })
+      .join(" ");
+    reportHtml =
+      styled("span", "color:#888;margin-left:auto", "最近检测(" + et2 + "): ") +
+      badges;
+  } else {
+    reportHtml = styled("span", "color:#555;margin-left:auto", "无结果");
+  }
+  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", "登录检测:") +
+      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 端口（逗号分隔，留空清空）",
+        },
+        (configured.length ? configured.join(",") : "未配置") + " ⚙️",
+      ) +
+      reportHtml,
+  );
+}
+
+// ── 登录检测端口配置弹窗 ──
+
+var _wdLoginPortsUserId = "";
+
+function wdShowLoginPortsModal(userId) {
+  _wdLoginPortsUserId = userId;
+  document.getElementById("wdLoginPortsUserId").textContent = userId;
+  var configured = [];
+  if (_wdData && _wdData.loginPorts && _wdData.loginPorts[userId]) {
+    configured = _wdData.loginPorts[userId].ports || [];
+  }
+  document.getElementById("wdLoginPortsInput").value = configured.join(",");
+  document.getElementById("wdLoginPortsModal").style.display = "flex";
+}
+
+async function wdSetLoginPorts() {
+  var raw = document.getElementById("wdLoginPortsInput").value;
+  var ports = raw
+    .split(",")
+    .map(function (s) {
+      return s.trim();
+    })
+    .filter(Boolean);
+  try {
+    var res = await fetch("/api/watchdog/login-ports", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdLoginPortsUserId, ports: ports }),
+    });
+    var d = await res.json();
+    document.getElementById("wdLoginPortsModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        "已配置检测端口: " +
+          (d.ports.length ? d.ports.join(",") : "无") +
+          "\n\n客户端将在下次心跳时生效，并立即触发一次检测。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
 // ── 错误自动切节点配置区域（看门狗面板中每个客户端卡片） ──
 
 function renderErrorTriggerSection(c, userId, errorTriggers) {

package/src/watch/public/index.html

@@ -667,7 +667,26 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260811b"></script>
+  <!-- 登录检测端口配置弹窗 -->
+  <div id="wdLoginPortsModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:480px">
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🔑 登录检测端口 — <span id="wdLoginPortsUserId"></span>
+      </div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">配置该客户端要定期检测登录状态的 CDP 端口（逗号分隔，如 <b
+          style="color:#4ade80">9222,9223,9225</b>）。<br>客户端每隔一段时间自动检测并上报结果，留空保存可清空配置。</div>
+      <input id="wdLoginPortsInput" placeholder="9222,9223,9225"
+        style="width:100%;padding:8px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:6px;font-size:13px;box-sizing:border-box">
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdLoginPortsModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetLoginPorts()"
+          style="padding:8px 16px;background:#4ade80;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
+  <script src="app.js?v=20260816b"></script>
 </body>
 
 </html>

package/src/watch/watchdog-server.js

@@ -121,6 +121,7 @@ function getOnlineClients() {
       llmAnalysis,
       clashHealth: info.clashHealth || null,
       clashHealthChannels: info.clashHealthChannels || [],
+      loginReport: info.loginReport || null,
       lastHeartbeat: info.lastHeartbeat,
       registeredAt: info.registeredAt,
       online,
@@ -243,6 +244,43 @@ function getAllErrorTriggers() {
   return cfg.errorTriggers || {};
 }
 
+// ── 登录端口检测配置管理（per agent，后端配置要检查的 CDP 端口列表） ──
+
+function getLoginPortsStored(userId) {
+  if (!userId) return [];
+  const cfg = loadConfig();
+  const entry = cfg.loginPorts && cfg.loginPorts[userId];
+  if (entry && Array.isArray(entry.ports)) return entry.ports;
+  return [];
+}
+
+function setLoginPortsStored(userId, ports) {
+  const cleaned = [
+    ...new Set(
+      (Array.isArray(ports) ? ports : [])
+        .map((p) => parseInt(p, 10))
+        .filter((p) => Number.isInteger(p) && p > 0 && p < 65536),
+    ),
+  ];
+  const cfg = loadConfig();
+  if (!cfg.loginPorts) cfg.loginPorts = {};
+  if (cleaned.length === 0) {
+    delete cfg.loginPorts[userId];
+  } else {
+    cfg.loginPorts[userId] = {
+      ports: cleaned,
+      updatedAt: new Date().toISOString(),
+    };
+  }
+  saveConfig(cfg);
+  return cleaned;
+}
+
+function getAllLoginPorts() {
+  const cfg = loadConfig();
+  return cfg.loginPorts || {};
+}
+
 // ── 节点国家配置管理（per agent，默认 US，幂等下发） ──
 
 /** 读取某 agent 的国家配置，未配置时默认 ["US"] */
@@ -328,6 +366,7 @@ async function handleHeartbeat(params, body, res) {
     clashHealthChannels: Array.isArray(body.clashHealthChannels)
       ? body.clashHealthChannels
       : [],
+    loginReport: body.loginReport || null,
   });
 
   // 按 userId 返回该客户端的专属命令列表
@@ -366,6 +405,7 @@ async function handleHeartbeat(params, body, res) {
     clashCommands: clashCommands.length > 0 ? clashCommands : undefined,
     clientConfig: getClientConfigStored(userId),
     errorTrigger: getErrorTriggerStored(userId),
+    loginPorts: getLoginPortsStored(userId),
     serverTime: Date.now(),
   });
 }
@@ -379,6 +419,7 @@ async function handleGetClients(params, body, res) {
     clashCountries: getAllClientCountries(),
     supportedCountries: SUPPORTED_COUNTRIES,
     errorTriggers: getAllErrorTriggers(),
+    loginPorts: getAllLoginPorts(),
     configPath: WATCHDOG_CONFIG_PATH,
   });
 }
@@ -449,6 +490,7 @@ async function handleDeleteClient(params, body, res) {
   if (cfg.clientConfigs) delete cfg.clientConfigs[userId];
   if (cfg.clashCountries) delete cfg.clashCountries[userId];
   if (cfg.errorTriggers) delete cfg.errorTriggers[userId];
+  if (cfg.loginPorts) delete cfg.loginPorts[userId];
   saveConfig(cfg);
   lastSentCountries.delete(userId);
   clashCmdQueue.delete(userId);
@@ -568,6 +610,36 @@ async function handleSetErrorTrigger(params, body, res) {
   sendJSON(res, 200, { ok: true, config: cleaned });
 }
 
+/** 配置某 agent 要检测登录状态的 CDP 端口列表（逗号分隔或数组） */
+async function handleSetLoginPorts(params, body, res) {
+  const { userId, ports } = body || {};
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  // 前端可能传字符串 "9222,9223"，统一转数组
+  let portArr = ports;
+  if (typeof ports === "string") {
+    portArr = ports
+      .split(",")
+      .map((s) => s.trim())
+      .filter(Boolean)
+      .map((s) => parseInt(s, 10));
+  }
+  const cleaned = setLoginPortsStored(userId, portArr);
+  const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+  console.error(
+    `[watchdog ${ts}] ${userId} 登录检测端口已更新: ${cleaned.join(",") || "已清空"}`,
+  );
+  sendJSON(res, 200, {
+    ok: true,
+    ports: cleaned,
+    message: cleaned.length
+      ? `已配置检测端口 ${cleaned.join(",")}，客户端将在下次心跳时生效`
+      : "已清空检测端口",
+  });
+}
+
 // ── 公开 ──
 
 export function registerWatchdogRoutes(httpServer) {
@@ -645,5 +717,9 @@ export async function tryHandleWatchdogRoute(
     await handleSetErrorTrigger(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/login-ports") {
+    await handleSetLoginPorts(params, body, res);
+    return true;
+  }
   return false;
 }

package/src/watchdog/agent.js

@@ -161,12 +161,29 @@ export class WatchdogAgent {
    * @param {string} opts.clientId - 客户端标识
    * @param {number} opts.intervalMs - 心跳间隔（毫秒）
    * @param {boolean} [opts.spawnDaemon=true] - 是否自动启动 clash daemon
+   * @param {number} [opts.loginCheckIntervalMs] - 登录检测周期（毫秒），默认 2 小时
    */
-  constructor({ serverUrl, clientId, intervalMs = 15000, spawnDaemon = true }) {
+  constructor({
+    serverUrl,
+    clientId,
+    intervalMs = 15000,
+    spawnDaemon = true,
+    loginCheckIntervalMs = 2 * 60 * 60 * 1000,
+  }) {
     this.serverUrl = serverUrl.replace(/\/+$/, "");
     this.clientId = clientId;
     this.intervalMs = intervalMs;
     this.spawnDaemon = !!spawnDaemon;
+    this.loginCheckIntervalMs = Math.max(
+      60 * 1000,
+      loginCheckIntervalMs || 2 * 60 * 60 * 1000,
+    );
+    this.loginPorts = []; // 服务端下发的检测端口列表
+    this._loginPortsKey = ""; // 端口列表指纹（变化时立即检测）
+    this.loginReport = null; // 最近一次登录检测结果（随心跳上报）
+    this._loginChecking = false; // 防重入
+    this._lastLoginCheckAt = 0; // 上次检测时间戳
+    this.loginCheckTimer = null;
     this.running = false;
     this.heartbeatTimer = null;
     this.thresholdTimer = null;
@@ -250,6 +267,14 @@ export class WatchdogAgent {
       this._checkProcessErrors();
     }, ERROR_SCAN_INTERVAL_MS);
 
+    // 登录检测调度：每 60s 检查一次是否到点（首次 60s 后检测，之后每 loginCheckIntervalMs）
+    this.loginCheckTimer = setInterval(() => {
+      this._maybeRunLoginCheck();
+    }, 60_000);
+    setTimeout(() => {
+      this._maybeRunLoginCheck();
+    }, 60_000);
+
     // LLM 日志分析（每 10 分钟调服务端接口）
     this._startLlmAnalyzer();
 
@@ -278,6 +303,10 @@ export class WatchdogAgent {
       clearInterval(this._errorTriggerTimer);
       this._errorTriggerTimer = null;
     }
+    if (this.loginCheckTimer) {
+      clearInterval(this.loginCheckTimer);
+      this.loginCheckTimer = null;
+    }
     if (this.llmAnalyzerTimer) {
       clearInterval(this.llmAnalyzerTimer);
       this.llmAnalyzerTimer = null;
@@ -417,6 +446,7 @@ export class WatchdogAgent {
       llmAnalysis: this._llmResults,
       clashHealth: getClashHealth(), // daemon 写入的主控制端健康状态（兼容旧版页面）
       clashHealthChannels: getClashHealthChannels(), // 多控制端各通道健康状态
+      loginReport: this.loginReport, // 最近一次登录检测结果
     };
   }
 
@@ -485,6 +515,18 @@ export class WatchdogAgent {
       if (data.errorTrigger) {
         this._applyErrorTriggerConfig(data.errorTrigger);
       }
+      // 服务端下发的登录检测端口列表
+      if (Array.isArray(data.loginPorts)) {
+        const key = data.loginPorts.join(",");
+        if (key !== this._loginPortsKey) {
+          this._loginPortsKey = key;
+          this.loginPorts = data.loginPorts;
+          this._lastLoginCheckAt = 0; // 配置变化 → 立即触发一次检测
+          console.error(
+            `[watchdog] 登录检测端口: ${key || "未配置"}（周期 ${Math.round(this.loginCheckIntervalMs / 60000)} 分钟）`,
+          );
+        }
+      }
 
       // 心跳日志：仅状态变化或每 10 次打印一次
       this._heartbeatSeq++;
@@ -538,6 +580,113 @@ export class WatchdogAgent {
     }
   }
 
+  /**
+   * 登录检测调度入口：到点且服务端配置了端口时执行一次检测
+   */
+  _maybeRunLoginCheck() {
+    if (!this.running || this._loginChecking) return;
+    if (!Array.isArray(this.loginPorts) || this.loginPorts.length === 0) return;
+    if (Date.now() - this._lastLoginCheckAt < this.loginCheckIntervalMs) return;
+    this._lastLoginCheckAt = Date.now(); // 先占位，防 60s tick 重入
+    this._runLoginCheck().catch((e) => {
+      console.error(`[watchdog] 登录检测执行失败: ${e.message}`);
+    });
+  }
+
+  /**
+   * 执行一次登录检测：spawn 子进程跑 tt-help login-check（一次性短任务，不进 ProcessManager）
+   */
+  async _runLoginCheck() {
+    this._loginChecking = true;
+    const ports = this.loginPorts;
+    console.error(`[watchdog] 开始登录检测 (端口: ${ports.join(",")})...`);
+    try {
+      // 全局安装用 tt-help 命令；源码模式用 node cli.js
+      const cliPath = join(__dirname, "..", "..", "cli.js");
+      const cmd = isGlobalInstall() ? "tt-help" : process.execPath;
+      const args = isGlobalInstall()
+        ? ["login-check", ports.join(","), "--json"]
+        : [cliPath, "login-check", ports.join(","), "--json"];
+      // 带上 ~/.tt-help.json 里配置的代理（服务端可通过 clientConfig 下发）
+      const cfg = getClientConfig();
+      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"],
+        });
+        let out = "",
+          err = "";
+        child.stdout.on("data", (d) => (out += d));
+        child.stderr.on("data", (d) => (err += d));
+        child.on("error", (e) =>
+          resolve({ stdout: out, stderr: err + e.message, code: -1 }),
+        );
+        child.on("close", (c) =>
+          resolve({ stdout: out, stderr: err, code: c }),
+        );
+        // 超时保护 10 分钟（单端口含启动探测最长约 2 分钟）
+        setTimeout(
+          () => {
+            try {
+              child.kill("SIGKILL");
+            } catch {
+              /* ignore */
+            }
+          },
+          10 * 60 * 1000,
+        );
+      });
+
+      if (code !== 0) {
+        // 部分端口失败时 login-check 也会输出完整 JSON（退出码 2）。
+        // 优先采用 stdout 里的 JSON 结果，仅解析失败才记为 error。
+        let partial = null;
+        try {
+          const parsed = JSON.parse(String(stdout).trim());
+          if (Array.isArray(parsed)) partial = parsed;
+        } catch {
+          // stdout 不是 JSON → 走错误分支
+        }
+        if (partial) {
+          this.loginReport = { ports: partial, checkedAt: Date.now() };
+          console.error(
+            `[watchdog] 登录检测完成(部分失败): ${
+              String(stderr)
+                .split("\n")
+                .filter((l) => l.includes("探测失败"))
+                .slice(-3)
+                .join(" | ")
+                .slice(-300) || "见端口状态"
+            }`,
+          );
+          return;
+        }
+        this.loginReport = {
+          error: `exit ${code}: ${String(stderr).slice(-500)}`,
+          checkedAt: Date.now(),
+        };
+        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() };
+      const summary = parsed
+        .map(
+          (r) =>
+            `${r.port}:${r.status}${r.status === "logged_in" && r.account ? "@" + r.account : ""}`,
+        )
+        .join(" ");
+      console.error(`[watchdog] 登录检测完成: ${summary}`);
+    } catch (e) {
+      this.loginReport = { error: e.message, checkedAt: Date.now() };
+      console.error(`[watchdog] 登录检测异常: ${e.message}`);
+    } finally {
+      this._loginChecking = false;
+    }
+  }
+
   /**
    * 启动 LLM 日志分析定时器（每 10 分钟调服务端接口）
    */