tt-help-cli-ycl 1.3.33 → 1.3.34

package/src/cli/watch.js

@@ -1,31 +1,31 @@
-import { existsSync } from 'fs';
-import { createStore } from '../watch/data-store.js';
-import { startWatchServer, openBrowser } from '../watch/server.js';
-
-export async function handleWatch(options) {
-  const { outputFile, watchPort } = options;
-
-  if (!outputFile) {
-    console.error('用法: tt-help watch -o <数据文件> [-p 端口]');
-    console.error('示例: tt-help watch -o data.json');
-    console.error('      tt-help watch -o data.json -p 8080');
-    process.exit(1);
-  }
-
-  if (!existsSync(outputFile)) {
-    console.error(`文件不存�? ${outputFile}`);
-    process.exit(1);
-  }
-
-  const store = createStore(outputFile);
-  const { server, port } = await startWatchServer(outputFile, watchPort, store);
-  openBrowser(port);
-
-  process.once('SIGINT', () => {
-    store.stopBackup();
-    server.close();
-    process.exit(0);
-  });
-
-  console.error('�?Ctrl+C 停止监控服务');
-}
+import { existsSync } from 'fs';
+import { createStore } from '../watch/data-store.js';
+import { startWatchServer, openBrowser } from '../watch/server.js';
+
+export async function handleWatch(options) {
+  const { outputFile, watchPort } = options;
+
+  if (!outputFile) {
+    console.error('用法: tt-help watch -o <数据文件> [-p 端口]');
+    console.error('示例: tt-help watch -o data.json');
+    console.error('      tt-help watch -o data.json -p 8080');
+    process.exit(1);
+  }
+
+  if (!existsSync(outputFile)) {
+    console.error(`文件不存�? ${outputFile}`);
+    process.exit(1);
+  }
+
+  const store = createStore(outputFile);
+  const { server, port } = await startWatchServer(outputFile, watchPort, store);
+  openBrowser(port);
+
+  process.once('SIGINT', () => {
+    store.stopBackup();
+    server.close();
+    process.exit(0);
+  });
+
+  console.error('�?Ctrl+C 停止监控服务');
+}

package/src/lib/api-interceptor.js

@@ -1,14 +1,10 @@
 import { delay } from "./delay.js";
-import { retryWithBackoff } from "./retry.js";
 import { assertPageUrl } from "./browser/page.js";
 import {
   detectPageError,
   detectPageErrorWithWait,
 } from "./page-error-detector.js";
 
-/**
- * 处理 API 响应数据：提取首页视频 + 翻页
- */
 async function processAPIResponse(
   data,
   username,
@@ -18,7 +14,6 @@ async function processAPIResponse(
   apiRequestUrl,
   log,
 ) {
-  // 提取首页视频
   const firstPageItems = data.itemList || [];
   for (const item of firstPageItems) {
     if (items.length >= maxVideos) break;
@@ -26,7 +21,6 @@ async function processAPIResponse(
     items.push({ id: item.id, href });
   }
 
-  // 翻页获取后续视频
   let cursor = data.cursor;
   let hasMore = data.hasMore;
 
@@ -61,7 +55,6 @@ async function processAPIResponse(
 
   log(`  [API拦截] 共 ${items.length} 条视频`);
 
-  // 转成 Map 返回，与 collectVideos 一致
   const videoMap = new Map();
   for (const v of items) {
     if (!videoMap.has(v.id)) videoMap.set(v.id, v);
@@ -70,232 +63,80 @@ async function processAPIResponse(
   return videoMap;
 }
 
-/**
- * 单次 API 拦截尝试：注册拦截器 → 导航 → 用 waitForResponse 精确等待 API
- * @param {number} apiTimeout - API 响应超时时间（ms），默认 15000
- * @returns {{data: object|null, apiRequestUrl: string|null, elapsed: number}}
- */
-async function tryInterceptAPI(page, username, log, apiTimeout = 15000) {
-  const url = `https://www.tiktok.com/@${username}`;
+async function fetchUserVideosAPI(page, username, maxVideos, log) {
+  log(`  [API拦截] 获取 @${username} 视频 ...`);
+
   let apiRequestUrl = null;
   let sawApiRequest = false;
-  let sawApiResponse = false;
-
-  const responseHandler = async (response) => {
-    if (response.url().includes("/api/post/item_list/")) {
-      sawApiResponse = true;
-    }
-  };
 
   const requestHandler = (request) => {
-    if (request.url().includes("/api/post/item_list/") && !apiRequestUrl) {
-      sawApiRequest = true;
-      apiRequestUrl = request.url();
-    } else if (request.url().includes("/api/post/item_list/")) {
+    if (request.url().includes("/api/post/item_list/")) {
       sawApiRequest = true;
+      if (!apiRequestUrl) apiRequestUrl = request.url();
     }
   };
 
-  page.on("response", responseHandler);
   page.on("request", requestHandler);
 
   const t0 = Date.now();
+  let data = null;
+  let interceptionError = null;
 
   try {
-    await page.goto(url, { waitUntil: "domcontentloaded", timeout: 30000 });
-    await assertPageUrl(page, `@${username}`);
-
-    // 用 waitForResponse 精确等待 API 响应（超时时间可配置）
-    const response = await page.waitForResponse(
-      (res) => res.url().includes("/api/post/item_list/"),
-      { timeout: apiTimeout },
+    await page.goto(
+      `https://www.tiktok.com/@${username}`,
+      { waitUntil: "domcontentloaded", timeout: 30000 },
     );
+    await assertPageUrl(page, `@${username}`);
 
-    sawApiResponse = true;
-    const data = await response.json();
-    const elapsed = Date.now() - t0;
-    return { data, apiRequestUrl, elapsed, sawApiRequest, sawApiResponse };
-  } catch (e) {
-    const elapsed = Date.now() - t0;
-    return {
-      data: null,
-      apiRequestUrl,
-      elapsed,
-      error: e.message,
-      sawApiRequest,
-      sawApiResponse,
-    };
-  } finally {
-    page.off("response", responseHandler);
-    page.off("request", requestHandler);
-  }
-}
-
-/**
- * 软重试：不重新 goto，直接在当前页继续等待 item_list API。
- */
-async function tryWaitCurrentPageAPI(page, apiTimeout = 12000) {
-  let apiRequestUrl = null;
-  let sawApiRequest = false;
-  let sawApiResponse = false;
-
-  const requestHandler = (request) => {
-    if (request.url().includes("/api/post/item_list/") && !apiRequestUrl) {
-      sawApiRequest = true;
-      apiRequestUrl = request.url();
-    } else if (request.url().includes("/api/post/item_list/")) {
-      sawApiRequest = true;
-    }
-  };
-
-  const responseHandler = (response) => {
-    if (response.url().includes("/api/post/item_list/")) {
-      sawApiResponse = true;
-    }
-  };
-
-  const t0 = Date.now();
-  page.on("request", requestHandler);
-  page.on("response", responseHandler);
-
-  try {
     const response = await page.waitForResponse(
       (res) => res.url().includes("/api/post/item_list/"),
-      { timeout: apiTimeout },
+      { timeout: 30000 },
     );
 
-    sawApiResponse = true;
-    const data = await response.json();
-    const elapsed = Date.now() - t0;
-    return { data, apiRequestUrl, elapsed, sawApiRequest, sawApiResponse };
+    data = await response.json();
   } catch (e) {
-    const elapsed = Date.now() - t0;
-    return {
-      data: null,
-      apiRequestUrl,
-      elapsed,
-      error: e.message,
-      sawApiRequest,
-      sawApiResponse,
-    };
+    interceptionError = e.message;
   } finally {
     page.off("request", requestHandler);
-    page.off("response", responseHandler);
   }
-}
-
-/**
- * 通过拦截 TikTok 内部 API 获取用户视频列表
- * 比 DOM 滚动解析快 5-10 倍
- *
- * 弱网优化：
- * - 第 1 轮：正常 goto，等待 15s
- * - 第 1.5 轮：不重新 goto，留在当前页继续等待 12s
- * - 第 2 轮：重新 goto，等待 30s
- * - 使用 waitForResponse 精确等待 API 响应（而非固定超时）
- *
- * @param {import('playwright').Page} page - Playwright page (CDP 连接)
- * @param {string} username - TikTok 用户名
- * @param {number} maxVideos - 最大视频数
- * @param {Function} log - 日志函数
- * @returns {Map<string, {id: string, href: string}>} 与 collectVideos 返回格式一致
- * @throws {Error} API 超时或网络异常时抛出
- */
-async function fetchUserVideosAPI(page, username, maxVideos, log) {
-  const items = [];
-  const noRetryErrors = new Set([
-    "service_error",
-    "not_found",
-    "region_blocked",
-    "login_required",
-  ]);
 
-  const attempts = [
-    {
-      label: `  [API拦截] 获取 @${username} 视频 ...`,
-      mode: "goto",
-      apiTimeout: 15000,
-    },
-    {
-      label: "  [API拦截] 首轮未命中，当前页继续补等 12s ...",
-      mode: "wait",
-      apiTimeout: 12000,
-    },
-    {
-      label: "  [API拦截] 重新加载主页后重试 (超时 30s)",
-      mode: "goto",
-      apiTimeout: 30000,
-    },
-  ];
+  const elapsed = Date.now() - t0;
 
-  for (let attempt = 0; attempt < attempts.length; attempt++) {
-    const currentAttempt = attempts[attempt];
-    log(currentAttempt.label);
-
-    const {
+  if (data && Array.isArray(data.itemList) && data.itemList.length > 0) {
+    log(`  [API拦截] 成功，耗时 ${elapsed}ms`);
+    return await processAPIResponse(
       data,
+      username,
+      maxVideos,
+      [],
+      page,
       apiRequestUrl,
-      elapsed,
-      error,
-      sawApiRequest,
-      sawApiResponse,
-    } =
-      currentAttempt.mode === "goto"
-        ? await tryInterceptAPI(page, username, log, currentAttempt.apiTimeout)
-        : await tryWaitCurrentPageAPI(page, currentAttempt.apiTimeout);
-
-    if (data && Array.isArray(data.itemList) && data.itemList.length > 0) {
-      // 成功拦截且拿到了视频，处理数据
-      return await processAPIResponse(
-        data,
-        username,
-        maxVideos,
-        items,
-        page,
-        apiRequestUrl,
-        log,
-      );
-    }
-
-    // API 已返回但没有视频时，优先判定是否是确定性的页面错误。
-    let pageError = await detectPageError(page);
-
-    // service_error 经常比 API 判定晚一点渲染，补一个短等待避免漏判“被封”。
-    if (!pageError) {
-      const delayedPageError = await detectPageErrorWithWait(page, 3000);
-      if (delayedPageError) pageError = delayedPageError;
-    }
-
-    if (pageError === "service_error") {
-      throw new Error(`被封: ${username}`);
-    }
-
-    if (data && Array.isArray(data.itemList) && data.itemList.length === 0) {
-      if (noRetryErrors.has(pageError)) {
-        return new Map();
-      }
+      log,
+    );
+  }
 
-      return new Map();
-    }
+  let pageError = await detectPageError(page);
+  if (!pageError) {
+    pageError = await detectPageErrorWithWait(page, 5000);
+  }
 
-    if (noRetryErrors.has(pageError)) {
-      return new Map();
-    }
+  if (pageError === "service_error") {
+    throw new Error(`被封: ${username}`);
+  }
 
-    log(
-      `  [API拦截] 未命中: request=${sawApiRequest ? "Y" : "N"}, response=${sawApiResponse ? "Y" : "N"}, elapsed=${elapsed}ms${error ? `, error=${error}` : ""}${apiRequestUrl ? ", apiUrl=Y" : ", apiUrl=N"}`,
-    );
+  if (pageError) {
+    log(`  [API拦截] 数据为空，识别到页面错误: ${pageError}`);
+    return new Map();
+  }
 
-    // 最后一次重试也失败了
-    if (attempt === attempts.length - 1) {
-      if (!pageError) {
-        throw new Error(
-          `@${username} 页面异常（首轮 + 补等 + 重载后仍未拦截到 API）`,
-        );
-      }
-      return new Map();
-    }
+  if (interceptionError) {
+    log(`  [API拦截] 超时/拦截失败: ${interceptionError}，耗时 ${elapsed}ms`);
+    throw new Error(`@${username} 页面异常（API拦截超时，未识别到错误类型）`);
   }
+
+  log(`  [API拦截] 数据为空，未识别到错误类型，当作无视频处理`);
+  return new Map();
 }
 
-export { fetchUserVideosAPI };
+export { fetchUserVideosAPI };