@browserless.io/browserless 2.22.0-beta-1 → 2.22.0-beta-2

package/build/routes/chrome/http/content.post.body.json

@@ -438,14 +438,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@14355": {
+                "__@toStringTag@14427": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@14355",
+                "__@toStringTag@14427",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -480,13 +480,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@14355",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },
@@ -496,18 +496,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@14393": {
+        "__@species@14465": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@14393",
-        "__@toStringTag@14355",
+        "__@species@14465",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/pdf.post.body.json

@@ -583,14 +583,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@128394": {
+                "__@toStringTag@114724": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@128394",
+                "__@toStringTag@114724",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -625,13 +625,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@128394": {
+        "__@toStringTag@114724": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@128394",
+        "__@toStringTag@114724",
         "byteLength"
       ]
     },
@@ -641,18 +641,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@128432": {
+        "__@species@114762": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@128394": {
+        "__@toStringTag@114724": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@128432",
-        "__@toStringTag@128394",
+        "__@species@114762",
+        "__@toStringTag@114724",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/scrape.post.body.json

@@ -485,14 +485,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@142840": {
+                "__@toStringTag@158089": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@142840",
+                "__@toStringTag@158089",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -527,13 +527,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@142840": {
+        "__@toStringTag@158089": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@142840",
+        "__@toStringTag@158089",
         "byteLength"
       ]
     },
@@ -543,18 +543,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@142878": {
+        "__@species@158127": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@142840": {
+        "__@toStringTag@158089": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@142878",
-        "__@toStringTag@142840",
+        "__@species@158127",
+        "__@toStringTag@158089",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/screenshot.post.body.json

@@ -528,14 +528,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@157363": {
+                "__@toStringTag@143571": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@157363",
+                "__@toStringTag@143571",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -570,13 +570,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@157363": {
+        "__@toStringTag@143571": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@157363",
+        "__@toStringTag@143571",
         "byteLength"
       ]
     },
@@ -586,18 +586,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@157401": {
+        "__@species@143609": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@157363": {
+        "__@toStringTag@143571": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@157401",
-        "__@toStringTag@157363",
+        "__@species@143609",
+        "__@toStringTag@143571",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/content.post.body.json

@@ -438,14 +438,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@171796": {
+                "__@toStringTag@172660": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@171796",
+                "__@toStringTag@172660",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -480,13 +480,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@171796": {
+        "__@toStringTag@172660": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@171796",
+        "__@toStringTag@172660",
         "byteLength"
       ]
     },
@@ -496,18 +496,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@171834": {
+        "__@species@172698": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@171796": {
+        "__@toStringTag@172660": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@171834",
-        "__@toStringTag@171796",
+        "__@species@172698",
+        "__@toStringTag@172660",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/pdf.post.body.json

@@ -583,14 +583,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@257332": {
+                "__@toStringTag@258628": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@257332",
+                "__@toStringTag@258628",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -625,13 +625,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@257332": {
+        "__@toStringTag@258628": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@257332",
+        "__@toStringTag@258628",
         "byteLength"
       ]
     },
@@ -641,18 +641,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@257370": {
+        "__@species@258666": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@257332": {
+        "__@toStringTag@258628": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@257370",
-        "__@toStringTag@257332",
+        "__@species@258666",
+        "__@toStringTag@258628",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/scrape.post.body.json

@@ -485,14 +485,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@300254": {
+                "__@toStringTag@387827": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@300254",
+                "__@toStringTag@387827",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -527,13 +527,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@300254": {
+        "__@toStringTag@387827": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@300254",
+        "__@toStringTag@387827",
         "byteLength"
       ]
     },
@@ -543,18 +543,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@300292": {
+        "__@species@387865": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@300254": {
+        "__@toStringTag@387827": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@300292",
-        "__@toStringTag@300254",
+        "__@species@387865",
+        "__@toStringTag@387827",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/screenshot.post.body.json

@@ -528,14 +528,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@328971": {
+                "__@toStringTag@301731": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@328971",
+                "__@toStringTag@301731",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -570,13 +570,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@328971": {
+        "__@toStringTag@301731": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@328971",
+        "__@toStringTag@301731",
         "byteLength"
       ]
     },
@@ -586,18 +586,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@329009": {
+        "__@species@301769": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@328971": {
+        "__@toStringTag@301731": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@329009",
-        "__@toStringTag@328971",
+        "__@species@301769",
+        "__@toStringTag@301731",
         "byteLength"
       ]
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.22.0-beta-1",
+  "version": "2.22.0-beta-2",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -61,7 +61,7 @@
     "playwright-1.44": "npm:playwright-core@1.44.1",
     "playwright-1.45": "npm:playwright-core@1.45.3",
     "playwright-1.46": "npm:playwright-core@1.46.1",
-    "playwright-core": "^1.47.2",
+    "playwright-core": "^1.48.0",
     "puppeteer-core": "^23.5.1",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",

package/static/docs/swagger.json

@@ -255,14 +255,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@14355": {
+                "__@toStringTag@14427": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@14355",
+                "__@toStringTag@14427",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -297,13 +297,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@14355",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },
@@ -313,18 +313,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@14393": {
+        "__@species@14465": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@14393",
-        "__@toStringTag@14355",
+        "__@species@14465",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },
@@ -969,7 +969,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.22.0-beta-1",
+    "version": "2.22.0-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"

package/static/docs/swagger.min.json

@@ -255,14 +255,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@14355": {
+                "__@toStringTag@14427": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@14355",
+                "__@toStringTag@14427",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -297,13 +297,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@14355",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },
@@ -313,18 +313,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@14393": {
+        "__@species@14465": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@14355": {
+        "__@toStringTag@14427": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@14393",
-        "__@toStringTag@14355",
+        "__@species@14465",
+        "__@toStringTag@14427",
         "byteLength"
       ]
     },
@@ -969,7 +969,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.22.0-beta-1",
+    "version": "2.22.0-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"

package/static/function/client.js

@@ -4382,7 +4382,7 @@
   // node_modules/puppeteer-core/lib/esm/puppeteer/generated/version.js
   init_dirname();
   init_buffer2();
-  var packageVersion = "23.4.1";
+  var packageVersion = "23.5.1";
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/util/assert.js
   init_dirname();
@@ -10119,7 +10119,7 @@
           return await frame.isolatedRealm().adoptHandle(elementOrFrame);
         })(), false);
         const { visible = false, hidden = false, timeout: timeout2, signal } = options;
-        const polling = options.polling ?? (visible || hidden ? "raf" : "mutation");
+        const polling = visible || hidden ? "raf" : options.polling;
         try {
           const env_4 = { stack: [], error: void 0, hasError: false };
           try {
@@ -14480,8 +14480,9 @@ ${sourceUrlComment}
      * Waits for the next context to be set on the isolated world.
      */
     async #waitForExecutionContext() {
+      const error = new Error("Execution context was destroyed");
       const result = await firstValueFrom(fromEmitterEvent(this.#emitter, "context").pipe(raceWith(fromEmitterEvent(this.#emitter, "disposed").pipe(map(() => {
-        throw new Error("Execution context was destroyed");
+        throw error;
       })), timeout(this.timeoutSettings.timeout()))));
       return result;
     }
@@ -15008,6 +15009,20 @@ ${sourceUrlComment}
       exposeFunction() {
         throw new UnsupportedOperation();
       }
+      async frameElement() {
+        const isFirefox = this.page().target()._targetManager() instanceof FirefoxTargetManager;
+        if (isFirefox) {
+          return await super.frameElement();
+        }
+        const parent = this.parentFrame();
+        if (!parent) {
+          return null;
+        }
+        const { backendNodeId } = await parent.client.send("DOM.getFrameOwner", {
+          frameId: this._id
+        });
+        return await parent.mainRealm().adoptBackendNode(backendNodeId);
+      }
     };
   })();
 
@@ -15221,6 +15236,9 @@ ${sourceUrlComment}
           return await this._continue(this.interception.requestOverrides);
       }
     }
+    #canBeIntercepted() {
+      return !this.url().startsWith("data:") && !this._fromMemoryCache;
+    }
     /**
      * Continues request with optional request overrides.
      *
@@ -15250,7 +15268,7 @@ ${sourceUrlComment}
      * Exception is immediately thrown if the request interception is not enabled.
      */
     async continue(overrides = {}, priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       assert(this.interception.enabled, "Request Interception is not enabled!");
@@ -15307,7 +15325,7 @@ ${sourceUrlComment}
      * Exception is immediately thrown if the request interception is not enabled.
      */
     async respond(response, priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       assert(this.interception.enabled, "Request Interception is not enabled!");
@@ -15345,7 +15363,7 @@ ${sourceUrlComment}
      * throw an exception immediately.
      */
     async abort(errorCode = "failed", priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       const errorReason = errorReasons[errorCode];
@@ -15984,6 +16002,29 @@ ${sourceUrlComment}
     forgetQueuedEventGroup(networkRequestId) {
       this.#queuedEventGroupMap.delete(networkRequestId);
     }
+    printState() {
+      function replacer(_key, value) {
+        if (value instanceof Map) {
+          return {
+            dataType: "Map",
+            value: Array.from(value.entries())
+            // or with spread: value: [...value]
+          };
+        } else if (value instanceof CdpHTTPRequest) {
+          return {
+            dataType: "CdpHTTPRequest",
+            value: `${value.id}: ${value.url()}`
+          };
+        }
+        {
+          return value;
+        }
+      }
+      console.log("httpRequestsMap", JSON.stringify(this.#httpRequestsMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#requestWillBeSentMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#responseReceivedExtraInfoMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#requestPausedMap, replacer, 2));
+    }
   };
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/NetworkManager.js
@@ -16246,7 +16287,7 @@ ${sourceUrlComment}
       this.emit(NetworkManagerEvent.Request, request);
       void request.finalizeInterceptions();
     }
-    #onRequest(client, event, fetchRequestId) {
+    #onRequest(client, event, fetchRequestId, fromMemoryCache = false) {
       let redirectChain = [];
       if (event.redirectResponse) {
         let redirectResponseExtraInfo = null;
@@ -16268,15 +16309,25 @@ ${sourceUrlComment}
       }
       const frame = event.frameId ? this.#frameManager.frame(event.frameId) : null;
       const request = new CdpHTTPRequest(client, frame, fetchRequestId, this.#userRequestInterceptionEnabled, event, redirectChain);
+      request._fromMemoryCache = fromMemoryCache;
       this.#networkEventManager.storeRequest(event.requestId, request);
       this.emit(NetworkManagerEvent.Request, request);
       void request.finalizeInterceptions();
     }
-    #onRequestServedFromCache(_client, event) {
-      const request = this.#networkEventManager.getRequest(event.requestId);
+    #onRequestServedFromCache(client, event) {
+      const requestWillBeSentEvent = this.#networkEventManager.getRequestWillBeSent(event.requestId);
+      let request = this.#networkEventManager.getRequest(event.requestId);
       if (request) {
         request._fromMemoryCache = true;
       }
+      if (!request && requestWillBeSentEvent) {
+        this.#onRequest(client, requestWillBeSentEvent, void 0, true);
+        request = this.#networkEventManager.getRequest(event.requestId);
+      }
+      if (!request) {
+        debugError(new Error(`Request ${event.requestId} was served from cache but we could not find the corresponding request object`));
+        return;
+      }
       this.emit(NetworkManagerEvent.RequestServedFromCache, request);
     }
     #handleRequestRedirect(client, request, responsePayload, extraInfo) {

package/static/function/index.html

@@ -4390,7 +4390,7 @@
   // node_modules/puppeteer-core/lib/esm/puppeteer/generated/version.js
   init_dirname();
   init_buffer2();
-  var packageVersion = "23.4.1";
+  var packageVersion = "23.5.1";
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/util/assert.js
   init_dirname();
@@ -10127,7 +10127,7 @@
           return await frame.isolatedRealm().adoptHandle(elementOrFrame);
         })(), false);
         const { visible = false, hidden = false, timeout: timeout2, signal } = options;
-        const polling = options.polling ?? (visible || hidden ? "raf" : "mutation");
+        const polling = visible || hidden ? "raf" : options.polling;
         try {
           const env_4 = { stack: [], error: void 0, hasError: false };
           try {
@@ -14488,8 +14488,9 @@ ${sourceUrlComment}
      * Waits for the next context to be set on the isolated world.
      */
     async #waitForExecutionContext() {
+      const error = new Error("Execution context was destroyed");
       const result = await firstValueFrom(fromEmitterEvent(this.#emitter, "context").pipe(raceWith(fromEmitterEvent(this.#emitter, "disposed").pipe(map(() => {
-        throw new Error("Execution context was destroyed");
+        throw error;
       })), timeout(this.timeoutSettings.timeout()))));
       return result;
     }
@@ -15016,6 +15017,20 @@ ${sourceUrlComment}
       exposeFunction() {
         throw new UnsupportedOperation();
       }
+      async frameElement() {
+        const isFirefox = this.page().target()._targetManager() instanceof FirefoxTargetManager;
+        if (isFirefox) {
+          return await super.frameElement();
+        }
+        const parent = this.parentFrame();
+        if (!parent) {
+          return null;
+        }
+        const { backendNodeId } = await parent.client.send("DOM.getFrameOwner", {
+          frameId: this._id
+        });
+        return await parent.mainRealm().adoptBackendNode(backendNodeId);
+      }
     };
   })();
 
@@ -15229,6 +15244,9 @@ ${sourceUrlComment}
           return await this._continue(this.interception.requestOverrides);
       }
     }
+    #canBeIntercepted() {
+      return !this.url().startsWith("data:") && !this._fromMemoryCache;
+    }
     /**
      * Continues request with optional request overrides.
      *
@@ -15258,7 +15276,7 @@ ${sourceUrlComment}
      * Exception is immediately thrown if the request interception is not enabled.
      */
     async continue(overrides = {}, priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       assert(this.interception.enabled, "Request Interception is not enabled!");
@@ -15315,7 +15333,7 @@ ${sourceUrlComment}
      * Exception is immediately thrown if the request interception is not enabled.
      */
     async respond(response, priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       assert(this.interception.enabled, "Request Interception is not enabled!");
@@ -15353,7 +15371,7 @@ ${sourceUrlComment}
      * throw an exception immediately.
      */
     async abort(errorCode = "failed", priority) {
-      if (this.url().startsWith("data:")) {
+      if (!this.#canBeIntercepted()) {
         return;
       }
       const errorReason = errorReasons[errorCode];
@@ -15992,6 +16010,29 @@ ${sourceUrlComment}
     forgetQueuedEventGroup(networkRequestId) {
       this.#queuedEventGroupMap.delete(networkRequestId);
     }
+    printState() {
+      function replacer(_key, value) {
+        if (value instanceof Map) {
+          return {
+            dataType: "Map",
+            value: Array.from(value.entries())
+            // or with spread: value: [...value]
+          };
+        } else if (value instanceof CdpHTTPRequest) {
+          return {
+            dataType: "CdpHTTPRequest",
+            value: `${value.id}: ${value.url()}`
+          };
+        }
+        {
+          return value;
+        }
+      }
+      console.log("httpRequestsMap", JSON.stringify(this.#httpRequestsMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#requestWillBeSentMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#responseReceivedExtraInfoMap, replacer, 2));
+      console.log("requestWillBeSentMap", JSON.stringify(this.#requestPausedMap, replacer, 2));
+    }
   };
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/NetworkManager.js
@@ -16254,7 +16295,7 @@ ${sourceUrlComment}
       this.emit(NetworkManagerEvent.Request, request);
       void request.finalizeInterceptions();
     }
-    #onRequest(client, event, fetchRequestId) {
+    #onRequest(client, event, fetchRequestId, fromMemoryCache = false) {
       let redirectChain = [];
       if (event.redirectResponse) {
         let redirectResponseExtraInfo = null;
@@ -16276,15 +16317,25 @@ ${sourceUrlComment}
       }
       const frame = event.frameId ? this.#frameManager.frame(event.frameId) : null;
       const request = new CdpHTTPRequest(client, frame, fetchRequestId, this.#userRequestInterceptionEnabled, event, redirectChain);
+      request._fromMemoryCache = fromMemoryCache;
       this.#networkEventManager.storeRequest(event.requestId, request);
       this.emit(NetworkManagerEvent.Request, request);
       void request.finalizeInterceptions();
     }
-    #onRequestServedFromCache(_client, event) {
-      const request = this.#networkEventManager.getRequest(event.requestId);
+    #onRequestServedFromCache(client, event) {
+      const requestWillBeSentEvent = this.#networkEventManager.getRequestWillBeSent(event.requestId);
+      let request = this.#networkEventManager.getRequest(event.requestId);
       if (request) {
         request._fromMemoryCache = true;
       }
+      if (!request && requestWillBeSentEvent) {
+        this.#onRequest(client, requestWillBeSentEvent, void 0, true);
+        request = this.#networkEventManager.getRequest(event.requestId);
+      }
+      if (!request) {
+        debugError(new Error(`Request ${event.requestId} was served from cache but we could not find the corresponding request object`));
+        return;
+      }
       this.emit(NetworkManagerEvent.RequestServedFromCache, request);
     }
     #handleRequestRedirect(client, request, responsePayload, extraInfo) {