tt-help-cli-ycl 1.3.86 → 1.3.88

package/package.json

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

package/src/cli/tag.js

@@ -419,7 +419,7 @@ async function reportToServer(baseUrl, result) {
 
 export async function handleScoreAll(parsed) {
   const { tagScoreAll } = parsed;
-  let { countries, serverUrl } = tagScoreAll || {};
+  let { countries, serverUrl, autoDiscover } = tagScoreAll || {};
 
   const baseUrl = serverUrl || DEFAULT_SERVER;
   const targetCountries = countries || [
@@ -445,13 +445,15 @@ export async function handleScoreAll(parsed) {
   log("  自动循环打分模式（客户端本地执行）");
   log(`  目标国家: ${targetCountries.join(", ")}`);
   log(`  服务端:   ${baseUrl}`);
+  if (autoDiscover) log(`  自动发现: 开启（无任务时自动生成标签）`);
   log("  流程: 从服务端拉 tag → 本地 Playwright 抓取 → enrich → 算分 → 上报");
   log("  每个标签约 1-2 分钟");
   log("========================================");
   log("");
 
   let totalScored = 0;
-  let totalNew = null;
+  let lastDiscoverTime = 0;
+  const DISCOVER_COOLDOWN = 5 * 60 * 1000; // 5 分钟冷却
 
   // 复用 TikTokScraper 实例，避免每次 enrich 都启动/关闭 headless 浏览器
   const enrichScraper = new TikTokScraper({ poolSize: 3 });
@@ -461,28 +463,34 @@ export async function handleScoreAll(parsed) {
 
   try {
     while (true) {
-      // 查剩余数量
-      if (totalNew === null) {
-        try {
-          const statsRes = await fetch(
-            `${baseUrl}/api/tags?status=new&limit=1000`,
-          );
-          const statsData = await statsRes.json();
-          totalNew = statsData.total || 0;
-          log(`📋 待打分标签: ${totalNew} 个`);
-          log("");
-        } catch (e) {
-          log(`⚠️ 无法连接服务端: ${e.message}`);
-          break;
-        }
-      }
-
       // 从服务端取下一个 new 标签
       const tagsRes = await fetch(`${baseUrl}/api/tags?status=new&limit=1`);
       const tagsData = await tagsRes.json();
       if (!tagsData.tags || tagsData.tags.length === 0) {
-        log(`  ⏳ 暂无待打分标签，10 秒后重试...`);
-        totalNew = null; // 重置计数，下次新标签到达时重新查询
+        // 自动发现：无任务时自动生成标签
+        if (autoDiscover && Date.now() - lastDiscoverTime > DISCOVER_COOLDOWN) {
+          log(
+            `🔍 无待打分标签，自动为 ${targetCountries.length} 个国家生成标签...`,
+          );
+          for (const country of targetCountries) {
+            try {
+              const discRes = await fetch(
+                `${baseUrl}/api/tags/discover?country=${country}&count=5`,
+              );
+              const discData = await discRes.json();
+              if (discData.inserted) {
+                log(`  ${country}: 新增 ${discData.inserted} 个`);
+              }
+            } catch (e) {
+              log(`  ${country}: 请求失败 (${e.message})`);
+            }
+          }
+          lastDiscoverTime = Date.now();
+          // 等 3 秒让服务端处理完
+          await new Promise((r) => setTimeout(r, 3000));
+          continue;
+        }
+        log(`⏳ 暂无待打分标签，10 秒后重试...`);
         await new Promise((r) => setTimeout(r, 10000));
         continue;
       }
@@ -490,7 +498,7 @@ export async function handleScoreAll(parsed) {
       const tag = tagsData.tags[0].tag.replace(/^#+/, "").trim().toLowerCase();
       const startTime = Date.now();
 
-      log(`[${totalScored + 1}/${totalNew || "?"}] 正在打分 #${tag} ...`);
+      log(`[${totalScored + 1}] 正在打分 #${tag} ...`);
 
       const result = {
         tag,
@@ -551,7 +559,6 @@ export async function handleScoreAll(parsed) {
         }
 
         // enrich: 逐个视频查 view-source 获取国家
-        log(`  补充国家信息...`);
         const enriched = await enrichVideosWithLocation(videos, {
           mode: "videos",
           existingScraper: enrichScraper,
@@ -564,8 +571,6 @@ export async function handleScoreAll(parsed) {
           },
         });
         videos = enriched.videos;
-        const withLoc = videos.filter((v) => v.locationCreated).length;
-        log(`  完成: ${withLoc}/${videos.length} 个视频有国家信息`);
 
         // 过滤 + 算分 (共用函数)
         const { matchedAuthorSet } = applyFilterAndScore(
@@ -601,10 +606,8 @@ export async function handleScoreAll(parsed) {
           .map((c) => `${c.c}:${c.n}`)
           .join(" ");
         log(
-          `  ${icon} ${result.status} score=${result.score} authors=${result.authorCount} matched=${result.matchedAuthors} (${elapsed}s)`,
+          `  ${icon} ${result.status} score=${result.score} authors=${result.authorCount} matched=${result.matchedAuthors} (${elapsed}s)${mc ? "  " + mc : ""}`,
         );
-        if (mc) log(`     国家: ${mc}`);
-        log(`     剩余: ~${Math.max(0, (totalNew || 0) - totalScored)} 个`);
         log("");
       } catch (e) {
         log(`  ❌ 失败: ${e.message}`);

package/src/lib/args.js

@@ -727,6 +727,7 @@ function parseTagArgs(args) {
   let discoverCountries = [];
   let discoverCount = 4;
   let discoverPrompt = null;
+  let autoDiscover = false;
   let isDiscover = false;
   let isScore = false;
   let isScoreAll = false;
@@ -767,6 +768,8 @@ function parseTagArgs(args) {
       }
     } else if (arg === "--count") {
       discoverCount = parseInt(args[++i]) || 4;
+    } else if (arg === "--auto-discover") {
+      autoDiscover = true;
     } else if (arg === "--countries") {
       scoreCountries = args[++i]
         .split(",")
@@ -854,6 +857,7 @@ function parseTagArgs(args) {
       tagScoreAll: {
         countries: scoreCountries,
         serverUrl,
+        autoDiscover,
       },
       urls: [],
       outputFormat: "json",

package/src/lib/browser/page.js

@@ -94,7 +94,13 @@ export async function isLoggedIn(page) {
       console.error(
         `  [登录检测] DOM 无法判断，刷新页面后重试 (${attempt}/${DOM_CHECK_RETRIES})...`,
       );
-      await page.reload({ waitUntil: "domcontentloaded" });
+      try {
+        await page.reload({ waitUntil: "domcontentloaded", timeout: 30000 });
+      } catch (reloadErr) {
+        console.error(
+          `  [登录检测] 页面刷新失败: ${reloadErr.message}，跳过重试继续检测...`,
+        );
+      }
     }
   }
   // 重试后仍无法判断，信任 Cookie
@@ -125,9 +131,16 @@ export async function safeCheckLogin(page) {
   for (let round = 2; round <= SAFE_CHECK_ROUNDS; round++) {
     await new Promise((r) => setTimeout(r, SAFE_CHECK_INTERVAL));
     // 重新导航到 TikTok 页面，确保页面状态刷新
-    await page.goto("https://www.tiktok.com", {
-      waitUntil: "domcontentloaded",
-    });
+    try {
+      await page.goto("https://www.tiktok.com", {
+        waitUntil: "domcontentloaded",
+        timeout: 30000,
+      });
+    } catch (gotoErr) {
+      console.error(
+        `[安全登录检测] 第 ${round} 轮: 页面导航失败: ${gotoErr.message}，直接在当前页面检测...`,
+      );
+    }
     loggedIn = await isLoggedIn(page);
     if (loggedIn) {
       console.error(`[安全登录检测] 第 ${round} 轮: 已登录 ✓`);