tt-help-cli-ycl 1.4.176 → 1.4.178

package/package.json

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

package/scripts/deploy-node.sh

@@ -1,26 +1,31 @@
 #!/bin/bash
-# 将本地 tiktok-cli 打包部署到 Windows 采集节点（试运行，不经 npm registry）
+# 将本地 tiktok-cli 打包部署到采集节点（不经 npm registry）—— npm publish 前真机测试标准通道
 # 用法:
-#   ./scripts/deploy-node.sh tiktok-210                  # 打包+传输+远程安装+校验
-#   ./scripts/deploy-node.sh tiktok-210 --bump           # 先把 package.json 版本号 +1 再打包
-#   ./scripts/deploy-node.sh tiktok-210 --bump --restart # 安装后重启走 CDP 的命令进程
-#                                                        #（watchdog 检测到退出会用新代码自动拉起）
-# 流程: (可选)升版本号 → npm pack → scp → 远程 npm install -g → 校验 → (可选)重启命令
-# 前提: ~/.ssh/config 已配置节点别名（如 tiktok-210，经跳板机），BatchMode 免密可用
+#   ./scripts/deploy-node.sh <ssh别名> [--linux] [--bump] [--restart]
+#   ./scripts/deploy-node.sh tiktok-210                  # 打包+传输+远程安装+校验（Windows 节点）
+#   ./scripts/deploy-node.sh f11 --linux --restart       # Linux 节点（如 F-11），重启 systemd watchdog
+#   ./scripts/deploy-node.sh tiktok-210 --bump --restart # 先把 package.json 版本号 +1 再打包，安装后重启业务进程
+# 流程: (可选)升版本号 → npm pack → scp → 远程 npm install -g → 校验 → (可选)重启
+# 前提: ~/.ssh/config 已配置节点别名（如 tiktok-210/f11，经跳板机或直连），BatchMode 免密可用
 # 说明:
+#   - 测试包【不要加 --bump】：同版本号覆盖安装，autoUpgrade 视为最新不动作；测完用官方包还原
+#     （带新版本号的测试包会让节点永远认为「已是最新」，发布同号正式版时再也升不上去）
+#   - Linux 重启前提：节点 /etc/sudoers.d 已放行 NOPASSWD systemctl restart tt-watchdog
 #   - 无需停进程再安装：采集客户端不加载 better-sqlite3（只有 videostats/watch 服务端用），无文件锁
 #   - watchdog 自升级：npm 覆盖安装后守护进程经 upgrader.js 自动重启，受管命令随后重建
 #   - 节点上保留 tgz 安装包，回滚时 npm install -g 旧版 tgz 即可
 set -euo pipefail
 
-ALIAS="${1:?用法: deploy-node.sh <ssh别名> [--bump] [--restart]}"
+ALIAS="${1:?用法: deploy-node.sh <ssh别名> [--linux] [--bump] [--restart]}"
 shift || true
 DO_BUMP=0
 DO_RESTART=0
+DO_LINUX=0
 for a in "$@"; do
   case "$a" in
     --bump) DO_BUMP=1 ;;
     --restart) DO_RESTART=1 ;;
+    --linux) DO_LINUX=1 ;;
     *) echo "未知参数: $a"; exit 1 ;;
   esac
 done
@@ -49,22 +54,33 @@ TGZ=$(npm pack 2>/dev/null | tail -1)
 echo "包: $TGZ ($(du -h "$TGZ" | cut -f1))"
 
 echo "==> scp → $ALIAS"
+# grep 对空输出返回 1，pipefail 下会误杀脚本；scp 真实成败由远程版本校验兕底
 scp -o ConnectTimeout=25 -o BatchMode=yes "$TGZ" "$ALIAS:$TGZ" 2>&1 |
-  grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' >/dev/null
-echo "已传输到 %USERPROFILE%\\$TGZ"
+  grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' >/dev/null || true
+echo "已传输到 ~/$TGZ"
 
 echo "==> 远程 npm install -g"
-ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" \
-  "npm install -g %USERPROFILE%\\$TGZ 2>&1" |
-  grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' |
-  tail -3
+if [ "$DO_LINUX" = 1 ]; then
+  ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" \
+    "npm install -g \$HOME/$TGZ 2>&1" |
+    grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|^Warning|Permanently added' |
+    tail -3
+else
+  ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" \
+    "npm install -g %USERPROFILE%\\$TGZ 2>&1" |
+    grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' |
+    tail -3
+fi
 
 echo "==> 校验远程版本"
-REMOTE_VER=$(
-  ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" "tt-help --version 2>nul" 2>/dev/null |
-    grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' |
-    tail -1 | tr -d '\r'
-)
+VER_FILTER='post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added'
+if [ "$DO_LINUX" = 1 ]; then
+  REMOTE_VER=$(ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" "tt-help --version 2>/dev/null" 2>/dev/null |
+    grep -vE "$VER_FILTER" | tail -1 | tr -d '\r')
+else
+  REMOTE_VER=$(ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" "tt-help --version 2>nul" 2>/dev/null |
+    grep -vE "$VER_FILTER" | tail -1 | tr -d '\r')
+fi
 if [ "$REMOTE_VER" = "$VER" ]; then
   echo "✓ 远程版本 $REMOTE_VER"
 else
@@ -73,11 +89,19 @@ else
 fi
 
 if [ "$DO_RESTART" = 1 ]; then
-  echo "==> 重启走 CDP 的命令进程（排除 watchdog/webserver，浏览器进程保留、新客户端直接重连）"
-  ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" 'powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \"Name='node.exe'\" | Where-Object { $_.CommandLine -match \"cli\.js\" -and $_.CommandLine -notmatch \"watchdog|webserver\" } | ForEach-Object { taskkill /F /PID $_.ProcessId }"' 2>&1 |
-    grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' |
-    head -10 || true
-  echo "（watchdog 检测到异常退出后会在 5-30s 内用新代码自动拉起，Edge 进程保留、客户端直连不重启浏览器）"
+  if [ "$DO_LINUX" = 1 ]; then
+    echo "==> 重启 watchdog（systemd）"
+    ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" \
+      "sudo -n systemctl restart tt-watchdog && sleep 2 && systemctl is-active tt-watchdog" 2>&1 |
+      grep -vE 'post-quantum|openssh.com/pq|Permanently added' | tail -1
+  else
+    echo "==> 重启走 CDP 的命令进程（排除 watchdog/webserver，浏览器进程保留、新客户端直接重连）"
+    ssh -o ConnectTimeout=25 -o BatchMode=yes "$ALIAS" 'powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \"Name='node.exe'\" | Where-Object { $_.CommandLine -match \"cli\.js\" -and $_.CommandLine -notmatch \"watchdog|webserver\" } | ForEach-Object { taskkill /F /PID $_.ProcessId }"' 2>&1 |
+      grep -vE 'post-quantum|openssh.com/pq|store now|upgraded|CLIXML|^Warning|Permanently added' |
+      head -10 || true
+    echo "（watchdog 检测到异常退出后会在 5-30s 内用新代码自动拉起，Edge 进程保留、客户端直连不重启浏览器）"
+    echo "（如需重启 watchdog 本体：杀 PID + schtasks /run \tt-watchdog）"
+  fi
 fi
 
 echo "==> 完成"

package/scripts/test-login-import-skip.mjs

@@ -0,0 +1,52 @@
+/**
+ * 登录导入跳过逻辑单元测试 — syncLoginStates 本地 marker 永久跳过 + fetch 省略
+ *
+ * 覆盖:
+ *   1. 全部端口在 marker → 不发中心 fetch（不可达服务端也不报错）→ 全部跳过「本地已导入」
+ *   2. 部分端口在 marker → marker 口跳过，未导入口因总超时放弃（不起 Edge）
+ *
+ * 跑法: HOME=$(mktemp -d) node scripts/test-login-import-skip.mjs
+ */
+import assert from "assert";
+import { writeFileSync } from "fs";
+import { join } from "path";
+
+const HOME = process.env.HOME;
+if (!HOME || HOME === "/") {
+  console.error("请用隔离 HOME 运行: HOME=$(mktemp -d) node scripts/test-login-import-skip.mjs");
+  process.exit(1);
+}
+
+const { syncLoginStates } = await import("../src/watchdog/login-import.js");
+
+let pass = 0, fail = 0;
+const check = (name, cond, extra = "") => {
+  if (cond) { pass++; console.log(`  ✓ ${name}`); }
+  else { fail++; console.log(`  ✗ ${name} ${extra}`); }
+};
+
+// 预置 marker：9222/9223 已导入过
+writeFileSync(join(HOME, ".tt-help-watchdog-login-imported.json"), JSON.stringify({ 9222: "userA", 9223: "userB" }));
+
+// 不可达服务端：若代码仍尝试 fetch，会等最多 15s 超时（用耗时断言识别）
+const UNREACHABLE = "http://127.0.0.1:1";
+
+console.log("\n[1] 全口 marker：零 fetch、全跳过");
+{
+  const t0 = Date.now();
+  const s = await syncLoginStates({ serverUrl: UNREACHABLE, userId: "T", ports: [9222, 9223], portTimeoutMs: 1000, totalTimeoutMs: 60000 });
+  check("两口全部 skipped", s.skipped.length === 2 && s.imported.length === 0 && s.failed.length === 0, JSON.stringify(s));
+  check("原因=本地已导入", s.skipped.every((x) => x.reason === "本地已导入"), JSON.stringify(s.skipped));
+  check("未发中心 fetch（<2s，fetch 会撞 15s 级等待）", Date.now() - t0 < 2000, `${Date.now() - t0}ms`);
+}
+
+console.log("\n[2] 混合：marker 口跳过，新口进不了 Edge（总超时拦截）");
+{
+  const s = await syncLoginStates({ serverUrl: UNREACHABLE, userId: "T", ports: [9222, 9444], portTimeoutMs: 1000, totalTimeoutMs: 0 });
+  const sk = s.skipped.find((x) => x.port === 9222);
+  check("marker 口 9222 跳过", sk && sk.reason === "本地已导入", JSON.stringify(s));
+  check("新口 9444 未起 Edge（总超时放弃）", s.failed.some((x) => x.port === 9444 && x.reason === "总超时"), JSON.stringify(s.failed));
+}
+
+console.log(`\n结果: ${pass} 过 / ${fail} 挂`);
+process.exit(fail ? 1 : 0);

package/scripts/test-login-pool-ui.mjs

@@ -150,14 +150,23 @@ await page.waitForFunction(() => document.querySelector("#content table"), { tim
 const headers = await page.textContent("#content table tr:first-child");
 check(
   "独立页新列齐全",
-  ["账号", "状态", "使用者", "最近使用", "次数", "有效期", "操作", "历史"].every((h) => headers.includes(h)),
+  ["账号", "状态", "使用者", "最近使用", "次数", "有效期", "检测", "操作", "历史"].every((h) => headers.includes(h)),
 );
 const row1 = await page.textContent("#content table tr:nth-child(2)");
 check("状态徽章=使用中", row1.includes("使用中"));
 check("使用者=机器:口", row1.includes("F-11:9222"));
 const poolSrc = await page.content();
 check("独立页无 cookie 明文", !poolSrc.includes("SECRET-SID-XYZ"));
-check("独立页含重登录置灰按钮", await page.$$eval("#content button[disabled]", (bs) => bs.some((b) => b.textContent.includes("重登录"))));
+check("独立页重登录按钮已点亮（不再是置灰占位）", await page.$$eval("#content button:not([disabled])", (bs) => bs.some((b) => b.textContent.includes("重登录"))));
+check("独立页含新增账号/批量检测按钮", await page.$$eval(".bar button", (bs) => {
+  const t = bs.map((b) => b.textContent).join();
+  return t.includes("新增账号") && t.includes("批量检测");
+}));
+const barSrc = await page.content();
+check("页面含命令化文案（协议桥后置，先复制命令）", barSrc.includes("tt-help login-pool"));
+check("模拟取号/入池粘cookies按钮已移除", !barSrc.includes("模拟取号") && !barSrc.includes("入池(粘cookies)"));
+check("自动刷新无条件化（无勾选框）", !barSrc.includes('id="auto"'));
+check("统计 chips 存在", await page.$$eval("#stats .chip", (cs) => cs.length >= 5));
 
 // 有效期归一显示：应为 ~90 天后的日期（而非 1970）
 const day90 = new Date(Date.now() + 90 * 86400000).toLocaleDateString("zh-CN");

package/scripts/test-login-pool.mjs

@@ -32,7 +32,13 @@ const {
   importAccount,
   heartbeatLoginPool,
   reapExpiredLeases,
+  reloginAccount,
+  prepareRelogin,
+  healthTargets,
+  recordHealth,
+  _accountsInternal,
 } = await import("../src/watch/login-pool.js");
+const { checkPoolAccounts } = await import("../src/watch/login-health.js");
 
 let pass = 0;
 let fail = 0;
@@ -370,12 +376,115 @@ console.log("\n[8] 登录态导入 import");
   const imp2 = importAccount({ userId: "F-8", port: 9301, username: "userD", cookies: [{ name: "sessionid", value: "OTHER-SESSION" }], note: "另机重复会话" });
   check("重复导入幂等（dedup=true）", imp2.dedup === true);
   check("不覆盖池内 cookies", !JSON.stringify(imp2.account).includes("OTHER-SESSION"));
-  check("原来源元数据不动", imp2.account.lastImportFrom.userId === "F-9");
+  check("幂等补写来源元数据（最近导入者，供节点热路径跳过）", imp2.account.lastImportFrom.userId === "F-8" && imp2.account.lastImportFrom.port === 9301);
 
   let threw = false;
   try { importAccount({ userId: "F-1", username: "x" }); } catch (e) { threw = true; check("缺 cookies 拒绝", /cookies/.test(e.message)); }
   check("缺 cookies 确实抛错", threw);
 }
 
+console.log("\n[9] 重登录 relogin（覆盖刷新 + 守卫）");
+{
+  for (const a of getLoginPoolView().accounts) {
+    try { releaseAccount({ id: a.id }); } catch {}
+    try { updateAccount({ id: a.id, status: "retired" }); } catch {}
+    try { deleteAccount(a.id); } catch {}
+  }
+  const D1 = [
+    { name: "sessionid", value: "sid-d-old", domain: ".tiktok.com", expires: Math.floor(Date.now() / 1000) + 86400 },
+    { name: "unique_id", value: "userD", domain: ".tiktok.com" },
+  ];
+  importAccount({ userId: "F-9", username: "userD", cookies: D1 });
+  const D2 = [
+    { name: "sessionid", value: "sid-d-new", domain: ".tiktok.com", expires: Math.floor(Date.now() / 1000) + 86400 * 2 },
+    { name: "unique_id", value: "userD", domain: ".tiktok.com" },
+    { name: "poc_marker", value: "x", domain: ".tiktok.com" },
+  ];
+
+  let r = reloginAccount({ username: "userD", cookies: D2, userId: "cli", note: "单测" });
+  const after = JSON.parse(JSON.stringify(_accountsInternal().find((a) => a.username === "userD")));
+  check("覆盖刷新（新 cookies 落池）", JSON.stringify(after.cookies).includes("sid-d-new") && JSON.stringify(after.cookies).includes("poc_marker"));
+  check("历史含 relogin 事件", (after.history || []).some((h) => h.event === "relogin"));
+  check("正常刷新不改状态不复活", r.revived === false && r.wasSuspect === false && r.account.status === "pool");
+
+  let threw = false;
+  try { reloginAccount({ username: "ghost", cookies: D2, userId: "cli" }); } catch (e) { threw = /不在池中/.test(e.message); }
+  check("不在池拒绝", threw);
+  threw = false;
+  try { reloginAccount({ username: "userD", cookies: D2 }); } catch (e) { threw = /userId/.test(e.message); }
+  check("缺 userId 拒绝", threw);
+  threw = false;
+  try { reloginAccount({ username: "userD", userId: "cli" }); } catch (e) { threw = /cookies/.test(e.message); }
+  check("缺 cookies 拒绝", threw);
+
+  acquireAccount({ userId: "T1", port: 9400 });
+  threw = false;
+  try { reloginAccount({ username: "userD", cookies: D2, userId: "cli" }); } catch (e) { threw = /使用中/.test(e.message); }
+  check("使用中拒绝重登录", threw);
+  releaseAccount({ id: getLoginPoolView().accounts.find((a) => a.username === "userD").id });
+
+  updateAccount({ id: getLoginPoolView().accounts.find((a) => a.username === "userD").id, status: "suspect" });
+  r = reloginAccount({ username: "userD", cookies: D2, userId: "cli" });
+  check("suspect → 刷新后回 pool", r.wasSuspect === true && r.account.status === "pool");
+
+  updateAccount({ id: getLoginPoolView().accounts.find((a) => a.username === "userD").id, status: "retired" });
+  r = reloginAccount({ username: "userD", cookies: D2, userId: "cli" });
+  check("retired → 重登录复活", r.revived === true && r.account.status === "pool");
+}
+
+console.log("\n[10] 巡检 healthTargets/recordHealth/checkPoolAccounts（注入假探测）");
+{
+  for (const a of getLoginPoolView().accounts) {
+    try { releaseAccount({ id: a.id }); } catch {}
+    try { updateAccount({ id: a.id, status: "retired" }); } catch {}
+    try { deleteAccount(a.id); } catch {}
+  }
+  const mk = (sid) => [
+    { name: "sessionid", value: sid, domain: ".tiktok.com", expires: Math.floor(Date.now() / 1000) + 86400 },
+    { name: "unique_id", value: "u-" + sid, domain: ".tiktok.com" },
+  ];
+  importAccount({ userId: "F-9", username: "u-alive", cookies: mk("alive-1") });
+  importAccount({ userId: "F-9", username: "u-dead", cookies: mk("dead-1") });
+  const retired = importAccount({ userId: "F-9", username: "u-retired", cookies: mk("ret-1") });
+  updateAccount({ id: retired.account.id, status: "retired" });
+
+  const targets = healthTargets();
+  check("巡检目标默认含 pool/suspect 排除 retired", targets.length === 2 && targets.every((t) => t.username !== "u-retired"));
+  check("巡检目标带 cookies/proxyHint", targets.every((t) => Array.isArray(t.cookies) && t.cookies.length > 0));
+
+  // 假探测：u-alive 判活，u-dead 判死（带标记 cookie 验证探测拿到的是池内 cookies）
+  const fakeProbe = async (cookies) => {
+    const isAlive = JSON.stringify(cookies).includes("alive-1");
+    check(isAlive ? "探测[活]拿到的是池内 cookies" : "探测[死]拿到的是池内 cookies", Array.isArray(cookies));
+    return isAlive
+      ? { alive: true, username: "u-alive", expired: false, httpStatus: 200, error: null, ms: 5 }
+      : { alive: false, username: null, expired: true, httpStatus: 200, error: null, ms: 5 };
+  };
+  const sum = await checkPoolAccounts({ probeFn: fakeProbe, pacingMs: 0 });
+  check("巡检计数 alive/dead", sum.checked === 2 && sum.alive === 1 && sum.dead === 1);
+  check("死号自动 pool→suspect", sum.migrated === 1 && sum.results.find((x) => x.username === "u-dead").migrated === true);
+
+  const deadAcc = getLoginPoolView().accounts.find((a) => a.username === "u-dead");
+  check("死号 lastHealth=dead + 时间戳", deadAcc.lastHealth === "dead" && deadAcc.lastHealthAt > 0);
+  check("死号历史含 health 事件", (deadAcc.history || []).some((h) => h.event === "health"));
+  const aliveAcc = getLoginPoolView().accounts.find((a) => a.username === "u-alive");
+  check("活号不写 history（防刷屏）", !(aliveAcc.history || []).some((h) => h.event === "health"));
+
+  acquireAccount({ userId: "T2", port: 9401 }); // 租走最久未用的（u-alive 或 u-dead 中 LRU 者）
+  const leased = getLoginPoolView().accounts.find((a) => a.status === "leased");
+  const rec = recordHealth({ id: leased.id, ok: "dead", detail: "单测" });
+  check("leased 死号仅记录不迁移状态", rec.status === "leased" && leased.username === rec.username);
+
+  const notLeased = getLoginPoolView().accounts.find((a) => a.status !== "leased").username;
+  const prep = prepareRelogin({ username: notLeased });
+  check("prepare 返回明文 cookies", Array.isArray(prep.account.cookies) && prep.account.cookies.length > 0);
+  let threw = false;
+  try { prepareRelogin({ username: leased.username }); } catch (e) { threw = /使用中/.test(e.message); }
+  check("prepare 使用中拒绝", threw);
+  threw = false;
+  try { prepareRelogin({ username: "ghost" }); } catch (e) { threw = /不在池中/.test(e.message); }
+  check("prepare 不在池拒绝", threw);
+}
+
 console.log(`\n═══ 结果: ${pass} 通过, ${fail} 失败 ═══`);
 process.exit(fail > 0 ? 1 : 0);

package/src/cli/login-pool.js

@@ -0,0 +1,207 @@
+/**
+ * handleLoginPool — 账号中心一条命令：新登录收号 / 重登录 / 巡检触发
+ *
+ * 用法:
+ *   tt-help login-pool add     [--server URL] [--proxy URL|--no-proxy] [--note S] [--dir D] [--timeout S]
+ *   tt-help login-pool relogin <username> [--server URL] [--proxy URL|--no-proxy] [--dir D] [--timeout S]
+ *   tt-help login-pool check   [--server URL] [--proxy URL] [--ids id1,id2] [--json]
+ *
+ * add:      起独立 Edge（临时目录+代理）→ 人工在窗口里登录 TikTok → 轮询 passport 检出
+ *           → 导出 cookies → POST /api/login-pool/import（幂等，同号跳过）
+ * relogin:  POST /prepare 取池内旧 cookies → 注入本机 Edge 试复活（快路径零操作）
+ *           → 会话已死则提示人工在窗口登录目标账号 → 身份校验 → POST /relogin 覆盖刷新
+ * check:    服务端无浏览器 HTTP 探测各号登录态（默认空闲+疑似），死号自动标疑似
+ *
+ * 协议桥（页面一键拉起本命令）为独立后续项，本命令即其执行端。
+ */
+import { mkdtempSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { chromium } from "playwright";
+import { gotoTiktok, whoAmI } from "../lib/login-pool-client.js";
+import { proxy as configuredProxy } from "../lib/constants.js";
+
+const POLL_INTERVAL_MS = 3000;
+const CDP_FALLBACK_NOTE = "（关掉窗口或 Ctrl+C 可中止）";
+
+function log(t) {
+  console.error(`[登录池] ${t}`);
+}
+
+/** HTTP POST，默认 30s 超时（check 场景调用方自带更长超时） */
+async function post(base, path, body, timeoutMs = 30 * 1000) {
+  const res = await fetch(`${String(base).replace(/\/+$/, "")}/api/login-pool/${path}`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body || {}),
+    signal: AbortSignal.timeout(timeoutMs),
+  });
+  const j = await res.json().catch(() => null);
+  if (!res.ok || !j || j.error) throw new Error((j && j.error) || `HTTP ${res.status}`);
+  return j;
+}
+
+/** 起独立 Edge 会话（launchPersistentContext: 跨平台自动找 Edge；临时目录随用随清） */
+async function openEdgeSession({ proxy, dir } = {}) {
+  const userDataDir = dir || mkdtempSync(join(tmpdir(), "tt-login-pool-"));
+  const context = await chromium.launchPersistentContext(userDataDir, {
+    channel: "msedge",
+    headless: false,
+    ...(proxy ? { proxy: { server: proxy } } : {}),
+    viewport: { width: 1280, height: 900 },
+    args: ["--no-first-run", "--no-default-browser-check", "--disable-sync"],
+  });
+  const page = context.pages()[0] || (await context.newPage());
+  return {
+    context,
+    page,
+    userDataDir,
+    cleanup: async () => {
+      await context.close().catch(() => {}); // persistent context close = 关浏览器
+      if (!dir) rmSync(userDataDir, { recursive: true, force: true });
+    },
+  };
+}
+
+/** 轮询等登录：注入 preCookies（重登录快路径）后循环 passport 检测 */
+async function waitForLogin({ page, preCookies, toPlaywrightCookies, timeoutMs }) {
+  const t0 = Date.now();
+  if (preCookies) {
+    await page.context().addCookies(preCookies);
+  }
+  await gotoTiktok(page);
+  for (;;) {
+    const id = await whoAmI(page);
+    if (id.hasAccount) return id;
+    if (Date.now() - t0 > timeoutMs) {
+      throw new Error(`等待登录超时（${Math.round(timeoutMs / 1000)}s）${CDP_FALLBACK_NOTE}`);
+    }
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+  }
+}
+
+/** add 子命令 */
+async function cmdAdd(opts) {
+  const { serverUrl, proxy, note, timeoutMs, dir } = opts;
+  log("启动 Edge，请在打开的窗口里登录 TikTok（等待中，随时可关窗口中止）…");
+  const session = await openEdgeSession({ proxy, dir });
+  try {
+    const id = await waitForLogin({ page: session.page, timeoutMs });
+    log(`检测到登录: @${id.username}，导出 cookies 并入池…`);
+    const cookies = await session.context.cookies();
+    const r = await post(serverUrl, "import", {
+      userId: "cli-login-pool",
+      username: id.username,
+      cookies,
+      note: note || "命令行新登录收号",
+    });
+    if (r.dedup) {
+      log(`✓ @${id.username} 已在池，幂等跳过（不覆盖）`);
+    } else {
+      log(`✓ @${id.username} 新入池（空闲），共 ${r.account.cookieCount} 条 cookies`);
+    }
+    log(`完成。服务端: ${serverUrl}`);
+  } finally {
+    await session.cleanup();
+  }
+}
+
+/** relogin 子命令 */
+async function cmdRelogin(opts) {
+  const { serverUrl, proxy, username, timeoutMs, dir } = opts;
+  if (!username) throw new Error("用法: tt-help login-pool relogin <username>");
+  const prep = await post(serverUrl, "prepare", { username });
+  const oldCookies = prep.account.cookies;
+  log(`目标 @${username}（池内 ${oldCookies.length} 条 cookies）。启动 Edge，先试旧登录态复活…`);
+  const toPlaywrightCookies = (cookies) =>
+    (cookies || []).map((c) => ({
+      name: c.name,
+      value: c.value,
+      domain: c.domain || ".tiktok.com",
+      path: c.path || "/",
+      secure: c.secure !== false,
+      httpOnly: c.httpOnly !== false,
+      ...(typeof c.expires === "number" && c.expires > 0 ? { expires: c.expires } : {}),
+    }));
+  const session = await openEdgeSession({ proxy, dir });
+  try {
+    let id = await waitForLogin({ page: session.page, preCookies: toPlaywrightCookies(oldCookies), timeoutMs: 20000 });
+    if (id.hasAccount && id.username === username) {
+      log("✓ 旧登录态仍存活（快路径，零操作）");
+    } else {
+      // 死号分支：清掉死 cookies，提示人工在窗口登录目标账号
+      log(`旧登录态已失效（${id.expired ? "会话过期" : "未登录"}）。请在窗口里登录 @${username}…`);
+      await session.context.clearCookies();
+      await gotoTiktok(session.page);
+      id = await waitForLogin({ page: session.page, timeoutMs });
+    }
+    if (id.username !== username) {
+      throw new Error(`身份不符：窗口登录的是 @${id.username}，目标是 @${username}，已中止（不更新池）`);
+    }
+    const cookies = await session.context.cookies();
+    const r = await post(serverUrl, "relogin", { username, cookies, userId: "cli-login-pool", note: "命令行重登录" });
+    log(
+      `✓ @${username} 重登录完成: cookies 已覆盖刷新（${r.account.cookieCount} 条）${r.revived ? "，已停用账号复活回池" : r.wasSuspect ? "，疑似已清回池" : ""}`,
+    );
+  } finally {
+    await session.cleanup();
+  }
+}
+
+/** check 子命令：触发服务端巡检（探测在服务端做，cookies 不出服务端） */
+async function cmdCheck(opts) {
+  const { serverUrl, proxy, ids, json } = opts;
+  log(`触发服务端巡检${proxy ? `（出口 ${proxy}）` : ""}…`);
+  const r = await post(serverUrl, "check", { ids: ids || undefined, proxy: proxy || undefined }, 15 * 60 * 1000);
+  if (json) {
+    console.log(JSON.stringify(r, null, 2));
+    return;
+  }
+  log(`巡检完成: 探测 ${r.checked}，活 ${r.alive} / 死 ${r.dead} / 异常 ${r.error}${r.migrated ? `，死号标疑似 ${r.migrated} 个` : ""}`);
+  for (const x of r.results || []) {
+    if (x.health !== "alive") {
+      log(`  ${x.health === "dead" ? "✗" : "?"} @${x.username} → ${x.status}${x.migrated ? "（pool→suspect）" : ""}`);
+    }
+  }
+}
+
+/**
+ * @param {object} parsed parseLoginPoolArgs 结果
+ *   { action, username, serverUrl, proxy(null=用配置默认), noProxy, note, dir, timeoutSec, ids, showHelp, json }
+ */
+export async function handleLoginPool(parsed) {
+  const {
+    action,
+    username,
+    serverUrl,
+    proxy: proxyArg,
+    noProxy,
+    note,
+    dir,
+    timeoutSec = 300,
+    ids,
+    json,
+    showHelp,
+  } = parsed;
+  if (showHelp || !action) {
+    console.error(
+      [
+        "用法:",
+        "  tt-help login-pool add     [--server URL] [--proxy URL|--no-proxy] [--note S] [--dir D] [--timeout S]",
+        "  tt-help login-pool relogin <username> [--server URL] [--proxy URL|--no-proxy] [--dir D] [--timeout S]",
+        "  tt-help login-pool check   [--server URL] [--proxy URL] [--ids id1,id2] [--json]",
+        "",
+        "  add     新登录收号：弹出 Edge 人工登录 TikTok，检出后自动入池（幂等）",
+        "  relogin 重登录：先试旧登录态复活（零操作），死了引导人工登录，身份校验后覆盖刷新",
+        "  check   巡检：服务端 HTTP 探测各号登录态，死号自动标疑似",
+      ].join("\n"),
+    );
+    return;
+  }
+  const proxy = noProxy ? null : proxyArg || configuredProxy || null;
+  const opts = { serverUrl, proxy, note, dir, timeoutMs: timeoutSec * 1000, ids, json };
+  if (action === "add") return cmdAdd(opts);
+  if (action === "relogin") return cmdRelogin({ ...opts, username: username || parsed.username });
+  if (action === "check") return cmdCheck(opts);
+  throw new Error(`未知子命令: ${action}（支持 add / relogin / check）`);
+}

package/src/lib/args.js

@@ -1167,6 +1167,71 @@ function parseLoginCheckArgs(args) {
   };
 }
 
+function parseLoginPoolArgs(args) {
+  let action = null;
+  let username = null;
+  let serverUrl = defaultServer;
+  let proxy = null;
+  let noProxy = false;
+  let note = null;
+  let dir = null;
+  let timeoutSec = 300;
+  let ids = null;
+  let json = false;
+  let showHelp = false;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--server" && i + 1 < args.length) {
+      serverUrl = args[++i];
+    } else if (arg === "--proxy" && i + 1 < args.length) {
+      proxy = args[++i];
+    } else if (arg === "--no-proxy") {
+      noProxy = true;
+    } else if (arg === "--note" && i + 1 < args.length) {
+      note = args[++i];
+    } else if (arg === "--dir" && i + 1 < args.length) {
+      dir = args[++i];
+    } else if (arg === "--timeout" && i + 1 < args.length) {
+      timeoutSec = parseInt(args[++i], 10) || 300;
+    } else if (arg === "--ids" && i + 1 < args.length) {
+      ids = args[++i].split(",").map((s) => s.trim()).filter(Boolean);
+    } else if (arg === "--json") {
+      json = true;
+    } else if (arg === "-h" || arg === "--help") {
+      showHelp = true;
+    } else if (!arg.startsWith("-")) {
+      if (!action) action = arg;
+      else if (!username) username = arg;
+    }
+  }
+
+  return {
+    subcommand: "login-pool",
+    action,
+    username,
+    serverUrl,
+    proxy,
+    noProxy,
+    note,
+    dir,
+    timeoutSec,
+    ids,
+    json,
+    showHelp,
+    urls: [],
+    outputFormat: "json",
+    exploreCount: 0,
+    showConfig: false,
+    showVersion: false,
+    customProxy: null,
+    configAction: null,
+    configValue: null,
+    pipeMode: false,
+    filterStr: null,
+  };
+}
+
 function parseOpenArgs(args) {
   let openPort = null;
   let openList = false;
@@ -1721,6 +1786,10 @@ export function parseArgs() {
     return parseLoginCheckArgs(args.slice(1));
   }
 
+  if (args.length > 0 && args[0] === "login-pool") {
+    return parseLoginPoolArgs(args.slice(1));
+  }
+
   if (args.length > 0 && args[0] === "comments") {
     return parseCommentsArgs(args.slice(1));
   }

package/src/lib/constants.js

@@ -291,10 +291,21 @@ const HELP_TEXT = [
   "    示例: 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 表",
-  "    -p, --parallel <N>       并发数（默认: 3）",
+  "  tt-help login-pool <add|relogin|check> [选项]",
+  "    账号中心：新登录收号 / 重登录 / 巡检（与网页 /login-pool 同一套账号库）",
+  "    add     弹出独立 Edge，人工登录 TikTok 后自动导出登录态入池（幂等）",
+  "    relogin <username>  先试旧登录态复活（零操作），失效则引导人工登录，覆盖刷新池内 cookies",
+  "    选项:",
+  "      --server <URL>            账号中心地址（watch 服务端）",
+  "      --proxy <地址>            Edge/探测代理，默认配置文件 proxy；--no-proxy 直连",
+  "      --note <备注>             add 备注信息",
+  "      --dir <路径>              自定义 Edge 用户目录（默认临时目录用后即清）",
+  "      --timeout <秒>            等待人工登录上限，默认 300",
+  "      --ids <id1,id2>           check 只探测指定账号",
+  "      --json                    check 输出 JSON",
+  "    示例: tt-help login-pool add --server http://172.18.154.201:3011",
+  "          tt-help login-pool relogin user8868337530661 --server http://172.18.154.201:3011",
+  "          tt-help login-pool check --server http://172.18.154.201:3011 --proxy http://127.0.0.1:7897",
   "    示例: tt-help videostats data/result.db -p 3",
   "",
   "  db-import  --db <db路径> [--users users.json] [--done done.json] [--videos videos.json]",