tt-help-cli-ycl 1.4.172 → 1.4.176

package/package.json

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

package/scripts/reset-login-pool.mjs

@@ -0,0 +1,66 @@
+/**
+ * 登录池（账号中心）重置脚本 — 在 201 上运行
+ *
+ * 作用（2026-10-26 清空重导需求）:
+ *   - 去重：丢弃 *-poc 实验副本与同 username 重复项（保留首个）
+ *   - 清空使用痕迹：useCount=0、history 重置为单条 imported 事件
+ *   - 清空命令队列（防遗留 applyLogin 误注入）
+ *   - 租约【原样保留】：在用进程（如 F-1 search 组）不受任何影响、无注入打断
+ *
+ * 用法:
+ *   node reset-login-pool.mjs            # 预览（只打印，不写盘）
+ *   node reset-login-pool.mjs --apply    # 实际写盘（原子替换 tmp+rename）
+ *
+ * 写盘后无需重启进程：watch/standalone 通过 mtime 自动重载池文件。
+ */
+import { readFileSync, writeFileSync, renameSync, copyFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+
+const APPLY = process.argv.includes("--apply");
+const FILE = join(homedir(), ".tt-help-watchdog-logins.json");
+
+const data = JSON.parse(readFileSync(FILE, "utf-8"));
+const now = Date.now();
+const seen = new Set();
+const kept = [];
+const dropped = [];
+
+for (const a of data.accounts || []) {
+  if (/-poc$/i.test(a.username)) {
+    dropped.push(`${a.username}（poc 实验副本）`);
+    continue;
+  }
+  if (seen.has(a.username)) {
+    dropped.push(`${a.username}（重复）`);
+    continue;
+  }
+  seen.add(a.username);
+  a.useCount = 0;
+  a.history = [{ at: now, event: "imported", detail: "重置导入（原租约保留）" }];
+  kept.push(a);
+}
+data.accounts = kept; // 去重后重建账号表（无此行则仅原地变更保留项，被丢弃项仍会写回）
+data.queue = [];
+
+console.log(`池文件: ${FILE}`);
+console.log(`保留 ${kept.length} 个账号:`);
+for (const a of kept) {
+  const l = a.lease;
+  console.log(
+    `  - ${a.username}  ${a.status}${l ? `  ← ${l.userId}:${l.port}${l.appName ? " · " + l.appName : ""}` : ""}  (cookies ${Array.isArray(a.cookies) ? a.cookies.length : 0} 条)`,
+  );
+}
+console.log(`丢弃 ${dropped.length} 个: ${dropped.join(", ") || "无"}`);
+console.log(`命令队列: 已清空（原 ${((data.queue || []).length, 0)} 条待发）`);
+
+if (!APPLY) {
+  console.log("\n[预览模式] 确认无误后执行: node reset-login-pool.mjs --apply");
+} else {
+  copyFileSync(FILE, FILE + ".bak-reset-" + now); // 先备份
+  const tmp = FILE + ".tmp";
+  writeFileSync(tmp, JSON.stringify(data, null, 2), "utf-8");
+  renameSync(tmp, FILE);
+  console.log(`\n[已写盘] 备份: ${FILE}.bak-reset-${now}`);
+  console.log("watch/standalone 将通过 mtime 自动重载，无需重启。打开 /login-pool 核对。");
+}

package/scripts/test-login-pool-e2e-real.mjs

@@ -0,0 +1,134 @@
+/**
+ * 登录池全链路实测（真实 agent + 真实 Edge 注入）
+ *
+ * 流程:
+ *   0. 临时 HOME + 本地 watch(3131) + 真实 WatchdogAgent（POOLTEST@dev, 心跳 3s）
+ *   1. API 入池（F-11:9223 导出的真实 cookies, @user2440618251624）
+ *   2. 指派 → POOLTEST:9299
+ *   3. agent 心跳取命令 → login-apply 真实 Edge 注入（Xvfb :99 + 7897 出口）
+ *   4. 轮询服务端直至 lastAppliedAt 落地 → 断言 ok + persisted
+ *   5. release(clearOnNode) → 等 clearLogin 回报 → 验证磁盘 Cookies 已删
+ *
+ * 运行: node scripts/test-login-pool-e2e-real.mjs
+ * 前提: Xvfb :99 已跑、7897 出口可用、9299/3131 空闲、~/login-pool-staging/f11-9223.json 存在
+ */
+import { spawn } from "child_process";
+import { mkdtempSync, readFileSync, existsSync } from "fs";
+import { tmpdir, homedir } from "os";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..");
+const HOME = mkdtempSync(join(tmpdir(), "pool-real-"));
+const PORT = 3131;
+const BASE = `http://127.0.0.1:${PORT}`;
+const TEST_PORT = 9299;
+const USERNAME = "user2440618251624";
+
+let pass = 0, fail = 0;
+const check = (name, cond, extra = "") => {
+  cond ? (pass++, console.log(`  ✓ ${name}`)) : (fail++, console.log(`  ✗ ${name} ${extra}`));
+};
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+// ── 起 watch ──
+const srv = spawn("node", [join(root, "src", "main.js"), "watch", "-o", join(HOME, "t.db"), "-p", String(PORT)], {
+  cwd: root, env: { ...process.env, HOME }, stdio: ["ignore", "ignore", "ignore"],
+});
+for (let i = 0; i < 30; i++) {
+  try { await fetch(BASE + "/api/stats"); break; } catch { await sleep(500); }
+}
+console.log("✓ watch 就绪");
+
+// ── 入池 ──
+const cookies = JSON.parse(readFileSync(join(homedir(), "login-pool-staging", "f11-9223.json"), "utf-8"));
+let r = await (await fetch(`${BASE}/api/watchdog/login-pool/add`, {
+  method: "POST", headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ username: USERNAME, cookies, note: "E2E-real: F-11:9223 导出", proxyHint: "7897" }),
+})).json();
+check("入池", r.ok, JSON.stringify(r).slice(0, 200));
+const accId = r.account.id;
+
+// ── 指派 ──
+r = await (await fetch(`${BASE}/api/watchdog/login-pool/assign`, {
+  method: "POST", headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, userId: "POOLTEST", port: TEST_PORT }),
+})).json();
+check("指派 POOLTEST:9299", r.ok, JSON.stringify(r).slice(0, 200));
+
+// ── 真实 agent ──
+const agentCode = `
+import { WatchdogAgent } from ${JSON.stringify(join(root, "src", "watchdog", "agent.js"))};
+const agent = new WatchdogAgent({
+  serverUrl: "${BASE}",
+  clientId: "pooltest@dev",
+  intervalMs: 3000,
+  spawnDaemon: false,
+});
+agent.running = true;
+const beat = () => agent._sendHeartbeat().catch((e) => console.error("[beat]", e.message));
+beat();
+setInterval(beat, 3000);
+setInterval(() => {}, 60000); // keep alive
+`;
+const agentScript = join(HOME, "agent.mjs");
+(await import("fs")).writeFileSync(agentScript, agentCode);
+// 节点约定：~/.tt-help.json 带 userId（服务端按它匹配命令队列）——生产节点都有，测试 HOME 补齐
+(await import("fs")).writeFileSync(join(HOME, ".tt-help.json"), JSON.stringify({ server: BASE, userId: "POOLTEST" }));
+const agent = spawn("node", [agentScript], {
+  cwd: root,
+  env: { ...process.env, HOME, DISPLAY: ":99" },
+  stdio: ["ignore", "ignore", "pipe"],
+});
+let agentLog = "";
+agent.stderr.on("data", (d) => {
+  agentLog += d;
+  process.stderr.write(`[agent] ${d}`);
+});
+console.log("✓ agent 已启动（真实进程，DISPLAY=:99）");
+
+// ── 轮询注入结果（最长 6 分钟） ──
+let lease = null;
+const t0 = Date.now();
+while (Date.now() - t0 < 6 * 60 * 1000) {
+  await sleep(5000);
+  const pool = await (await fetch(`${BASE}/api/watchdog/login-pool`)).json();
+  lease = pool.accounts.find((a) => a.id === accId)?.lease;
+  if (lease && lease.lastAppliedAt) break;
+}
+check("节点回报已到达", !!lease?.lastAppliedAt, `agentLog 尾部: ${agentLog.slice(-400)}`);
+check("注入成功", lease?.lastAppliedOk === true, `error 见上方 agent 日志`);
+check("持久化成功", lease?.persisted === true);
+check("回报用户名正确", lease?.appliedUsername === USERNAME, `got ${lease?.appliedUsername}`);
+
+// 磁盘验证：Cookies 文件存在且非空
+const ck1 = join(HOME, "Library/Application Support/Microsoft Edge For Testing_p" + TEST_PORT, "Default/Cookies");
+const ck2 = join(HOME, "Library/Application Support/Microsoft Edge For Testing_p" + TEST_PORT, "Default/Network/Cookies");
+const diskHas = existsSync(ck1) || existsSync(ck2);
+check("磁盘 Cookies 落盘", diskHas);
+
+// ── release + clearOnNode → clearLogin 回报 ──
+r = await (await fetch(`${BASE}/api/watchdog/login-pool/release`, {
+  method: "POST", headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, clearOnNode: true }),
+})).json();
+check("释放+清理下发", r.ok);
+
+let cleared = false;
+const t1 = Date.now();
+while (Date.now() - t1 < 60 * 1000) {
+  await sleep(4000);
+  const pool = await (await fetch(`${BASE}/api/watchdog/login-pool`)).json();
+  const acc = pool.accounts.find((a) => a.id === accId);
+  if (acc?.history?.some((h) => h.event === "cleared")) { cleared = true; break; }
+}
+check("clearLogin 回报到达", cleared, agentLog.slice(-200));
+await sleep(2000);
+check("磁盘 Cookies 已删除", !existsSync(ck1) && !existsSync(ck2));
+
+// 收尾
+agent.kill("SIGKILL");
+srv.kill("SIGKILL");
+console.log(`\n═══ 结果: ${pass} 通过, ${fail} 失败 ═══`);
+console.log(`临时 HOME（含测试 cookies，可直接删）: ${HOME}`);
+process.exit(fail > 0 ? 1 : 0);

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

@@ -0,0 +1,211 @@
+/**
+ * 登录池 UI 冒烟测试 — 真实 watch 服务 + 无头 Edge
+ *
+ * 覆盖（2026-10-26 账号中心改版后）:
+ *   1. 主页：账户中心入口链接存在（→ /login-pool），嵌入区块已移除，无 JS 错误，无 cookie 明文
+ *   2. 独立页 /login-pool：新列渲染（状态徽章/使用者/次数/有效期）、有效期秒→毫秒归一正确
+ *   3. API 指派 → 独占（已租不可再指派）；心跳下发命令含明文 cookies（仅此通道）
+ *   4. 释放回池；suspect 拒绝无 force 指派；leased 删除保护
+ *
+ * 运行: node scripts/test-login-pool-ui.mjs（自行起停服务）
+ */
+import { spawn } from "child_process";
+import { mkdtempSync } from "fs";
+import { tmpdir } from "os";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+import { chromium } from "playwright";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..");
+const HOME = mkdtempSync(join(tmpdir(), "loginpool-ui-"));
+const PORT = 3129;
+const BASE = `http://127.0.0.1:${PORT}`;
+
+// ── 起 watch 服务 ──
+const srv = spawn("node", [join(root, "src", "main.js"), "watch", "-o", join(HOME, "t.db"), "-p", String(PORT)], {
+  cwd: root,
+  env: { ...process.env, HOME },
+  stdio: ["ignore", "pipe", "pipe"],
+});
+srv.stdout.on("data", () => {});
+srv.stderr.on("data", (d) => process.stderr.write(`[srv] ${d}`));
+const srvReady = new Promise((resolve, reject) => {
+  const timer = setTimeout(() => reject(new Error("服务 15s 未就绪")), 15000);
+  srv.stderr.on("data", (d) => {
+    if (String(d).includes("监控服务已启动")) {
+      clearTimeout(timer);
+      resolve();
+    }
+  });
+});
+await srvReady;
+console.log("✓ watch 服务已启动");
+
+let pass = 0;
+let fail = 0;
+const check = (name, cond, extra = "") => {
+  if (cond) {
+    pass++;
+    console.log(`  ✓ ${name}`);
+  } else {
+    fail++;
+    console.log(`  ✗ ${name} ${extra}`);
+  }
+};
+
+// ── F-11 心跳上线 ──
+async function heartbeat(body) {
+  const r = await fetch(`${BASE}/api/watchdog/heartbeat?clientId=F-11@ubuntu`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ hostname: "ubuntu", config: { userId: "F-11" }, processes: [], ...body }),
+  });
+  return r.json();
+}
+await heartbeat({});
+console.log("✓ F-11 心跳上线");
+
+// ── API 入池（expires 用秒——cookie 规范，验证前端毫秒归一） ──
+const EXPIRES_IN_90D_SEC = Math.floor(Date.now() / 1000) + 90 * 86400;
+const COOKIES = [
+  { name: "sessionid", value: "SECRET-SID-XYZ", domain: ".tiktok.com", expires: EXPIRES_IN_90D_SEC },
+  { name: "unique_id", value: "userA", domain: ".tiktok.com" },
+];
+let addRes = await fetch(`${BASE}/api/watchdog/login-pool/add`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ cookies: COOKIES, note: "E2E 测试账号", proxyHint: "7897" }),
+});
+let addData = await addRes.json();
+check("API 入池成功", addRes.ok && addData.ok && addData.account.username === "userA");
+const accId = addData.account.id;
+check("API 视图有效期已归一为毫秒", addData.account.sessionExpiresAt > Date.now() + 89 * 86400000,
+  `got ${addData.account.sessionExpiresAt}`);
+
+// ── 浏览器 ──
+const browser = await chromium.launch({ executablePath: "/usr/bin/microsoft-edge", headless: true });
+const ctx = await browser.newContext({ viewport: { width: 1560, height: 1000 }, deviceScaleFactor: 1.5 });
+const page = await ctx.newPage();
+page.on("dialog", (d) => d.accept());
+const errors = [];
+page.on("pageerror", (e) => errors.push(String(e)));
+
+// 登录（当日密码 tt@YYYYMMDD）
+const pad = (n) => String(n).padStart(2, "0");
+const d = new Date();
+await page.goto(BASE + "/", { waitUntil: "domcontentloaded" });
+await page.fill("#password", `tt@${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}`);
+const loginResp = page.waitForResponse((r) => r.url().includes("/api/login"), { timeout: 15000 });
+await page.locator("#login-form").evaluate((f) => f.submit());
+await loginResp;
+await page.waitForTimeout(800);
+console.log("✓ 已登录");
+
+// ── 主页：入口链接 + 嵌入区块已移除 ──
+await page.goto(BASE + "/#watchdog", { waitUntil: "domcontentloaded" });
+await page.waitForTimeout(1200);
+const mainSrc = await page.content();
+check("主页含账号中心入口链接", !!mainSrc.match(/href="\/login-pool"/));
+check("主页无 cookie 明文", !mainSrc.includes("SECRET-SID-XYZ"));
+check("主页嵌入区块已移除", !mainSrc.includes("wdPoolSummary") && !mainSrc.includes("wdPoolList"));
+const clientsRaw = await (await fetch(`${BASE}/api/watchdog/clients`)).text();
+check("/clients 无 cookie 明文", !clientsRaw.includes("SECRET-SID-XYZ"));
+
+// ── API 指派（独占租约）→ 心跳下发命令 ──
+const asgRes = await fetch(`${BASE}/api/watchdog/login-pool/assign`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, userId: "F-11", port: 9222 }),
+});
+check("API 指派成功", asgRes.ok && (await asgRes.json()).account.status === "leased");
+const asgDup = await fetch(`${BASE}/api/watchdog/login-pool/assign`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, userId: "F-11", port: 9223 }),
+});
+check("同账号双租拒绝", !asgDup.ok);
+
+const hbReport = await (
+  await fetch(`${BASE}/api/watchdog/heartbeat?clientId=F-11@ubuntu`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      hostname: "ubuntu",
+      config: { userId: "F-11" },
+      processes: [],
+      loginPool: { applied: [{ action: "applyLogin", accountId: accId, port: 9222, username: "userA", ok: true, persisted: true, at: Date.now() }] },
+    }),
+  })
+).json();
+check("心跳响应带 loginPool 命令", hbReport.loginPool && Array.isArray(hbReport.loginPool.commands), JSON.stringify(hbReport.loginPool));
+check(
+  "命令含明文 cookies（下发通道）",
+  hbReport.loginPool.commands[0].cookies.some((c) => c.value === "SECRET-SID-XYZ"),
+);
+check("命令含端口", hbReport.loginPool.commands[0].port === 9222);
+
+// ── 独立页 /login-pool：新设计渲染 ──
+await page.goto(BASE + "/login-pool", { waitUntil: "domcontentloaded" });
+await page.waitForFunction(() => document.querySelector("#content table"), { timeout: 15000 });
+const headers = await page.textContent("#content table tr:first-child");
+check(
+  "独立页新列齐全",
+  ["账号", "状态", "使用者", "最近使用", "次数", "有效期", "操作", "历史"].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("重登录"))));
+
+// 有效期归一显示：应为 ~90 天后的日期（而非 1970）
+const day90 = new Date(Date.now() + 90 * 86400000).toLocaleDateString("zh-CN");
+check("有效期秒→毫秒归一显示正确", row1.includes(day90), `期望含 ${day90}`);
+check("有效期无 1970 异常", !row1.includes("1970"));
+
+await page.screenshot({ path: "/tmp/loginpool-ui-standalone.png", fullPage: true });
+console.log("✓ 截图: 独立页新版");
+
+// ── 释放（不清理）──
+const relRes = await fetch(`${BASE}/api/watchdog/login-pool/release`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, clearOnNode: false }),
+});
+check("释放回池", relRes.ok && (await relRes.json()).account.status === "pool");
+
+// ── suspect 拒绝无 force 指派 ──
+const susRes = await fetch(`${BASE}/api/watchdog/login-pool/update`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, status: "suspect" }),
+});
+check("迁入 suspect", susRes.ok && (await susRes.json()).account.status === "suspect");
+const asSus = await fetch(`${BASE}/api/watchdog/login-pool/assign`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, userId: "F-11", port: 9223 }),
+});
+check("suspect 无 force 拒绝指派", !asSus.ok);
+
+// ── 停用（retired）+ 删除保护顺序 ──
+const retRes = await fetch(`${BASE}/api/watchdog/login-pool/update`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId, status: "retired" }),
+});
+check("停用（retired）", retRes.ok && (await retRes.json()).account.status === "retired");
+const delLeased = await fetch(`${BASE}/api/watchdog/login-pool/delete`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ id: accId }),
+});
+check("已停用可删除", delLeased.ok);
+
+check("两页均无 JS 错误", errors.length === 0, errors.join("; "));
+
+await browser.close();
+srv.kill();
+console.log(`\n═══ 结果: ${pass} 通过, ${fail} 失败 ═══`);
+process.exit(fail > 0 ? 1 : 0);