PR comment

packages/proxy/lib/http/index.ts

@@ -28,14 +28,17 @@ import type { ResourceTypeAndCredentialManager } from '@packages/server/lib/util
 import type { ProtocolManagerShape } from '@packages/types'
 import type Protocol from 'devtools-protocol'
 import { ServiceWorkerManager } from './util/service-worker-manager'
-import { hasServiceWorkerHeader } from './util/headers'
 
 function getRandomColorFn () {
   return chalk.hex(`#${Number(
     Math.floor(Math.random() * 0xFFFFFF),
   ).toString(16).padStart(6, 'F').toUpperCase()}`)
 }
 
+const hasServiceWorkerHeader = (headers: Record<string, string | string[] | undefined>) => {
+  return headers?.['service-worker'] === 'script' || headers?.['Service-Worker'] === 'script'
+}
+
 export const isVerboseTelemetry = true
 
 const isVerbose = isVerboseTelemetry
@@ -336,6 +339,18 @@ export class Http {
       getAUTUrl: this.getAUTUrl,
       setAUTUrl: this.setAUTUrl,
       getPreRequest: (cb) => {
+        // The initial request that loads the service worker does not always get sent to CDP. Thus, we need to explicitly ignore it. We determine
+        // it's the service worker request via the `service-worker` header
+        if (hasServiceWorkerHeader(req.headers)) {
+          ctx.debug('Ignoring service worker script since we are not guaranteed to receive it', req.proxiedUrl)
+
+          cb({
+            noPreRequestExpected: true,
+          })
+
+          return
+        }
+
         return this.preRequests.get(ctx.req, ctx.debug, cb)
       },
       addPendingUrlWithoutPreRequest: (url) => {

packages/proxy/lib/http/util/prerequests.ts

@@ -5,7 +5,6 @@ import type {
 } from '@packages/proxy'
 import type { ProtocolManagerShape } from '@packages/types'
 import Debug from 'debug'
-import { hasServiceWorkerHeader } from './headers'
 
 const debug = Debug('cypress:proxy:http:util:prerequests')
 const debugVerbose = Debug('cypress-verbose:proxy:http:util:prerequests')
@@ -232,18 +231,6 @@ export class PreRequests {
   }
 
   get (req: CypressIncomingRequest, ctxDebug, callback: GetPreRequestCb) {
-    // The initial request that loads the service worker does not always get sent to CDP. Thus, we need to explicitly ignore it. We determine
-    // it's the service worker request via the `service-worker` header
-    if (hasServiceWorkerHeader(req.headers)) {
-      ctxDebug('Ignoring service worker script since we are not guaranteed to receive it', req.proxiedUrl)
-
-      callback({
-        noPreRequestExpected: true,
-      })
-
-      return
-    }
-
     const proxyRequestReceivedTimestamp = performance.now() + performance.timeOrigin
 
     metrics.proxyRequestsReceived++

packages/proxy/test/unit/http/util/prerequests.spec.ts

@@ -231,15 +231,6 @@ describe('http/util/prerequests', () => {
     expectPendingCounts(0, 2)
   })
 
-  it('immediately handles a request from a service worker loading', () => {
-    const cbServiceWorker = sinon.stub()
-
-    preRequests.get({ proxiedUrl: 'foo', method: 'GET', headers: { 'service-worker': 'script' } } as any, () => {}, cbServiceWorker)
-
-    expect(cbServiceWorker).to.be.calledOnce
-    expect(cbServiceWorker).to.be.calledWith()
-  })
-
   it('removes a pending request', () => {
     const cb = sinon.stub()