fix: emit responseCompleted at the right time

Author: OrKoN

src/bidiMapper/modules/network/NetworkModuleMocks.spec.ts

@@ -415,6 +415,14 @@ export class MockCdpNetworkEvents {
     });
   }
 
+  loadingFinished() {
+    this.cdpClient.emit('Network.loadingFinished', {
+      requestId: this.requestId,
+      timestamp: 279179.745291,
+      encodedDataLength: 999,
+    });
+  }
+
   setJsonEvent(json: string | Record<string, unknown>, _normalize = false) {
     const event = json instanceof Object ? json : JSON.parse(json);
 

src/bidiMapper/modules/network/NetworkRequest.ts

@@ -101,6 +101,8 @@ export class NetworkRequest {
     info?: Protocol.Network.Response;
     extraInfo?: Protocol.Network.ResponseReceivedExtraInfoEvent;
     paused?: Protocol.Fetch.RequestPausedEvent;
+    loadingFinished?: Protocol.Network.LoadingFinishedEvent;
+    loadingFailed?: Protocol.Network.LoadingFailedEvent;
   } = {};
 
   #eventManager: EventManager;
@@ -453,13 +455,12 @@ export class NetworkRequest {
   #emitEventsIfReady(
     options: {
       wasRedirected?: boolean;
-      hasFailed?: boolean;
     } = {},
   ) {
     const requestExtraInfoCompleted =
       // Flush redirects
       options.wasRedirected ||
-      options.hasFailed ||
+      Boolean(this.#response.loadingFailed) ||
       this.#isDataUrl() ||
       Boolean(this.#request.extraInfo) ||
       // Requests from cache don't have extra info
@@ -508,10 +509,15 @@ export class NetworkRequest {
       !responseInterceptionExpected ||
       (responseInterceptionExpected && Boolean(this.#response.paused));
 
+    const loadingFinished =
+      Boolean(this.#response.loadingFailed) ||
+      Boolean(this.#response.loadingFinished);
+
     if (
       Boolean(this.#response.info) &&
       responseExtraInfoCompleted &&
-      responseInterceptionCompleted
+      responseInterceptionCompleted &&
+      (loadingFinished || options.wasRedirected)
     ) {
       this.#emitEvent(this.#getResponseReceivedEvent.bind(this));
       this.#networkStorage.disposeRequest(this.id);
@@ -561,10 +567,14 @@ export class NetworkRequest {
     this.#emitEventsIfReady();
   }
 
+  onLoadingFinishedEvent(event: Protocol.Network.LoadingFinishedEvent) {
+    this.#response.loadingFinished = event;
+    this.#emitEventsIfReady();
+  }
+
   onLoadingFailedEvent(event: Protocol.Network.LoadingFailedEvent) {
-    this.#emitEventsIfReady({
-      hasFailed: true,
-    });
+    this.#response.loadingFailed = event;
+    this.#emitEventsIfReady();
 
     this.#emitEvent(() => {
       return {

src/bidiMapper/modules/network/NetworkStorage.spec.ts

@@ -413,6 +413,7 @@ describe('NetworkStorage', () => {
 
       request.requestWillBeSent();
       request.responseReceived();
+      request.loadingFinished();
       const event = await getEvent('network.responseCompleted');
       expect(event).to.exist;
     });
@@ -438,6 +439,7 @@ describe('NetworkStorage', () => {
       request.requestWillBeSentExtraInfo();
       request.responseReceived();
       request.responseReceivedExtraInfo();
+      request.loadingFinished();
 
       const event = await getEvent('network.responseCompleted');
 
@@ -466,6 +468,7 @@ describe('NetworkStorage', () => {
       });
       request.responseReceived();
       request.responseReceivedExtraInfo();
+      request.loadingFinished();
 
       const event = await getEvent('network.responseCompleted');
 

src/bidiMapper/modules/network/NetworkStorage.ts

@@ -185,17 +185,6 @@ export class NetworkStorage {
           request.onServedFromCache();
         },
       ],
-      [
-        'Network.loadingFailed',
-        (params: Protocol.Network.LoadingFailedEvent) => {
-          const request = this.#getOrCreateNetworkRequest(
-            params.requestId,
-            cdpTarget,
-          );
-          request.updateCdpTarget(cdpTarget);
-          request.onLoadingFailedEvent(params);
-        },
-      ],
       [
         'Fetch.requestPaused',
         (event: Protocol.Fetch.RequestPausedEvent) => {
@@ -228,10 +217,23 @@ export class NetworkStorage {
           this.getRequestById(params.requestId)?.updateCdpTarget(cdpTarget);
         },
       ],
+      [
+        'Network.loadingFailed',
+        (params: Protocol.Network.LoadingFailedEvent) => {
+          const request = this.#getOrCreateNetworkRequest(
+            params.requestId,
+            cdpTarget,
+          );
+          request.updateCdpTarget(cdpTarget);
+          request.onLoadingFailedEvent(params);
+        },
+      ],
       [
         'Network.loadingFinished',
         (params: Protocol.Network.LoadingFinishedEvent) => {
-          this.getRequestById(params.requestId)?.updateCdpTarget(cdpTarget);
+          const request = this.getRequestById(params.requestId);
+          request?.updateCdpTarget(cdpTarget);
+          request?.onLoadingFinishedEvent(params);
         },
       ],
     ] as const;