msw 2.8.7 → 2.9.0

package/lib/browser/index.js

@@ -289,11 +289,11 @@ function pruneGetRequestBody(request) {
   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)
   });
 }
 
@@ -307,11 +307,10 @@ var createRequestListener = (context, options) => {
   return async (event, message) => {
     const messageChannel = new WorkerChannel(event.ports[0]);
     const requestId = message.payload.id;
-    const request = parseWorkerRequest(message.payload);
+    const request = deserializeRequest(message.payload);
     const requestCloneForLogs = request.clone();
     const requestClone = request.clone();
     import_RequestHandler.RequestHandler.cache.set(request, requestClone);
-    context.requests.set(requestId, requestClone);
     try {
       await (0, import_handleRequest.handleRequest)(
         request,
@@ -390,7 +389,7 @@ var import_devUtils5 = require("../core/utils/internal/devUtils");
 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") {
     import_devUtils5.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.
 
@@ -1145,20 +1144,18 @@ var BatchInterceptor = class extends Interceptor {
 function createResponseListener(context) {
   return (_, message) => {
     const { payload: responseJson } = message;
-    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,
         /**
@@ -1172,9 +1169,9 @@ function createResponseListener(context) {
     context.emitter.emit(
       responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
       {
-        response,
+        requestId: responseJson.request.id,
         request,
-        requestId: responseJson.requestId
+        response
       }
     );
   };
@@ -2790,7 +2787,6 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
         return this.handlersController.currentHandlers();
       },
       registration: null,
-      requests: /* @__PURE__ */ new Map(),
       emitter: this.emitter,
       workerChannel: {
         on: (eventType, callback) => {