@skrillex1224/playwright-toolkit 3.0.5 → 3.0.7

package/dist/index.cjs

@@ -5318,6 +5318,49 @@ var normalizeStringArray = (value) => {
   }
   return value.map((item) => String(item || "").trim()).filter(Boolean);
 };
+var hashStableSeed = (value = "") => {
+  const raw = String(value || "").trim();
+  if (!raw) return "";
+  let hash = 2166136261;
+  for (let index = 0; index < raw.length; index += 1) {
+    hash ^= raw.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  const normalized = hash >>> 0 || 1;
+  return String(normalized);
+};
+var extractProxySeedSource = (proxyConfiguration = {}) => {
+  const config = normalizeObject2(proxyConfiguration);
+  return String(config.proxy_url || "").trim();
+};
+var resolveCloakRuntimeHints = (runtimeState = {}, proxyConfiguration = {}, cloakOptions = {}) => {
+  const normalizedCloakOptions = normalizeObject2(cloakOptions);
+  const browserProfileCore = RuntimeEnv.getBrowserProfileCore(runtimeState);
+  const baseConfig = DefaultAntiCheat.getBaseConfig();
+  const locale = String(
+    normalizedCloakOptions.locale || browserProfileCore?.locale || baseConfig.locale || ""
+  ).trim();
+  const timezone = String(
+    normalizedCloakOptions.timezone || normalizedCloakOptions.timezoneId || browserProfileCore?.timezone_id || baseConfig.timezoneId || ""
+  ).trim();
+  const explicitArgs = normalizeStringArray(normalizedCloakOptions.args);
+  const hasExplicitFingerprint = explicitArgs.some((arg) => arg.startsWith("--fingerprint="));
+  const fingerprintSeedSource = String(
+    runtimeState?.envId || browserProfileCore?.schema_version && JSON.stringify({
+      envId: runtimeState?.envId || "",
+      timezone: browserProfileCore?.timezone_id || "",
+      locale: browserProfileCore?.locale || "",
+      browserMajorVersion: browserProfileCore?.browser_major_version || "",
+      device: browserProfileCore?.device || ""
+    }) || extractProxySeedSource(proxyConfiguration)
+  ).trim();
+  return {
+    locale,
+    timezone,
+    fingerprintSeed: hasExplicitFingerprint ? "" : hashStableSeed(fingerprintSeedSource),
+    hasExplicitFingerprint
+  };
+};
 var resolveCloakProxy = (proxyConfiguration = {}) => {
   const config = normalizeObject2(proxyConfiguration);
   const proxyUrl = String(config.proxy_url || "").trim();
@@ -5453,6 +5496,7 @@ var CloakLaunch = {
       runInHeadfulMode = false,
       isRunningOnApify = false,
       launcher = null,
+      runtimeState = null,
       cloakOptions = {},
       humanizeOptions = DEFAULT_CLOAK_HUMANIZE_OPTIONS,
       crawlerBaseOptions = {},
@@ -5467,6 +5511,7 @@ var CloakLaunch = {
     const patchedBrowsers = /* @__PURE__ */ new WeakSet();
     const defaultArgs = isRunningOnApify ? ["--no-sandbox", "--disable-setuid-sandbox"] : [];
     const extraArgs = normalizeStringArray(normalizedCloakOptions.args);
+    const runtimeHints = resolveCloakRuntimeHints(runtimeState, proxyConfiguration, normalizedCloakOptions);
     const hasExplicitProxy = hasOwn(normalizedCloakOptions, "proxy");
     const proxyLaunchState = hasExplicitProxy ? resolveLaunchTraffic({ proxyConfiguration, debugMode, useMeter: false }) : resolveLaunchTraffic({ proxyConfiguration, debugMode });
     const proxy = hasExplicitProxy ? normalizedCloakOptions.proxy : proxyLaunchState.launchProxy;
@@ -5476,7 +5521,13 @@ var CloakLaunch = {
       ...normalizedCloakOptions,
       headless,
       proxy,
-      args: [...defaultArgs, ...extraArgs]
+      ...runtimeHints.locale ? { locale: runtimeHints.locale } : {},
+      ...runtimeHints.timezone ? { timezone: runtimeHints.timezone } : {},
+      args: [
+        ...defaultArgs,
+        ...extraArgs,
+        ...runtimeHints.fingerprintSeed ? [`--fingerprint=${runtimeHints.fingerprintSeed}`] : []
+      ]
     };
     const launchOptions = await buildCloakLaunchOptions(mergedCloakOptions);
     const fingerprintArg = extractFingerprintArg(launchOptions);
@@ -6303,7 +6354,7 @@ function useCaptchaMonitor(page, options) {
   let isStopped = false;
   let isHandling = false;
   let frameHandler = null;
-  let exposedFunctionName = null;
+  let domFrameHandler = null;
   const triggerDetected = async () => {
     if (isStopped || isHandling) return;
     isHandling = true;
@@ -6315,12 +6366,16 @@ function useCaptchaMonitor(page, options) {
   };
   const cleanupFns = [];
   if (domSelector) {
-    exposedFunctionName = `__c_d_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
+    const exposedFunctionName = `__c_d_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
     const cleanerName = `__c_cleaner_${(0, import_uuid.v4)().replace(/-/g, "_")}`;
-    page.exposeFunction(exposedFunctionName, triggerDetected).catch(() => {
-    });
-    page.addInitScript(({ selector, callbackName, cleanerName: cleanupName }) => {
+    const installDomMonitor = ({ selector, callbackName, cleanerName: cleanupName }) => {
       (() => {
+        if (typeof window[cleanupName] === "function") {
+          try {
+            window[cleanupName]();
+          } catch {
+          }
+        }
         let observer = null;
         const checkAndReport = () => {
           const element = document.querySelector(selector);
@@ -6346,7 +6401,7 @@ function useCaptchaMonitor(page, options) {
           }
         };
         if (document.readyState === "loading") {
-          window.addEventListener("DOMContentLoaded", mountObserver);
+          window.addEventListener("DOMContentLoaded", mountObserver, { once: true });
         } else {
           mountObserver();
         }
@@ -6357,9 +6412,41 @@ function useCaptchaMonitor(page, options) {
           }
         };
       })();
-    }, { selector: domSelector, callbackName: exposedFunctionName, cleanerName });
-    logger12.success("useCaptchaMonitor", `DOM \u76D1\u63A7\u5DF2\u542F\u7528\uFF1A${domSelector}`);
+    };
+    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);
     cleanupFns.push(async () => {
+      if (domFrameHandler) {
+        page.off("framenavigated", domFrameHandler);
+      }
+      await domMonitorReady;
       try {
         await page.evaluate((name) => {
           if (window[name]) {
@@ -6390,10 +6477,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;
     }
   };
 }