@skrillex1224/playwright-toolkit 3.0.1 → 3.0.2

package/dist/index.cjs

@@ -5219,8 +5219,9 @@ var DefaultLaunch = {
 // src/internals/launch/cloak.js
 var import_node_child_process2 = require("node:child_process");
 var import_node_util = require("node:util");
-var logger8 = createInternalLogger("Cloak");
+var logger8 = createInternalLogger("Launch");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process2.execFile);
+var REQUEST_HOOK_FLAG2 = Symbol("playwright-toolkit-cloak-request-hook");
 var DEFAULT_CLOAK_CRAWLER_BASE_OPTIONS = Object.freeze({
   maxConcurrency: 1,
   maxRequestRetries: 0,
@@ -5281,6 +5282,86 @@ var resolveCloakProxy = (proxyConfiguration = {}) => {
     bypass: byPassDomains.join(",")
   };
 };
+var resolveProxyLaunchOptions2 = (proxyConfiguration = {}) => {
+  const config = normalizeObject(proxyConfiguration);
+  const proxyUrl = String(config.proxy_url || "").trim();
+  const enableProxy = typeof config.enable_proxy === "boolean" ? config.enable_proxy : proxyUrl !== "";
+  const byPassDomains = enableProxy && proxyUrl ? ByPass.normalizeByPassDomains(config.by_pass_domains) : [];
+  return {
+    byPassDomains,
+    enableProxy,
+    proxyUrl
+  };
+};
+var buildMeteredProxy = ({ proxyConfiguration = {}, debugMode = false } = {}) => {
+  const { byPassDomains, enableProxy, proxyUrl } = resolveProxyLaunchOptions2(proxyConfiguration);
+  const byPassRules = ByPass.buildByPassDomainRules(byPassDomains);
+  const proxyMeter = enableProxy && proxyUrl ? ProxyMeterRuntime.startProxyMeter({ proxyUrl, debugMode }) : null;
+  const launchProxy = proxyMeter ? { server: proxyMeter.server } : null;
+  if (launchProxy && byPassDomains.length > 0) {
+    launchProxy.bypass = byPassDomains.join(",");
+  }
+  return {
+    byPassDomains,
+    byPassRules,
+    enableProxy,
+    proxyUrl,
+    launchProxy
+  };
+};
+var logProxyLaunchState = ({
+  byPassDomains = [],
+  debugMode = false,
+  enableByPassLogger = false,
+  enableProxy = false,
+  launchProxy = null,
+  proxyUrl = ""
+} = {}) => {
+  if (!enableByPassLogger) return;
+  if (launchProxy) {
+    let upstreamLabel = "";
+    try {
+      const parsedProxyUrl = new URL(proxyUrl.includes("://") ? proxyUrl : `http://${proxyUrl}`);
+      upstreamLabel = `${parsedProxyUrl.protocol}//${parsedProxyUrl.host}`;
+    } catch {
+    }
+    logger8.info(
+      `[\u4EE3\u7406\u5DF2\u542F\u7528] \u672C\u5730=${launchProxy.server} \u4E0A\u6E38=${upstreamLabel || "-"} \u76F4\u8FDE\u57DF\u540D=${byPassDomains.join(",")}`
+    );
+    logger8.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
+    return;
+  }
+  if (enableProxy) {
+    logger8.info("[\u4EE3\u7406\u672A\u542F\u7528] enable_proxy=true \u4F46 proxy_url \u4E3A\u7A7A");
+  } else if (proxyUrl) {
+    logger8.info("[\u4EE3\u7406\u672A\u542F\u7528] enable_proxy=false \u4E14 proxy_url \u5DF2\u914D\u7F6E");
+  }
+  logger8.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
+};
+var createProxyRequestHook = ({
+  byPassDomains = [],
+  byPassRules = [],
+  enableByPassLogger = false,
+  launchProxy = null
+} = {}) => {
+  return (page) => {
+    if (!page || typeof page.on !== "function" || page[REQUEST_HOOK_FLAG2]) {
+      return;
+    }
+    page[REQUEST_HOOK_FLAG2] = true;
+    page.on("request", (req) => {
+      const requestUrl = req.url();
+      const resourceType = req.resourceType();
+      const matched = byPassDomains.length > 0 ? ByPass.findMatchedByPassRule(byPassRules, requestUrl) : null;
+      if (launchProxy) {
+        ProxyMeterRuntime.recordProxyMeterResourceType(requestUrl, resourceType);
+      }
+      if (!enableByPassLogger || byPassDomains.length === 0) return;
+      if (!matched || !matched.rule) return;
+      logger8.info(`[\u76F4\u8FDE\u547D\u4E2D] \u89C4\u5219=${matched.rule.pattern} \u57DF\u540D=${matched.hostname} \u8D44\u6E90\u7C7B\u578B=${resourceType} \u65B9\u6CD5=${req.method()} \u5730\u5740=${requestUrl}`);
+    });
+  };
+};
 var extractFingerprintArg = (launchOptions = {}) => {
   const args = Array.isArray(launchOptions?.args) ? launchOptions.args : [];
   return args.find((value) => String(value || "").startsWith("--fingerprint=")) || "";
@@ -5392,6 +5473,8 @@ var CloakLaunch = {
     const normalizedOptions = normalizeObject(options);
     const {
       proxyConfiguration = {},
+      log: logOptions = null,
+      debugMode = false,
       runInHeadfulMode = false,
       isRunningOnApify = false,
       launcher = null,
@@ -5409,8 +5492,15 @@ var CloakLaunch = {
     const patchedBrowsers = /* @__PURE__ */ new WeakSet();
     const defaultArgs = isRunningOnApify ? ["--no-sandbox", "--disable-setuid-sandbox"] : [];
     const extraArgs = normalizeStringArray(normalizedCloakOptions.args);
-    const proxy = hasOwn(normalizedCloakOptions, "proxy") ? normalizedCloakOptions.proxy : resolveCloakProxy(proxyConfiguration);
+    const hasExplicitProxy = hasOwn(normalizedCloakOptions, "proxy");
+    const proxyLaunchState = hasExplicitProxy ? {
+      ...resolveProxyLaunchOptions2(proxyConfiguration),
+      byPassRules: [],
+      launchProxy: null
+    } : buildMeteredProxy({ proxyConfiguration, debugMode });
+    const proxy = hasExplicitProxy ? normalizedCloakOptions.proxy : proxyLaunchState.launchProxy;
     const headless = hasOwn(normalizedCloakOptions, "headless") ? normalizedCloakOptions.headless : !runInHeadfulMode || isRunningOnApify;
+    const enableByPassLogger = Boolean(logOptions && logOptions.enable);
     const mergedCloakOptions = {
       ...normalizedCloakOptions,
       headless,
@@ -5420,8 +5510,23 @@ var CloakLaunch = {
     const launchOptions = await buildCloakLaunchOptions(mergedCloakOptions);
     const fingerprintArg = extractFingerprintArg(launchOptions);
     const internalPreNavigationHook = createStableGotoHook(recommendedGotoOptions);
+    const proxyRequestHook = createProxyRequestHook({
+      byPassDomains: proxyLaunchState.byPassDomains,
+      byPassRules: proxyLaunchState.byPassRules,
+      enableByPassLogger,
+      launchProxy: proxyLaunchState.launchProxy
+    });
     const normalizedPreNavigationHooks = Array.isArray(preNavigationHooks) ? preNavigationHooks : [];
     const normalizedPostNavigationHooks = Array.isArray(postNavigationHooks) ? postNavigationHooks : [];
+    if (hasExplicitProxy && enableByPassLogger) {
+      logger8.info("[\u4EE3\u7406\u5DF2\u542F\u7528] \u4F7F\u7528 cloakOptions.proxy\uFF0C\u8DF3\u8FC7 toolkit \u672C\u5730\u6D41\u91CF\u89C2\u6D4B");
+    } else {
+      logProxyLaunchState({
+        ...proxyLaunchState,
+        debugMode,
+        enableByPassLogger
+      });
+    }
     const crawlerOptions = {
       ...DEFAULT_CLOAK_CRAWLER_BASE_OPTIONS,
       ...normalizeObject(crawlerBaseOptions),
@@ -5438,7 +5543,13 @@ var CloakLaunch = {
         patchedBrowsers,
         humanizeOptions
       }),
-      preNavigationHooks: [internalPreNavigationHook, ...normalizedPreNavigationHooks],
+      preNavigationHooks: [
+        async (crawlingContext, gotoOptions = {}) => {
+          proxyRequestHook(crawlingContext?.page);
+          await internalPreNavigationHook(crawlingContext, gotoOptions);
+        },
+        ...normalizedPreNavigationHooks
+      ],
       ...normalizedPostNavigationHooks.length > 0 ? { postNavigationHooks: normalizedPostNavigationHooks } : {}
     };
     const closeActiveBrowsers = async () => {