fix: apply timeout to waiting for a response (#12142)

puppeteer · Mar 25, 2024 · ac1767d · ac1767d
1 parent 00fa75e
commit ac1767d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/puppeteer-core/src/cdp/Frame.ts b/packages/puppeteer-core/src/cdp/Frame.ts
@@ -230,7 +230,13 @@ export class CdpFrame extends Frame {
       if (error) {
         throw error;
       }
-      return await watcher.navigationResponse();
+      const result = await Deferred.race<
+        Error | HTTPResponse | null | undefined
+      >([watcher.terminationPromise(), watcher.navigationResponse()]);
+      if (result instanceof Error) {
+        throw error;
+      }
+      return result || null;
     } finally {
       watcher.dispose();
     }