tt-help-cli-ycl 1.4.179 → 1.4.182

package/package.json

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

package/scripts/deploy-linux-node.sh

@@ -0,0 +1,256 @@
+#!/bin/bash
+# Linux 节点零→一部署（tiktok watchdog 集群）—— 给 ssh 地址+账号+密码即可部署一台新 Linux 节点
+# SOP 文档（铁律 T1~T6 / 手工核对单）: ~/knowledge/topics/linux-node-deploy.md
+# 用法:
+#   DEPLOY_PW='<密码>' bash deploy-linux-node.sh --host <IP> --user <user> --node-id <F-13> [选项]
+# 选项:
+#   --port N          ssh 端口（默认 22）
+#   --public          节点在集群内网之外（server 用公网入口 117.71.53.99:17301，如 instabox 沙箱）
+#   --server URL      显式指定 watch 服务端（默认内网 http://172.18.154.201:3001）
+#   --pubkey FILE     部署公钥到节点（默认 ~/.ssh/id_ed25519.pub，替换式部署+备份；--no-pubkey 跳过）
+#   --append-pubkey   追加公钥而非替换（默认替换并备份 authorized_keys）
+#   --dry-run         只读体检：连通性/sudo/已装组件/属主/配置/服务状态，不做任何变更
+#   --timeout SEC     整体超时（默认 2400s，国内源 Edge 大包 ~15min）
+# 行为与安全:
+#   - 幂等：已存在的 ~/.tt-help.json 只合并不覆盖、已有 systemd 单元不动、已有 /MAINTENANCE.md 不动
+#   - 远程脚本以 root 后台跑（sudo -S 喂一次密码），日志 /tmp/deploy-linux-node.log，结束打 DEPLOY_DONE/DEPLOY_FAILED
+#   - 密码只经 stdin/环境变量传递，不落日志不落脚本
+#   - 部署完成后订阅分配、业务命令 = 用户后台决定（agent 红线 8，脚本不碰）
+set -uo pipefail
+
+HOST="" ; PORT=22 ; SSH_USER="" ; NODE_ID="" ; SERVER="" ; PUBKEY="$HOME/.ssh/id_ed25519.pub"
+PUBKEY_MODE="replace" ; DRY=0 ; TIMEOUT=2400 ; NO_PUBKEY=0 ; PW="${DEPLOY_PW:-}"
+
+usage() { grep '^#   \|^# 用法' "$0" | sed 's/^#   \{0,1\}//'; exit 1; }
+die() { echo "✗ $*" >&2; exit 1; }
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --host) HOST="$2"; shift 2 ;; --port) PORT="$2"; shift 2 ;;
+    --user) SSH_USER="$2"; shift 2 ;; --node-id) NODE_ID="$2"; shift 2 ;;
+    --public) SERVER="http://117.71.53.99:17301"; shift ;;
+    --server) SERVER="$2"; shift 2 ;;
+    --pubkey) PUBKEY="$2"; shift 2 ;; --no-pubkey) NO_PUBKEY=1; shift ;;
+    --append-pubkey) PUBKEY_MODE="append"; shift ;;
+    --dry-run) DRY=1; shift ;; --timeout) TIMEOUT="$2"; shift 2 ;;
+    -h|--help) usage ;; *) die "未知参数: $1（-h 看用法）" ;;
+  esac
+done
+[ -n "$HOST" ] && [ -n "$SSH_USER" ] && [ -n "$NODE_ID" ] || { echo "缺 --host/--user/--node-id"; usage; }
+[ -n "$SERVER" ] || SERVER="http://172.18.154.201:3001"
+[ -n "$PW" ] || die "密码未设置：用 DEPLOY_PW 环境变量传入（不进命令行历史）"
+command -v sshpass >/dev/null || die "本机缺 sshpass（ubuntu26 已装；其他机器 sudo apt install sshpass）"
+[ -f "$PUBKEY" ] || { [ $NO_PUBKEY -eq 1 ] || die "公钥文件不存在: $PUBKEY（或加 --no-pubkey 跳过）"; }
+
+SSH_OPTS=(-p "$PORT" -o StrictHostKeyChecking=accept-new -o ConnectTimeout=10)
+RLOG=/tmp/deploy-linux-node.log ; RSCRIPT=/tmp/deploy-linux-node-remote.sh
+
+ssh_run() { sshpass -e ssh "${SSH_OPTS[@]}" "$SSH_USER@$HOST" "$@"; }
+export SSHPASS="$PW"
+
+echo "== [0/9] 连通性与 sudo 探测 =="
+HOME_DIR=$(ssh_run 'echo $HOME') || die "ssh 连不上 $HOST:$PORT"
+HN=$(ssh_run 'hostname') || die "取 hostname 失败"
+CLIENT_ID="${NODE_ID}@${HN}"
+ssh_run "printf '%s\n' \"\$SSHPASS\" | sudo -S -p '' true" 2>/dev/null || \
+  ssh_run "printf '%s\n' '$PW' | sudo -S -p '' true" || die "sudo 密码验证失败（密码是否=账号密码？）"
+OSINFO=$(ssh_run '. /etc/os-release 2>/dev/null; echo "$ID $VERSION_ID"; uname -m')
+echo "  节点: $HN ($OSINFO), home=$HOME_DIR, clientId=$CLIENT_ID, server=$SERVER"
+case "$OSINFO" in ubuntu*|debian*) ;; *) die "仅支持 Debian/Ubuntu 系（实测: $OSINFO）" ;; esac
+
+# ---------- 公钥部署 ----------
+if [ $NO_PUBKEY -eq 0 ] && [ $DRY -eq 0 ]; then
+  echo "== [0.5] 部署公钥（$PUBKEY_MODE 模式）=="
+  ssh_run "mkdir -p ~/.ssh && chmod 700 ~/.ssh && cp ~/.ssh/authorized_keys ~/.ssh/authorized_keys.bak.\$(date +%s) 2>/dev/null; true"
+  if [ "$PUBKEY_MODE" = replace ]; then
+    cat "$PUBKEY" | ssh_run "cat > ~/.ssh/authorized_keys"
+  else
+    cat "$PUBKEY" | ssh_run "cat >> ~/.ssh/authorized_keys"
+  fi
+  ssh_run "chmod 600 ~/.ssh/authorized_keys && sort -u ~/.ssh/authorized_keys -o ~/.ssh/authorized_keys"
+  echo "  ✓ ubuntu26 公钥已部署（免密后续可用: ssh $SSH_USER@$HOST）"
+elif [ $DRY -eq 1 ]; then
+  echo "== [0.5] dry-run: 跳过公钥部署 =="
+fi
+
+# ---------- 生成远程脚本（变量经 $1..$5 传入，不拼接密码） ----------
+RLOCAL=$(mktemp /tmp/deploy-linux-node-remote.XXXXXX.sh)
+cat > "$RLOCAL" <<'REMOTE_EOF'
+#!/bin/bash
+# 远程执行体（root）。参数: $1=dry-run标记 $2=SERVER $3=NODE_ID $4=CLIENT_ID $5=SSH_USER
+DRY="$1"; SERVER="$2"; NODE_ID="$3"; CLIENT_ID="$4"; U="$5"
+UHOME="/home/$U"
+export DEBIAN_FRONTEND=noninteractive
+step() { echo "[STEP $1/$2] $3"; }
+ok(){ echo "  ✓ $*"; }
+fail(){ echo "DEPLOY_FAILED: $*"; exit 1; }
+
+if [ "$DRY" = dry ]; then
+  echo "===== DRY-RUN 体检报告 ====="
+  command -v node >/dev/null && ok "node $(node -v)" || echo "  ✗ node 未装"
+  command -v microsoft-edge-stable >/dev/null && ok "edge $(microsoft-edge-stable --version 2>/dev/null | head -1)" || echo "  ✗ Edge 未装"
+  dpkg -s xvfb >/dev/null 2>&1 && ok "xvfb 已装" || echo "  ✗ xvfb 未装（铁律 T2）"
+  if [ -d /usr/local/lib/node_modules ]; then
+    OWN=$(stat -c %U /usr/local/lib/node_modules)
+    [ "$OWN" = "$U" ] && ok "全局包属主=$OWN（T1 ✓）" || echo "  ✗ 全局包属主=$OWN（T1 违反，需 chown）"
+  fi
+  [ -f "$UHOME/.tt-help.json" ] && ok "配置存在: $(cat "$UHOME/.tt-help.json")" || echo "  ✗ ~/.tt-help.json 不存在（T3）"
+  if [ -f /etc/systemd/system/tt-watchdog.service ]; then
+    ok "systemd 单元已存在: $(systemctl is-active tt-watchdog 2>/dev/null || echo inactive)（已存在则部署体不会覆盖）"
+    grep -q -- --no-daemon /etc/systemd/system/tt-watchdog.service && echo "  ✗ 单元含 --no-daemon（铁律 T4 违反）" || true
+  else
+    echo "  - systemd 单元不存在（部署体将创建）"
+  fi
+  [ -f /MAINTENANCE.md ] && { ok "/MAINTENANCE.md 存在，属主=$(stat -c %U /MAINTENANCE.md)"; [ "$(stat -c %U /MAINTENANCE.md)" = "$U" ] || echo "  ✗ 属主非 $U（铁律 T6 违反）"; } || echo "  - /MAINTENANCE.md 不存在（部署体将创建）"
+  HB=$(curl -s --max-time 5 "$SERVER/api/watchdog/clients" | grep -o "$CLIENT_ID" | head -1)
+  [ -n "$HB" ] && ok "服务端已见 $CLIENT_ID 在线" || echo "  - 服务端未见 $CLIENT_ID（新机属正常）"
+  echo "===== DRY-RUN 结束（无任何变更）====="
+  exit 0
+fi
+
+step 1 9 "apt 基础包: nodejs npm xvfb"
+apt-get update -qq || fail "apt update"
+apt-get install -y -qq nodejs npm xvfb curl ca-certificates || fail "apt 基础包安装"
+ok "node $(node -v)"
+
+step 2 9 "Microsoft Edge"
+if command -v microsoft-edge-stable >/dev/null; then ok "已装 $(microsoft-edge-stable --version 2>/dev/null|head -1)"; else
+  if command -v gpg >/dev/null; then
+    curl -fSsL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-edge.gpg || fail "edge key"
+    SIGNED_BY="/usr/share/keyrings/microsoft-edge.gpg"
+  else
+    curl -fSsL https://packages.microsoft.com/keys/microsoft.asc -o /usr/share/keyrings/microsoft-edge.asc || fail "edge key(asc)"
+    SIGNED_BY="/usr/share/keyrings/microsoft-edge.asc"
+  fi
+  cat > /etc/apt/sources.list.d/microsoft-edge.sources <<EOF2
+Types: deb
+URIs: https://packages.microsoft.com/repos/edge-stable
+Suites: stable
+Components: main
+Architectures: amd64
+Signed-By: $SIGNED_BY
+EOF2
+  apt-get update -qq && apt-get install -y -qq microsoft-edge-stable || fail "edge 安装"
+  ok "edge $(microsoft-edge-stable --version 2>/dev/null|head -1)"
+fi
+
+step 3 9 "npm i -g tt-help-cli-ycl"
+command -v tt-help >/dev/null && ok "已装 $(tt-help --version 2>/dev/null|tail -1)" || { npm install -g tt-help-cli-ycl || fail "npm i -g"; ok "$(tt-help --version|tail -1)"; }
+
+step 4 9 "属主修正（铁律 T1）"
+chown -R "$U:$U" /usr/local/lib/node_modules && chown "$U:$U" /usr/local/bin && chown -h "$U:$U" /usr/local/bin/tt-help 2>/dev/null
+ok "node_modules/bin/tt-help 链接 → $U"
+
+step 5 9 "~/.tt-help.json 三字段合并（铁律 T3，只补不覆盖）"
+node -e 'const fs=require("fs");const p=process.argv[1];let c={};try{c=JSON.parse(fs.readFileSync(p,"utf8"))}catch(e){};c.server=process.argv[2];c.userId=process.argv[3];c.watchdogClientId=process.argv[4];fs.writeFileSync(p,JSON.stringify(c,null,2))' \
+  "$UHOME/.tt-help.json" "$SERVER" "$NODE_ID" "$CLIENT_ID" || fail "写配置"
+chown "$U:$U" "$UHOME/.tt-help.json" && chmod 600 "$UHOME/.tt-help.json"
+ok "$(cat "$UHOME/.tt-help.json" | tr -d '\n')"
+
+step 6 9 "/MAINTENANCE.md（铁律 T6，已存在则不动）"
+if [ ! -f /MAINTENANCE.md ]; then
+  cat > /MAINTENANCE.md <<EOF3
+# 节点维护档案（SSOT）
+
+> 建档：$(date +%F)（deploy-linux-node.sh 自动建档）。权限 600，勿入仓库/知识库。
+
+## 1. 身份
+
+- 角色：TikTok 采集集群 Linux 节点，设备号 **$NODE_ID**
+- 主机名：$HN；ssh 端口见接入记录；公钥：ubuntu26 id_ed25519
+
+## 2. 账号
+
+- **账号**: $U（sudo 组）
+- **密码**: 见集群接入时用户提供（本文件不回填密码，由建档会话补写本节）
+- sudo 非交互模板：\`printf '%s\n' '<密码>' | sudo -S -p '' <cmd>\`
+
+## 3. 软件栈
+
+- 由 deploy-linux-node.sh 部署：nodejs+npm / Edge / xvfb / tt-help / tt-watchdog.service
+- server=$SERVER  clientId=$CLIENT_ID
+
+## 4. 维护记录
+
+- $(date +%F) 初始部署（deploy-linux-node.sh）；订阅分配/业务命令待用户后台配置
+EOF3
+  chown "$U:$U" /MAINTENANCE.md && chmod 600 /MAINTENANCE.md
+  ok "已建档（密码节待会话补写）"
+else
+  ok "已存在，跳过（属主 $(stat -c %U /MAINTENANCE.md)，非 $U 需手动 chown）"
+fi
+
+step 7 9 "systemd tt-watchdog.service（新版命令，无 --no-daemon）"
+if [ -f /etc/systemd/system/tt-watchdog.service ]; then
+  ok "单元已存在，不动（当前 $(systemctl is-active tt-watchdog 2>/dev/null || echo inactive)）"
+else
+  cat > /etc/systemd/system/tt-watchdog.service <<EOF4
+[Unit]
+Description=tt-help watchdog ($CLIENT_ID)
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+User=$U
+ExecStart=/usr/local/bin/tt-help watchdog --server $SERVER --client-id $CLIENT_ID --interval 15
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+EOF4
+  systemctl daemon-reload && systemctl enable --now tt-watchdog || fail "systemd 启动"
+  ok "已 enable --now"
+fi
+
+step 8 9 "服务端建订阅条目（铁律 T5，失败不阻塞）"
+curl -s --max-time 10 -X POST "$SERVER/api/watchdog/set-proxy-auto" -H 'Content-Type: application/json' \
+  -d "{\"userId\":\"$NODE_ID\",\"count\":1}" >/dev/null && ok "set-proxy-auto OK" || echo "  ⚠ set-proxy-auto 失败（服务端不可达？后台补配）"
+
+step 9 9 "验证：服务在线 + 心跳到服务端"
+sleep 5
+systemctl is-active --quiet tt-watchdog || fail "tt-watchdog 未 active: $(journalctl -u tt-watchdog -n 5 --no-pager 2>/dev/null | tr -d '\n')"
+ok "tt-watchdog active"
+HB=0
+for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
+  curl -s --max-time 5 "$SERVER/api/watchdog/clients" | grep -q "$CLIENT_ID" && { HB=1; break; }
+  sleep 10
+done
+[ $HB -eq 1 ] && ok "服务端已见 $CLIENT_ID 在线" || echo "  ⚠ 心跳未见于服务端（检查 server 可达性/防火墙），进程本机已 active"
+tt-help --version | tail -1
+echo "DEPLOY_DONE clientId=$CLIENT_ID"
+REMOTE_EOF
+
+if [ $DRY -eq 1 ]; then
+  echo "== dry-run：上传体检脚本 =="
+  sshpass -e scp -P "$PORT" -o StrictHostKeyChecking=accept-new "$RLOCAL" "$SSH_USER@$HOST:$RSCRIPT" || die "scp 失败"
+  ssh_run "SSHPASS='$PW' bash $RSCRIPT dry '$SERVER' '$NODE_ID' '$CLIENT_ID' '$SSH_USER'"
+  rm -f "$RLOCAL"; exit 0
+fi
+
+echo "== [1/9] 上传远程执行体 =="
+sshpass -e scp -P "$PORT" -o StrictHostKeyChecking=accept-new "$RLOCAL" "$SSH_USER@$HOST:$RSCRIPT" || die "scp 失败"
+
+echo "== [2/9] 后台启动部署（root，日志 $RLOG）=="
+ssh_run "printf '%s\n' \"\$SSHPASS\" | sudo -S -p '' bash -c 'setsid nohup bash $RSCRIPT run \"$SERVER\" \"$NODE_ID\" \"$CLIENT_ID\" \"$SSH_USER\" </dev/null >$RLOG 2>&1 &'" \
+|| ssh_run "printf '%s\n' '$PW' | sudo -S -p '' bash -c 'setsid nohup bash $RSCRIPT run \"$SERVER\" \"$NODE_ID\" \"$CLIENT_ID\" \"$SSH_USER\" </dev/null >$RLOG 2>&1 &'" \
+|| die "后台拉起失败"
+
+echo "== [3/9] 轮询进度（每 15s，超时 ${TIMEOUT}s）=="
+LAST=""
+i=0
+while [ $i -lt $((TIMEOUT / 15)) ]; do
+  sleep 15; i=$((i+1))
+  LOG=$(ssh_run "cat $RLOG 2>/dev/null") || { echo "  (日志读取失败，重试)"; continue; }
+  CUR=$(echo "$LOG" | grep -E '^\[STEP' | tail -1)
+  [ -n "$CUR" ] && [ "$CUR" != "$LAST" ] && { echo "  $CUR"; LAST="$CUR"; }
+  if echo "$LOG" | grep -q '^DEPLOY_DONE'; then
+    echo "$LOG" | grep -E '^  ✓|DEPLOY_DONE|⚠'
+    echo; echo "✅ 部署完成。接下来（用户后台决定，agent 不代做）：订阅分配 / 业务命令下发"
+    rm -f "$RLOCAL"; exit 0
+  fi
+  if echo "$LOG" | grep -q '^DEPLOY_FAILED'; then
+    echo "$LOG" | tail -15; rm -f "$RLOCAL"; die "$(echo "$LOG" | grep '^DEPLOY_FAILED')"
+  fi
+done
+echo "$LOG" | tail -10; rm -f "$RLOCAL"; die "超时（${TIMEOUT}s），登节点看 $RLOG"

package/scripts/test-login-pool-acquire-order.mjs

@@ -0,0 +1,270 @@
+/**
+ * 登录池批量改造 smoke — 取号排序 + reason 聚合 + 清空日志（2026-10-30 清单 B1/B2/B3/C1/C2 服务端）
+ *
+ * 覆盖:
+ *   B2 取号排序五条: 非同类优先生效 / 全同类仍发号 / 全冷却退全池 / 从未用过最前 / lastAppName 空值中性
+ *   B1/B3 lastAppName 落账号本体（release 后保留）+ acquired history detail 带 appName
+ *   C2 reason 聚合: 显式上报计数、未知 code 原样存、不带 reason 不计（无「未上报」桶）
+ *   C1 清空日志: history 清成一条留痕 + useCount/switchStats 清零 + 不动 lastUsedAt/lastAppName
+ *
+ * 跑法: HOME=$(mktemp -d) node scripts/test-login-pool-acquire-order.mjs
+ */
+import assert from "assert";
+
+const HOME = process.env.HOME;
+if (!HOME || HOME === "/") {
+  console.error("请用隔离 HOME 运行: HOME=$(mktemp -d) node scripts/test-login-pool-acquire-order.mjs");
+  process.exit(1);
+}
+
+const {
+  getLoginPoolView,
+  addAccount,
+  releaseAccount,
+  acquireAccount,
+  clearAccountHistory,
+  clearAllAccountHistory,
+  _accountsInternal,
+} = await import("../src/watch/login-pool.js");
+
+let pass = 0;
+let fail = 0;
+const check = (name, cond, extra = "") => {
+  if (cond) {
+    pass++;
+    console.log(`  ✓ ${name}`);
+  } else {
+    fail++;
+    console.log(`  ✗ ${name} ${extra}`);
+  }
+};
+const MIN_IDLE_MS = 30 * 60 * 1000;
+const findAcc = (username) =>
+  getLoginPoolView().accounts.find((x) => x.username === username);
+const backdate = (username, msAgo) => {
+  for (const a of _accountsInternal()) {
+    if (a.username === username) a.lastUsedAt = Date.now() - msAgo;
+  }
+};
+// 节间隔离：把目前为止全部账号下架（retired 不参与取号），每节干净开局
+const retireAll = () => {
+  for (const a of _accountsInternal()) {
+    a.status = "retired";
+    a.lease = null;
+  }
+};
+
+const mkCookies = (sid, uid) => [
+  { name: "sessionid", value: sid, domain: ".tiktok.com", expires: Date.now() / 1000 + 86400 },
+  { name: "unique_id", value: uid, domain: ".tiktok.com" },
+];
+const add = (uid) => addAccount({ cookies: mkCookies("sid-" + uid, uid) });
+
+// ── B2-1: 从未用过最前（K1 优先于 K2 非同类）──
+console.log("\n[B2-1] 从未用过最前（K1）");
+{
+  add("ordUsed");
+  add("ordNever");
+  // 先 acquire 再 release：只为给账号盖 lastAppName 标记（lease 已还，回池）
+  acquireAccount({ userId: "O1", appName: "search" });
+  releaseAccount({ id: findAcc("ordUsed").id });
+  backdate("ordUsed", 31 * 60 * 1000); // eligible 且非同类（search≠explore）
+  // ordNever: lastUsedAt=null（无限冷），无 lastAppName
+  const got = acquireAccount({ userId: "O1b", appName: "explore" });
+  check("从未用过的号优先于 eligible 的非同类旧号", got.username === "ordNever", `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── B2-2: 非同类优先生效（K2 优先于 K3）──
+console.log("\n[B2-2] 非同类优先生效（K2）");
+{
+  add("ordSameApp");
+  add("ordDiffApp");
+  acquireAccount({ userId: "O2", appName: "explore" });
+  acquireAccount({ userId: "O2b", appName: "search" });
+  releaseAccount({ id: findAcc("ordSameApp").id });
+  releaseAccount({ id: findAcc("ordDiffApp").id });
+  backdate("ordSameApp", 40 * 60 * 1000); // eligible、同类（explore）、更冷
+  backdate("ordDiffApp", 31 * 60 * 1000); // eligible、非同类（search）、更新
+  const got = acquireAccount({ userId: "O2c", appName: "explore" });
+  check("非同类（search）优先于更冷的同类（explore）——K2 压过 K3", got.username === "ordDiffApp",
+    `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── B2-3: 全同类仍发号（K3）──
+console.log("\n[B2-3] 全同类仍发号（K3 兜底排序）");
+{
+  add("ordC1");
+  add("ordD1");
+  acquireAccount({ userId: "O3", appName: "explore" });
+  acquireAccount({ userId: "O3b", appName: "explore" });
+  releaseAccount({ id: findAcc("ordC1").id });
+  releaseAccount({ id: findAcc("ordD1").id });
+  backdate("ordC1", 60 * 60 * 1000);
+  backdate("ordD1", 35 * 60 * 1000);
+  const got = acquireAccount({ userId: "O3c", appName: "explore" });
+  check("全同类仍发号，按 lastUsedAt 升序取最冷", got.username === "ordC1", `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── B2-4: 全冷却退全池（eligible 空集兜底）──
+console.log("\n[B2-4] 全冷却退全池兜底");
+{
+  add("ordE1");
+  add("ordF1");
+  acquireAccount({ userId: "O4", appName: "explore" });
+  acquireAccount({ userId: "O4b", appName: "explore" });
+  releaseAccount({ id: findAcc("ordE1").id });
+  releaseAccount({ id: findAcc("ordF1").id });
+  // 全部压进 30min 冷却窗内
+  backdate("ordE1", 5 * 60 * 1000);
+  backdate("ordF1", 8 * 60 * 1000);
+  const got = acquireAccount({ userId: "O4c", appName: "explore" });
+  check("eligible 空集时全池兜底仍发号", !!got && got.status === "leased", `got=${got && got.username}`);
+  check("兜底排序仍按 lastUsedAt 升序（取窗内更冷的 ordF1）", got.username === "ordF1", `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── B2-5: lastAppName 空值中性 ──
+console.log("\n[B2-5] lastAppName 空值按非同类 / 请求无 appName 时键中性化");
+{
+  // 先加 ordExploreApp（创建序在前 → 首个 acquire 取到它并盖上 explore）
+  add("ordExploreApp");
+  add("ordEmptyApp");
+  acquireAccount({ userId: "O5", appName: "explore" });
+  releaseAccount({ id: findAcc("ordExploreApp").id });
+  for (const a of _accountsInternal()) {
+    if (a.username === "ordEmptyApp") a.lastAppName = null; // 模拟改造前的存量账号（无 lastAppName）
+  }
+  backdate("ordEmptyApp", 32 * 60 * 1000); // eligible、lastAppName 空
+  backdate("ordExploreApp", 31 * 60 * 1000); // eligible、同类 explore
+  let got = acquireAccount({ userId: "O5b", appName: "explore" });
+  check("lastAppName 空按非同类（优先于同类旧号）", got.username === "ordEmptyApp", `取到 ${got.username}`);
+
+  // 请求无 appName → K2 中性化，纯 K3（取更冷的）
+  add("ordNet1");
+  add("ordNet2");
+  acquireAccount({ userId: "O5c", appName: "explore" });
+  acquireAccount({ userId: "O5d", appName: "search" });
+  releaseAccount({ id: findAcc("ordNet1").id });
+  releaseAccount({ id: findAcc("ordNet2").id });
+  backdate("ordNet1", 31 * 60 * 1000);
+  backdate("ordNet2", 45 * 60 * 1000);
+  got = acquireAccount({ userId: "O5e" }); // 不带 appName
+  check("请求无 appName 时 K2 中性化（纯 lastUsedAt 升序）", got.username === "ordNet2", `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── B1/B3: lastAppName 落本体 + history 带 appName ──
+console.log("\n[B1/B3] lastAppName 落账号本体（release 后保留）+ history detail 带 appName");
+{
+  add("ordMeta");
+  const got = acquireAccount({ userId: "O6", port: 9222, appName: "explore" });
+  check("acquire 落 lastAppName", got.lastAppName === "explore", `got ${got.lastAppName}`);
+  const hist = got.history.find((h) => h.event === "acquired");
+  check("acquired history detail 带 appName", hist && hist.detail.includes("explore"),
+    JSON.stringify(hist && hist.detail));
+  releaseAccount({ id: got.id });
+  const after = findAcc("ordMeta");
+  check("release 后 lastAppName 保留", after.lastAppName === "explore");
+  retireAll();
+}
+
+// ── prevAppName: 前一任程序 ──
+console.log("\n[prev] 前一任程序记录（页面「上次使用」列数据源）");
+{
+  add("ordPrev");
+  acquireAccount({ userId: "P1", appName: "explore" });
+  releaseAccount({ id: findAcc("ordPrev").id });
+  const got = acquireAccount({ userId: "P2", appName: "search" });
+  check("第二次取号后 lastAppName=当前程序", got.lastAppName === "search", `got ${got.lastAppName}`);
+  check("prevAppName=前一任（explore→search 切换可追溯）", got.prevAppName === "explore", `got ${got.prevAppName}`);
+  const first = getLoginPoolView().accounts.find((x) => x.username === "ordBatchA");
+  // 从未换过程序的账号 prevAppName 应为 null（首次取号无前一任）
+  add("ordPrevFirst");
+  const g2 = acquireAccount({ userId: "P3", appName: "explore" });
+  check("首次取号无前一任（prevAppName=null）", g2.prevAppName === null, `got ${g2.prevAppName}`);
+  retireAll();
+}
+
+// ── C2: reason 聚合 ──
+console.log("\n[C2] switchStats 聚合：显式计数 / 未知 code 原样存 / 不带不计");
+{
+  add("ordReason1");
+  let got = acquireAccount({ userId: "O7", appName: "explore", reason: "banned" });
+  check("显式上报 banned 计数 1", got.switchStats && got.switchStats.banned === 1, JSON.stringify(got.switchStats));
+  const hist = got.history.find((h) => h.event === "acquired");
+  check("acquired history detail 带原因", hist && hist.detail.includes("原因 banned"), JSON.stringify(hist && hist.detail));
+
+  releaseAccount({ id: got.id });
+  backdate("ordReason1", 31 * 60 * 1000);
+  got = acquireAccount({ userId: "O7b", appName: "explore", reason: "banned" });
+  check("同账号再上报 banned 累计为 2", got.switchStats.banned === 2, JSON.stringify(got.switchStats));
+
+  releaseAccount({ id: got.id });
+  backdate("ordReason1", 31 * 60 * 1000);
+  got = acquireAccount({ userId: "O7c", appName: "explore", reason: "weird_reason" });
+  check("未知 code 原样存不拒绝", got.switchStats.weird_reason === 1, JSON.stringify(got.switchStats));
+
+  add("ordNoReason");
+  got = acquireAccount({ userId: "O7d", appName: "explore" });
+  const noBucket = !got.switchStats || Object.keys(got.switchStats).length === 0;
+  check("不带 reason 不计数（无「未上报」桶）", noBucket, JSON.stringify(got.switchStats));
+  retireAll();
+}
+
+// ── C1: 清空日志 ──
+console.log("\n[C1] 清空日志：留痕一条 + useCount/switchStats 清零 + 不动休息窗/最近程序");
+{
+  add("ordClear");
+  let got = acquireAccount({ userId: "O8", appName: "explore", reason: "banned" });
+  assert(got.useCount === 1);
+  const lastUsedBefore = got.lastUsedAt;
+  releaseAccount({ id: got.id });
+  const cleared = clearAccountHistory({ id: got.id, by: "page" });
+  check("history 清成一条留痕", cleared.history.length === 1, `len=${cleared.history.length}`);
+  check("留痕含来源 page", cleared.history[0].detail.includes("page"), JSON.stringify(cleared.history[0]));
+  check("useCount 归零", cleared.useCount === 0);
+  check("switchStats 清空", !cleared.switchStats || Object.keys(cleared.switchStats).length === 0);
+  check("不动 lastUsedAt（休息窗保留）", cleared.lastUsedAt === lastUsedBefore,
+    `before=${lastUsedBefore} after=${cleared.lastUsedAt}`);
+  check("不动 lastAppName", cleared.lastAppName === "explore");
+  // 清空后休息窗仍生效（30min 内不因清日志而被取走）
+  add("ordClearFresh");
+  got = acquireAccount({ userId: "O8b", appName: "explore" });
+  check("清日志不影响休息窗（清空号未被取走）", got.username === "ordClearFresh", `取到 ${got.username}`);
+  retireAll();
+}
+
+// ── 批量清空（一键全清）──
+console.log("\n[批量清空] clearAllAccountHistory 一键全清");
+{
+  add("ordBatchA");
+  add("ordBatchB");
+  let g = acquireAccount({ userId: "OB1", appName: "explore", reason: "banned" });
+  releaseAccount({ id: g.id });
+  g = acquireAccount({ userId: "OB2", appName: "search", reason: "captcha" });
+  const snap = {};
+  for (const a of _accountsInternal()) {
+    if (a.username === "ordBatchA") snap.A = { lastUsedAt: a.lastUsedAt, lastAppName: a.lastAppName };
+  }
+  const r = clearAllAccountHistory({ by: "page" });
+  check("返回清空数量（含历史遗留账号）", r.cleared >= 2, `cleared=${r.cleared}`);
+  for (const u of ["ordBatchA", "ordBatchB"]) {
+    const a = findAcc(u);
+    check(`${u}: history 清成一条批量留痕`, a.history.length === 1 && a.history[0].detail.includes("批量"),
+      JSON.stringify(a.history));
+    check(`${u}: useCount/switchStats 清零`, a.useCount === 0 && Object.keys(a.switchStats || {}).length === 0);
+  }
+  const a = findAcc("ordBatchA");
+  check("批量清空不动 lastUsedAt/lastAppName", a.lastUsedAt === snap.A.lastUsedAt && a.lastAppName === snap.A.lastAppName);
+  // 休息窗保留：全池刚被清空的账号不会被立刻取走（除从未用过的）
+  add("ordBatchFresh");
+  g = acquireAccount({ userId: "OB3", appName: "explore" });
+  check("批量清空后休息窗仍生效（取到从未用过的 ordBatchFresh）", g.username === "ordBatchFresh", `取到 ${g.username}`);
+  retireAll();
+}
+
+console.log(`\n结果: ${pass} 通过, ${fail} 失败`);
+process.exit(fail > 0 ? 1 : 0);

package/scripts/test-login-pool-renew-fix.mjs

@@ -0,0 +1,123 @@
+/**
+ * 登录池批量改造 smoke — 缺陷修复部分（2026-10-30 清单 A1/A2）
+ *
+ * 覆盖:
+ *   A1 heartbeatLoginPool 续租匹配：带实例后缀 userId（{节点}-{端口}-{实例}）的租约
+ *      能被纯节点名心跳续租（阳性），且不误续其他节点（阴性，"- " 边界）；
+ *      acquireAccount「自动释放同使用者旧租约」保持精确相等（一实例一号不变量）
+ *   A2 updateAccount 手动释放（leased→pool）盖 lastUsedAt：陈旧 lastUsedAt 不再绕过休息窗
+ *
+ * 跑法: HOME=$(mktemp -d) node scripts/test-login-pool-renew-fix.mjs
+ */
+import assert from "assert";
+
+const HOME = process.env.HOME;
+if (!HOME || HOME === "/") {
+  console.error("请用隔离 HOME 运行: HOME=$(mktemp -d) node scripts/test-login-pool-renew-fix.mjs");
+  process.exit(1);
+}
+
+const {
+  getLoginPoolView,
+  addAccount,
+  updateAccount,
+  acquireAccount,
+  heartbeatLoginPool,
+  _accountsInternal,
+} = await import("../src/watch/login-pool.js");
+
+let pass = 0;
+let fail = 0;
+const check = (name, cond, extra = "") => {
+  if (cond) {
+    pass++;
+    console.log(`  ✓ ${name}`);
+  } else {
+    fail++;
+    console.log(`  ✗ ${name} ${extra}`);
+  }
+};
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+const findAcc = (username) =>
+  getLoginPoolView().accounts.find((x) => x.username === username);
+
+const mkCookies = (sid, uid) => [
+  { name: "sessionid", value: sid, domain: ".tiktok.com", expires: Date.now() / 1000 + 86400 },
+  { name: "unique_id", value: uid, domain: ".tiktok.com" },
+];
+
+// ── A1: 续租匹配 ──
+console.log("\n[A1] heartbeatLoginPool 续租匹配（后缀租约 + 边界阴性）");
+{
+  addAccount({ cookies: mkCookies("sid-1", "userRenewSuffix") }); // 租约 userId=F-1-9222-4（业务实例）
+  addAccount({ cookies: mkCookies("sid-2", "userRenewPlain") }); // 租约 userId=F-1（watchdog 指派语义）
+  addAccount({ cookies: mkCookies("sid-3", "userOtherNode") }); // 租约 userId=F-11-8222-2（别的节点）
+
+  let suffix = acquireAccount({ userId: "F-1-9222-4", port: 9222, appName: "explore", username: "userRenewSuffix" });
+  suffix = findAcc("userRenewSuffix");
+  acquireAccount({ userId: "F-1", username: "userRenewPlain" });
+  acquireAccount({ userId: "F-11-8222-2", username: "userOtherNode" });
+
+  const plainBefore = findAcc("userRenewPlain").lease.lastHealthAt;
+  const otherBefore = findAcc("userOtherNode").lease.lastHealthAt;
+  await sleep(15); // 保证时间戳可分辨
+
+  // 纯节点名 F-1 心跳：应续租 F-1（精确）与 F-1-9222-4（前缀），不得碰 F-11-*
+  heartbeatLoginPool("F-1", {});
+  let s = findAcc("userRenewSuffix");
+  let p = findAcc("userRenewPlain");
+  let o = findAcc("userOtherNode");
+  check("阳性: 带后缀租约 F-1-9222-4 被纯节点名 F-1 续租", s.lease.lastHealthAt > suffix.lease.assignedAt,
+    `lastHealthAt=${s.lease.lastHealthAt} assignedAt=${suffix.lease.assignedAt}`);
+  check("阳性: 精确相等 F-1 租约仍然续租", p.lease.lastHealthAt > plainBefore);
+  check("镜像: lastUsedAt/lastHealthAt 随续租刷新", s.lastUsedAt > 0 && s.lastHealthAt > 0);
+  check("阴性: F-1 不续租 F-11-8222-2（节点名前缀边界）", o.lease.lastHealthAt === otherBefore,
+    `应为 ${otherBefore}，实际 ${o.lease.lastHealthAt}`);
+
+  // F-11 心跳续自己的后缀租约
+  await sleep(15);
+  heartbeatLoginPool("F-11", {});
+  o = findAcc("userOtherNode");
+  check("F-11 心跳续 F-11-8222-2", o.lease.lastHealthAt > otherBefore);
+
+  // 不变量: acquireAccount 自动释放同使用者旧租约必须精确相等
+  // （F-1 再取号只释放 F-1 的租约，F-1-9222-4/F-11-8222-2 的租约不动）
+  addAccount({ cookies: mkCookies("sid-4", "userNewTake") });
+  const t0 = findAcc("userOtherNode").lease.assignedAt;
+  acquireAccount({ userId: "F-1", username: "userNewTake" });
+  const others = getLoginPoolView().accounts;
+  check("不变量: F-1 取新号不释放后缀租约 F-1-9222-4",
+    others.find((x) => x.username === "userRenewSuffix").status === "leased");
+  check("不变量: F-1 取新号不释放 F-11-8222-2（精确相等，非前缀）",
+    others.find((x) => x.username === "userOtherNode").status === "leased" &&
+      others.find((x) => x.username === "userOtherNode").lease.assignedAt === t0);
+  check("不变量: F-1 精确相等的旧租约被自动释放",
+    others.find((x) => x.username === "userRenewPlain").status === "pool");
+}
+
+// ── A2: 手动释放盖 lastUsedAt ──
+console.log("\n[A2] updateAccount 手动释放（leased→pool）补盖 lastUsedAt");
+{
+  addAccount({ cookies: mkCookies("sid-5", "userStaleRelease") });
+  addAccount({ cookies: mkCookies("sid-6", "userFreshCandidate") });
+
+  acquireAccount({ userId: "A2-NODE", username: "userStaleRelease" });
+  // 模拟持有节点掉线：lastUsedAt 停在 2h 前（无心跳续租场景）
+  const stale = Date.now() - 2 * 60 * 60 * 1000;
+  for (const a of _accountsInternal()) {
+    if (a.username === "userStaleRelease") a.lastUsedAt = stale;
+  }
+  updateAccount({ id: findAcc("userStaleRelease").id, status: "pool" }); // 手动释放
+  const released = findAcc("userStaleRelease");
+  check("手动释放后 lastUsedAt 被盖为当前时间（不再停在取号时刻）",
+    released.lastUsedAt > Date.now() - 60 * 1000, `lastUsedAt=${released.lastUsedAt}`);
+
+  // 休息窗生效：30min 内另一个取号应拿从未用过的候选，而不是刚手动释放的号
+  const got = acquireAccount({ userId: "A2-OTHER", username: "userFreshCandidate" });
+  check("手动释放的号 30min 内不可再取（休息窗生效）", got.username === "userFreshCandidate",
+    `取到 ${got.username}`);
+  check("手动释放的号仍在池中未被取走", findAcc("userStaleRelease").status === "pool");
+}
+
+console.log(`\n结果: ${pass} 通过, ${fail} 失败`);
+process.exit(fail > 0 ? 1 : 0);