@skrillex1224/playwright-toolkit 2.1.134 → 2.1.135

package/README.md

@@ -182,12 +182,6 @@ Captcha.useCaptchaMonitor(page, {
     urlPattern: '/captcha',
     onDetected: async () => { await Actor.fail('检测到验证码'); }
 });
-
-// Title 监控模式
-Captcha.useCaptchaMonitor(page, {
-    titlePattern: /human verification|access denied/i,
-    onDetected: async () => { await Actor.fail('检测到风控标题'); }
-});
 ```
 
 ### Constants

package/dist/index.cjs

@@ -1345,19 +1345,15 @@ var LiveView = {
 var import_uuid = require("uuid");
 var logger7 = createInternalLogger("Captcha");
 function useCaptchaMonitor(page, options) {
-  const { domSelector, urlPattern, titlePattern, onDetected } = options;
-  if (!domSelector && !urlPattern && !titlePattern) {
-    throw new Error("[CaptchaMonitor] \u5FC5\u987B\u63D0\u4F9B domSelector / urlPattern / titlePattern \u81F3\u5C11\u4E00\u4E2A");
+  const { domSelector, urlPattern, onDetected } = options;
+  if (!domSelector && !urlPattern) {
+    throw new Error("[CaptchaMonitor] \u5FC5\u987B\u63D0\u4F9B domSelector \u6216 urlPattern \u81F3\u5C11\u4E00\u4E2A");
   }
   if (!onDetected || typeof onDetected !== "function") {
     throw new Error("[CaptchaMonitor] onDetected \u5FC5\u987B\u662F\u4E00\u4E2A\u51FD\u6570");
   }
-  if (titlePattern && typeof titlePattern !== "string" && !(titlePattern instanceof RegExp)) {
-    throw new Error("[CaptchaMonitor] titlePattern \u5FC5\u987B\u662F string \u6216 RegExp");
-  }
   let isHandled = false;
   let frameHandler = null;
-  let titleFrameHandler = null;
   let exposedFunctionName = null;
   const triggerDetected = async () => {
     if (isHandled) return;
@@ -1447,51 +1443,6 @@ function useCaptchaMonitor(page, options) {
       page.off("framenavigated", frameHandler);
     });
   }
-  if (titlePattern) {
-    let titleTimer = null;
-    let lastTitle = null;
-    const matchTitle = (title) => {
-      if (!titlePattern) return false;
-      const normalized = String(title || "");
-      if (titlePattern instanceof RegExp) {
-        titlePattern.lastIndex = 0;
-        return titlePattern.test(normalized);
-      }
-      return normalized.includes(String(titlePattern));
-    };
-    const checkCurrentTitle = async (force = false) => {
-      try {
-        const currentTitle = await page.title();
-        if (!force && currentTitle === lastTitle) return;
-        lastTitle = currentTitle;
-        if (!matchTitle(currentTitle)) return;
-        await triggerDetected();
-      } catch {
-      }
-    };
-    titleFrameHandler = async (frame) => {
-      if (frame !== page.mainFrame()) return;
-      await checkCurrentTitle();
-    };
-    page.on("framenavigated", titleFrameHandler);
-    checkCurrentTitle(true).catch(() => {
-    });
-    titleTimer = setInterval(() => {
-      if (isHandled) return;
-      checkCurrentTitle(false).catch(() => {
-      });
-    }, 1e3);
-    logger7.success("useCaptchaMonitor", `Title \u76D1\u63A7\u5DF2\u542F\u7528: ${String(titlePattern)}`);
-    cleanupFns.push(async () => {
-      if (titleTimer) {
-        clearInterval(titleTimer);
-        titleTimer = null;
-      }
-      if (titleFrameHandler) {
-        page.off("framenavigated", titleFrameHandler);
-      }
-    });
-  }
   return {
     stop: async () => {
       logger7.info("useCaptchaMonitor", "\u6B63\u5728\u505C\u6B62\u76D1\u63A7...");
@@ -1756,12 +1707,6 @@ var SHARED_HTTPS_AGENT = new import_https2.Agent({
   maxFreeSockets: 10,
   rejectUnauthorized: false
 });
-var DirectConfig = {
-  /** 直连请求超时时间（秒） */
-  directTimeout: 12,
-  /** 静默扩展名：这些扩展名的直连成功日志用 debug 级别 */
-  silentExtensions: [".js"]
-};
 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"];
@@ -1787,7 +1732,14 @@ var IMAGE_EXTENSIONS = [
 var MEDIA_EXTENSIONS = [".mp3", ".mp4", ".avi", ".mkv", ".webm", ".midi", ".mid", ".ogg", ".flac", ".swf"];
 var FONT_EXTENSIONS = [".woff", ".woff2", ".ttf", ".otf"];
 var CSS_EXTENSIONS = [".css"];
+var JS_EXTENSIONS = [".js"];
 var OTHER_EXTENSIONS = [".ps", ".iso"];
+var DirectConfig = {
+  /** 直连请求超时时间（秒） */
+  directTimeout: 12,
+  /** 静默扩展名：这些扩展名的直连成功日志用 debug 级别 */
+  silentExtensions: JS_EXTENSIONS
+};
 var DEFAULT_BLOCKING_CONFIG = {
   /** 屏蔽压缩包 */
   blockArchive: true,
@@ -1804,9 +1756,29 @@ var DEFAULT_BLOCKING_CONFIG = {
   /** 屏蔽 CSS (注意：可能影响页面视觉效果) */
   blockCss: false,
   /** 屏蔽其他资源 */
-  blockOther: true,
-  /** 额外自定义扩展名列表 */
-  customExtensions: []
+  blockOther: true
+};
+var DEFAULT_DIRECT_CONFIG = {
+  /** 直连域名 */
+  domains: [],
+  /** 直连压缩包 */
+  directAllArchive: false,
+  /** 直连可执行文件 */
+  directAllExecutable: false,
+  /** 直连办公文档 */
+  directAllDocument: false,
+  /** 直连图片 */
+  directAllImage: false,
+  /** 直连音视频 */
+  directAllMedia: false,
+  /** 直连字体 */
+  directAllFont: false,
+  /** 直连 CSS */
+  directAllCss: false,
+  /** 直连 JS */
+  directAllJs: false,
+  /** 直连其他资源 */
+  directAllOther: false
 };
 var SHARED_GOT_OPTIONS = {
   http2: false,
@@ -1834,9 +1806,6 @@ var Interception = {
     if (mergedConfig.blockFont) extensions.push(...FONT_EXTENSIONS);
     if (mergedConfig.blockCss) extensions.push(...CSS_EXTENSIONS);
     if (mergedConfig.blockOther) extensions.push(...OTHER_EXTENSIONS);
-    if (mergedConfig.customExtensions?.length > 0) {
-      extensions.push(...mergedConfig.customExtensions);
-    }
     return [...new Set(extensions)];
   },
   /**
@@ -1856,12 +1825,34 @@ var Interception = {
       other: { name: "\u5176\u4ED6\u8D44\u6E90", extensions: OTHER_EXTENSIONS }
     };
   },
+  /**
+   * 根据配置生成需要直连的扩展名列表
+   * 
+   * @param {Object} [config] - 直连扩展名配置
+   * @returns {string[]} 需要直连的扩展名列表
+   */
+  getDirectExtensions(config = {}) {
+    const mergedConfig = { ...DEFAULT_DIRECT_CONFIG, ...config };
+    const extensions = [];
+    if (mergedConfig.directAllArchive) extensions.push(...ARCHIVE_EXTENSIONS);
+    if (mergedConfig.directAllExecutable) extensions.push(...EXECUTABLE_EXTENSIONS);
+    if (mergedConfig.directAllDocument) extensions.push(...DOCUMENT_EXTENSIONS);
+    if (mergedConfig.directAllImage) extensions.push(...IMAGE_EXTENSIONS);
+    if (mergedConfig.directAllMedia) extensions.push(...MEDIA_EXTENSIONS);
+    if (mergedConfig.directAllFont) extensions.push(...FONT_EXTENSIONS);
+    if (mergedConfig.directAllCss) extensions.push(...CSS_EXTENSIONS);
+    if (mergedConfig.directAllJs) extensions.push(...JS_EXTENSIONS);
+    if (mergedConfig.directAllOther) extensions.push(...OTHER_EXTENSIONS);
+    return [...new Set(extensions)];
+  },
   /**
    * 设置网络拦截规则（资源屏蔽 + CDN 直连）
    * 
    * @param {import('playwright').Page} page - Playwright Page 对象
    * @param {Object} [options] - 配置选项
-   * @param {string[]} [options.directDomains] - 需要直连的域名列表
+   * @param {string[]} [options.directDomains] - [已过时] 需要直连的域名列表，请改用 directConfig.domains
+   * @param {string[]} [options.directExtensions] - 需要直连的扩展名（如 .js/.css）
+   * @param {Object} [options.directConfig] - 直连配置（参考 blockingConfig），支持 domains/directAllXxx 系列开关
    * @param {Object} [options.blockingConfig] - 资源屏蔽配置
    * @param {boolean} [options.fallbackToProxy] - 直连失败时是否回退到代理（默认 true）
    * @returns {Promise<void>}
@@ -1869,12 +1860,27 @@ var Interception = {
   async setup(page, options = {}) {
     const {
       directDomains = [],
+      directExtensions = [],
+      directConfig = {},
       blockingConfig = {},
       fallbackToProxy = true
     } = options;
     const mergedBlockingConfig = { ...DEFAULT_BLOCKING_CONFIG, ...blockingConfig };
+    const mergedDirectConfig = { ...DEFAULT_DIRECT_CONFIG, ...directConfig };
     const blockedExtensions = this.getBlockedExtensions(mergedBlockingConfig);
-    const hasDirectDomains = directDomains.length > 0;
+    const configuredDirectExtensions = this.getDirectExtensions(mergedDirectConfig);
+    const normalizedDirectDomains = Array.from(
+      new Set(
+        [...directDomains, ...mergedDirectConfig.domains || []].map((domain) => String(domain || "").toLowerCase().trim()).filter(Boolean)
+      )
+    );
+    const hasDirectDomains = normalizedDirectDomains.length > 0;
+    const normalizedDirectExtensions = Array.from(
+      new Set(
+        [...directExtensions, ...configuredDirectExtensions].map((ext) => String(ext || "").toLowerCase().trim()).filter(Boolean).map((ext) => ext.startsWith(".") ? ext : `.${ext}`)
+      )
+    );
+    const hasDirectExtensions = normalizedDirectExtensions.length > 0;
     const enabledCategories = [];
     if (mergedBlockingConfig.blockArchive) enabledCategories.push("\u538B\u7F29\u5305");
     if (mergedBlockingConfig.blockExecutable) enabledCategories.push("\u53EF\u6267\u884C\u6587\u4EF6");
@@ -1884,7 +1890,10 @@ var Interception = {
     if (mergedBlockingConfig.blockFont) enabledCategories.push("\u5B57\u4F53");
     if (mergedBlockingConfig.blockCss) enabledCategories.push("CSS");
     if (mergedBlockingConfig.blockOther) enabledCategories.push("\u5176\u4ED6");
-    logger9.start("setup", hasDirectDomains ? `\u76F4\u8FDE\u57DF\u540D: [${directDomains.length} \u4E2A] | \u5C4F\u853D: [${enabledCategories.join(", ")}]` : `\u4EC5\u8D44\u6E90\u5C4F\u853D\u6A21\u5F0F | \u5C4F\u853D: [${enabledCategories.join(", ")}]`);
+    const directRules = [];
+    if (hasDirectDomains) directRules.push(`\u76F4\u8FDE\u57DF\u540D: [${normalizedDirectDomains.length} \u4E2A]`);
+    if (hasDirectExtensions) directRules.push(`\u76F4\u8FDE\u6269\u5C55\u540D: [${normalizedDirectExtensions.join(", ")}]`);
+    logger9.start("setup", directRules.length > 0 ? `${directRules.join(" | ")} | \u5C4F\u853D: [${enabledCategories.join(", ")}]` : `\u4EC5\u8D44\u6E90\u5C4F\u853D\u6A21\u5F0F | \u5C4F\u853D: [${enabledCategories.join(", ")}]`);
     await page.route("**/*", async (route) => {
       let handled = false;
       try {
@@ -1899,14 +1908,16 @@ var Interception = {
           handled = true;
           return;
         }
-        let isDirect = false;
+        let isDirectByDomain = false;
         if (hasDirectDomains) {
           try {
             const hostname = new URL(url).hostname;
-            isDirect = directDomains.some((domain) => hostname.startsWith(domain));
+            isDirectByDomain = normalizedDirectDomains.some((domain) => hostname.startsWith(domain));
           } catch (e) {
           }
         }
+        const isDirectByExtension = hasDirectExtensions ? normalizedDirectExtensions.some((ext) => urlPath.endsWith(ext)) : false;
+        const isDirect = isDirectByDomain || isDirectByExtension;
         if (isDirect) {
           try {
             const reqHeaders = await request.allHeaders();