@skrillex1224/playwright-toolkit 3.0.10 → 3.0.11

package/dist/index.js

@@ -122,7 +122,6 @@ var createActorInfo = (info) => {
   const buildLandingUrl = ({ protocol: protocol2, domain: domain2, path: path4 }) => {
     const safeProtocol = String(protocol2).trim();
     const safeDomain = normalizeDomain(domain2);
-    if (!safeDomain) return "";
     const safePath = normalizePath(path4);
     return `${safeProtocol}://${safeDomain}${safePath}`;
   };
@@ -330,17 +329,6 @@ var ActorInfo = {
       prefix: "",
       xurl: []
     }
-  }),
-  webpage: createActorInfo({
-    key: "webpage",
-    name: "\u901A\u7528\u7F51\u9875",
-    domain: "",
-    path: "/",
-    share: {
-      mode: "dom",
-      prefix: "",
-      xurl: []
-    }
   })
 };
 
@@ -1071,7 +1059,7 @@ import { serializeError as serializeError2 } from "serialize-error";
 
 // src/internals/proxy-meter-runtime.js
 import { spawn, spawnSync } from "child_process";
-import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -1180,18 +1168,6 @@ var ensureLogPath = () => {
   const label = runId ? `proxy-meter-${runId}-${suffix}.json` : `proxy-meter-${process.pid}-${suffix}.json`;
   return path.join(baseDir, label);
 };
-var ensureStdioLogPath = (logPath) => `${logPath}.stdio.log`;
-var writeChildOutput = (stream, output, prefix) => {
-  if (!stream || !output) return;
-  output.on("data", (chunk) => {
-    const text = chunk?.toString?.() || String(chunk || "");
-    if (!text) return;
-    for (const line of text.split(/\r?\n/)) {
-      if (!line) continue;
-      stream.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] ${prefix} ${line}\n`);
-    }
-  });
-};
 var readSnapshot = (logPath) => {
   if (!logPath || !existsSync(logPath)) return null;
   try {
@@ -1359,7 +1335,6 @@ var startProxyMeter = (options = {}) => {
   observedDomainResourceTypes = /* @__PURE__ */ new Map();
   const port = pickFreePort();
   const logPath = ensureLogPath();
-  const stdioLogPath = ensureStdioLogPath(logPath);
   const scriptPath = resolveScriptPath();
   const debugMode = Boolean(options.debugMode);
   const debugMaxEvents = Math.max(10, toSafeInt(options.debugMaxEvents) || DEFAULT_DEBUG_MAX_EVENTS);
@@ -1372,26 +1347,19 @@ var startProxyMeter = (options = {}) => {
     PROXY_METER_DEBUG: debugMode ? "1" : "0",
     PROXY_METER_DEBUG_MAX_EVENTS: String(debugMaxEvents)
   };
-  const stdioLog = createWriteStream(stdioLogPath, { flags: "a" });
-  stdioLog.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [proxy-meter-runtime] start script=${scriptPath} port=${port} snapshot=${logPath}\n`);
   const child = spawn(process.execPath, [scriptPath], {
     env,
-    stdio: ["ignore", "pipe", "pipe"]
+    stdio: ["ignore", "ignore", "ignore"]
   });
-  writeChildOutput(stdioLog, child.stdout, "stdout");
-  writeChildOutput(stdioLog, child.stderr, "stderr");
-  child.once("exit", (code, signal) => {
-    stdioLog.write(`[${(/* @__PURE__ */ new Date()).toISOString()}] [proxy-meter-runtime] exit code=${code ?? ""} signal=${signal ?? ""}\n`);
-    stdioLog.end();
+  child.once("exit", (code) => {
     if (code && code !== 0) {
-      logger2.warn(`[proxy-meter] exited with code ${code}; stdio=${stdioLogPath}`);
+      logger2.warn(`[proxy-meter] exited with code ${code}`);
     }
   });
   runtime = {
     proc: child,
     port,
     logPath,
-    stdioLogPath,
     startedAt: Date.now()
   };
   registerCleanup();
@@ -5615,9 +5583,6 @@ var LiveView = {
   useLiveView
 };
 
-// src/chaptcha.js
-import { v4 as uuidv4 } from "uuid";
-
 // src/internals/captcha/bytedance.js
 import { mkdir, writeFile } from "fs/promises";
 import path2 from "path";
@@ -6276,6 +6241,9 @@ var sloveCaptcha = solveCaptcha;
 
 // src/chaptcha.js
 var logger12 = createInternalLogger("Captcha");
+var DOM_MONITOR_WAIT_TIMEOUT_MS = 1e3;
+var DOM_MONITOR_POST_DETECT_HIDDEN_WAIT_MS = 300;
+var DOM_MONITOR_RECOVERY_WAIT_MS = 100;
 var DEFAULT_CAPTCHA_RECOGNITION_OPTIONS = Object.freeze({
   token: "eKJvBfwfN0YRav0-VD_44E2VBSfm7l0YtddUQ7cFySI",
   apiUrl: "https://api.jfbym.com/api/YmServer/customApi"
@@ -6296,6 +6264,15 @@ var mergeDefinedOptions = (...sources) => {
   }
   return merged;
 };
+var sleep = (ms) => new Promise((resolve) => {
+  setTimeout(resolve, ms);
+});
+var getErrorMessage = (error) => String(error?.message || error || "");
+var isTimeoutError = (error) => error?.name === "TimeoutError" || getErrorMessage(error).includes("Timeout");
+var isPageLifecycleError = (error) => {
+  const message = getErrorMessage(error);
+  return message.includes("Execution context was destroyed") || message.includes("Frame was detached") || message.includes("Target page, context or browser has been closed") || message.includes("Target closed") || message.includes("Most likely the page has been closed");
+};
 function useCaptchaMonitor(page, options) {
   const { domSelector, urlPattern, onDetected } = options;
   if (!domSelector && !urlPattern) {
@@ -6307,10 +6284,13 @@ function useCaptchaMonitor(page, options) {
   let isStopped = false;
   let isHandling = false;
   let frameHandler = null;
-  let exposedFunctionName = null;
+  let domMonitorTask = null;
+  let lastTriggeredAt = 0;
   const triggerDetected = async () => {
-    if (isStopped || isHandling) return;
+    const now = Date.now();
+    if (isStopped || isHandling || now - lastTriggeredAt < 250) return;
     isHandling = true;
+    lastTriggeredAt = now;
     try {
       await onDetected();
     } finally {
@@ -6319,60 +6299,38 @@ function useCaptchaMonitor(page, options) {
   };
   const cleanupFns = [];
   if (domSelector) {
-    exposedFunctionName = `__c_d_${uuidv4().replace(/-/g, "_")}`;
-    const cleanerName = `__c_cleaner_${uuidv4().replace(/-/g, "_")}`;
-    page.exposeFunction(exposedFunctionName, triggerDetected).catch(() => {
-    });
-    page.addInitScript(({ selector, callbackName, cleanerName: cleanupName }) => {
-      (() => {
-        let observer = null;
-        const checkAndReport = () => {
-          const element = document.querySelector(selector);
-          if (!element) {
-            return false;
-          }
-          if (window[callbackName]) {
-            window[callbackName]();
-          }
-          return true;
-        };
-        checkAndReport();
-        observer = new MutationObserver((mutations) => {
-          const shouldCheck = mutations.some((mutation) => mutation.addedNodes.length > 0);
-          if (shouldCheck && observer) {
-            checkAndReport();
-          }
-        });
-        const mountObserver = () => {
-          const target = document.documentElement;
-          if (target && observer) {
-            observer.observe(target, { childList: true, subtree: true });
+    domMonitorTask = (async () => {
+      const locator = page.locator(domSelector).first();
+      while (!isStopped) {
+        try {
+          await locator.waitFor({ state: "visible", timeout: DOM_MONITOR_WAIT_TIMEOUT_MS });
+          if (isStopped) break;
+          await triggerDetected();
+          if (isStopped) break;
+          await locator.waitFor({
+            state: "hidden",
+            timeout: DOM_MONITOR_POST_DETECT_HIDDEN_WAIT_MS
+          }).catch(() => {
+          });
+        } catch (error) {
+          if (isStopped) break;
+          if (page?.isClosed?.() && isPageLifecycleError(error)) break;
+          if (isTimeoutError(error) || isPageLifecycleError(error)) {
+            await sleep(DOM_MONITOR_RECOVERY_WAIT_MS);
+            continue;
           }
-        };
-        if (document.readyState === "loading") {
-          window.addEventListener("DOMContentLoaded", mountObserver);
-        } else {
-          mountObserver();
+          logger12.warning(
+            "useCaptchaMonitor",
+            `DOM \u76D1\u63A7\u51FA\u73B0\u5F02\u5E38\uFF08\u7EE7\u7EED\u91CD\u8BD5\uFF09: selector=${domSelector}, error=${getErrorMessage(error)}`
+          );
+          await sleep(DOM_MONITOR_RECOVERY_WAIT_MS);
         }
-        window[cleanupName] = () => {
-          if (observer) {
-            observer.disconnect();
-            observer = null;
-          }
-        };
-      })();
-    }, { selector: domSelector, callbackName: exposedFunctionName, cleanerName });
+      }
+    })();
     logger12.success("useCaptchaMonitor", `DOM \u76D1\u63A7\u5DF2\u542F\u7528\uFF1A${domSelector}`);
     cleanupFns.push(async () => {
-      try {
-        await page.evaluate((name) => {
-          if (window[name]) {
-            window[name]();
-            delete window[name];
-          }
-        }, cleanerName);
-      } catch {
-      }
+      await domMonitorTask?.catch(() => {
+      });
     });
   }
   if (urlPattern) {
@@ -6387,6 +6345,12 @@ function useCaptchaMonitor(page, options) {
     };
     page.on("framenavigated", frameHandler);
     logger12.success("useCaptchaMonitor", `URL \u76D1\u63A7\u5DF2\u542F\u7528\uFF1A${urlPattern}`);
+    Promise.resolve().then(async () => {
+      if (!isStopped && page.url().includes(urlPattern)) {
+        await triggerDetected();
+      }
+    }).catch(() => {
+    });
     cleanupFns.push(async () => {
       page.off("framenavigated", frameHandler);
     });
@@ -6394,10 +6358,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;
     }
   };
 }
@@ -6442,7 +6406,7 @@ var Captcha = {
 
 // src/mutation.js
 import { createHash } from "node:crypto";
-import { v4 as uuidv42 } from "uuid";
+import { v4 as uuidv4 } from "uuid";
 var logger13 = createInternalLogger("Mutation");
 var MUTATION_MONITOR_MODE = Object.freeze({
   Added: "added",
@@ -6450,7 +6414,7 @@ var MUTATION_MONITOR_MODE = Object.freeze({
   All: "all"
 });
 function generateKey(prefix) {
-  return `__${prefix}_${uuidv42().replace(/-/g, "_")}`;
+  return `__${prefix}_${uuidv4().replace(/-/g, "_")}`;
 }
 var Mutation = {
   Mode: MUTATION_MONITOR_MODE,
@@ -6640,7 +6604,7 @@ var Mutation = {
     const overallTimeout = options.timeout ?? 180 * 1e3;
     const onMutation = options.onMutation;
     const pollInterval = 500;
-    const sleep = (ms) => new Promise((resolve) => {
+    const sleep2 = (ms) => new Promise((resolve) => {
       setTimeout(resolve, ms);
     });
     const truncate = (value, max = 800) => {
@@ -6832,7 +6796,7 @@ var Mutation = {
     const deadline = Date.now() + overallTimeout;
     let lastState = state2;
     while (Date.now() < deadline) {
-      await sleep(pollInterval);
+      await sleep2(pollInterval);
       lastState = await buildState();
       if (!lastState?.hasMatched) {
         continue;