@skrillex1224/playwright-toolkit 3.0.7 → 3.0.9

package/dist/index.js

@@ -1059,7 +1059,7 @@ import { serializeError as serializeError2 } from "serialize-error";
 
 // src/internals/proxy-meter-runtime.js
 import { spawn, spawnSync } from "child_process";
-import { existsSync, mkdirSync, readFileSync, rmSync } from "fs";
+import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -1168,6 +1168,18 @@ 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 {
@@ -1335,6 +1347,7 @@ 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);
@@ -1347,19 +1360,26 @@ 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", "ignore", "ignore"]
+    stdio: ["ignore", "pipe", "pipe"]
   });
-  child.once("exit", (code) => {
+  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();
     if (code && code !== 0) {
-      logger2.warn(`[proxy-meter] exited with code ${code}`);
+      logger2.warn(`[proxy-meter] exited with code ${code}; stdio=${stdioLogPath}`);
     }
   });
   runtime = {
     proc: child,
     port,
     logPath,
+    stdioLogPath,
     startedAt: Date.now()
   };
   registerCleanup();
@@ -5290,49 +5310,6 @@ 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();
@@ -5468,7 +5445,6 @@ var CloakLaunch = {
       runInHeadfulMode = false,
       isRunningOnApify = false,
       launcher = null,
-      runtimeState = null,
       cloakOptions = {},
       humanizeOptions = DEFAULT_CLOAK_HUMANIZE_OPTIONS,
       crawlerBaseOptions = {},
@@ -5483,7 +5459,6 @@ 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;
@@ -5493,13 +5468,7 @@ var CloakLaunch = {
       ...normalizedCloakOptions,
       headless,
       proxy,
-      ...runtimeHints.locale ? { locale: runtimeHints.locale } : {},
-      ...runtimeHints.timezone ? { timezone: runtimeHints.timezone } : {},
-      args: [
-        ...defaultArgs,
-        ...extraArgs,
-        ...runtimeHints.fingerprintSeed ? [`--fingerprint=${runtimeHints.fingerprintSeed}`] : []
-      ]
+      args: [...defaultArgs, ...extraArgs]
     };
     const launchOptions = await buildCloakLaunchOptions(mergedCloakOptions);
     const fingerprintArg = extractFingerprintArg(launchOptions);
@@ -6326,7 +6295,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;
@@ -6338,16 +6307,12 @@ function useCaptchaMonitor(page, options) {
   };
   const cleanupFns = [];
   if (domSelector) {
-    const exposedFunctionName = `__c_d_${uuidv4().replace(/-/g, "_")}`;
+    exposedFunctionName = `__c_d_${uuidv4().replace(/-/g, "_")}`;
     const cleanerName = `__c_cleaner_${uuidv4().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);
@@ -6373,7 +6338,7 @@ function useCaptchaMonitor(page, options) {
           }
         };
         if (document.readyState === "loading") {
-          window.addEventListener("DOMContentLoaded", mountObserver, { once: true });
+          window.addEventListener("DOMContentLoaded", mountObserver);
         } else {
           mountObserver();
         }
@@ -6384,41 +6349,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]) {
@@ -6449,10 +6382,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;
     }
   };
 }