msw 2.8.7 → 2.10.0

package/lib/iife/index.js

@@ -28038,7 +28038,6 @@ Consider naming this operation or using "graphql.operation()" request handler to
 
   // src/core/handlers/WebSocketHandler.ts
   var kEmitter = Symbol("kEmitter");
-  var kDispatchEvent = Symbol("kDispatchEvent");
   var kSender = Symbol("kSender");
   var kStopPropagationPatched = Symbol("kStopPropagationPatched");
   var KOnStopPropagation = Symbol("KOnStopPropagation");
@@ -28055,8 +28054,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
     callFrame;
     [kEmitter];
     parse(args) {
-      const { data: connection } = args.event;
-      const { url: clientUrl } = connection.client;
+      const clientUrl = new URL(args.url);
       clientUrl.pathname = clientUrl.pathname.replace(/^\/socket.io\//, "/");
       const match2 = matchRequestUrl(clientUrl, this.url);
       return {
@@ -28066,13 +28064,20 @@ Consider naming this operation or using "graphql.operation()" request handler to
     predicate(args) {
       return args.parsedResult.match.matches;
     }
-    async [kDispatchEvent](event) {
-      const parsedResult = this.parse({ event });
-      const connection = event.data;
+    async run(connection) {
+      const parsedResult = this.parse({
+        url: connection.client.url
+      });
+      if (!this.predicate({ url: connection.client.url, parsedResult })) {
+        return false;
+      }
       const resolvedConnection = {
         ...connection,
         params: parsedResult.match.params || {}
       };
+      return this.connect(resolvedConnection);
+    }
+    connect(connection) {
       connection.client.addEventListener(
         "message",
         createStopPropagationListener(this)
@@ -28097,7 +28102,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
         "close",
         createStopPropagationListener(this)
       );
-      this[kEmitter].emit("connection", resolvedConnection);
+      return this[kEmitter].emit("connection", connection);
     }
   };
   function createStopPropagationListener(handler) {
@@ -29038,11 +29043,11 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     return request.body;
   }
 
-  // src/browser/utils/parseWorkerRequest.ts
-  function parseWorkerRequest(incomingRequest) {
-    return new Request(incomingRequest.url, {
-      ...incomingRequest,
-      body: pruneGetRequestBody(incomingRequest)
+  // src/browser/utils/deserializeRequest.ts
+  function deserializeRequest(serializedRequest) {
+    return new Request(serializedRequest.url, {
+      ...serializedRequest,
+      body: pruneGetRequestBody(serializedRequest)
     });
   }
 
@@ -29067,11 +29072,10 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     return async (event, message3) => {
       const messageChannel = new WorkerChannel(event.ports[0]);
       const requestId = message3.payload.id;
-      const request = parseWorkerRequest(message3.payload);
+      const request = deserializeRequest(message3.payload);
       const requestCloneForLogs = request.clone();
       const requestClone = request.clone();
       RequestHandler.cache.set(request, requestClone);
-      context.requests.set(requestId, requestClone);
       try {
         await handleRequest(
           request,
@@ -29149,7 +29153,7 @@ This exception has been gracefully handled as a 500 response, however, it's stro
   async function checkWorkerIntegrity(context) {
     context.workerChannel.send("INTEGRITY_CHECK_REQUEST");
     const { payload } = await context.events.once("INTEGRITY_CHECK_RESPONSE");
-    if (payload.checksum !== "00729d72e3b82faf54ca8b9621dbb96f") {
+    if (payload.checksum !== "f5825c521429caf22a4dd13b66e243af") {
       devUtils.warn(
         `The currently registered Service Worker has been generated by a different version of MSW (${payload.packageVersion}) and may not be fully compatible with the installed version.
 
@@ -29166,20 +29170,18 @@ You can also automate this process and make the worker script update automatical
   function createResponseListener(context) {
     return (_, message3) => {
       const { payload: responseJson } = message3;
-      const { requestId } = responseJson;
-      const request = context.requests.get(requestId);
-      context.requests.delete(requestId);
-      if (responseJson.type?.includes("opaque")) {
+      const request = deserializeRequest(responseJson.request);
+      if (responseJson.response.type?.includes("opaque")) {
         return;
       }
-      const response = responseJson.status === 0 ? Response.error() : new FetchResponse(
+      const response = responseJson.response.status === 0 ? Response.error() : new FetchResponse(
         /**
          * Responses may be streams here, but when we create a response object
          * with null-body status codes, like 204, 205, 304 Response will
          * throw when passed a non-null body, so ensure it's null here
          * for those codes
          */
-        FetchResponse.isResponseWithBody(responseJson.status) ? responseJson.body : null,
+        FetchResponse.isResponseWithBody(responseJson.response.status) ? responseJson.response.body : null,
         {
           ...responseJson,
           /**
@@ -29193,9 +29195,9 @@ You can also automate this process and make the worker script update automatical
       context.emitter.emit(
         responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
         {
-          response,
+          requestId: responseJson.request.id,
           request,
-          requestId: responseJson.requestId
+          response
         }
       );
     };
@@ -31409,48 +31411,36 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
   // src/core/ws/handleWebSocketEvent.ts
   function handleWebSocketEvent(options) {
     webSocketInterceptor.on("connection", async (connection) => {
-      const handlers = options.getHandlers();
-      const connectionEvent = new MessageEvent("connection", {
-        data: connection
-      });
-      const matchingHandlers = [];
-      for (const handler of handlers) {
-        if (isHandlerKind("EventHandler")(handler) && handler.predicate({
-          event: connectionEvent,
-          parsedResult: handler.parse({
-            event: connectionEvent
+      const handlers = options.getHandlers().filter(isHandlerKind("EventHandler"));
+      if (handlers.length > 0) {
+        options?.onMockedConnection(connection);
+        await Promise.all(
+          handlers.map((handler) => {
+            return handler.run(connection);
           })
-        })) {
-          matchingHandlers.push(handler);
-        }
+        );
+        return;
       }
-      if (matchingHandlers.length > 0) {
-        options?.onMockedConnection(connection);
-        for (const handler of matchingHandlers) {
-          handler[kDispatchEvent](connectionEvent);
+      const request = new Request(connection.client.url, {
+        headers: {
+          upgrade: "websocket",
+          connection: "upgrade"
         }
-      } else {
-        const request = new Request(connection.client.url, {
-          headers: {
-            upgrade: "websocket",
-            connection: "upgrade"
-          }
-        });
-        await onUnhandledRequest(
-          request,
-          options.getUnhandledRequestStrategy()
-        ).catch((error3) => {
-          const errorEvent = new Event("error");
-          Object.defineProperty(errorEvent, "cause", {
-            enumerable: true,
-            configurable: false,
-            value: error3
-          });
-          connection.client.socket.dispatchEvent(errorEvent);
+      });
+      await onUnhandledRequest(
+        request,
+        options.getUnhandledRequestStrategy()
+      ).catch((error3) => {
+        const errorEvent = new Event("error");
+        Object.defineProperty(errorEvent, "cause", {
+          enumerable: true,
+          configurable: false,
+          value: error3
         });
-        options?.onPassthroughConnection(connection);
-        connection.server.connect();
-      }
+        connection.client.socket.dispatchEvent(errorEvent);
+      });
+      options?.onPassthroughConnection(connection);
+      connection.server.connect();
     });
   }
 
@@ -31685,7 +31675,6 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
           return this.handlersController.currentHandlers();
         },
         registration: null,
-        requests: /* @__PURE__ */ new Map(),
         emitter: this.emitter,
         workerChannel: {
           on: (eventType, callback) => {