@skrillex1224/playwright-toolkit 3.0.6 → 3.0.8

package/dist/index.cjs

@@ -6303,7 +6303,7 @@ function useCaptchaMonitor(page, options) {
   let isStopped = false;
   let isHandling = false;
   let frameHandler = null;
-  let domFrameHandler = null;
+  let exposedFunctionName = null;
   const triggerDetected = async () => {
     if (isStopped || isHandling) return;
     isHandling = true;
@@ -6315,16 +6315,12 @@ function useCaptchaMonitor(page, options) {
   };
   const cleanupFns = [];
   if (domSelector) {
-    const exposedFunctionName = `__c_d_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
+    exposedFunctionName = `__c_d_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
     const cleanerName = `__c_cleaner_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
-    const installDomMonitor = ({ selector, callbackName, cleanerName: cleanupName }) => {
+    page.exposeFunction(exposedFunctionName, triggerDetected).catch(() => {
+    });
+    page.addInitScript(({ selector, callbackName, cleanerName: cleanupName }) => {
       (() => {
-        if (typeof window[cleanupName] === "function") {
-          try {
-            window[cleanupName]();
-          } catch {
-          }
-        }
         let observer = null;
         const checkAndReport = () => {
           const element = document.querySelector(selector);
@@ -6350,7 +6346,7 @@ function useCaptchaMonitor(page, options) {
           }
         };
         if (document.readyState === "loading") {
-          window.addEventListener("DOMContentLoaded", mountObserver, { once: true });
+          window.addEventListener("DOMContentLoaded", mountObserver);
         } else {
           mountObserver();
         }
@@ -6361,41 +6357,9 @@ function useCaptchaMonitor(page, options) {
           }
         };
       })();
-    };
-    const installArgs = {
-      selector: domSelector,
-      callbackName: exposedFunctionName,
-      cleanerName
-    };
-    const domMonitorReady = (async () => {
-      await page.exposeFunction(exposedFunctionName, triggerDetected);
-      await page.addInitScript(installDomMonitor, installArgs);
-      await page.evaluate(installDomMonitor, installArgs).catch(() => {
-      });
-      logger12.success("useCaptchaMonitor", `DOM \u76D1\u63A7\u5DF2\u542F\u7528\uFF1A${domSelector}`);
-    })().catch((error) => {
-      if (isStopped) {
-        return;
-      }
-      logger12.warn(`DOM \u76D1\u63A7\u521D\u59CB\u5316\u5931\u8D25 (${domSelector}): ${error?.message || error}`);
-    });
-    domFrameHandler = async (frame) => {
-      if (frame !== page.mainFrame() || isStopped) {
-        return;
-      }
-      await domMonitorReady;
-      if (isStopped) {
-        return;
-      }
-      await page.evaluate(installDomMonitor, installArgs).catch(() => {
-      });
-    };
-    page.on("framenavigated", domFrameHandler);
+    }, { selector: domSelector, callbackName: exposedFunctionName, cleanerName });
+    logger12.success("useCaptchaMonitor", `DOM \u76D1\u63A7\u5DF2\u542F\u7528\uFF1A${domSelector}`);
     cleanupFns.push(async () => {
-      if (domFrameHandler) {
-        page.off("framenavigated", domFrameHandler);
-      }
-      await domMonitorReady;
       try {
         await page.evaluate((name) => {
           if (window[name]) {
@@ -6426,10 +6390,10 @@ function useCaptchaMonitor(page, options) {
   return {
     stop: async () => {
       logger12.info("\u6B63\u5728\u505C\u6B62\u9A8C\u8BC1\u7801\u76D1\u63A7...");
-      isStopped = true;
       for (const fn of cleanupFns) {
         await fn();
       }
+      isStopped = true;
     }
   };
 }