tt-help-cli-ycl 1.4.115 → 1.4.119

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/refresh-mini.js

@@ -37,7 +37,6 @@ import {
   killEdgeProcesses,
 } from "../lib/browser/cdp.js";
 import { createApiClient } from "../lib/api-client.js";
-import { requireClashOrExit } from "../clash/checker.js";
 import { readHealth, writeCommand } from "../clash/ipc.js";
 import { spawn } from "child_process";
 import { fileURLToPath } from "url";
@@ -83,6 +82,19 @@ async function withRetry(label, fn) {
  */
 let spawnedDaemonPid = null;
 
+/** 从代理 URL 解析端口（http://127.0.0.1:7890 → 7890），无法解析返回 0（默认通道） */
+function proxyPortOf(url) {
+  if (!url) return 0;
+  try {
+    const u = new URL(url);
+    const p = parseInt(u.port, 10);
+    return p > 0 ? p : 0;
+  } catch {
+    const m = String(url).match(/:(\d+)/);
+    return m ? parseInt(m[1], 10) : 0;
+  }
+}
+
 function spawnClashDaemon() {
   try {
     const mainJs = path.join(__dirname, "..", "main.js");
@@ -115,10 +127,10 @@ function stopSpawnedDaemon() {
 }
 
 /**
- * 用 daemon 的 IPC 健康状态判断其是否存活（黑盒接口：clash-health.json）
+ * 用 daemon 的 IPC 健康状态判断其是否存活（黑盒接口：clash-health.json，按通道端口）
  */
-function isDaemonAlive() {
-  const h = readHealth();
+function isDaemonAlive(port = 0) {
+  const h = readHealth(port);
   return !!(h && !h.stale);
 }
 
@@ -140,20 +152,13 @@ export async function handleRefreshMini(options) {
     ensureDaemon,
   } = options;
 
+  // 配置了什么代理就用什么代理（--proxy > ~/.tt-help.json 的 proxy）；
+  // 未配置则不注入 proxyServer，浏览器走系统默认代理。
+  // 节点切换仍由 clash-daemon 负责（触发通知模式），不在此处自动解析。
   const effectiveProxy = exploreProxy || configuredProxy;
-  let resolvedProxy = effectiveProxy;
-  if (
-    !effectiveProxy ||
-    effectiveProxy.includes("127.0.0.1") ||
-    effectiveProxy.includes("localhost")
-  ) {
-    // refresh-mini 必须走本地 Clash：未配置代理时自动发现，节点轮换才有意义
-    resolvedProxy = await requireClashOrExit("refresh-mini");
-  } else {
-    console.error(
-      `[警告] 使用非本地代理 ${effectiveProxy}，Clash 节点轮换将无效`,
-    );
-  }
+  const resolvedProxy = effectiveProxy || null;
+  // 切换通知通道：按本实例的代理端口路由到 daemon 对应控制端
+  const proxyPort = proxyPortOf(resolvedProxy);
 
   let userId = exploreUserId || configuredUserId;
   let browser = null;
@@ -196,7 +201,7 @@ export async function handleRefreshMini(options) {
     if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
     console.error(`空闲间隔: ${exploreInterval || 30} 秒`);
     console.error(
-      `代理: ${resolvedProxy || "无"}${
+      `代理: ${resolvedProxy || "系统默认"}${
         rotateMin > 0
           ? `（每 ${rotateMin} 分钟轮换节点）`
           : "（定时轮换已关闭）"
@@ -310,8 +315,8 @@ export async function handleRefreshMini(options) {
 
     // --ensure-daemon：检查 clash-daemon 是否存活，未存活则拉起（默认不检测）
     if (ensureDaemon) {
-      if (isDaemonAlive()) {
-        const h = readHealth();
+      if (isDaemonAlive(proxyPort)) {
+        const h = readHealth(proxyPort);
         console.error(
           `[daemon] 已运行（上次巡检 ${h?.ageSeconds ?? "?"}s 前）`,
         );
@@ -339,16 +344,23 @@ export async function handleRefreshMini(options) {
       proxySwitchCount++;
       lastProxyTriggerTime = Date.now();
       consecutiveTaskErrors = 0;
-      const before = readHealth()?.lastSwitch || "";
+      const before = readHealth(proxyPort)?.lastSwitch || "";
       console.error(
-        `[代理] 触发切换通知（${reason}，累计 ${proxySwitchCount} 次），等待 daemon 回执...`,
+        `[代理] 触发切换通知（${reason}${proxyPort ? `，通道 ${proxyPort}` : ""}，累计 ${proxySwitchCount} 次），等待 daemon 回执...`,
+      );
+      writeCommand(
+        {
+          action: "failover",
+          reason: `refresh-mini: ${reason}`,
+          proxyPort: proxyPort || undefined,
+        },
+        proxyPort,
       );
-      writeCommand({ action: "failover", reason: `refresh-mini: ${reason}` });
 
       const deadline = Date.now() + SWITCH_RECEIPT_TIMEOUT_MS;
       while (Date.now() < deadline) {
         await sleep(3000);
-        const h = readHealth();
+        const h = readHealth(proxyPort);
         if (
           h &&
           h.lastSwitch &&

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,
@@ -758,6 +762,10 @@ function parseClashDaemonArgs(args) {
   let benchmark = 10;
   let dryRun = false;
   let country = null;
+  let apiPort = null;
+  let secret = null;
+  let selection = null;
+  const configPaths = [];
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -769,6 +777,15 @@ function parseClashDaemonArgs(args) {
       country = args[++i] || null;
     } else if (arg === "--dry-run") {
       dryRun = true;
+    } else if (arg === "--api-port") {
+      apiPort = parseInt(args[++i]) || 0;
+    } else if (arg === "--secret") {
+      secret = args[++i] || "";
+    } else if (arg === "--selection") {
+      selection = args[++i] || null;
+    } else if (arg === "--config-path") {
+      const p = args[++i];
+      if (p) configPaths.push(p);
     }
   }
 
@@ -778,6 +795,10 @@ function parseClashDaemonArgs(args) {
     benchmark,
     country,
     "dry-run": dryRun,
+    "api-port": apiPort,
+    secret,
+    selection,
+    "config-paths": configPaths,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,
@@ -992,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;
@@ -1542,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 表",
@@ -420,7 +431,7 @@ const HELP_TEXT = [
   "          tt-help watchdog -i 30 --client-id my-server-01",
   "",
   "  tt-help clash-daemon [选项]",
-  "    Clash Verge 代理节点健康守护：定时巡检 TikTok 可达性，异常时自动切换节点",
+  "    Clash Verge / mihomo 代理节点健康守护：定时巡检 TikTok 可达性，异常时自动切换节点",
   "    看门狗启动时会自动拉起此守护进程",
   "    选项:",
   "      --interval <秒>          巡检间隔，默认 120 秒（2分钟）",
@@ -428,6 +439,11 @@ const HELP_TEXT = [
   "      --country <国家代码>     只保留指定国家节点，默认不过滤",
   "                               支持: US, GB, DE, FR, JP, KR, SG, HK, TW, RU 等",
   "      --dry-run                只检测不切换（调试用）",
+  "      --api-port <端口>        控制 API 端口（默认自动发现；显式指定验证失败时报错）",
+  "      --secret <secret>        控制 API 密钥（默认自动获取）",
+  "      --selection <策略>       多控制端选择策略: system-proxy / preference / first-alive",
+  "      --config-path <路径>     追加自定义 config.yaml 探测路径（可重复）",
+  "    控制端自动发现: 依次探测 Clash Verge / 69cloud 配置 → 端口枚举，按策略选定",
   "    看门狗运行时可通过 /tmp/clash-cmd.json 发命令动态调整：",
   '      {"action":"switchNode","node":"节点名"}         一次性切换到指定节点（不干扰自检）',
   '      {"action":"setCountryFilter","country":"US"}   切换国家过滤',

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 {