tt-help-cli-ycl 1.4.29 → 1.4.30

package/package.json

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

package/src/lib/search-collector.js

@@ -58,6 +58,18 @@ async function scrollPage(page) {
   });
 }
 
+async function waitForSearchResults(page, timeoutMs = 20000) {
+  try {
+    await page.waitForSelector(
+      '[class*="DivItemContainer"]',
+      { timeout: timeoutMs },
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function processOneTab(page, tabName, keyword, allIds, excludeSet, log) {
   const urlFn = TAB_URLS[tabName];
   if (!urlFn) {
@@ -68,7 +80,7 @@ async function processOneTab(page, tabName, keyword, allIds, excludeSet, log) {
   const tag = `[${tabName}]`;
   const url = urlFn(keyword);
 
-  // 首屏正常加载
+  // 首屏加载
   log(`${tag} 加载...`);
   try {
     await page.goto(url, { waitUntil: "domcontentloaded", timeout: 30000 });
@@ -76,7 +88,12 @@ async function processOneTab(page, tabName, keyword, allIds, excludeSet, log) {
     log(`${tag} 导航失败: ${e.message}`);
     return;
   }
-  await delay(4000);
+
+  // 等待搜索结果实际加载（最长 20 秒）
+  const ready = await waitForSearchResults(page, 20000);
+  if (!ready) {
+    log(`${tag} 等待超时，继续采集`);
+  }
 
   // 首屏渲染完成后屏蔽图片/字体/媒体，加速后续滚动
   await page.route("**/*", (route) => {
@@ -151,35 +168,16 @@ export async function collectSearchAuthors(browser, keyword, opts = {}) {
     log(`[collect] 排除: [${[...excludeSet].join(", ")}]`);
 
   const context = browser.contexts()[0];
-  const existingPage = context.pages()[0];
+  const page = context.pages()[0];
   const allIds = new Set();
 
-  // 并行：每个 tab 独立页面同时跑
-  const newPages = []; // 追踪所有新建页面，确保清理
-  const tasks = tabs.map(async (tabName, i) => {
-    let page = null;
+  // 串行：复用同一个页面，逐个 tab 采集
+  for (const tabName of tabs) {
     try {
-      page = i === 0 ? existingPage : await context.newPage();
-      if (i > 0) newPages.push(page);
       await processOneTab(page, tabName, keyword, allIds, excludeSet, log);
     } catch (e) {
       log(`[${tabName}] 异常: ${e.message}`);
-    } finally {
-      if (i > 0 && page) {
-        try {
-          await page.close();
-        } catch {}
-      }
     }
-  });
-
-  await Promise.all(tasks);
-
-  // 兜底：确保所有新建页面都已关闭
-  for (const p of newPages) {
-    try {
-      if (!p.isClosed()) await p.close();
-    } catch {}
   }
 
   return [...allIds].sort();