@skrillex1224/playwright-toolkit 2.1.147 → 2.1.150

package/dist/index.js

@@ -122,6 +122,31 @@ var createActorInfo = (info) => {
   };
 };
 var ActorInfo = {
+  qbot: createActorInfo({
+    key: "qbot",
+    name: "\u641C\u72D7QBot",
+    domain: "m.sogou.com",
+    path: "/web/searchList.jsp",
+    share: {
+      mode: "dom",
+      prefix: "",
+      xurl: []
+    }
+  }),
+  douyin: createActorInfo({
+    key: "douyin",
+    name: "\u6296\u97F3\u641C\u7D22",
+    domain: "www.douyin.com",
+    path: "/search",
+    share: {
+      mode: "response",
+      prefix: "",
+      xurl: [
+        "/aweme/v1/web/web_shorten",
+        "data"
+      ]
+    }
+  }),
   doubao: createActorInfo({
     key: "doubao",
     name: "\u8C46\u5305",
@@ -1250,6 +1275,14 @@ var normalizeByPassDomains = (domains) => {
   if (!Array.isArray(domains)) return [];
   return domains.map((item) => String(item || "").trim()).filter(Boolean);
 };
+var compileByPassMatcher = (patternRaw) => {
+  const pattern = String(patternRaw || "").trim().toLowerCase();
+  if (!pattern) return null;
+  if (!pattern.includes("*")) return { pattern, test: (hostname) => hostname === pattern };
+  const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+  const regex = new RegExp(`^${escaped}$`);
+  return { pattern, test: (hostname) => regex.test(hostname) };
+};
 var resolveProxyLaunchOptions = (proxyConfiguration = {}) => {
   const config = proxyConfiguration && typeof proxyConfiguration === "object" && !Array.isArray(proxyConfiguration) ? proxyConfiguration : {};
   const proxyUrl = String(config.proxy_url || "").trim();
@@ -1312,7 +1345,7 @@ var Launch = {
         return () => {
         };
       }
-      const domainSet = new Set(byPassDomains.map((domain) => domain.toLowerCase()));
+      const matchers = byPassDomains.map((pattern) => compileByPassMatcher(pattern)).filter(Boolean);
       const requestHandler = (req) => {
         const requestUrl = req.url();
         let hostname = "";
@@ -1321,8 +1354,9 @@ var Launch = {
         } catch {
           return;
         }
-        if (!domainSet.has(hostname)) return;
-        logger6.info(`[\u76F4\u8FDE\u547D\u4E2D] \u57DF\u540D=${hostname} \u8D44\u6E90\u7C7B\u578B=${req.resourceType()} \u65B9\u6CD5=${req.method()} \u5730\u5740=${requestUrl}`);
+        const matched = matchers.find((item) => item.test(hostname));
+        if (!matched) return;
+        logger6.info(`[\u76F4\u8FDE\u547D\u4E2D] \u89C4\u5219=${matched.pattern} \u57DF\u540D=${hostname} \u8D44\u6E90\u7C7B\u578B=${req.resourceType()} \u65B9\u6CD5=${req.method()} \u5730\u5740=${requestUrl}`);
       };
       page.on("request", requestHandler);
       return () => page.off("request", requestHandler);
@@ -1411,13 +1445,18 @@ function useCaptchaMonitor(page, options) {
   if (!onDetected || typeof onDetected !== "function") {
     throw new Error("[CaptchaMonitor] onDetected \u5FC5\u987B\u662F\u4E00\u4E2A\u51FD\u6570");
   }
-  let isHandled = false;
+  let isStopped = false;
+  let isHandling = false;
   let frameHandler = null;
   let exposedFunctionName = null;
   const triggerDetected = async () => {
-    if (isHandled) return;
-    isHandled = true;
-    await onDetected();
+    if (isStopped || isHandling) return;
+    isHandling = true;
+    try {
+      await onDetected();
+    } finally {
+      isHandling = false;
+    }
   };
   const cleanupFns = [];
   if (domSelector) {
@@ -1431,10 +1470,6 @@ function useCaptchaMonitor(page, options) {
         const checkAndReport = () => {
           const element = document.querySelector(selector);
           if (element) {
-            if (observer) {
-              observer.disconnect();
-              observer = null;
-            }
             if (window[callbackName]) {
               window[callbackName]();
             }
@@ -1442,7 +1477,7 @@ function useCaptchaMonitor(page, options) {
           }
           return false;
         };
-        if (checkAndReport()) return;
+        checkAndReport();
         observer = new MutationObserver((mutations) => {
           let shouldCheck = false;
           for (const mutation of mutations) {
@@ -1508,7 +1543,7 @@ function useCaptchaMonitor(page, options) {
       for (const fn of cleanupFns) {
         await fn();
       }
-      isHandled = true;
+      isStopped = true;
     }
   };
 }