tt-help-cli-ycl 1.4.38 → 1.4.39

package/package.json

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

package/src/cli/precheck.js

@@ -59,8 +59,10 @@ export async function handlePrecheck(options) {
     precheckCountries,
     serverUrl,
     customProxy,
+    precheckWebserver,
     showHelp,
   } = options;
+  const webserverUrl = precheckWebserver || null;
   const effectiveProxy = customProxy || configuredProxy;
 
   if (showHelp) {
@@ -148,12 +150,32 @@ export async function handlePrecheck(options) {
   try {
     const { apiGet, apiPost } = createApiClient({ log: false });
 
-    const scraper = new TikTokScraper({
-      poolSize: precheckSize,
-      proxyServer: effectiveProxy || null,
-    });
-    await scraper.init();
-    precheckLog("[Precheck] 浏览器初始化完成，开始循环预检...");
+    // ── webserver 模式：不启动本地浏览器，通过 HTTP 调用集中式 webserver ──
+    let scraper = null;
+    let getUserInfo;
+
+    if (webserverUrl) {
+      precheckLog(`[Precheck] webserver 模式: ${webserverUrl}`);
+      getUserInfo = async (uniqueId) => {
+        const res = await fetch(`${webserverUrl}/api/tiktok/user`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ uniqueId }),
+          signal: AbortSignal.timeout(30000),
+        });
+        const data = await res.json();
+        if (!res.ok || data.error) return null;
+        return data;
+      };
+    } else {
+      scraper = new TikTokScraper({
+        poolSize: precheckSize,
+        proxyServer: effectiveProxy || null,
+      });
+      await scraper.init();
+      precheckLog("[Precheck] 浏览器初始化完成，开始循环预检...");
+      getUserInfo = (uniqueId) => scraper.getUserInfo(uniqueId);
+    }
 
     let loopCount = 0;
     let browserRestartCount = 0;
@@ -162,8 +184,8 @@ export async function handlePrecheck(options) {
     while (!shuttingDown) {
       loopCount++;
 
-      // 检查浏览器是否存活
-      if (!scraper.isAlive()) {
+      // 检查浏览器是否存活（仅本地模式）
+      if (scraper && !scraper.isAlive()) {
         precheckLog(
           `[Precheck] 浏览器已关闭，正在重启 (${++browserRestartCount})...`,
         );
@@ -173,8 +195,10 @@ export async function handlePrecheck(options) {
 
       // 收到退出信号，完成清理
       if (shuttingDown) {
-        precheckLog("[Precheck] 正在关闭浏览器...");
-        await scraper.close().catch(() => {});
+        if (scraper) {
+          precheckLog("[Precheck] 正在关闭浏览器...");
+          await scraper.close().catch(() => {});
+        }
         if (forceExitTimer) {
           clearTimeout(forceExitTimer);
           forceExitTimer = null;
@@ -192,7 +216,7 @@ export async function handlePrecheck(options) {
       // 收到退出信号，不再处理新任务
       if (shuttingDown) {
         precheckLog("[Precheck] 已收到退出信号，跳过本轮...");
-        await scraper.close().catch(() => {});
+        if (scraper) await scraper.close().catch(() => {});
         if (forceExitTimer) {
           clearTimeout(forceExitTimer);
           forceExitTimer = null;
@@ -202,12 +226,14 @@ export async function handlePrecheck(options) {
       }
 
       if (!candidates || candidates.length === 0) {
-        const heap = getHeapUsage();
-        if (heap.ratio >= HEAP_RESTART_RATIO) {
-          await recycleScraper(
-            scraper,
-            `空闲时堆占用 ${(heap.ratio * 100).toFixed(1)}%`,
-          );
+        if (scraper) {
+          const heap = getHeapUsage();
+          if (heap.ratio >= HEAP_RESTART_RATIO) {
+            await recycleScraper(
+              scraper,
+              `空闲时堆占用 ${(heap.ratio * 100).toFixed(1)}%`,
+            );
+          }
         }
         if (loopCount === 1) {
           precheckLog(
@@ -242,7 +268,7 @@ export async function handlePrecheck(options) {
         candidates.map(async (candidate) => {
           const uniqueId = candidate.uniqueId;
           try {
-            const info = await scraper.getUserInfo(uniqueId);
+            const info = await getUserInfo(uniqueId);
             return {
               uniqueId,
               info,
@@ -262,8 +288,10 @@ export async function handlePrecheck(options) {
 
       // 批次完成后检查退出信号
       if (shuttingDown) {
-        precheckLog("[Precheck] 正在关闭浏览器...");
-        await scraper.close().catch(() => {});
+        if (scraper) {
+          precheckLog("[Precheck] 正在关闭浏览器...");
+          await scraper.close().catch(() => {});
+        }
         if (forceExitTimer) {
           clearTimeout(forceExitTimer);
           forceExitTimer = null;
@@ -369,39 +397,41 @@ export async function handlePrecheck(options) {
         `  本轮结果: ${needRefreshCount} 需刷新, ${skipCount} 跳过, ${failCount} 失败`,
       );
 
-      // CDN 限流比例超过 30% 时，冷却 + 重启浏览器
-      const cdnRatio =
-        candidates.length > 0 ? cdnBlockedCount / candidates.length : 0;
-      if (cdnRatio > 0.3) {
-        const coolDownSeconds = cdnRatio > 0.8 ? 120 : 60;
-        precheckLog(
-          `  [Precheck] CDN限流比例 ${(cdnRatio * 100).toFixed(0)}% (${cdnBlockedCount}/${candidates.length})，冷却 ${coolDownSeconds} 秒后重启浏览器...`,
-        );
-        await new Promise((r) => setTimeout(r, coolDownSeconds * 1000));
-        await recycleScraper(
-          scraper,
-          `CDN限流比例过高 (${cdnBlockedCount}/${candidates.length})`,
-        );
-        browserRestartCount++;
-        taskBatchCount = 0;
-      }
+      // CDN 限流/堆内存/批次重启（仅本地浏览器模式）
+      if (scraper) {
+        const cdnRatio =
+          candidates.length > 0 ? cdnBlockedCount / candidates.length : 0;
+        if (cdnRatio > 0.3) {
+          const coolDownSeconds = cdnRatio > 0.8 ? 120 : 60;
+          precheckLog(
+            `  [Precheck] CDN限流比例 ${(cdnRatio * 100).toFixed(0)}% (${cdnBlockedCount}/${candidates.length})，冷却 ${coolDownSeconds} 秒后重启浏览器...`,
+          );
+          await new Promise((r) => setTimeout(r, coolDownSeconds * 1000));
+          await recycleScraper(
+            scraper,
+            `CDN限流比例过高 (${cdnBlockedCount}/${candidates.length})`,
+          );
+          browserRestartCount++;
+          taskBatchCount = 0;
+        }
 
-      const heap = getHeapUsage();
-      if (heap.ratio >= HEAP_RESTART_RATIO) {
-        await recycleScraper(
-          scraper,
-          `本批后堆占用 ${(heap.ratio * 100).toFixed(1)}%`,
-        );
-        browserRestartCount++;
-        taskBatchCount = 0;
-      } else if (taskBatchCount >= MAX_TASK_BATCHES_BEFORE_RESTART) {
-        await recycleScraper(scraper, `已连续处理 ${taskBatchCount} 批任务`);
-        browserRestartCount++;
-        taskBatchCount = 0;
-      }
+        const heap = getHeapUsage();
+        if (heap.ratio >= HEAP_RESTART_RATIO) {
+          await recycleScraper(
+            scraper,
+            `本批后堆占用 ${(heap.ratio * 100).toFixed(1)}%`,
+          );
+          browserRestartCount++;
+          taskBatchCount = 0;
+        } else if (taskBatchCount >= MAX_TASK_BATCHES_BEFORE_RESTART) {
+          await recycleScraper(scraper, `已连续处理 ${taskBatchCount} 批任务`);
+          browserRestartCount++;
+          taskBatchCount = 0;
+        }
 
-      if (needRestart) {
-        precheckLog("[Precheck] 检测到浏览器异常，将在下一轮重启...");
+        if (needRestart) {
+          precheckLog("[Precheck] 检测到浏览器异常，将在下一轮重启...");
+        }
       }
 
       // 批次间短暂休息

package/src/lib/args.js

@@ -710,6 +710,7 @@ function parsePrecheckArgs(args) {
   let precheckSize = 5;
   let precheckCountries = null;
   let customProxy = null;
+  let precheckWebserver = null;
   let showHelp = false;
 
   for (let i = 0; i < args.length; i++) {
@@ -731,6 +732,8 @@ function parsePrecheckArgs(args) {
         .filter(Boolean);
     } else if (arg === "--proxy") {
       customProxy = args[++i];
+    } else if (arg === "--webserver") {
+      precheckWebserver = args[++i];
     } else if (arg === "--help" || arg === "-h") {
       showHelp = true;
     }
@@ -745,6 +748,7 @@ function parsePrecheckArgs(args) {
     precheckSize,
     precheckCountries,
     customProxy,
+    precheckWebserver,
     showHelp,
     urls: [],
     outputFormat: "json",

package/src/lib/constants.js

@@ -174,9 +174,11 @@ const HELP_TEXT = [
   "      --size <数量>             浏览器页面池大小，默认 5",
   `      -c, --countries <国家>    目标国家列表，逗号分隔，默认 ${DEFAULT_TARGET_LOCATIONS_CSV}`,
   "      --proxy <地址>            HTTP 代理（如 http://127.0.0.1:7890）",
+  "      --webserver <URL>         集中式 webserver（如 http://127.0.0.1:3000），省去本地 Playwright 浏览器",
   "    示例: tt-help precheck -s http://127.0.0.1:3001",
   "          tt-help precheck -i 60 --max-age 86400 -p 20 -c DE,ES,FR",
   "          tt-help precheck --proxy http://127.0.0.1:7890",
+  "          tt-help precheck --webserver http://127.0.0.1:3000 -p 30",
   "",
   "  tt-help info <URL> [URL2 ...] [--onlyvideo]",
   "    获取用户/视频信息，支持多个 URL",