fix: handle extraInfo events even if event.hasExtraInfo === false

Issues: #7805
puppeteer · Nov 28, 2021 · 210b7a8 · 210b7a8
1 parent 641588a
commit 210b7a8
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/src/common/NetworkManager.ts b/src/common/NetworkManager.ts
@@ -513,7 +513,7 @@ export class NetworkManager extends EventEmitter {
 
   _emitResponseEvent(
     responseReceived: Protocol.Network.ResponseReceivedEvent,
-    extraInfo: Protocol.Network.ResponseReceivedExtraInfoEvent
+    extraInfo: Protocol.Network.ResponseReceivedExtraInfoEvent | null
   ): void {
     const request = this._requestIdToRequest.get(responseReceived.requestId);
     // FileUpload sends a response without a matching request.
@@ -540,20 +540,23 @@ export class NetworkManager extends EventEmitter {
 
   _onResponseReceived(event: Protocol.Network.ResponseReceivedEvent): void {
     const request = this._requestIdToRequest.get(event.requestId);
-    let extraInfo = null;
-    if (request && !request._fromMemoryCache && event.hasExtraInfo) {
-      extraInfo = this._requestIdToResponseExtraInfo(event.requestId).shift();
-      if (!extraInfo) {
-        // Wait until we get the corresponding ExtraInfo event.
-        let resolver = null;
-        const promise = new Promise<void>((resolve) => (resolver = resolve));
-        this._requestIdToQueuedEvents.set(event.requestId, {
-          responseReceived: event,
-          promise,
-          resolver,
-        });
-        return;
-      }
+    const extraInfo =
+      this._requestIdToResponseExtraInfo(event.requestId).shift() || null;
+    if (
+      !extraInfo &&
+      request &&
+      !request._fromMemoryCache &&
+      event.hasExtraInfo
+    ) {
+      // Wait until we get the corresponding ExtraInfo event.
+      let resolver = null;
+      const promise = new Promise<void>((resolve) => (resolver = resolve));
+      this._requestIdToQueuedEvents.set(event.requestId, {
+        responseReceived: event,
+        promise,
+        resolver,
+      });
+      return;
     }
     this._emitResponseEvent(event, extraInfo);
   }