@skrillex1224/playwright-toolkit 2.1.170 → 2.1.171

package/dist/index.js

@@ -546,7 +546,7 @@ var CrawlerError = class _CrawlerError extends Error {
 // src/apify-kit.js
 import { serializeError as serializeError2 } from "serialize-error";
 
-// src/proxy-meter-runtime.js
+// src/internals/proxy-meter-runtime.js
 import { spawn, spawnSync } from "child_process";
 import { existsSync, mkdirSync, readFileSync, rmSync } from "fs";
 import { tmpdir } from "os";
@@ -615,6 +615,10 @@ var resolveResourceTypeMeta = (domain) => {
 };
 var resolveScriptPath = () => {
   const baseDir = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
+  const internalCandidate = path.join(baseDir, "internals", "proxy-meter.js");
+  if (existsSync(internalCandidate)) {
+    return internalCandidate;
+  }
   return path.join(baseDir, "proxy-meter.js");
 };
 var pickFreePort = () => {
@@ -898,6 +902,12 @@ var getProxyMeterSnapshot = async (options = {}) => {
   }
   return snapshot;
 };
+var ProxyMeterRuntime = {
+  startProxyMeter,
+  recordProxyMeterResourceType,
+  stopProxyMeter,
+  getProxyMeterSnapshot
+};
 
 // src/apify-kit.js
 var logger3 = createInternalLogger("ApifyKit");
@@ -1017,7 +1027,7 @@ async function createApifyKit() {
      * @param {Object} data - 要推送的数据对象
      */
     async pushSuccess(data) {
-      const traffic = await getProxyMeterSnapshot({ finalize: true });
+      const traffic = await ProxyMeterRuntime.getProxyMeterSnapshot({ finalize: true });
       await Actor2.pushData({
         // 固定为0
         code: Code.Success,
@@ -1039,7 +1049,7 @@ async function createApifyKit() {
       const isCrawlerError = CrawlerError.isCrawlerError(error);
       const code = isCrawlerError ? error.code : Code.UnknownError;
       const context = isCrawlerError ? error.context : {};
-      const traffic = await getProxyMeterSnapshot({ finalize: true });
+      const traffic = await ProxyMeterRuntime.getProxyMeterSnapshot({ finalize: true });
       await Actor2.pushData({
         // 如果是 CrawlerError，使用其 code，否则使用默认 Failed code
         code,
@@ -1670,6 +1680,7 @@ var normalizeByPassDomains = (domains) => {
   if (!Array.isArray(domains)) return [];
   return domains.map((item) => String(item || "").trim()).filter(Boolean);
 };
+var normalizeHostname = (value = "") => String(value || "").trim().toLowerCase();
 var buildByPassDomainRule = (rawPattern) => {
   const pattern = String(rawPattern || "").trim().toLowerCase();
   if (!pattern) return null;
@@ -1690,7 +1701,7 @@ var buildByPassDomainRules = (domains = []) => {
 var findMatchedByPassRule = (rules = [], requestUrl = "") => {
   let hostname = "";
   try {
-    hostname = new URL(String(requestUrl || "")).hostname.toLowerCase();
+    hostname = normalizeHostname(new URL(String(requestUrl || "")).hostname);
   } catch {
     return null;
   }
@@ -1707,6 +1718,41 @@ var findMatchedByPassRule = (rules = [], requestUrl = "") => {
     hostname
   };
 };
+var isDomainCoveredByByPass = (domain = "", rules = []) => {
+  const hostname = normalizeHostname(domain);
+  if (!hostname) return false;
+  for (const rule of rules || []) {
+    if (!rule || typeof rule.test !== "function") continue;
+    if (rule.test(hostname)) return true;
+  }
+  return false;
+};
+var resolveRouteByProxy = ({
+  requestUrl = "",
+  enableProxy = false,
+  byPassRules = []
+}) => {
+  if (!enableProxy) {
+    return { route: "direct", matchedRule: null, hostname: "" };
+  }
+  const matched = findMatchedByPassRule(byPassRules, requestUrl);
+  if (!matched) {
+    return { route: "proxy", matchedRule: null, hostname: "" };
+  }
+  if (matched.rule) {
+    return { route: "direct", matchedRule: matched.rule, hostname: matched.hostname };
+  }
+  return { route: "proxy", matchedRule: null, hostname: matched.hostname };
+};
+var ByPass = {
+  normalizeByPassDomains,
+  normalizeHostname,
+  buildByPassDomainRule,
+  buildByPassDomainRules,
+  findMatchedByPassRule,
+  isDomainCoveredByByPass,
+  resolveRouteByProxy
+};
 
 // src/launch.js
 var logger7 = createInternalLogger("Launch");
@@ -1724,7 +1770,7 @@ var resolveProxyLaunchOptions = (proxyConfiguration = {}) => {
   if (!enableProxy || !proxyUrl) {
     return { byPassDomains: [], enableProxy, proxyUrl };
   }
-  const byPassDomains = normalizeByPassDomains(config.by_pass_domains);
+  const byPassDomains = ByPass.normalizeByPassDomains(config.by_pass_domains);
   return { byPassDomains, enableProxy, proxyUrl };
 };
 var Launch = {
@@ -1742,8 +1788,8 @@ var Launch = {
       postNavigationHooks = []
     } = normalizedOptions;
     const { byPassDomains, enableProxy, proxyUrl } = resolveProxyLaunchOptions(proxyConfiguration);
-    const byPassRules = buildByPassDomainRules(byPassDomains);
-    const proxyMeter = enableProxy && proxyUrl ? startProxyMeter({ proxyUrl, debugMode }) : null;
+    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(",");
@@ -1797,9 +1843,9 @@ var Launch = {
       const requestHandler = (req) => {
         const requestUrl = req.url();
         const resourceType = req.resourceType();
-        const matched = byPassDomains.length > 0 ? findMatchedByPassRule(byPassRules, requestUrl) : null;
-        if (launchProxy && !matched) {
-          recordProxyMeterResourceType(requestUrl, 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;
@@ -4153,6 +4199,7 @@ var usePlaywrightToolKit = () => {
     Display,
     Logger,
     Share,
+    ByPass,
     $Internals: { LOG_TEMPLATES, stripAnsi }
   };
 };