From 351f6fbc974dfb82ad5e5be73b45d40ae88abccc Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Fri, 3 Feb 2023 17:08:33 -0800
Subject: [PATCH] improved redirect-on-new-page handling: if page open event
 results in a redirect, create an implicit redirect record instead of
 re-fetching in browser async fetch: allow adding synthetic redirect response
 instead of trying in browser, if all that's needed is the redirect record
 itself should fix #137

---
 src/recorder.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/recorder.js b/src/recorder.js
index bf08673a..08f8bafa 100644
--- a/src/recorder.js
+++ b/src/recorder.js
@@ -626,7 +626,7 @@ class Recorder {
 
   handleWindowOpen(url, sessions) {
     const headers = {"Referer": this.pageInfo.url};
-    this.doAsyncFetch({url, headers}, sessions);
+    this.doAsyncFetch({url, headers, redirectOnly: true}, sessions);
   }
 
   isPagePDF() {
@@ -1217,6 +1217,23 @@ class Recorder {
     }
   }
 
+  async attemptFetchRedirect(request, resp) {
+    if (request.redirectOnly && resp.type === "opaqueredirect") {
+      const abort = new AbortController();
+      resp = await fetch(request.url, {abort});
+      abort.abort();
+
+      if (resp.redirected) {
+        console.warn(`Adding synthetic redirect ${request.url} -> ${resp.url}`);
+        return Response.redirect(resp.url, 302);
+      }
+    }
+
+    console.warn(`async fetch error ${resp.status}, opaque due to redirect, retrying in browser`);
+    await this.doAsyncFetchInBrowser(request, request.sessions, true);
+    return null;
+  }
+
   async doAsyncFetchInBrowser(request, sessions) {
     this._fetchUrls.add(request.url);
 
@@ -1283,9 +1300,10 @@ class Recorder {
 
       let resp = await fetch(request.url, opts);
       if (resp.status === 0) {
-        console.warn(`async fetch error ${resp.status}, opaque due to redirect, retrying in browser`);
-        await this.doAsyncFetchInBrowser(request, request.sessions, true);
-        return;
+        resp = await this.attemptFetchRedirect(request, resp);
+        if (!resp) {
+          return;
+        }
       } else if (resp.status >= 400) {
         console.warn(`async fetch error ${resp.status}, retrying without headers`);
         resp = await fetch(request.url, this.defaultFetchOpts);