@skrillex1224/playwright-toolkit 2.1.162 → 2.1.164

package/dist/index.js

@@ -604,7 +604,7 @@ async function createApifyKit() {
           logger2.success(`[RetryStep] before \u94A9\u5B50\u5B8C\u6210`);
         } else if (retryMode === "refresh") {
           logger2.start(`[RetryStep] \u5237\u65B0\u9875\u9762 (\u7B2C ${attemptNumber} \u6B21\u91CD\u8BD5)`);
-          await page.reload({ waitUntil: "domcontentloaded" });
+          await page.reload({ waitUntil: "commit" });
           logger2.success(`[RetryStep] \u9875\u9762\u5237\u65B0\u5B8C\u6210`);
         } else {
           logger2.start(`[RetryStep] \u7B49\u5F85 3 \u79D2 (\u7B2C ${attemptNumber} \u6B21\u91CD\u8BD5)`);
@@ -1433,6 +1433,19 @@ var createTrafficState = () => ({
   directDownloadBytes: 0
 });
 var ensureRoute = (route) => route === "proxy" ? "proxy" : "direct";
+var formatBytes = (bytes = 0) => {
+  const value = toSafeNumber(bytes);
+  if (value <= 0) return "0B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let size = value;
+  let unit = 0;
+  while (size >= 1024 && unit < units.length - 1) {
+    size /= 1024;
+    unit += 1;
+  }
+  const precision = size >= 100 || unit === 0 ? 0 : 2;
+  return `${size.toFixed(precision)}${units[unit]}`;
+};
 var addRequests = (state, route, count = 1) => {
   const c = toSafeNumber(count);
   if (c <= 0) return;
@@ -1468,7 +1481,8 @@ var addDownloadBytes = (state, route, bytes = 0) => {
 };
 var createTrafficMeter = ({
   enableProxy = false,
-  byPassRules = []
+  byPassRules = [],
+  debugMode = false
 } = {}) => {
   const state = createTrafficState();
   const requestMap = /* @__PURE__ */ new Map();
@@ -1480,31 +1494,53 @@ var createTrafficMeter = ({
       byPassRules
     }).route;
   };
+  const debugLog = (message) => {
+    if (!debugMode) return;
+    logger6.info(`[\u9010\u8BF7\u6C42\u8C03\u8BD5] ${message}`);
+  };
   const recordRequest = (params = {}) => {
     const requestId = String(params.requestId || "");
     const request = params.request && typeof params.request === "object" ? params.request : {};
-    const route = resolveRoute(request.url || "");
+    const url = String(request.url || "");
+    const route = resolveRoute(url);
+    const resourceType = String(params.type || request.type || "other").trim().toLowerCase() || "other";
     addRequests(state, route, 1);
     const uploadBytes = estimateRequestBytes(request);
     addUploadBytes(state, route, uploadBytes);
     if (requestId) {
       requestMap.set(requestId, {
-        route
+        route,
+        resourceType,
+        url,
+        uploadBytes
       });
     }
+    debugLog(
+      `request id=${requestId || "-"} route=${route} type=${resourceType} upload=${formatBytes(uploadBytes)} (${uploadBytes}) method=${String(request.method || "GET")} url=${url || "-"}`
+    );
   };
   const recordLoadingFinished = (params = {}) => {
     const requestId = String(params.requestId || "");
     const requestState = requestId ? requestMap.get(requestId) : null;
     const route = requestState?.route || "direct";
+    const resourceType = requestState?.resourceType || "other";
     const downloadBytes = toSafeNumber(params.encodedDataLength);
     addDownloadBytes(state, route, downloadBytes);
+    const uploadBytes = toSafeNumber(requestState?.uploadBytes);
+    const totalBytes = uploadBytes + downloadBytes;
+    debugLog(
+      `finish id=${requestId || "-"} route=${route} type=${resourceType} download=${formatBytes(downloadBytes)} (${downloadBytes}) total=${formatBytes(totalBytes)} (${totalBytes}) url=${requestState?.url || "-"}`
+    );
     if (requestId) {
       requestMap.delete(requestId);
     }
   };
   const recordRequestFailed = (params = {}) => {
     const requestId = String(params.requestId || "");
+    const requestState = requestId ? requestMap.get(requestId) : null;
+    debugLog(
+      `failed id=${requestId || "-"} route=${requestState?.route || "direct"} type=${requestState?.resourceType || "other"} reason=${String(params.errorText || "").trim() || "unknown"} canceled=${Boolean(params.canceled)} url=${requestState?.url || "-"}`
+    );
     if (requestId) {
       requestMap.delete(requestId);
     }
@@ -1513,30 +1549,39 @@ var createTrafficMeter = ({
     const requestId = String(params.requestId || "");
     if (!requestId) return;
     const route = resolveRoute(params.url || "");
-    wsRouteMap.set(requestId, route);
+    wsRouteMap.set(requestId, { route, url: String(params.url || "") });
   };
   const clearWebSocketRoute = (params = {}) => {
     const requestId = String(params.requestId || "");
     if (!requestId) return;
     wsRouteMap.delete(requestId);
   };
-  const getWebSocketRoute = (requestId = "") => {
-    if (!requestId) return "direct";
-    return wsRouteMap.get(requestId) || "direct";
+  const getWebSocketMeta = (requestId = "") => {
+    if (!requestId) return { route: "direct", url: "" };
+    const meta = wsRouteMap.get(requestId);
+    if (!meta || typeof meta !== "object") {
+      return { route: "direct", url: "" };
+    }
+    return {
+      route: ensureRoute(meta.route),
+      url: String(meta.url || "")
+    };
   };
   const recordWebSocketFrameSent = (params = {}) => {
     const requestId = String(params.requestId || "");
-    const route = getWebSocketRoute(requestId);
+    const { route, url } = getWebSocketMeta(requestId);
     const payload = params.response && typeof params.response === "object" ? params.response.payloadData : "";
     const bytes = byteLength(payload || "");
     addUploadBytes(state, route, bytes);
+    debugLog(`ws-send id=${requestId || "-"} route=${route} bytes=${formatBytes(bytes)} (${bytes}) url=${url || "-"}`);
   };
   const recordWebSocketFrameReceived = (params = {}) => {
     const requestId = String(params.requestId || "");
-    const route = getWebSocketRoute(requestId);
+    const { route, url } = getWebSocketMeta(requestId);
     const payload = params.response && typeof params.response === "object" ? params.response.payloadData : "";
     const bytes = byteLength(payload || "");
     addDownloadBytes(state, route, bytes);
+    debugLog(`ws-recv id=${requestId || "-"} route=${route} bytes=${formatBytes(bytes)} (${bytes}) url=${url || "-"}`);
   };
   const attachPage = async (page) => {
     if (!page || typeof page.context !== "function") return;
@@ -1630,6 +1675,7 @@ var Launch = {
       proxyConfiguration = {},
       log: logOptions = null,
       runInHeadfulMode = false,
+      debugMode = false,
       isRunningOnApify = false,
       launcher = null,
       preNavigationHooks = [],
@@ -1639,7 +1685,8 @@ var Launch = {
     const byPassRules = buildByPassDomainRules(byPassDomains);
     const trafficMeter2 = createTrafficMeter({
       enableProxy: Boolean(launchProxy),
-      byPassRules
+      byPassRules,
+      debugMode: Boolean(debugMode)
     });
     setTrafficMeter(trafficMeter2);
     const launchOptions = {
@@ -1657,18 +1704,23 @@ var Launch = {
       logger7.info(
         `[\u4EE3\u7406\u5DF2\u542F\u7528] \u4EE3\u7406\u670D\u52A1=${launchProxy.server} \u76F4\u8FDE\u57DF\u540D=${(byPassDomains || []).join(",")}`
       );
+      logger7.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
     } else if (enableByPassLogger && enableProxy && !launchProxy) {
       logger7.info(
         `[\u4EE3\u7406\u672A\u542F\u7528] enable_proxy=true \u4F46 proxy_url \u4E3A\u7A7A`
       );
+      logger7.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
     } else if (enableByPassLogger && !enableProxy && proxyUrl) {
       logger7.info(
         `[\u4EE3\u7406\u672A\u542F\u7528] enable_proxy=false \u4E14 proxy_url \u5DF2\u914D\u7F6E`
       );
+      logger7.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
+    } else if (enableByPassLogger) {
+      logger7.info(`[\u6D41\u91CF\u89C2\u6D4B] \u9010\u8BF7\u6C42\u8C03\u8BD5=${Boolean(debugMode) ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF08\u6C47\u603B\u59CB\u7EC8\u5F00\u542F\uFF09`);
     }
     const onPageCreated = (page) => {
       const recommendedGotoOptions = {
-        waitUntil: "domcontentloaded"
+        waitUntil: "commit"
       };
       if (page && typeof page.on === "function") {
         trafficMeter2.attachPage(page);