Capture redirect before page (#89)

* Capture redirect before page

* Lint fix

* Use vercel for test

Author: Michael Dijkstra

index.js

@@ -34,6 +34,27 @@ function addFromFirstRequest(page, params) {
   }
 }
 
+function populateRedirectResponse(page, params, entries, options) {
+  const previousEntry = entries.find(
+    entry => entry._requestId === params.requestId
+  );
+  if (previousEntry) {
+    previousEntry._requestId += 'r';
+    populateEntryFromResponse(
+      previousEntry,
+      params.redirectResponse,
+      page,
+      options
+    );
+  } else {
+    debug(
+      `Couldn't find original request for redirect response: ${
+        params.requestId
+      }`
+    );
+  }
+}
+
 module.exports = {
   harFromMessages(messages, options) {
     options = Object.assign({}, defaultOptions, options);
@@ -86,7 +107,15 @@ module.exports = {
               }
               entries = entries.concat(entriesWithoutPage);
               addFromFirstRequest(page, paramsWithoutPage[0]);
+
+              // Add unmapped redirects
+              for (let params of paramsWithoutPage) {
+                if (params.redirectResponse) {
+                  populateRedirectResponse(page, params, entries, options);
+                }
+              }
             }
+
             if (responsesWithoutPage.length > 0) {
               for (let params of responsesWithoutPage) {
                 let entry = entries.find(
@@ -188,24 +217,7 @@ module.exports = {
             }
 
             if (params.redirectResponse) {
-              const previousEntry = entries.find(
-                entry => entry._requestId === params.requestId
-              );
-              if (previousEntry) {
-                previousEntry._requestId += 'r';
-                populateEntryFromResponse(
-                  previousEntry,
-                  params.redirectResponse,
-                  page,
-                  options
-                );
-              } else {
-                debug(
-                  `Couldn't find original request for redirect response: ${
-                    params.requestId
-                  }`
-                );
-              }
+              populateRedirectResponse(page, params, entries, options);
             }
 
             if (!page) {

test/perflogs/www.vercel.com.json

@@ -252,3 +252,12 @@ test('Excludes response blocked cookies', t => {
       t.is(request.response.cookies.length, 1);
     });
 });
+
+test('Includes initial redirect', t => {
+  const perflogPath = perflog('www.vercel.com.json');
+  return parsePerflog(perflogPath)
+    .then(har => har.log)
+    .tap(log => t.is(log.pages.length, 1))
+    .tap(log => t.is(log.entries.length, 99))
+    .tap(log => t.is(log.entries[0].response.status, 308));
+});