@skrillex1224/playwright-toolkit 2.0.93 → 2.0.95

package/dist/index.js

@@ -1171,8 +1171,8 @@ var Sse = {
   }
 };
 
-// src/blocking.js
-var logger9 = createLogger("Blocking");
+// src/interception.js
+var logger9 = createLogger("Interception");
 var ARCHIVE_EXTENSIONS = [".7z", ".zip", ".rar", ".gz", ".bz2", ".tar", ".zst"];
 var EXECUTABLE_EXTENSIONS = [".exe", ".apk", ".bin", ".dmg", ".jar", ".class"];
 var DOCUMENT_EXTENSIONS = [".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".csv"];
@@ -1219,20 +1219,11 @@ var DEFAULT_BLOCKING_CONFIG = {
   /** 额外自定义扩展名列表 */
   customExtensions: []
 };
-var Blocking = {
+var Interception = {
   /**
    * 根据配置生成需要屏蔽的扩展名列表
    * 
-   * @param {Object} [config] - 屏蔽配置，缺省则使用默认配置
-   * @param {boolean} [config.blockArchive] - 是否屏蔽压缩包
-   * @param {boolean} [config.blockExecutable] - 是否屏蔽可执行文件
-   * @param {boolean} [config.blockDocument] - 是否屏蔽办公文档
-   * @param {boolean} [config.blockImage] - 是否屏蔽图片
-   * @param {boolean} [config.blockMedia] - 是否屏蔽音视频
-   * @param {boolean} [config.blockFont] - 是否屏蔽字体
-   * @param {boolean} [config.blockCss] - 是否屏蔽 CSS
-   * @param {boolean} [config.blockOther] - 是否屏蔽其他资源
-   * @param {string[]} [config.customExtensions] - 额外自定义扩展名
+   * @param {Object} [config] - 屏蔽配置
    * @returns {string[]} 需要屏蔽的扩展名列表
    */
   getBlockedExtensions(config = {}) {
@@ -1251,45 +1242,6 @@ var Blocking = {
     }
     return [...new Set(extensions)];
   },
-  /**
-   * 设置资源屏蔽规则
-   * 拦截指定扩展名的请求，优化加载速度并绕过代理问题
-   * 
-   * @param {import('playwright').Page} page - Playwright Page 对象
-   * @param {Object} [config] - 屏蔽配置
-   * @returns {Promise<void>}
-   */
-  async setupBlockingResources(page, config = {}) {
-    const mergedConfig = { ...DEFAULT_BLOCKING_CONFIG, ...config };
-    const blockedExtensions = this.getBlockedExtensions(mergedConfig);
-    const enabledCategories = [];
-    if (mergedConfig.blockArchive) enabledCategories.push("\u538B\u7F29\u5305");
-    if (mergedConfig.blockExecutable) enabledCategories.push("\u53EF\u6267\u884C\u6587\u4EF6");
-    if (mergedConfig.blockDocument) enabledCategories.push("\u529E\u516C\u6587\u6863");
-    if (mergedConfig.blockImage) enabledCategories.push("\u56FE\u7247");
-    if (mergedConfig.blockMedia) enabledCategories.push("\u97F3\u89C6\u9891");
-    if (mergedConfig.blockFont) enabledCategories.push("\u5B57\u4F53");
-    if (mergedConfig.blockCss) enabledCategories.push("CSS");
-    if (mergedConfig.blockOther) enabledCategories.push("\u5176\u4ED6");
-    if (mergedConfig.customExtensions?.length > 0) {
-      enabledCategories.push(`\u81EA\u5B9A\u4E49(${mergedConfig.customExtensions.join(",")})`);
-    }
-    logger9.start("setupBlockingResources", `\u5C4F\u853D\u5206\u7C7B: [${enabledCategories.join(", ")}]`);
-    await page.route("**/*", async (route) => {
-      const url = route.request().url();
-      const urlLower = url.toLowerCase();
-      const shouldBlock = blockedExtensions.some((ext) => {
-        const urlPath = urlLower.split("?")[0];
-        return urlPath.endsWith(ext);
-      });
-      if (shouldBlock) {
-        logger9.debug(`blocked: ${url.substring(0, 120)}`);
-        return route.abort();
-      }
-      return route.continue();
-    });
-    logger9.success("setupBlockingResources", `\u5171 ${blockedExtensions.length} \u79CD\u6269\u5C55\u540D`);
-  },
   /**
    * 获取所有可用的扩展名分类信息
    * 
@@ -1308,101 +1260,92 @@ var Blocking = {
     };
   },
   /**
-   * 设置 CDN 直连规则（与 setupBlockingResources 协同工作）
+   * 设置网络拦截规则（资源屏蔽 + CDN 直连）
    * 
-   * 对于指定域名：
-   * 1. 如果资源在屏蔽列表中 → 直接 abort（不请求）
-   * 2. 如果资源不在屏蔽列表中 → 使用 Node.js 原生 fetch 直连获取（绕过浏览器代理）
+   * 工作流程：
+   * 1. 检查请求是否在屏蔽列表中 → 如果是，直接 abort
+   * 2. 检查是否匹配直连域名 → 如果是，使用 Node.js fetch 直连
+   * 3. 其他请求正常走代理
    * 
    * 适用场景：
-   * - 代理 IP 无法访问某些 CDN 域名（如 statics.moonshot.cn）
+   * - 代理 IP 无法访问某些 CDN 域名
    * - 需要加速静态资源加载
-   * 
-   * 注意事项：
-   * - 仅当代码运行在国内环境（本地/国内服务器）时，直连才能访问国内 CDN
-   * - 如果在海外服务器（如 Apify 云端）运行，直连仍使用海外 IP，可能依然无法访问
+   * - 屏蔽不必要的资源请求
    * 
    * @param {import('playwright').Page} page - Playwright Page 对象
-   * @param {Object} options - 配置选项
-   * @param {string[]} options.domains - 需要直连的域名列表（必填）
-   * @param {Object} [options.blockingConfig] - 资源屏蔽配置（与 setupBlockingResources 相同）
+   * @param {Object} [options] - 配置选项
+   * @param {string[]} [options.directDomains] - 需要直连的域名列表
+   * @param {Object} [options.blockingConfig] - 资源屏蔽配置
    * @param {boolean} [options.fallbackToProxy] - 直连失败时是否回退到代理（默认 true）
    * @returns {Promise<void>}
    */
-  async setupDirectConnect(page, options = {}) {
+  async setup(page, options = {}) {
     const {
-      domains = [],
+      directDomains = [],
       blockingConfig = {},
       fallbackToProxy = true
     } = options;
-    if (domains.length === 0) {
-      logger9.warn("setupDirectConnect", "\u672A\u6307\u5B9A\u57DF\u540D\u5217\u8868\uFF0C\u8DF3\u8FC7\u76F4\u8FDE\u914D\u7F6E");
-      return;
-    }
     const mergedBlockingConfig = { ...DEFAULT_BLOCKING_CONFIG, ...blockingConfig };
     const blockedExtensions = this.getBlockedExtensions(mergedBlockingConfig);
-    logger9.start("setupDirectConnect", `\u76F4\u8FDE\u57DF\u540D: [${domains.join(", ")}]`);
+    const enabledCategories = [];
+    if (mergedBlockingConfig.blockArchive) enabledCategories.push("\u538B\u7F29\u5305");
+    if (mergedBlockingConfig.blockExecutable) enabledCategories.push("\u53EF\u6267\u884C\u6587\u4EF6");
+    if (mergedBlockingConfig.blockDocument) enabledCategories.push("\u529E\u516C\u6587\u6863");
+    if (mergedBlockingConfig.blockImage) enabledCategories.push("\u56FE\u7247");
+    if (mergedBlockingConfig.blockMedia) enabledCategories.push("\u97F3\u89C6\u9891");
+    if (mergedBlockingConfig.blockFont) enabledCategories.push("\u5B57\u4F53");
+    if (mergedBlockingConfig.blockCss) enabledCategories.push("CSS");
+    if (mergedBlockingConfig.blockOther) enabledCategories.push("\u5176\u4ED6");
+    const hasDirectDomains = directDomains.length > 0;
+    logger9.start("setup", hasDirectDomains ? `\u76F4\u8FDE\u57DF\u540D: [${directDomains.join(", ")}]` : "\u4EC5\u8D44\u6E90\u5C4F\u853D\u6A21\u5F0F");
     await page.route("**/*", async (route) => {
       const request = route.request();
       const url = request.url();
       const urlLower = url.toLowerCase();
       const urlPath = urlLower.split("?")[0];
-      const matchesDomain = domains.some((domain) => url.includes(domain));
-      if (matchesDomain) {
-        const shouldBlock2 = blockedExtensions.some((ext) => urlPath.endsWith(ext));
-        if (shouldBlock2) {
-          logger9.debug(`blocked: ${url.substring(0, 100)}`);
-          return route.abort();
-        }
-        try {
-          const response = await fetch(url, {
-            method: request.method(),
-            headers: request.headers()
-            // 不传 agent 参数 = 直连（使用服务器本地网络）
-          });
-          if (!response.ok) {
-            throw new Error(`HTTP ${response.status}`);
-          }
-          const buffer = await response.arrayBuffer();
-          const body = Buffer.from(buffer);
-          const headers = {};
-          response.headers.forEach((value, key) => {
-            headers[key] = value;
-          });
-          logger9.debug(`direct: ${url.substring(0, 100)}`);
-          await route.fulfill({
-            status: response.status,
-            headers,
-            body
-          });
-          return;
-        } catch (e) {
-          if (fallbackToProxy) {
-            logger9.debug(`fallback: ${url.substring(0, 80)} (${e.message})`);
-            return route.continue();
-          } else {
-            logger9.warn("setupDirectConnect", `\u76F4\u8FDE\u5931\u8D25: ${url.substring(0, 80)}`);
-            return route.abort();
-          }
-        }
-      }
       const shouldBlock = blockedExtensions.some((ext) => urlPath.endsWith(ext));
       if (shouldBlock) {
         logger9.debug(`blocked: ${url.substring(0, 100)}`);
         return route.abort();
       }
+      if (hasDirectDomains) {
+        const matchesDomain = directDomains.some((domain) => url.includes(domain));
+        if (matchesDomain) {
+          try {
+            const response = await fetch(url, {
+              method: request.method(),
+              headers: request.headers()
+            });
+            if (!response.ok) {
+              throw new Error(`HTTP ${response.status}`);
+            }
+            const buffer = await response.arrayBuffer();
+            const body = Buffer.from(buffer);
+            const headers = {};
+            response.headers.forEach((value, key) => {
+              headers[key] = value;
+            });
+            logger9.debug(`direct: ${url.substring(0, 100)}`);
+            await route.fulfill({
+              status: response.status,
+              headers,
+              body
+            });
+            return;
+          } catch (e) {
+            if (fallbackToProxy) {
+              logger9.debug(`fallback: ${url.substring(0, 80)} (${e.message})`);
+              return route.continue();
+            } else {
+              logger9.warn("setup", `\u76F4\u8FDE\u5931\u8D25: ${url.substring(0, 80)}`);
+              return route.abort();
+            }
+          }
+        }
+      }
       return route.continue();
     });
-    const enabledCategories = [];
-    if (mergedBlockingConfig.blockArchive) enabledCategories.push("\u538B\u7F29\u5305");
-    if (mergedBlockingConfig.blockExecutable) enabledCategories.push("\u53EF\u6267\u884C\u6587\u4EF6");
-    if (mergedBlockingConfig.blockDocument) enabledCategories.push("\u529E\u516C\u6587\u6863");
-    if (mergedBlockingConfig.blockImage) enabledCategories.push("\u56FE\u7247");
-    if (mergedBlockingConfig.blockMedia) enabledCategories.push("\u97F3\u89C6\u9891");
-    if (mergedBlockingConfig.blockFont) enabledCategories.push("\u5B57\u4F53");
-    if (mergedBlockingConfig.blockCss) enabledCategories.push("CSS");
-    if (mergedBlockingConfig.blockOther) enabledCategories.push("\u5176\u4ED6");
-    logger9.success("setupDirectConnect", `\u5C4F\u853D\u5206\u7C7B: [${enabledCategories.join(", ")}]`);
+    logger9.success("setup", `\u5C4F\u853D\u5206\u7C7B: [${enabledCategories.join(", ")}]`);
   }
 };
 
@@ -1419,7 +1362,7 @@ var usePlaywrightToolKit = () => {
     Captcha,
     Sse,
     Errors: errors_exports,
-    Blocking
+    Interception
   };
 };
 export {