tt-help-cli-ycl 1.3.79 → 1.3.80

package/package.json

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

package/src/cli/attach.js

@@ -1,4 +1,5 @@
 import { TikTokScraper } from "../lib/tiktok-scraper.mjs";
+import { CDNBlockedError } from "../lib/parse-ssr.mjs";
 import { proxy as configuredProxy } from "../lib/constants.js";
 import v8 from "node:v8";
 
@@ -249,6 +250,7 @@ export async function handleAttach(options) {
 
       let successCount = 0;
       let failCount = 0;
+      let cdnBlockedCount = 0;
       let needRestart = false;
 
       // 收集抓取成功的任务，记录抓取失败的
@@ -257,13 +259,20 @@ export async function handleAttach(options) {
         if (result.status === "fulfilled") {
           const { uniqueId, info, error } = result.value;
           if (error) {
-            if (isBrowserClosedError(error)) {
+            if (error instanceof CDNBlockedError) {
+              attachLog(`  ⚠ @${uniqueId} CDN限流 (Access Denied)`);
+              cdnBlockedCount++;
+              failCount++;
+            } else if (isBrowserClosedError(error)) {
               needRestart = true;
+              attachLog(`  ✗ @${uniqueId} 浏览器断开: ${error.message}`);
+              failCount++;
+            } else {
+              attachLog(
+                `  ✗ @${uniqueId} 获取失败: ${error.message || "未知错误"}`,
+              );
+              failCount++;
             }
-            attachLog(
-              `  ✗ @${uniqueId} 获取失败: ${error.message || "未知错误"}`,
-            );
-            failCount++;
           } else if (info) {
             // info 可能是 { error: true, statusCode: xxx } 表示 TikTok 给了明确响应
             if (info.error) {
@@ -327,6 +336,22 @@ export async function handleAttach(options) {
 
       attachLog(`  本批结果: ${successCount} 成功, ${failCount} 失败\n`);
 
+      // CDN 限流比例超过 30% 时，冷却 + 重启浏览器
+      const cdnRatio = cdnBlockedCount / tasks.length;
+      if (cdnRatio > 0.3) {
+        const coolDownSeconds = cdnRatio > 0.8 ? 120 : 60;
+        attachLog(
+          `  [Attach] CDN限流比例 ${(cdnRatio * 100).toFixed(0)}% (${cdnBlockedCount}/${tasks.length})，冷却 ${coolDownSeconds} 秒后重启浏览器...`,
+        );
+        await new Promise((r) => setTimeout(r, coolDownSeconds * 1000));
+        await recycleScraper(
+          scraper,
+          `CDN限流比例过高 (${cdnBlockedCount}/${tasks.length})`,
+        );
+        browserRestartCount++;
+        taskBatchCount = 0;
+      }
+
       const heap = getHeapUsage();
       if (heap.ratio >= HEAP_RESTART_RATIO) {
         await recycleScraper(

package/src/cli/explore.js

@@ -29,6 +29,7 @@ import os from "os";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
 const STARTUP_TIKTOK_URL = "https://www.tiktok.com/@ycl5007";
+const PAGE_GOTO_TIMEOUT = 60000; // 页面导航超时 60 秒（账户切换后需要更长时间）
 
 async function withRetry(label, fn) {
   let backoff = 1000;
@@ -181,8 +182,11 @@ export async function handleExplore(options) {
     const page = await getOrCreatePage(browser);
 
     // 先导航到 TikTok 页面，再检测登录状态
-    await page.goto(STARTUP_TIKTOK_URL, {
-      waitUntil: "domcontentloaded",
+    await withRetry("启动页面导航", async () => {
+      await page.goto(STARTUP_TIKTOK_URL, {
+        waitUntil: "domcontentloaded",
+        timeout: PAGE_GOTO_TIMEOUT,
+      });
     });
 
     // 检测登录状态（启动时只检测一次）
@@ -235,8 +239,11 @@ export async function handleExplore(options) {
         `[健康检查] 已切换到端口 ${nextAccount.port}${effectiveProxy ? ", 代理: " + effectiveProxy : ""}`,
       );
       // 切换账户后先导航到 TikTok 页面，再重新检测登录状态
-      await page.goto(STARTUP_TIKTOK_URL, {
-        waitUntil: "domcontentloaded",
+      await withRetry("账户切换后页面导航", async () => {
+        await page.goto(STARTUP_TIKTOK_URL, {
+          waitUntil: "domcontentloaded",
+          timeout: PAGE_GOTO_TIMEOUT,
+        });
       });
       loggedIn = await safeCheckLogin(page);
       console.error(

package/src/cli/refresh.js

@@ -28,6 +28,7 @@ import os from "os";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
 const STARTUP_TIKTOK_URL = "https://www.tiktok.com/@ycl5007";
+const PAGE_GOTO_TIMEOUT = 60000; // 页面导航超时 60 秒（账户切换后需要更长时间）
 
 async function withRetry(label, fn) {
   let backoff = 1000;
@@ -181,8 +182,11 @@ export async function handleRefresh(options) {
     const page = await getOrCreatePage(browser);
 
     // 导航到 TikTok 页面
-    await page.goto(STARTUP_TIKTOK_URL, {
-      waitUntil: "domcontentloaded",
+    await withRetry("启动页面导航", async () => {
+      await page.goto(STARTUP_TIKTOK_URL, {
+        waitUntil: "domcontentloaded",
+        timeout: PAGE_GOTO_TIMEOUT,
+      });
     });
 
     // 检测登录状态
@@ -233,8 +237,11 @@ export async function handleRefresh(options) {
         cdpOptions.proxyServer = effectiveProxy;
       }
       console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
-      await page.goto(STARTUP_TIKTOK_URL, {
-        waitUntil: "domcontentloaded",
+      await withRetry("账户切换后页面导航", async () => {
+        await page.goto(STARTUP_TIKTOK_URL, {
+          waitUntil: "domcontentloaded",
+          timeout: PAGE_GOTO_TIMEOUT,
+        });
       });
       loggedIn = await isLoggedIn(page);
       console.error(

package/src/lib/browser/cdp.js

@@ -277,7 +277,8 @@ export async function switchAccount(oldAccount, newAccount, proxyServer) {
 
   const browser = await ensureBrowserReady(newCdpOptions);
 
-  await new Promise((r) => setTimeout(r, 10000));
+  // 等待浏览器完全稳定（Windows 下 Edge 启动后需要更长时间）
+  await new Promise((r) => setTimeout(r, 15000));
 
   return browser;
 }

package/src/lib/parse-ssr.mjs

@@ -1,3 +1,25 @@
+/**
+ * CDN 限流错误（Akamai Access Denied）
+ */
+export class CDNBlockedError extends Error {
+  constructor(message = "CDN限流 (Access Denied)", reference) {
+    super(message);
+    this.name = "CDNBlockedError";
+    this.reference = reference;
+  }
+}
+
+/**
+ * 检测 HTML 是否为 CDN Access Denied
+ * 返回 { isBlocked: true, reference: "xxx" } 或 null
+ */
+export function detectAccessDenied(rawHtml) {
+  if (!rawHtml || typeof rawHtml !== "string") return null;
+  if (!rawHtml.includes("Access Denied")) return null;
+  const refMatch = rawHtml.match(/Reference\s*#\s*([\w.]+)/);
+  return { isBlocked: true, reference: refMatch ? refMatch[1] : null };
+}
+
 /**
  * 判断失败是否可重试
  * - 有 statusCode（无论值是多少）：TikTok 给了明确响应，不可重试
@@ -5,6 +27,10 @@
  */
 export function isRetryableFailure(rawHtml) {
   if (!rawHtml || typeof rawHtml !== "string") return false;
+  // Access Denied = CDN 限流 = 可重试
+  if (detectAccessDenied(rawHtml)) {
+    return true;
+  }
   // 没有 SSR 标记 = 空壳 HTML = 可重试
   if (!rawHtml.includes("__UNIVERSAL_DATA_FOR_REHYDRATION__")) {
     return true;
@@ -49,6 +75,15 @@ function parseSSR(rawHtml) {
 }
 
 export function parseUserInfo(rawHtml) {
+  // 先检查 CDN 限流
+  const denied = detectAccessDenied(rawHtml);
+  if (denied) {
+    throw new CDNBlockedError(
+      `CDN限流 (Access Denied, ref:${denied.reference || "N/A"})`,
+      denied.reference,
+    );
+  }
+
   const data = parseSSR(rawHtml);
   if (!data) return null;
   const scopeKeys = data.__DEFAULT_SCOPE__

package/src/lib/tiktok-scraper.mjs

@@ -4,6 +4,8 @@ import {
   parseUserInfo,
   parseVideoInfo,
   isRetryableFailure,
+  CDNBlockedError,
+  detectAccessDenied,
 } from "./parse-ssr.mjs";
 
 const DEFAULT_POOL_SIZE = 3;
@@ -225,6 +227,14 @@ export class TikTokScraper {
         `https://www.tiktok.com/@${uniqueId}`,
         slot,
       );
+      // CDN 限流立即抛出，不重试
+      if (detectAccessDenied(rawHtml)) {
+        const denied = detectAccessDenied(rawHtml);
+        throw new CDNBlockedError(
+          `CDN限流 (Access Denied, ref:${denied.reference || "N/A"})`,
+          denied.reference,
+        );
+      }
       let result = parseUserInfo(rawHtml);
       for (let attempt = 1; !result && attempt <= maxRetries; attempt++) {
         // 检查是否值得重试：用户异常/不存在则跳过重试
@@ -239,6 +249,14 @@ export class TikTokScraper {
           `https://www.tiktok.com/@${uniqueId}`,
           slot,
         );
+        // 重试中也检查 CDN 限流
+        if (detectAccessDenied(rawHtml)) {
+          const denied = detectAccessDenied(rawHtml);
+          throw new CDNBlockedError(
+            `CDN限流 (Access Denied, ref:${denied.reference || "N/A"})`,
+            denied.reference,
+          );
+        }
         result = parseUserInfo(rawHtml);
       }
       return result || null;