support redirected requests

packages/driver/cypress/e2e/e2e/service-worker.cy.js

@@ -684,4 +684,33 @@ describe('service workers', { defaultCommandTimeout: 1000, pageLoadTimeout: 1000
     cy.get('#output').should('have.text', 'done')
     validateFetchHandlers({ listenerCount: 1 })
   })
+
+  it('supports a redirected request', () => {
+    const script = () => {
+      self.addEventListener('fetch', function (event) {
+        return
+      })
+    }
+
+    cy.intercept('/fixtures/service-worker.js', (req) => {
+      req.reply(`(${script})()`,
+        { 'Content-Type': 'application/javascript' })
+    })
+
+    cy.intercept('/fixtures/1mb*', (req) => {
+      req.reply({
+        statusCode: 302,
+        headers: {
+          location: '/fixtures/redirected',
+        },
+      })
+    })
+
+    cy.intercept('/fixtures/redirected', (req) => {
+      req.reply('redirected')
+    })
+
+    cy.visit('fixtures/service-worker.html')
+    cy.get('#output').should('have.text', 'done')
+  })
 })

packages/proxy/lib/http/util/service-worker-manager.ts

@@ -197,6 +197,12 @@ export class ServiceWorkerManager {
       return false
     }
 
+    if (browserPreRequest.hasRedirectResponse) {
+      debug('skipping request with redirect response: %o', browserPreRequest)
+
+      return false
+    }
+
     let requestPotentiallyControlledByServiceWorker = false
     let activatedServiceWorker: ServiceWorker | undefined
     const paramlessURL = browserPreRequest.url?.split('?')[0] || ''
@@ -242,19 +248,17 @@ export class ServiceWorkerManager {
 
     if (activatedServiceWorker) {
       if (requestPotentiallyControlledByServiceWorker) {
-        isControlled = await this.isURLControlledByServiceWorker(browserPreRequest.url)
+        isControlled = await this.isURLControlledByServiceWorker(browserPreRequest)
 
         if (isControlled) {
-          debug('Request is controlled by service worker: %o', browserPreRequest.url)
+          debug('Request is controlled by service worker: %o', { url: browserPreRequest.url, requestId: browserPreRequest.requestId })
           activatedServiceWorker.controlledURLs.add(paramlessURL)
 
           return true
         }
-
-        debug('Request is not controlled by service worker: %o', browserPreRequest.url)
       }
 
-      debug('Request is not controlled by service worker: %o', { browserPreRequest, requestPotentiallyControlledByServiceWorker })
+      debug('Request is not controlled by service worker: %o', { url: browserPreRequest.url, requestId: browserPreRequest.requestId, requestPotentiallyControlledByServiceWorker })
     }
 
     return false
@@ -345,13 +349,14 @@ export class ServiceWorkerManager {
    * @param url the URL to check
    * @returns a promise that resolves to `true` if the URL is controlled by a service worker, `false` otherwise.
    */
-  private isURLControlledByServiceWorker (url: string) {
+  private isURLControlledByServiceWorker (browserPreRequest: BrowserPreRequest) {
+    const url = browserPreRequest.url
     const fetches = this.pendingServiceWorkerFetches.get(url)
 
     if (fetches) {
       const isControlled = fetches.shift()
 
-      debug('found pending service worker fetch: %o', { url, isControlled })
+      debug('found pending service worker fetch: %o', { url, isControlled, requestId: browserPreRequest.requestId })
 
       if (fetches.length === 0) {
         this.pendingServiceWorkerFetches.delete(url)
@@ -370,7 +375,7 @@ export class ServiceWorkerManager {
     const deferred = pDefer<boolean>()
 
     promises.push(deferred)
-    debug('adding pending controlled request promise: %s', url)
+    debug('adding pending controlled request promise: %o', { url, requestId: browserPreRequest.requestId })
 
     return deferred.promise
   }

packages/proxy/lib/types.ts

@@ -66,6 +66,7 @@ export type BrowserPreRequest = {
   errorHandled?: boolean
   initiator?: Protocol.Network.Initiator
   documentURL: string
+  hasRedirectResponse: boolean
   cdpRequestWillBeSentTimestamp: number
   cdpRequestWillBeSentReceivedTimestamp: number
 }

packages/proxy/test/unit/http/util/service-worker-manager.spec.ts

@@ -3,8 +3,8 @@ import sinon from 'sinon'
 import { ServiceWorkerManager, serviceWorkerClientEventHandler } from '../../../../lib/http/util/service-worker-manager'
 
 const createBrowserPreRequest = (
-  { url, initiatorUrl, callFrameUrl, documentUrl, isPreload, originalResourceType }:
-  { url: string, initiatorUrl?: string, documentUrl?: string, callFrameUrl?: string, isPreload?: boolean, originalResourceType?: string },
+  { url, initiatorUrl, callFrameUrl, documentUrl, isPreload, originalResourceType, hasRedirectResponse }:
+  { url: string, initiatorUrl?: string, documentUrl?: string, callFrameUrl?: string, isPreload?: boolean, originalResourceType?: string, hasRedirectResponse?: boolean },
 ) => {
   return {
     requestId: 'id-1',
@@ -13,6 +13,7 @@ const createBrowserPreRequest = (
     headers: {},
     resourceType: 'fetch' as const,
     originalResourceType: originalResourceType || 'Fetch' as const,
+    hasRedirectResponse: hasRedirectResponse || false,
     ...(isPreload
       ? {
         initiator: {
@@ -532,6 +533,13 @@ describe('lib/http/util/service-worker-manager', () => {
 
           expect(await result).to.be.true
         })
+
+        it('supports a redirected request', async () => {
+          expect(await manager.processBrowserPreRequest(createBrowserPreRequest({
+            url: 'http://localhost:8080/foo.js',
+            hasRedirectResponse: true,
+          }))).to.be.false
+        })
       })
 
       context('without any controlled urls', () => {

packages/server/lib/browsers/cdp_automation.ts

@@ -283,6 +283,7 @@ export class CdpAutomation implements CDPClient {
       originalResourceType: params.type,
       initiator: params.initiator,
       documentURL: params.documentURL,
+      hasRedirectResponse: params.redirectResponse != null,
       // wallTime is in seconds: https://vanilla.aslushnikov.com/?Network.TimeSinceEpoch
       // normalize to milliseconds to be comparable to everything else we're gathering
       cdpRequestWillBeSentTimestamp: params.wallTime * 1000,