adding timeout

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

@@ -248,7 +248,11 @@ export class ServiceWorkerManager {
 
     if (activatedServiceWorker) {
       if (requestPotentiallyControlledByServiceWorker) {
-        isControlled = await this.isURLControlledByServiceWorker(browserPreRequest)
+        try {
+          isControlled = await this.isURLControlledByServiceWorker(browserPreRequest)
+        } catch (e) {
+          debug('timed out checking if pre-request is controlled by service worker: %o', { url: browserPreRequest.url, requestId: browserPreRequest.requestId })
+        }
 
         if (isControlled) {
           debug('Request is controlled by service worker: %o', { url: browserPreRequest.url, requestId: browserPreRequest.requestId })
@@ -377,7 +381,14 @@ export class ServiceWorkerManager {
     promises.push(deferred)
     debug('adding pending controlled request promise: %o', { url, requestId: browserPreRequest.requestId })
 
-    return deferred.promise
+    let timer
+    // race the deferred promise with a timeout to prevent the pre-request from hanging indefinitely
+    const racingPromises = Promise.race([
+      deferred.promise,
+      new Promise<boolean>((_resolve, reject) => timer = setTimeout(reject, 250)),
+    ]).finally(() => clearTimeout(timer))
+
+    return racingPromises
   }
 
   /**

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

@@ -540,6 +540,12 @@ describe('lib/http/util/service-worker-manager', () => {
             hasRedirectResponse: true,
           }))).to.be.false
         })
+
+        it('supports a pre-request that times out when it does not receive a fetch event', async () => {
+          expect(await manager.processBrowserPreRequest(createBrowserPreRequest({
+            url: 'http://localhost:8080/foo.js',
+          }))).to.be.false
+        })
       })
 
       context('without any controlled urls', () => {