tt-help-cli-ycl 1.4.95 → 1.4.97

package/package.json

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

package/scripts/test-product-fill.mjs

@@ -0,0 +1,306 @@
+/**
+ * 补商品命令核心逻辑测试
+ *
+ * 验证「领取任务 → 补商品详情 → 回传服务端」全链路，自包含：
+ *  - mock 服务端：/api/product-tasks（领任务）、/api/product-fill/:uniqueId（收回传）
+ *  - mock webserver：/api/tiktok/product（商品详情）
+ *
+ * 运行: TMPDIR=$(mktemp -d) node scripts/test-product-fill.mjs
+ */
+import http from "node:http";
+import assert from "node:assert";
+
+// ────────────────────────────────────────────────
+// mock webserver：/api/tiktok/product
+//   failUrls   → 502（普通失败）
+//   captchaUrls → 503 retryable（验证码，跳过）
+//   其余       → 200 {rating, reviewCount, soldCount, productName}
+// ────────────────────────────────────────────────
+async function startMockWebserver({
+  failUrls = new Set(),
+  captchaUrls = new Set(),
+} = {}) {
+  const server = http.createServer(async (req, res) => {
+    if (req.method === "POST" && req.url.startsWith("/api/tiktok/product")) {
+      const body = await readBody(req);
+      const { url } = JSON.parse(body || "{}");
+      if (captchaUrls.has(url)) {
+        res.writeHead(503, { "Content-Type": "application/json" });
+        res.end(
+          JSON.stringify({
+            error: "Blocked by TikTok security check (captcha)",
+            retryable: true,
+          }),
+        );
+        return;
+      }
+      if (failUrls.has(url)) {
+        res.writeHead(502, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Bad Gateway" }));
+        return;
+      }
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(
+        JSON.stringify({
+          rating: 4.7,
+          reviewCount: 3303,
+          soldCount: 296,
+          productName: `商品-${url.slice(-8)}`,
+        }),
+      );
+      return;
+    }
+    res.writeHead(404, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "not found" }));
+  });
+  await new Promise((r) => server.listen(0, "127.0.0.1", r));
+  return {
+    url: `http://127.0.0.1:${server.address().port}`,
+    close: () => new Promise((r) => server.close(r)),
+  };
+}
+
+// ────────────────────────────────────────────────
+// mock 服务端：/api/product-tasks + /api/product-fill/:uniqueId
+//   tasksPool 可变：每次 GET 弹出 min(limit, 剩余) 个任务
+// ────────────────────────────────────────────────
+async function startMockServer(tasksPool) {
+  const received = []; // 回传记录
+  const server = http.createServer(async (req, res) => {
+    const url = new URL(req.url, "http://x");
+    if (req.method === "GET" && url.pathname === "/api/product-tasks") {
+      const limit = Number(url.searchParams.get("limit") || 1);
+      const tasks = tasksPool.splice(0, limit);
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ total: tasks.length, tasks }));
+      return;
+    }
+    const m = url.pathname.match(/^\/api\/product-fill\/([^/]+)$/);
+    if (req.method === "POST" && m) {
+      const body = JSON.parse((await readBody(req)) || "{}");
+      received.push({ uniqueId: decodeURIComponent(m[1]), ...body });
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ ok: true }));
+      return;
+    }
+    res.writeHead(404, { "Content-Type": "application/json" });
+    res.end(JSON.stringify({ error: "not found" }));
+  });
+  await new Promise((r) => server.listen(0, "127.0.0.1", r));
+  return {
+    url: `http://127.0.0.1:${server.address().port}`,
+    received,
+    close: () => new Promise((r) => server.close(r)),
+  };
+}
+
+function readBody(req) {
+  return new Promise((resolve) => {
+    let data = "";
+    req.on("data", (c) => (data += c));
+    req.on("end", () => resolve(data));
+  });
+}
+
+// ────────────────────────────────────────────────
+// 补商品客户端核心逻辑（未来命令的雏形）
+//   返回 { batches, success, failed, skipped, received }
+// ────────────────────────────────────────────────
+async function fetchProductDetail(webserverUrl, seoUrl) {
+  const res = await fetch(`${webserverUrl}/api/tiktok/product`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ url: seoUrl }),
+    signal: AbortSignal.timeout(10000),
+  });
+  if (res.status === 503) {
+    const err = new Error(
+      `captcha: ${(await res.json().catch(() => ({}))).error || "Blocked"}`,
+    );
+    err.retryable = true;
+    throw err;
+  }
+  if (!res.ok) {
+    const err = new Error(`HTTP ${res.status}`);
+    err.status = res.status;
+    throw err;
+  }
+  return res.json();
+}
+
+async function fillProducts({
+  serverUrl,
+  webserverUrl,
+  limit = 2,
+  intervalMs = 50,
+  maxBatches = 4,
+}) {
+  let batches = 0,
+    success = 0,
+    failed = 0,
+    skipped = 0;
+  const received = [];
+  for (let b = 0; b < maxBatches; b++) {
+    batches++;
+    const res = await fetch(
+      `${serverUrl}/api/product-tasks?limit=${limit}&userId=test-user`,
+    );
+    const { tasks = [] } = await res.json();
+    if (tasks.length === 0) {
+      await new Promise((r) => setTimeout(r, intervalMs)); // 空闲等待
+      continue;
+    }
+    for (const task of tasks) {
+      try {
+        const detail = await fetchProductDetail(webserverUrl, task.seoUrl);
+        const post = await fetch(
+          `${serverUrl}/api/product-fill/${encodeURIComponent(task.uniqueId)}`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ productDetail: detail }),
+          },
+        );
+        if (post.ok) {
+          success++;
+          received.push({ uniqueId: task.uniqueId, productDetail: detail });
+        } else {
+          failed++;
+        }
+      } catch (e) {
+        if (e.retryable) skipped++;
+        else failed++;
+      }
+    }
+  }
+  return { batches, success, failed, skipped, received };
+}
+
+// ────────────────────────────────────────────────
+// 测试用例
+// ────────────────────────────────────────────────
+let passed = 0;
+function check(name, fn) {
+  try {
+    fn();
+    passed++;
+    console.log(`  ✅ ${name}`);
+  } catch (e) {
+    console.error(`  ❌ ${name}\n     ${e.message}`);
+    process.exitCode = 1;
+  }
+}
+
+// 用例 1：正常链路——领取 2 个缺商品任务 → 补商品成功 → 回传 payload 正确
+async function testNormalFlow() {
+  console.log("\n[1] 正常链路：领取→补商品→回传");
+  const tasksPool = [
+    { uniqueId: "userA", seoUrl: "https://www.tiktok.com/shop/pdp/a123" },
+    { uniqueId: "userB", seoUrl: "https://www.tiktok.com/shop/pdp/b456" },
+  ];
+  const ws = await startMockWebserver();
+  const srv = await startMockServer(tasksPool);
+  const r = await fillProducts({
+    serverUrl: srv.url,
+    webserverUrl: ws.url,
+    limit: 2,
+    maxBatches: 1,
+  });
+  check("成功数 = 2", () => assert.strictEqual(r.success, 2));
+  check("失败/跳过 = 0", () => assert.strictEqual(r.failed + r.skipped, 0));
+  check("回传数 = 2", () => assert.strictEqual(r.received.length, 2));
+  check("回传 payload 含 productDetail 且字段正确", () => {
+    assert.strictEqual(r.received[0].productDetail.rating, 4.7);
+    assert.strictEqual(r.received[0].productDetail.soldCount, 296);
+    assert.ok(r.received[0].productDetail.productName);
+  });
+  check("服务端收到 uniqueId 匹配", () =>
+    assert.strictEqual(srv.received[0].uniqueId, "userA"),
+  );
+  await ws.close();
+  await srv.close();
+}
+
+// 用例 2：空任务——先无任务（空闲等待），后补任务仍能接上
+async function testEmptyThenTask() {
+  console.log("\n[2] 空任务：空闲等待后仍能接到任务");
+  const tasksPool = [];
+  const ws = await startMockWebserver();
+  const srv = await startMockServer(tasksPool);
+  // 启动时任务池为空 → 第一轮空闲；随后注入任务
+  const runner = fillProducts({
+    serverUrl: srv.url,
+    webserverUrl: ws.url,
+    limit: 1,
+    intervalMs: 80,
+    maxBatches: 4,
+  });
+  setTimeout(() => {
+    tasksPool.push({
+      uniqueId: "lateUser",
+      seoUrl: "https://www.tiktok.com/shop/pdp/late789",
+    });
+  }, 150);
+  const r = await runner;
+  check("空闲等待后成功补到 1 个", () => assert.strictEqual(r.success, 1));
+  check("无失败", () => assert.strictEqual(r.failed, 0));
+  await ws.close();
+  await srv.close();
+}
+
+// 用例 3：502 失败——该任务 failed，不回传成功
+async function testHttpFail() {
+  console.log("\n[3] 补商品 502 失败：计入 failed 且不回传");
+  const failUrl = "https://www.tiktok.com/shop/pdp/fail502";
+  const tasksPool = [
+    { uniqueId: "failUser", seoUrl: failUrl },
+    { uniqueId: "okUser", seoUrl: "https://www.tiktok.com/shop/pdp/ok001" },
+  ];
+  const ws = await startMockWebserver({ failUrls: new Set([failUrl]) });
+  const srv = await startMockServer(tasksPool);
+  const r = await fillProducts({
+    serverUrl: srv.url,
+    webserverUrl: ws.url,
+    limit: 2,
+    maxBatches: 1,
+  });
+  check("成功 1 个", () => assert.strictEqual(r.success, 1));
+  check("失败 1 个", () => assert.strictEqual(r.failed, 1));
+  check("只回传成功的（failUser 不在回传里）", () => {
+    assert.strictEqual(r.received.length, 1);
+    assert.strictEqual(r.received[0].uniqueId, "okUser");
+  });
+  await ws.close();
+  await srv.close();
+}
+
+// 用例 4：captcha——503 retryable，计入 skipped
+async function testCaptcha() {
+  console.log("\n[4] 商品详情验证码(503)：计入 skipped");
+  const capUrl = "https://www.tiktok.com/shop/pdp/cap999";
+  const tasksPool = [{ uniqueId: "capUser", seoUrl: capUrl }];
+  const ws = await startMockWebserver({ captchaUrls: new Set([capUrl]) });
+  const srv = await startMockServer(tasksPool);
+  const r = await fillProducts({
+    serverUrl: srv.url,
+    webserverUrl: ws.url,
+    limit: 1,
+    maxBatches: 1,
+  });
+  check("skipped = 1", () => assert.strictEqual(r.skipped, 1));
+  check("失败/成功 = 0", () => assert.strictEqual(r.failed + r.success, 0));
+  check("未回传（验证码跳过，不提交）", () =>
+    assert.strictEqual(r.received.length, 0),
+  );
+  await ws.close();
+  await srv.close();
+}
+
+console.log("===== 补商品命令核心逻辑测试 =====");
+await testNormalFlow();
+await testEmptyThenTask();
+await testHttpFail();
+await testCaptcha();
+console.log(
+  `\n结果: ${passed} 通过${process.exitCode ? ", 有失败" : ", 0 失败"}`,
+);

package/src/watchdog/upgrader.js

@@ -2,13 +2,13 @@
  * 自动升级模块 — 检测 tt-help-cli-ycl 新版本并执行升级
  *
  * 仅全局安装模式启用。每 10 分钟查询 npm registry 发现新版本，
- * 由旧 watchdog spawn 独立升级进程 U：U 负责「下载 → 验证代码 → 杀旧 → 启新」，
+ * 由旧 watchdog spawn 独立升级进程 U：U 负责「下载 → 验证版本 → 杀旧 → 启新」，
  * 见 runUpgradeMode。旧 watchdog 收到 SIGTERM 后优雅退出，新版接管。
  */
 
 import { exec, spawn } from "child_process";
 import { readFileSync, openSync } from "fs";
-import { fileURLToPath, pathToFileURL } from "url";
+import { fileURLToPath } from "url";
 import { dirname, join } from "path";
 import { homedir, tmpdir } from "os";
 
@@ -115,8 +115,9 @@ export function performUpgrade() {
 }
 
 /**
- * 下载后验证：确认 npm install 真正换了版本，且新版主模块能加载（冒烟）
- * 验证通过才允许杀旧 → 启新；失败则旧 watchdog 不受影响继续运行
+ * 下载后验证：确认 npm install 真正换了版本（npm 装 @latest，版本变了即已装上最新版）。
+ * 不做模块加载冒烟——主模块 import 链会引入可选依赖（如 better-sqlite3），未安装时
+ * 会误报验证失败、阻断升级（211 实测发现），因此仅以版本号为准。
  */
 async function verifyUpgradedPackage(beforeVersion) {
   const now = getVersion();
@@ -127,50 +128,9 @@ async function verifyUpgradedPackage(beforeVersion) {
       ok: false,
       reason: `版本未变化（仍 ${now}），疑似 npm install 未生效`,
     };
-  const smoke = await smokeTestMainModule();
-  if (!smoke.ok) return { ok: false, reason: smoke.reason };
   return { ok: true, version: now };
 }
 
-/** 冒烟：spawn 子进程加载新版主模块（仅加载不执行业务），能加载则代码/依赖基本可用 */
-function smokeTestMainModule(timeoutMs = 15_000) {
-  return new Promise((resolve) => {
-    // 必须转成 file:// URL：Windows 上裸的 C:\... 路径会被 ESM loader 当作协议 c: 而报错
-    const mainModulePath = pathToFileURL(
-      join(__dirname, "..", "..", "src", "main.js"),
-    ).href;
-    const code = `import(${JSON.stringify(
-      mainModulePath,
-    )}).then(()=>process.exit(0)).catch((e)=>{console.error(e&&e.message||e);process.exit(1)})`;
-    let child;
-    try {
-      child = spawn(process.execPath, ["--input-type=module", "-e", code], {
-        stdio: ["ignore", "ignore", "pipe"],
-        windowsHide: true,
-      });
-    } catch (e) {
-      resolve({ ok: false, reason: `冒烟启动失败: ${e.message}` });
-      return;
-    }
-    let err = "";
-    child.stderr?.on("data", (d) => (err += d.toString()));
-    const timer = setTimeout(() => {
-      try {
-        child.kill("SIGKILL");
-      } catch {}
-      resolve({ ok: false, reason: `冒烟超时 ${timeoutMs}ms` });
-    }, timeoutMs);
-    child.on("exit", (code) => {
-      clearTimeout(timer);
-      resolve(
-        code === 0
-          ? { ok: true }
-          : { ok: false, reason: `冒烟失败: ${err.slice(0, 200)}` },
-      );
-    });
-  });
-}
-
 /**
  * 启动定时升级检测
  * @param {{intervalMs?: number, onUpdateAvailable?: function}} opts
@@ -220,8 +180,8 @@ export function startUpgradeChecker({
 // ══════════════════════════════════════════════
 //
 // 设计（定稿，无中间文件）：旧 watchdog 检测到新版 → spawn 独立升级进程 U（detached）
-//   U：npm install 下载 →【验证代码】→【杀旧】→【启新】
-//   - 下载失败 / 验证未通过（版本未变、新版主模块加载失败）→ 不杀旧，旧 watchdog 继续跑
+//   U：npm install 下载 →【验证版本】→【杀旧】→【启新】
+//   - 下载失败 / 验证未通过（版本未变化）→ 不杀旧，旧 watchdog 继续跑
 //   - 验证通过 → SIGTERM 旧 watchdog（优雅，5s 未退强杀兜底）→ 无并存窗口 → 启新版一定能起来
 // 关键：U 的 stdout/stderr 独立落盘（tmpdir/tt-help-upgrader-*.log），旧 watchdog 退出后日志不断，可定位。
 
@@ -293,7 +253,7 @@ function buildWatchdogArgs({ serverUrl, clientId, intervalSec, noDaemon }) {
 
 /**
  * 独立升级器主流程（由旧 watchdog 以子进程方式启动）
- * 顺序：下载 → 验证代码 → 杀旧 → 启新。任一步失败都不杀旧，业务不断。
+ * 顺序：下载 → 验证版本 → 杀旧 → 启新。任一步失败都不杀旧，业务不断。
  * @param {string[]} argv - process.argv.slice(2)
  */
 export async function runUpgradeMode(argv) {
@@ -320,7 +280,7 @@ export async function runUpgradeMode(argv) {
     process.exit(1);
   }
 
-  // 2) 下载后验证：版本确实更新 + 新版主模块能加载（冒烟）；通过才允许杀旧
+  // 2) 下载后验证：版本确实更新（npm 装 @latest，版本变了即最新）；通过才允许杀旧
   const verify = await verifyUpgradedPackage(beforeVersion);
   if (!verify.ok) {
     console.error(