tt-help-cli-ycl 1.4.176 → 1.4.177

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.176",
+  "version": "1.4.177",
   "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.mjs

@@ -370,7 +370,7 @@ 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)); }

package/src/watch/login-pool.js

@@ -723,7 +723,10 @@ export function importAccount({ userId, port, username, cookies, note, proxyHint
 
   const dup = _accounts.find((a) => a.username === username && a.status !== "retired");
   if (dup) {
-    // 幂等：不覆盖 cookies、不动租约
+    // 幂等：不覆盖 cookies、不动租约；仅补写来源元数据，
+    // 否则已在池的号永远不带 lastImportFrom，节点热路径匹配不上会每次启动全量重导
+    dup.lastImportFrom = importMeta(userId, portNum, t);
+    scheduleSave();
     return { account: publicView(dup), dedup: true };
   }
   if (_accounts.length >= POOL_MAX) throw new Error(`池已满（上限 ${POOL_MAX}）`);
@@ -737,7 +740,7 @@ export function importAccount({ userId, port, username, cookies, note, proxyHint
     status: "pool",
     lease: null,
     useCount: 0, // 导入是登记不是消费；次数只在 acquire/assign 时 +1
-    lastImportFrom: { userId, port: portNum, at: t }, // 来源元数据（供节点热路径跳过 + 账号中心展示），非租约
+    lastImportFrom: importMeta(userId, portNum, t),
     history: [],
     createdAt: t,
     updatedAt: t,
@@ -748,6 +751,9 @@ export function importAccount({ userId, port, username, cookies, note, proxyHint
   return { account: fullView(acc), dedup: false };
 }
 
+/** 来源元数据（供节点热路径跳过 + 账号中心展示），非租约；新入池与幂等补写共用此定义 */
+const importMeta = (userId, portNum, at) => ({ userId, port: portNum, at });
+
 /** 内部：注入账号（测试/迁移工具用，跳过命令队列直接改状态） */
 export function _accountsInternal() {
   ensureLoaded();

package/src/watchdog/login-import.js

@@ -50,9 +50,8 @@ function withTimeout(promise, ms, label) {
   ]);
 }
 
-/** 单口导入：起/附 Edge → 验证 → 导出 cookies → 上传。未登录返回 skip */
+/** 单口导入：起/附 Edge → 验证 → 导出 cookies → 上传。未登录返回 skip；不负责 marker（由 syncLoginStates 统一记账） */
 async function importPort({ serverUrl, userId, port, proxyServer }) {
-  const marker = loadMarker(); // 本地已导入标识（永久只导一次）
   // 探测该口是否已有 Edge 在跑：同步自己起的，导出完关掉；本来就跑着的不动
   let selfStarted = false;
   try {
@@ -92,9 +91,6 @@ async function importPort({ serverUrl, userId, port, proxyServer }) {
     );
     const j = await res.json().catch(() => null);
     if (!res.ok || !j || j.error) throw new Error((j && j.error) || `HTTP ${res.status}`);
-    // 成功（含 dedup：中心已有即视为已同步）→ 写本地标识，永久只导一次
-    marker[port] = j.account.username;
-    saveMarker(marker);
     return { ok: true, dedup: !!j.dedup, username: j.account.username, status: j.account.status };
   } finally {
     await page.close().catch(() => {}); // 只关自建页，不清光页面（POC 坑②）
@@ -107,6 +103,10 @@ async function importPort({ serverUrl, userId, port, proxyServer }) {
 
 /**
  * 同步入口：逐口导入本节点登录态。
+ * 跳过策略（按优先级，零成本跳过不受总超时影响）：
+ *   1. 服务端 lastImportFrom 认领（本节点+本口导入过）→ 免重复起 Edge
+ *   2. 本地 marker（成功导入过 = 永久跳过，与账号中心状态无关）
+ * marker 的读/判/写全部收拢在本函数（importPort 只做单口机构）。
  * @param {object} opts { serverUrl, userId, ports[], proxyServer?, portTimeoutMs?, totalTimeoutMs? }
  * @returns {Promise<{imported: Array, skipped: Array, failed: Array}>}
  */
@@ -123,38 +123,23 @@ export async function syncLoginStates(opts = {}) {
   if (!serverUrl || !userId || !Array.isArray(ports) || ports.length === 0) return summary;
   const deadline = Date.now() + totalTimeoutMs;
 
-  // 本地标识：永久只导入一次（与账号中心状态无关）
+  // 本地标识：成功导入过一次即永久跳过
   const marker = loadMarker();
-
-  // 热路径：本节点此前已成功导入过的口（lastImportFrom 元数据）直接跳过，免重复起 Edge
-  const imported = new Set();
-  try {
-    const r = await fetch(`${String(serverUrl).replace(/\/+$/, "")}/api/login-pool`, {
-      signal: AbortSignal.timeout(15000),
-    });
-    const j = await r.json();
-    for (const a of j.accounts || []) {
-      const m = a.lastImportFrom;
-      if (m && m.userId === userId && ports.includes(Number(m.port))) {
-        imported.add(Number(m.port));
-      }
-    }
-  } catch (e) {
-    console.error(`[登录导入] 中心视图获取失败（继续逐口尝试）: ${e.message}`);
-  }
+  const serverConfirmed = await serverImportedPorts({ serverUrl, userId, ports, marker });
 
   for (const port of ports) {
     const p = Number(port);
+    const reason = skipReason(p, marker, serverConfirmed);
+    if (reason) {
+      summary.skipped.push({ port: p, reason });
+      console.error(`[登录导入] 端口 ${p}: ${reason}，跳过`);
+      continue;
+    }
     if (Date.now() > deadline) {
       summary.failed.push({ port: p, reason: "总超时" });
       console.error(`[登录导入] 端口 ${p}: 总超时，剩余端口放弃`);
       continue;
     }
-    if (imported.has(p)) {
-      summary.skipped.push({ port: p, reason: "本节点此前已导入" });
-      console.error(`[登录导入] 端口 ${p}: 此前已导入，跳过`);
-      continue;
-    }
     console.error(`[登录导入] 端口 ${p}: 检测并导入...`);
     try {
       const r = await withTimeout(
@@ -163,6 +148,8 @@ export async function syncLoginStates(opts = {}) {
         `端口 ${p} 导入`,
       );
       if (r.ok) {
+        marker[p] = r.username; // 成功（含 dedup：中心已有即视为已同步）→ 写本地标识，永久只导一次
+        saveMarker(marker);
         summary.imported.push({ port: p, username: r.username, dedup: r.dedup });
         console.error(
           `[登录导入] 端口 ${p}: @${r.username} ${r.dedup ? "已在池，幂等跳过" : "新入池（空闲）✓"}`,
@@ -178,3 +165,31 @@ export async function syncLoginStates(opts = {}) {
   }
   return summary;
 }
+
+/** 服务端认领：中心 lastImportFrom 指向本节点本口的端口集合；全口都有本地 marker 时不发 fetch */
+async function serverImportedPorts({ serverUrl, userId, ports, marker }) {
+  const confirmed = new Set();
+  if (ports.every((x) => marker[Number(x)])) return confirmed; // 本地标识已全覆盖，无需问中心
+  try {
+    const r = await fetch(`${String(serverUrl).replace(/\/+$/, "")}/api/login-pool`, {
+      signal: AbortSignal.timeout(15000),
+    });
+    const j = await r.json();
+    for (const a of j.accounts || []) {
+      const m = a.lastImportFrom;
+      if (m && m.userId === userId && ports.includes(Number(m.port))) {
+        confirmed.add(Number(m.port));
+      }
+    }
+  } catch (e) {
+    console.error(`[登录导入] 中心视图获取失败（继续逐口尝试）: ${e.message}`);
+  }
+  return confirmed;
+}
+
+/** 跳过判定：返回原因字符串（跳过）或 null（需导入） */
+function skipReason(p, marker, serverConfirmed) {
+  if (serverConfirmed.has(p)) return "本节点此前已导入";
+  if (marker[p]) return "本地已导入";
+  return null;
+}