align network module with BiDi spec and scaffold responseStarted

Bug: #765 Spec: https://w3c.github.io/webdriver-bidi/#module-network
GoogleChromeLabs · May 24, 2023 · 29838d2 · 29838d2
1 parent 2471874
commit 29838d2
Show file tree

Hide file tree

Showing 12 changed files with 247 additions and 188 deletions.
diff --git a/src/bidiMapper/domains/events/SubscriptionManager.spec.ts b/src/bidiMapper/domains/events/SubscriptionManager.spec.ts
@@ -451,8 +451,9 @@ describe('unroll events', () => {
   it('all Network events', () => {
     expect(unrollEvents([Network.AllEvents])).to.deep.equal([
       Network.EventNames.BeforeRequestSentEvent,
-      Network.EventNames.ResponseCompletedEvent,
       Network.EventNames.FetchErrorEvent,
+      Network.EventNames.ResponseStartedEvent,
+      Network.EventNames.ResponseCompletedEvent,
     ]);
   });
 

diff --git a/src/bidiMapper/domains/network/networkProcessor.ts b/src/bidiMapper/domains/network/networkProcessor.ts
@@ -25,6 +25,7 @@ import Protocol from 'devtools-protocol';
 import {CdpClient} from '../../CdpConnection.js';
 import {IEventManager} from '../events/EventManager.js';
 import {DefaultMap} from '../../../utils/DefaultMap.js';
+import {Network} from '../../../protocol/protocol.js';
 
 import {NetworkRequest} from './networkRequest.js';
 
@@ -35,11 +36,11 @@ export class NetworkProcessor {
    * Map of request ID to NetworkRequest objects. Needed as long as information
    * about requests comes from different events.
    */
-  readonly #requestMap: DefaultMap<string, NetworkRequest>;
+  readonly #requestMap: DefaultMap<Network.Request, NetworkRequest>;
 
   private constructor(eventManager: IEventManager) {
     this.#eventManager = eventManager;
-    this.#requestMap = new DefaultMap<string, NetworkRequest>(
+    this.#requestMap = new DefaultMap(
       (requestId) => new NetworkRequest(requestId, this.#eventManager)
     );
   }
@@ -100,7 +101,7 @@ export class NetworkProcessor {
     return networkProcessor;
   }
 
-  #getOrCreateNetworkRequest(requestId: string): NetworkRequest {
+  #getOrCreateNetworkRequest(requestId: Network.Request): NetworkRequest {
     return this.#requestMap.get(requestId);
   }
 }