fixing ci build issue [run ci]

cypress-io · Apr 9, 2024 · 67db370 · 67db370 · cypress-bot · Apr 9, 2024
1 parent 4de2375
commit 67db370
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/proxy/lib/http/util/service-worker-injector.ts b/packages/proxy/lib/http/util/service-worker-injector.ts
@@ -44,7 +44,9 @@ export const injectIntoServiceWorker = (body: Buffer) => {
       // if the binding has been created, we can call it
       // otherwise, we need to queue the event
       if (self.__cypressServiceWorkerClientEvent) {
-        self.__cypressServiceWorkerClientEvent(JSON.stringify({ ...event, scope: self.registration.scope }))
+        const payload = Object.assign({}, event, { scope: self.registration.scope })
+
+        self.__cypressServiceWorkerClientEvent(JSON.stringify(payload))
       } else {
         eventQueue.push(event)
       }

diff --git a/packages/proxy/lib/http/util/service-worker-manager.ts b/packages/proxy/lib/http/util/service-worker-manager.ts
@@ -142,14 +142,14 @@ export class ServiceWorkerManager {
    * @param event the service worker fetch event to handle
    */
   handleServiceWorkerClientEvent (event: ServiceWorkerClientEvent) {
-    debug('Handling service worker fetch event: %o', event)
+    debug('Handling service worker event: %o', event)
 
     switch (event.type) {
       case 'fetchRequest':
         this.handleServiceWorkerFetchEvent(event.payload as ServiceWorkerEventsPayload['fetchRequest'])
         break
       case 'hasFetchHandler':
-        this.hasServiceWorkerFetchHandlers(event.payload as ServiceWorkerEventsPayload['hasFetchHandler'], event.scope)
+        this.handleHasServiceWorkerFetchHandlersEvent(event.payload as ServiceWorkerEventsPayload['hasFetchHandler'], event.scope)
         break
       case 'startHandlingRequests':
         this.handleStartHandlingRequestsEvent(event.payload as ServiceWorkerEventsPayload['startHandlingRequests'], event.scope)
@@ -188,7 +188,7 @@ export class ServiceWorkerManager {
         activatedServiceWorker.scriptURL === paramlessDocumentURL ||
         !activatedServiceWorker.initiatorOrigin ||
         !paramlessDocumentURL.startsWith(activatedServiceWorker.initiatorOrigin)) {
-        debug('Service worker not activated or request URL is from the service worker, skipping: %o', { registration, browserPreRequest })
+        debug('Service worker not activated/handling requests, or the request is directly from the service worker, skipping: %o', { registration, browserPreRequest })
 
         return
       }
@@ -234,7 +234,7 @@ export class ServiceWorkerManager {
    * Handles a service worker has fetch handlers event.
    * @param event the service worker has fetch handlers event to handle
    */
-  private hasServiceWorkerFetchHandlers (event: ServiceWorkerEventsPayload['hasFetchHandler'], scope: string) {
+  private handleHasServiceWorkerFetchHandlersEvent (event: ServiceWorkerEventsPayload['hasFetchHandler'], scope: string) {
     debug('service worker has fetch handlers event called: %o', { event, scope })
 
     const registration = this.getRegistrationForScope(scope)