chromium-bidi 0.4.19 → 0.4.21

package/lib/cjs/bidiMapper/domains/log/logManager.js

@@ -56,21 +56,24 @@ class LogManager {
                         return realm.serializeCdpObject(arg, "none" /* Script.ResultOwnership.None */);
                     }));
             this.#eventManager.registerPromiseEvent(argsPromise.then((args) => ({
-                type: 'event',
-                method: protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent,
-                params: {
-                    level: getLogLevel(params.type),
-                    source: {
-                        realm: realm?.realmId ?? 'UNKNOWN',
-                        context: realm?.browsingContextId ?? 'UNKNOWN',
+                kind: 'success',
+                value: {
+                    type: 'event',
+                    method: protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent,
+                    params: {
+                        level: getLogLevel(params.type),
+                        source: {
+                            realm: realm?.realmId ?? 'UNKNOWN',
+                            context: realm?.browsingContextId ?? 'UNKNOWN',
+                        },
+                        text: (0, logHelper_js_1.getRemoteValuesText)(args, true),
+                        timestamp: Math.round(params.timestamp),
+                        stackTrace: getBidiStackTrace(params.stackTrace),
+                        type: 'console',
+                        // Console method is `warn`, not `warning`.
+                        method: params.type === 'warning' ? 'warn' : params.type,
+                        args,
                     },
-                    text: (0, logHelper_js_1.getRemoteValuesText)(args, true),
-                    timestamp: Math.round(params.timestamp),
-                    stackTrace: getBidiStackTrace(params.stackTrace),
-                    type: 'console',
-                    // Console method is `warn`, not `warning`.
-                    method: params.type === 'warning' ? 'warn' : params.type,
-                    args,
                 },
             })), realm?.browsingContextId ?? 'UNKNOWN', protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent);
         });
@@ -92,18 +95,21 @@ class LogManager {
                 return realm.stringifyObject(params.exceptionDetails.exception);
             })();
             this.#eventManager.registerPromiseEvent(textPromise.then((text) => ({
-                type: 'event',
-                method: protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent,
-                params: {
-                    level: "error" /* Log.Level.Error */,
-                    source: {
-                        realm: realm?.realmId ?? 'UNKNOWN',
-                        context: realm?.browsingContextId ?? 'UNKNOWN',
+                kind: 'success',
+                value: {
+                    type: 'event',
+                    method: protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent,
+                    params: {
+                        level: "error" /* Log.Level.Error */,
+                        source: {
+                            realm: realm?.realmId ?? 'UNKNOWN',
+                            context: realm?.browsingContextId ?? 'UNKNOWN',
+                        },
+                        text,
+                        timestamp: Math.round(params.timestamp),
+                        stackTrace: getBidiStackTrace(params.exceptionDetails.stackTrace),
+                        type: 'javascript',
                     },
-                    text,
-                    timestamp: Math.round(params.timestamp),
-                    stackTrace: getBidiStackTrace(params.exceptionDetails.stackTrace),
-                    type: 'javascript',
                 },
             })), realm?.browsingContextId ?? 'UNKNOWN', protocol_js_1.ChromiumBidi.Log.EventNames.LogEntryAddedEvent);
         });

package/lib/cjs/bidiMapper/domains/log/logManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"logManager.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/log/logManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logManager.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/log/logManager.ts"],"names":[],"mappings":"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"}

package/lib/cjs/bidiMapper/domains/network/NetworkManager.d.ts

@@ -1,8 +1,10 @@
-import type { ICdpClient } from '../../../cdp/cdpClient.js';
-import type { IEventManager } from '../events/EventManager.js';
+import type { CdpTarget } from '../context/cdpTarget.js';
+import type { NetworkStorage } from './NetworkStorage.js';
+/** Maps 1:1 to CdpTarget. */
 export declare class NetworkManager {
     #private;
     private constructor();
-    static create(cdpClient: ICdpClient, eventManager: IEventManager): NetworkManager;
-    dispose(): void;
+    /** Returns the CDP Target associated with this NetworkManager instance. */
+    get cdpTarget(): CdpTarget;
+    static create(cdpTarget: CdpTarget, networkStorage: NetworkStorage): NetworkManager;
 }

package/lib/cjs/bidiMapper/domains/network/NetworkManager.js

@@ -17,80 +17,75 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkManager = void 0;
-const DefaultMap_js_1 = require("../../../utils/DefaultMap.js");
-const networkRequest_js_1 = require("./networkRequest.js");
+/** Maps 1:1 to CdpTarget. */
 class NetworkManager {
-    #eventManager;
-    /**
-     * Map of request ID to NetworkRequest objects. Needed as long as information
-     * about requests comes from different events.
-     */
-    #requestMap;
-    constructor(eventManager) {
-        this.#eventManager = eventManager;
-        this.#requestMap = new DefaultMap_js_1.DefaultMap((requestId) => new networkRequest_js_1.NetworkRequest(requestId, this.#eventManager));
+    #cdpTarget;
+    #networkStorage;
+    constructor(cdpTarget, networkStorage) {
+        this.#cdpTarget = cdpTarget;
+        this.#networkStorage = networkStorage;
     }
-    static create(cdpClient, eventManager) {
-        const networkProcessor = new NetworkManager(eventManager);
-        cdpClient
+    /** Returns the CDP Target associated with this NetworkManager instance. */
+    get cdpTarget() {
+        return this.#cdpTarget;
+    }
+    static create(cdpTarget, networkStorage) {
+        const networkManager = new NetworkManager(cdpTarget, networkStorage);
+        // XXX: This will work if a single page is open but what if we open 2 pages?
+        // Investigate further.
+        cdpTarget.cdpClient
             .browserClient()
             .on('Target.detachedFromTarget', (params) => {
-            if (cdpClient.sessionId === params.sessionId) {
-                networkProcessor.dispose();
+            if (cdpTarget.cdpClient.sessionId === params.sessionId) {
+                networkManager.#networkStorage.disposeRequestMap();
             }
         });
-        cdpClient.on('Network.requestWillBeSent', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.requestWillBeSent', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onRequestWillBeSentEvent(params);
         });
-        cdpClient.on('Network.requestWillBeSentExtraInfo', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.requestWillBeSentExtraInfo', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onRequestWillBeSentExtraInfoEvent(params);
         });
-        cdpClient.on('Network.responseReceived', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.responseReceived', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onResponseReceivedEvent(params);
         });
-        cdpClient.on('Network.responseReceivedExtraInfo', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.responseReceivedExtraInfo', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onResponseReceivedEventExtraInfo(params);
         });
-        cdpClient.on('Network.requestServedFromCache', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.requestServedFromCache', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onServedFromCache();
         });
-        cdpClient.on('Network.loadingFailed', (params) => {
-            networkProcessor
+        cdpTarget.cdpClient.on('Network.loadingFailed', (params) => {
+            networkManager
                 .#getOrCreateNetworkRequest(params.requestId)
                 .onLoadingFailedEvent(params);
-            networkProcessor.#forgetRequest(params.requestId);
+            networkManager.#forgetRequest(params.requestId);
         });
-        cdpClient.on('Network.loadingFinished', (params) => {
-            networkProcessor.#forgetRequest(params.requestId);
+        cdpTarget.cdpClient.on('Network.loadingFinished', (params) => {
+            networkManager.#forgetRequest(params.requestId);
         });
-        return networkProcessor;
-    }
-    dispose() {
-        for (const request of this.#requestMap.values()) {
-            request.dispose();
-        }
-        this.#requestMap.clear();
-    }
-    #getOrCreateNetworkRequest(requestId) {
-        return this.#requestMap.get(requestId);
+        return networkManager;
     }
     #forgetRequest(requestId) {
-        const request = this.#requestMap.get(requestId);
+        const request = this.#networkStorage.requestMap.get(requestId);
         if (request) {
             request.dispose();
-            this.#requestMap.delete(requestId);
+            this.#networkStorage.requestMap.delete(requestId);
         }
     }
+    #getOrCreateNetworkRequest(requestId) {
+        return this.#networkStorage.requestMap.get(requestId);
+    }
 }
 exports.NetworkManager = NetworkManager;
 //# sourceMappingURL=NetworkManager.js.map

package/lib/cjs/bidiMapper/domains/network/NetworkManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkManager.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/network/NetworkManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NetworkManager.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/network/NetworkManager.ts"],"names":[],"mappings":"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"}

package/lib/cjs/bidiMapper/domains/network/NetworkProcessor.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { type Network, type EmptyResult } from '../../../protocol/protocol.js';
+import type { BrowsingContextStorage } from '../context/browsingContextStorage.js';
+import type { NetworkStorage } from './NetworkStorage.js';
+/** Dispatches Network domain commands. */
+export declare class NetworkProcessor {
+    #private;
+    constructor(browsingContextStorage: BrowsingContextStorage, networkStorage: NetworkStorage);
+    /** Applies all existing network intercepts to all CDP targets concurrently. */
+    applyIntercepts(): Promise<void>;
+    addIntercept(params: Network.AddInterceptParameters): Promise<Network.AddInterceptResult>;
+    continueRequest(_params: Network.ContinueRequestParameters): EmptyResult;
+    continueResponse(_params: Network.ContinueResponseParameters): EmptyResult;
+    continueWithAuth(_params: Network.ContinueWithAuthParameters): EmptyResult;
+    failRequest(_params: Network.FailRequestParameters): EmptyResult;
+    provideResponse(_params: Network.ProvideResponseParameters): EmptyResult;
+    removeIntercept(params: Network.RemoveInterceptParameters): Promise<EmptyResult>;
+}

package/lib/cjs/bidiMapper/domains/network/NetworkProcessor.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetworkProcessor = void 0;
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const protocol_js_1 = require("../../../protocol/protocol.js");
+/** Dispatches Network domain commands. */
+class NetworkProcessor {
+    #browsingContextStorage;
+    #networkStorage;
+    constructor(browsingContextStorage, networkStorage) {
+        this.#browsingContextStorage = browsingContextStorage;
+        this.#networkStorage = networkStorage;
+    }
+    /** Applies all existing network intercepts to all CDP targets concurrently. */
+    async applyIntercepts() {
+        await Promise.all(this.#browsingContextStorage.getAllContexts().map(async (context) => {
+            await context.cdpTarget.fetchApply();
+        }));
+    }
+    async addIntercept(params) {
+        if (params.phases.length === 0) {
+            throw new protocol_js_1.InvalidArgumentException('At least one phase must be specified.');
+        }
+        // TODO: Parse the pattern. Should fix a WPT test with the "foo" string.
+        const urlPatterns = params.urlPatterns ?? [];
+        const intercept = this.#networkStorage.addIntercept({
+            urlPatterns,
+            phases: params.phases,
+        });
+        // TODO: Add try/catch. Remove the intercept if CDP Fetch commands fail.
+        await this.applyIntercepts();
+        return {
+            intercept,
+        };
+    }
+    continueRequest(_params) {
+        throw new protocol_js_1.UnknownCommandException('Not implemented yet.');
+    }
+    continueResponse(_params) {
+        throw new protocol_js_1.UnknownCommandException('Not implemented yet.');
+    }
+    continueWithAuth(_params) {
+        throw new protocol_js_1.UnknownCommandException('Not implemented yet.');
+    }
+    failRequest(_params) {
+        throw new protocol_js_1.UnknownCommandException('Not implemented yet.');
+    }
+    provideResponse(_params) {
+        throw new protocol_js_1.UnknownCommandException('Not implemented yet.');
+    }
+    async removeIntercept(params) {
+        this.#networkStorage.removeIntercept(params.intercept);
+        // TODO: Add try/catch. Remove the intercept if CDP Fetch commands fail.
+        await this.applyIntercepts();
+        return {};
+    }
+}
+exports.NetworkProcessor = NetworkProcessor;
+//# sourceMappingURL=NetworkProcessor.js.map

package/lib/cjs/bidiMapper/domains/network/NetworkProcessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkProcessor.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/network/NetworkProcessor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;GAeG;AACH,+DAKuC;AAKvC,0CAA0C;AAC1C,MAAa,gBAAgB;IAClB,uBAAuB,CAAyB;IAChD,eAAe,CAAiB;IAEzC,YACE,sBAA8C,EAC9C,cAA8B;QAE9B,IAAI,CAAC,uBAAuB,GAAG,sBAAsB,CAAC;QACtD,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IACxC,CAAC;IAED,+EAA+E;IAC/E,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAClE,MAAM,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QACvC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAsC;QAEtC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,sCAAwB,CAChC,uCAAuC,CACxC,CAAC;SACH;QAED,wEAAwE;QACxE,MAAM,WAAW,GAAyB,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;QAEnE,MAAM,SAAS,GAAsB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;YACrE,WAAW;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;QAEH,wEAAwE;QACxE,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,OAAO;YACL,SAAS;SACV,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,OAA0C;QACxD,MAAM,IAAI,qCAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAED,gBAAgB,CAAC,OAA2C;QAC1D,MAAM,IAAI,qCAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAED,gBAAgB,CAAC,OAA2C;QAC1D,MAAM,IAAI,qCAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAED,WAAW,CAAC,OAAsC;QAChD,MAAM,IAAI,qCAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAED,eAAe,CAAC,OAA0C;QACxD,MAAM,IAAI,qCAAuB,CAAC,sBAAsB,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,MAAyC;QAEzC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEvD,wEAAwE;QACxE,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA5ED,4CA4EC"}

package/lib/cjs/bidiMapper/domains/network/{networkRequest.d.ts → NetworkRequest.d.ts}

@@ -3,8 +3,9 @@
  * track of all the related CDP events.
  */
 import type Protocol from 'devtools-protocol';
-import type { IEventManager } from '../events/EventManager.js';
+import type { EventManager } from '../events/EventManager.js';
 import { type Network } from '../../../protocol/protocol.js';
+/** Abstracts one individual network request. */
 export declare class NetworkRequest {
     #private;
     /**
@@ -15,7 +16,7 @@ export declare class NetworkRequest {
      * request that initiated it.
      */
     readonly requestId: Network.Request;
-    constructor(requestId: Network.Request, eventManager: IEventManager);
+    constructor(requestId: Network.Request, eventManager: EventManager);
     onRequestWillBeSentEvent(event: Protocol.Network.RequestWillBeSentEvent): void;
     onRequestWillBeSentExtraInfoEvent(event: Protocol.Network.RequestWillBeSentExtraInfoEvent): void;
     onResponseReceivedEventExtraInfo(event: Protocol.Network.ResponseReceivedExtraInfoEvent): void;

package/lib/cjs/bidiMapper/domains/network/{networkRequest.js → NetworkRequest.js}

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkRequest = void 0;
 const deferred_js_1 = require("../../../utils/deferred.js");
 const protocol_js_1 = require("../../../protocol/protocol.js");
+/** Abstracts one individual network request. */
 class NetworkRequest {
     static #unknown = 'UNKNOWN';
     /**
@@ -50,7 +51,10 @@ class NetworkRequest {
         }
         this.#requestWillBeSentEvent = event;
         if (this.#requestWillBeSentExtraInfoEvent !== undefined) {
-            this.#beforeRequestSentDeferred.resolve();
+            this.#beforeRequestSentDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
         this.#sendBeforeRequestEvent();
     }
@@ -61,7 +65,10 @@ class NetworkRequest {
         }
         this.#requestWillBeSentExtraInfoEvent = event;
         if (this.#requestWillBeSentEvent !== undefined) {
-            this.#beforeRequestSentDeferred.resolve();
+            this.#beforeRequestSentDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
     }
     onResponseReceivedEventExtraInfo(event) {
@@ -71,7 +78,10 @@ class NetworkRequest {
         }
         this.#responseReceivedExtraInfoEvent = event;
         if (this.#responseReceivedEvent !== undefined) {
-            this.#responseReceivedDeferred.resolve();
+            this.#responseReceivedDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
     }
     onResponseReceivedEvent(responseReceivedEvent) {
@@ -82,27 +92,45 @@ class NetworkRequest {
         this.#responseReceivedEvent = responseReceivedEvent;
         if (!responseReceivedEvent.hasExtraInfo &&
             !this.#beforeRequestSentDeferred.isFinished) {
-            this.#beforeRequestSentDeferred.resolve();
+            this.#beforeRequestSentDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
         if (!responseReceivedEvent.hasExtraInfo ||
             this.#responseReceivedExtraInfoEvent !== undefined ||
             this.#servedFromCache) {
-            this.#responseReceivedDeferred.resolve();
+            this.#responseReceivedDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
         this.#sendResponseReceivedEvent();
     }
     onServedFromCache() {
         if (this.#requestWillBeSentEvent !== undefined) {
-            this.#beforeRequestSentDeferred.resolve();
+            this.#beforeRequestSentDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
         if (this.#responseReceivedEvent !== undefined) {
-            this.#responseReceivedDeferred.resolve();
+            this.#responseReceivedDeferred.resolve({
+                kind: 'success',
+                value: undefined,
+            });
         }
         this.#servedFromCache = true;
     }
     onLoadingFailedEvent(event) {
-        this.#beforeRequestSentDeferred.resolve();
-        this.#responseReceivedDeferred.reject(event);
+        this.#beforeRequestSentDeferred.resolve({
+            kind: 'success',
+            value: undefined,
+        });
+        this.#responseReceivedDeferred.resolve({
+            kind: 'error',
+            error: new Error('Loading Failed'),
+        });
         this.#eventManager.registerEvent({
             type: 'event',
             method: protocol_js_1.ChromiumBidi.Network.EventNames.FetchErrorEvent,
@@ -113,12 +141,17 @@ class NetworkRequest {
         }, this.#requestWillBeSentEvent?.frameId ?? null);
     }
     dispose() {
-        const error = new Error('Network processor detached');
-        this.#responseReceivedDeferred.reject(error);
-        this.#beforeRequestSentDeferred.reject(error);
+        const result = {
+            kind: 'error',
+            error: new Error('Network processor detached'),
+        };
+        this.#responseReceivedDeferred.resolve(result);
+        this.#beforeRequestSentDeferred.resolve(result);
     }
     #getBaseEventParams() {
         return {
+            // TODO: implement.
+            isBlocked: false,
             context: this.#requestWillBeSentEvent?.frameId ?? null,
             navigation: this.#getNavigationId(),
             // TODO: implement.
@@ -186,7 +219,17 @@ class NetworkRequest {
     }
     #sendBeforeRequestEvent() {
         if (!this.#isIgnoredEvent()) {
-            this.#eventManager.registerPromiseEvent(this.#beforeRequestSentDeferred.then(() => Object.assign(this.#getBeforeRequestEvent(), { type: 'event' })), this.#requestWillBeSentEvent?.frameId ?? null, protocol_js_1.ChromiumBidi.Network.EventNames.BeforeRequestSentEvent);
+            this.#eventManager.registerPromiseEvent(this.#beforeRequestSentDeferred.then((result) => {
+                if (result.kind === 'success') {
+                    return {
+                        kind: 'success',
+                        value: Object.assign(this.#getBeforeRequestEvent(), {
+                            type: 'event',
+                        }),
+                    };
+                }
+                return result;
+            }), this.#requestWillBeSentEvent?.frameId ?? null, protocol_js_1.ChromiumBidi.Network.EventNames.BeforeRequestSentEvent);
         }
     }
     #getBeforeRequestEvent() {
@@ -205,9 +248,17 @@ class NetworkRequest {
     }
     #sendResponseReceivedEvent() {
         if (!this.#isIgnoredEvent()) {
-            this.#eventManager.registerPromiseEvent(this.#responseReceivedDeferred.then(() => Object.assign(this.#getResponseReceivedEvent(), {
-                type: 'event',
-            })), this.#responseReceivedEvent?.frameId ?? null, protocol_js_1.ChromiumBidi.Network.EventNames.ResponseCompletedEvent);
+            this.#eventManager.registerPromiseEvent(this.#responseReceivedDeferred.then((result) => {
+                if (result.kind === 'success') {
+                    return {
+                        kind: 'success',
+                        value: Object.assign(this.#getResponseReceivedEvent(), {
+                            type: 'event',
+                        }),
+                    };
+                }
+                return result;
+            }), this.#responseReceivedEvent?.frameId ?? null, protocol_js_1.ChromiumBidi.Network.EventNames.ResponseCompletedEvent);
         }
     }
     #getResponseReceivedEvent() {
@@ -284,20 +335,24 @@ class NetworkRequest {
         }
     }
     static #getCookies(associatedCookies) {
-        return associatedCookies.map((cookieInfo) => {
+        return associatedCookies
+            .filter(({ blockedReasons }) => {
+            return !Array.isArray(blockedReasons) || blockedReasons.length === 0;
+        })
+            .map(({ cookie }) => {
             return {
-                name: cookieInfo.cookie.name,
+                name: cookie.name,
                 value: {
                     type: 'string',
-                    value: cookieInfo.cookie.value,
+                    value: cookie.value,
                 },
-                domain: cookieInfo.cookie.domain,
-                path: cookieInfo.cookie.path,
-                expires: cookieInfo.cookie.expires,
-                size: cookieInfo.cookie.size,
-                httpOnly: cookieInfo.cookie.httpOnly,
-                secure: cookieInfo.cookie.secure,
-                sameSite: NetworkRequest.#getCookiesSameSite(cookieInfo.cookie.sameSite),
+                domain: cookie.domain,
+                path: cookie.path,
+                expires: cookie.expires,
+                size: cookie.size,
+                httpOnly: cookie.httpOnly,
+                secure: cookie.secure,
+                sameSite: NetworkRequest.#getCookiesSameSite(cookie.sameSite),
             };
         });
     }
@@ -313,4 +368,4 @@ class NetworkRequest {
     }
 }
 exports.NetworkRequest = NetworkRequest;
-//# sourceMappingURL=networkRequest.js.map
+//# sourceMappingURL=NetworkRequest.js.map

package/lib/cjs/bidiMapper/domains/network/NetworkRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkRequest.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/network/NetworkRequest.ts"],"names":[],"mappings":"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"}