feat(network intercept): populate "intercepts" in base event params

Bug: #644
GoogleChromeLabs · Oct 30, 2023 · 73bbe4b · 73bbe4b
1 parent d7c613e
commit 73bbe4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/bidiMapper/domains/network/NetworkManager.ts b/src/bidiMapper/domains/network/NetworkManager.ts
@@ -58,7 +58,7 @@ export class NetworkManager {
 
     request = new NetworkRequest(
       id,
-      this.#networkStorage.eventManager,
+      this.#networkStorage,
       this.#cdpTarget,
       redirectCount
     );

diff --git a/src/bidiMapper/domains/network/NetworkRequest.ts b/src/bidiMapper/domains/network/NetworkRequest.ts
@@ -23,7 +23,6 @@
 import type Protocol from 'devtools-protocol';
 
 import {Deferred} from '../../../utils/Deferred.js';
-import type {EventManager} from '../events/EventManager.js';
 import {
   Network,
   type BrowsingContext,
@@ -52,7 +51,7 @@ export class NetworkRequest {
    * The identifier for a request resulting from a redirect matches that of the
    * request that initiated it.
    */
-  readonly requestId: Network.Request;
+  #requestId: Network.Request;
 
   // TODO: Handle auth required?
   /**
@@ -65,7 +64,7 @@ export class NetworkRequest {
 
   #redirectCount: number;
 
-  #eventManager: EventManager;
+  #networkStorage: NetworkStorage;
 
   #request: {
     info?: Protocol.Network.RequestWillBeSentEvent;
@@ -86,16 +85,20 @@ export class NetworkRequest {
 
   constructor(
     requestId: Network.Request,
-    eventManager: EventManager,
+    networkStorage: NetworkStorage,
     cdpTarget: CdpTarget,
     redirectCount = 0
   ) {
-    this.requestId = requestId;
-    this.#eventManager = eventManager;
+    this.#requestId = requestId;
+    this.#networkStorage = networkStorage;
     this.#cdpTarget = cdpTarget;
     this.#redirectCount = redirectCount;
   }
 
+  get requestId(): string {
+    return this.#requestId;
+  }
+
   get url(): string | undefined {
     return this.#response.info?.url ?? this.#request.info?.request.url;
   }
@@ -206,7 +209,7 @@ export class NetworkRequest {
       error: new Error('Network event loading failed'),
     });
 
-    this.#eventManager.registerEvent(
+    this.#networkStorage.eventManager.registerEvent(
       {
         type: 'event',
         method: ChromiumBidi.Network.EventNames.FetchError,
@@ -394,8 +397,10 @@ export class NetworkRequest {
   }
 
   #getBaseEventParams(phase?: Network.InterceptPhase): Network.BaseParameters {
+    const isBlocked = phase !== undefined && phase === this.#interceptPhase; // TODO: Set this in terms of intercepts?
+
     return {
-      isBlocked: phase !== undefined && phase === this.#interceptPhase,
+      isBlocked,
       context: this.#context,
       navigation: this.#getNavigationId(),
       redirectCount: this.#redirectCount,
@@ -464,7 +469,7 @@ export class NetworkRequest {
     if (this.#isIgnoredEvent()) {
       return;
     }
-    this.#eventManager.registerPromiseEvent(
+    this.#networkStorage.eventManager.registerPromiseEvent(
       this.#beforeRequestSentDeferred.then((result) => {
         if (result.kind === 'success') {
           try {
@@ -508,7 +513,7 @@ export class NetworkRequest {
     if (this.#isIgnoredEvent()) {
       return;
     }
-    this.#eventManager.registerPromiseEvent(
+    this.#networkStorage.eventManager.registerPromiseEvent(
       this.#responseStartedDeferred.then((result) => {
         if (result.kind === 'success') {
           try {
@@ -579,7 +584,7 @@ export class NetworkRequest {
     if (this.#isIgnoredEvent()) {
       return;
     }
-    this.#eventManager.registerPromiseEvent(
+    this.#networkStorage.eventManager.registerPromiseEvent(
       this.#responseCompletedDeferred.then((result) => {
         if (result.kind === 'success') {
           try {