tt-help-cli-ycl 1.4.41 → 1.4.42

package/package.json

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

package/src/cli/tag.js

@@ -1548,7 +1548,7 @@ export async function handleTag(parsed) {
 
 export async function handleTagRefresh(parsed) {
   const { tagRefresh } = parsed;
-  const { serverUrl, port, proxy: cliProxy } = tagRefresh || {};
+  const { serverUrl, port, proxy: cliProxy, webserver } = tagRefresh || {};
 
   const baseUrl = serverUrl || DEFAULT_SERVER;
   const defaultRefreshPort =
@@ -1743,19 +1743,23 @@ export async function handleTagRefresh(parsed) {
   const clientId = randomUUID();
   const clientMeta = { type: "tag-refresh", port: cdpPort };
 
-  // 复用 TikTokScraper
-  const enrichScraper = new TikTokScraper({
-    poolSize: 3,
-    proxyServer: effectiveProxy || undefined,
-  });
-  await enrichScraper.init();
-  log("✅ TikTokScraper 已就绪 (enrich 复用)");
+  // 复用 TikTokScraper（webserver 模式下不需要本地 scraper）
+  const enrichScraper = webserver
+    ? null
+    : new TikTokScraper({
+        poolSize: 3,
+        proxyServer: effectiveProxy || undefined,
+      });
+  if (enrichScraper) {
+    await enrichScraper.init();
+    log("✅ TikTokScraper 已就绪 (enrich 复用)");
+  }
   log(`  客户端 ID: ${clientId.substring(0, 8)}...`);
   log("");
 
   const cleanup = () => {
     log("\n正在清理资源...");
-    enrichScraper.close().catch(() => {});
+    if (enrichScraper) enrichScraper.close().catch(() => {});
     killEdgeProcesses(null, cdpPort);
     process.exit(0);
   };
@@ -1875,32 +1879,52 @@ export async function handleTagRefresh(parsed) {
           continue;
         }
 
-        // enrich: 先查服务端缓存，只对未知视频发 HTTP 请求
-        const enriched = await enrichWithServerCache(
-          videos,
-          baseUrl,
-          enrichScraper,
-          {
-            clientId,
-            clientMeta,
-            effectiveProxy,
-            log,
-          },
-        );
-        videos = enriched.videos;
-
-        // CDN 限流检测
-        const cdnBlocked = enriched.cdnBlockedCount || 0;
-        if (cdnBlocked > 0) {
-          const cdnRatio = cdnBlocked / (videos.length || 1);
-          const coolSec = cdnRatio > 0.3 ? 120 : 60;
+        // enrich: webserver API 或本地 HTTP view-source
+        if (webserver) {
           log(
-            `  ⚠️ CDN 限流: ${cdnBlocked}/${videos.length} (${(cdnRatio * 100).toFixed(0)}%)，冷却 ${coolSec} 秒后重启 scraper`,
+            `  ⏳ 补充国家信息 (${videos.length} 个视频, via webserver ${webserver})...`,
           );
-          await new Promise((r) => setTimeout(r, coolSec * 1000));
-          log(`  正在重启 TikTokScraper...`);
-          await enrichScraper.restart();
-          log(`  ✅ TikTokScraper 已重启`);
+          await enrichViaWebserver(
+            videos,
+            webserver,
+            ({ done, total, current, locationCreated }) => {
+              if (done % 10 === 0 || done === total) {
+                const name = current.split("/").pop().slice(0, 20);
+                process.stderr.write(
+                  `\r    [${done}/${total}] ${name} → ${locationCreated || "-"}\x1b[K`,
+                );
+              }
+            },
+          );
+          process.stderr.write("\n");
+        } else {
+          // enrich: 先查服务端缓存，只对未知视频发 HTTP 请求
+          const enriched = await enrichWithServerCache(
+            videos,
+            baseUrl,
+            enrichScraper,
+            {
+              clientId,
+              clientMeta,
+              effectiveProxy,
+              log,
+            },
+          );
+          videos = enriched.videos;
+
+          // CDN 限流检测
+          const cdnBlocked = enriched.cdnBlockedCount || 0;
+          if (cdnBlocked > 0) {
+            const cdnRatio = cdnBlocked / (videos.length || 1);
+            const coolSec = cdnRatio > 0.3 ? 120 : 60;
+            log(
+              `  ⚠️ CDN 限流: ${cdnBlocked}/${videos.length} (${(cdnRatio * 100).toFixed(0)}%)，冷却 ${coolSec} 秒后重启 scraper`,
+            );
+            await new Promise((r) => setTimeout(r, coolSec * 1000));
+            log(`  正在重启 TikTokScraper...`);
+            await enrichScraper.restart();
+            log(`  ✅ TikTokScraper 已重启`);
+          }
         }
 
         // 过滤目标国家的视频和作者

package/src/lib/args.js

@@ -1155,6 +1155,7 @@ function parseTagArgs(args) {
         serverUrl,
         port: refreshPort,
         proxy: scoreProxy,
+        webserver: webserverUrl,
       },
       urls: [],
       outputFormat: "json",