@skrillex1224/playwright-toolkit 2.1.167 → 2.1.168

package/dist/index.js

@@ -558,6 +558,7 @@ var FLUSH_INTERVAL_MS = 2e3;
 var DEFAULT_DEBUG_MAX_EVENTS = 400;
 var runtime = null;
 var cleanupInstalled = false;
+var observedDomainResourceTypes = /* @__PURE__ */ new Map();
 var toSafeInt = (value) => {
   const num = Number(value);
   if (!Number.isFinite(num) || num <= 0) return 0;
@@ -568,6 +569,50 @@ var toSafeFloat = (value) => {
   if (!Number.isFinite(num)) return 0;
   return num;
 };
+var normalizeResourceType = (value) => {
+  const type = String(value || "").trim().toLowerCase();
+  if (!type) return "other";
+  return type;
+};
+var resolveHostname = (requestUrl) => {
+  const raw = String(requestUrl || "").trim();
+  if (!raw) return "";
+  try {
+    return String(new URL(raw).hostname || "").trim().toLowerCase();
+  } catch {
+    return "";
+  }
+};
+var recordDomainResourceType = (domain, resourceType) => {
+  const host = String(domain || "").trim().toLowerCase();
+  if (!host) return;
+  const type = normalizeResourceType(resourceType);
+  let byType = observedDomainResourceTypes.get(host);
+  if (!byType) {
+    byType = /* @__PURE__ */ new Map();
+    observedDomainResourceTypes.set(host, byType);
+  }
+  byType.set(type, (byType.get(type) || 0) + 1);
+};
+var resolveResourceTypeMeta = (domain) => {
+  const host = String(domain || "").trim().toLowerCase();
+  if (!host) return { resourceType: "", resourceTypeCounts: void 0 };
+  const byType = observedDomainResourceTypes.get(host);
+  if (!byType || byType.size === 0) {
+    return { resourceType: "", resourceTypeCounts: void 0 };
+  }
+  const entries = Array.from(byType.entries()).filter(([type, count]) => type && Number(count) > 0).sort((a, b) => {
+    if (Number(b[1]) !== Number(a[1])) return Number(b[1]) - Number(a[1]);
+    return String(a[0]).localeCompare(String(b[0]));
+  });
+  if (entries.length === 0) {
+    return { resourceType: "", resourceTypeCounts: void 0 };
+  }
+  return {
+    resourceType: entries[0][0],
+    resourceTypeCounts: Object.fromEntries(entries.map(([type, count]) => [type, toSafeInt(count)]))
+  };
+};
 var resolveScriptPath = () => {
   const baseDir = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
   return path.join(baseDir, "proxy-meter.js");
@@ -632,13 +677,16 @@ var normalizeDomainRows = (hosts) => {
     requestCount += requests;
     connectCount += connections;
     if (totalBytes <= 0 && requests <= 0 && connections <= 0) continue;
+    const resourceTypeMeta = resolveResourceTypeMeta(domain);
     rows.push({
       domain,
       inBytes,
       outBytes,
       totalBytes,
       requests,
-      connections
+      connections,
+      resourceType: resourceTypeMeta.resourceType || void 0,
+      resourceTypeCounts: resourceTypeMeta.resourceTypeCounts || void 0
     });
   }
   rows.sort((a, b) => {
@@ -769,6 +817,7 @@ var startProxyMeter = (options = {}) => {
     }
     runtime = null;
   }
+  observedDomainResourceTypes = /* @__PURE__ */ new Map();
   const port = pickFreePort();
   const logPath = ensureLogPath();
   const scriptPath = resolveScriptPath();
@@ -801,6 +850,12 @@ var startProxyMeter = (options = {}) => {
   registerCleanup();
   return { server: `http://127.0.0.1:${port}` };
 };
+var recordProxyMeterResourceType = (requestUrl, resourceType) => {
+  if (!runtime) return;
+  const host = resolveHostname(requestUrl);
+  if (!host) return;
+  recordDomainResourceType(host, resourceType);
+};
 var stopProxyMeter = async () => {
   if (!runtime) return null;
   const { proc, logPath } = runtime;
@@ -1655,6 +1710,7 @@ var findMatchedByPassRule = (rules = [], requestUrl = "") => {
 
 // src/launch.js
 var logger7 = createInternalLogger("Launch");
+var REQUEST_HOOK_FLAG = Symbol("playwright-toolkit-request-hook");
 var DEFAULT_CRAWLER_BASE_OPTIONS = Object.freeze({
   maxConcurrency: 1,
   maxRequestRetries: 0,
@@ -1731,14 +1787,23 @@ var Launch = {
       const recommendedGotoOptions = {
         waitUntil: "commit"
       };
-      if (!enableByPassLogger || byPassDomains.length === 0 || !page || typeof page.on !== "function") {
+      if (!page || typeof page.on !== "function") {
+        return recommendedGotoOptions;
+      }
+      if (page[REQUEST_HOOK_FLAG]) {
         return recommendedGotoOptions;
       }
+      page[REQUEST_HOOK_FLAG] = true;
       const requestHandler = (req) => {
         const requestUrl = req.url();
+        const resourceType = req.resourceType();
+        if (launchProxy) {
+          recordProxyMeterResourceType(requestUrl, resourceType);
+        }
+        if (!enableByPassLogger || byPassDomains.length === 0) return;
         const matched = findMatchedByPassRule(byPassRules, requestUrl);
         if (!matched || !matched.rule) return;
-        logger7.info(`[\u76F4\u8FDE\u547D\u4E2D] \u89C4\u5219=${matched.rule.pattern} \u57DF\u540D=${matched.hostname} \u8D44\u6E90\u7C7B\u578B=${req.resourceType()} \u65B9\u6CD5=${req.method()} \u5730\u5740=${requestUrl}`);
+        logger7.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}`);
       };
       page.on("request", requestHandler);
       return recommendedGotoOptions;