msw 0.42.1 → 0.43.0

package/lib/mockServiceWorker.js

@@ -2,22 +2,21 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (0.42.1).
+ * Mock Service Worker (0.43.0).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.
  */
 
-const INTEGRITY_CHECKSUM = '02f4ad4a2797f85668baf196e553d929'
-const bypassHeaderName = 'x-msw-bypass'
+const INTEGRITY_CHECKSUM = 'c9450df6e4dc5e45740c3b0b640727a2'
 const activeClientIds = new Set()
 
 self.addEventListener('install', function () {
-  return self.skipWaiting()
+  self.skipWaiting()
 })
 
-self.addEventListener('activate', async function (event) {
-  return self.clients.claim()
+self.addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim())
 })
 
 self.addEventListener('message', async function (event) {
@@ -33,7 +32,9 @@ self.addEventListener('message', async function (event) {
     return
   }
 
-  const allClients = await self.clients.matchAll()
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
 
   switch (event.data) {
     case 'KEEPALIVE_REQUEST': {
@@ -83,30 +84,58 @@ self.addEventListener('message', async function (event) {
   }
 })
 
-// Resolve the "main" client for the given event.
-// Client that issues a request doesn't necessarily equal the client
-// that registered the worker. It's with the latter the worker should
-// communicate with during the response resolving phase.
-async function resolveMainClient(event) {
-  const client = await self.clients.get(event.clientId)
+self.addEventListener('fetch', function (event) {
+  const { request } = event
+  const accept = request.headers.get('accept') || ''
 
-  if (client.frameType === 'top-level') {
-    return client
+  // Bypass server-sent events.
+  if (accept.includes('text/event-stream')) {
+    return
   }
 
-  const allClients = await self.clients.matchAll()
+  // Bypass navigation requests.
+  if (request.mode === 'navigate') {
+    return
+  }
 
-  return allClients
-    .filter((client) => {
-      // Get only those clients that are currently visible.
-      return client.visibilityState === 'visible'
-    })
-    .find((client) => {
-      // Find the client ID that's recorded in the
-      // set of clients that have registered the worker.
-      return activeClientIds.has(client.id)
-    })
-}
+  // Opening the DevTools triggers the "only-if-cached" request
+  // that cannot be handled by the worker. Bypass such requests.
+  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
+    return
+  }
+
+  // Bypass all requests when there are no active clients.
+  // Prevents the self-unregistered worked from handling requests
+  // after it's been deleted (still remains active until the next reload).
+  if (activeClientIds.size === 0) {
+    return
+  }
+
+  // Generate unique request ID.
+  const requestId = Math.random().toString(16).slice(2)
+
+  event.respondWith(
+    handleRequest(event, requestId).catch((error) => {
+      if (error.name === 'NetworkError') {
+        console.warn(
+          '[MSW] Successfully emulated a network error for the "%s %s" request.',
+          request.method,
+          request.url,
+        )
+        return
+      }
+
+      // At this point, any exception indicates an issue with the original request/response.
+      console.error(
+        `\
+[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
+        request.method,
+        request.url,
+        `${error.name}: ${error.message}`,
+      )
+    }),
+  )
+})
 
 async function handleRequest(event, requestId) {
   const client = await resolveMainClient(event)
@@ -128,7 +157,7 @@ async function handleRequest(event, requestId) {
           statusText: clonedResponse.statusText,
           body:
             clonedResponse.body === null ? null : await clonedResponse.text(),
-          headers: serializeHeaders(clonedResponse.headers),
+          headers: Object.fromEntries(clonedResponse.headers.entries()),
           redirected: clonedResponse.redirected,
         },
       })
@@ -138,14 +167,54 @@ async function handleRequest(event, requestId) {
   return response
 }
 
+// Resolve the main client for the given event.
+// Client that issues a request doesn't necessarily equal the client
+// that registered the worker. It's with the latter the worker should
+// communicate with during the response resolving phase.
+async function resolveMainClient(event) {
+  const client = await self.clients.get(event.clientId)
+
+  if (client.frameType === 'top-level') {
+    return client
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  return allClients
+    .filter((client) => {
+      // Get only those clients that are currently visible.
+      return client.visibilityState === 'visible'
+    })
+    .find((client) => {
+      // Find the client ID that's recorded in the
+      // set of clients that have registered the worker.
+      return activeClientIds.has(client.id)
+    })
+}
+
 async function getResponse(event, client, requestId) {
   const { request } = event
-  const requestClone = request.clone()
-  const getOriginalResponse = () => fetch(requestClone)
+  const clonedRequest = request.clone()
+
+  function passthrough() {
+    // Clone the request because it might've been already used
+    // (i.e. its body has been read and sent to the cilent).
+    const headers = Object.fromEntries(clonedRequest.headers.entries())
 
-  // Bypass mocking when the request client is not active.
+    // Remove MSW-specific request headers so the bypassed requests
+    // comply with the server's CORS preflight check.
+    // Operate with the headers as an object because request "Headers"
+    // are immutable.
+    delete headers['x-msw-bypass']
+
+    return fetch(clonedRequest, { headers })
+  }
+
+  // Bypass mocking when the client is not active.
   if (!client) {
-    return getOriginalResponse()
+    return passthrough()
   }
 
   // Bypass initial page load requests (i.e. static assets).
@@ -153,34 +222,30 @@ async function getResponse(event, client, requestId) {
   // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
   // and is not ready to handle requests.
   if (!activeClientIds.has(client.id)) {
-    return await getOriginalResponse()
+    return passthrough()
   }
 
-  // Bypass requests with the explicit bypass header
-  if (requestClone.headers.get(bypassHeaderName) === 'true') {
-    const cleanRequestHeaders = serializeHeaders(requestClone.headers)
-
-    // Remove the bypass header to comply with the CORS preflight check.
-    delete cleanRequestHeaders[bypassHeaderName]
-
-    const originalRequest = new Request(requestClone, {
-      headers: new Headers(cleanRequestHeaders),
-    })
-
-    return fetch(originalRequest)
+  // Bypass requests with the explicit bypass header.
+  // Such requests can be issued by "ctx.fetch()".
+  if (request.headers.get('x-msw-bypass') === 'true') {
+    return passthrough()
   }
 
-  // Send the request to the client-side MSW.
-  const reqHeaders = serializeHeaders(request.headers)
-  const body = await request.text()
+  // Create a communication channel scoped to the current request.
+  // This way events can be exchanged outside of the worker's global
+  // "message" event listener (i.e. abstracted into functions).
+  const operationChannel = new BroadcastChannel(
+    `msw-response-stream-${requestId}`,
+  )
 
+  // Notify the client that a request has been intercepted.
   const clientMessage = await sendToClient(client, {
     type: 'REQUEST',
     payload: {
       id: requestId,
       url: request.url,
       method: request.method,
-      headers: reqHeaders,
+      headers: Object.fromEntries(request.headers.entries()),
       cache: request.cache,
       mode: request.mode,
       credentials: request.credentials,
@@ -189,22 +254,23 @@ async function getResponse(event, client, requestId) {
       redirect: request.redirect,
       referrer: request.referrer,
       referrerPolicy: request.referrerPolicy,
-      body,
+      body: await request.text(),
       bodyUsed: request.bodyUsed,
       keepalive: request.keepalive,
     },
   })
 
   switch (clientMessage.type) {
-    case 'MOCK_SUCCESS': {
-      return delayPromise(
-        () => respondWithMock(clientMessage),
-        clientMessage.payload.delay,
-      )
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.payload)
+    }
+
+    case 'MOCK_RESPONSE_START': {
+      return respondWithMockStream(operationChannel, clientMessage.payload)
     }
 
     case 'MOCK_NOT_FOUND': {
-      return getOriginalResponse()
+      return passthrough()
     }
 
     case 'NETWORK_ERROR': {
@@ -212,7 +278,7 @@ async function getResponse(event, client, requestId) {
       const networkError = new Error(message)
       networkError.name = name
 
-      // Rejecting a request Promise emulates a network error.
+      // Rejecting a "respondWith" promise emulates a network error.
       throw networkError
     }
 
@@ -231,73 +297,11 @@ This exception has been gracefully handled as a 500 response, however, it's stro
         request.url,
       )
 
-      return respondWithMock(clientMessage)
+      return respondWithMock(clientMessage.payload)
     }
   }
 
-  return getOriginalResponse()
-}
-
-self.addEventListener('fetch', function (event) {
-  const { request } = event
-  const accept = request.headers.get('accept') || ''
-
-  // Bypass server-sent events.
-  if (accept.includes('text/event-stream')) {
-    return
-  }
-
-  // Bypass navigation requests.
-  if (request.mode === 'navigate') {
-    return
-  }
-
-  // Opening the DevTools triggers the "only-if-cached" request
-  // that cannot be handled by the worker. Bypass such requests.
-  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
-    return
-  }
-
-  // Bypass all requests when there are no active clients.
-  // Prevents the self-unregistered worked from handling requests
-  // after it's been deleted (still remains active until the next reload).
-  if (activeClientIds.size === 0) {
-    return
-  }
-
-  const requestId = uuidv4()
-
-  return event.respondWith(
-    handleRequest(event, requestId).catch((error) => {
-      if (error.name === 'NetworkError') {
-        console.warn(
-          '[MSW] Successfully emulated a network error for the "%s %s" request.',
-          request.method,
-          request.url,
-        )
-        return
-      }
-
-      // At this point, any exception indicates an issue with the original request/response.
-      console.error(
-        `\
-[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
-        request.method,
-        request.url,
-        `${error.name}: ${error.message}`,
-      )
-    }),
-  )
-})
-
-function serializeHeaders(headers) {
-  const reqHeaders = {}
-  headers.forEach((value, name) => {
-    reqHeaders[name] = reqHeaders[name]
-      ? [].concat(reqHeaders[name]).concat(value)
-      : value
-  })
-  return reqHeaders
+  return passthrough()
 }
 
 function sendToClient(client, message) {
@@ -316,23 +320,48 @@ function sendToClient(client, message) {
   })
 }
 
-function delayPromise(cb, duration) {
+function sleep(timeMs) {
   return new Promise((resolve) => {
-    setTimeout(() => resolve(cb()), duration)
+    setTimeout(resolve, timeMs)
   })
 }
 
-function respondWithMock(clientMessage) {
-  return new Response(clientMessage.payload.body, {
-    ...clientMessage.payload,
-    headers: clientMessage.payload.headers,
-  })
+async function respondWithMock(response) {
+  await sleep(response.delay)
+  return new Response(response.body, response)
 }
 
-function uuidv4() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    const r = (Math.random() * 16) | 0
-    const v = c == 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
+function respondWithMockStream(operationChannel, mockResponse) {
+  let streamCtrl
+  const stream = new ReadableStream({
+    start: (controller) => (streamCtrl = controller),
+  })
+
+  return new Promise(async (resolve, reject) => {
+    operationChannel.onmessageerror = (event) => {
+      operationChannel.close()
+      return reject(event.data.error)
+    }
+
+    operationChannel.onmessage = (event) => {
+      if (!event.data) {
+        return
+      }
+
+      switch (event.data.type) {
+        case 'MOCK_RESPONSE_CHUNK': {
+          streamCtrl.enqueue(event.data.payload)
+          break
+        }
+
+        case 'MOCK_RESPONSE_END': {
+          streamCtrl.close()
+          operationChannel.close()
+        }
+      }
+    }
+
+    await sleep(mockResponse.delay)
+    return resolve(new Response(stream, mockResponse))
   })
 }

package/lib/native/index.js

@@ -1157,7 +1157,7 @@ function readResponseCookies(request, response2) {
 
 // src/utils/handleRequest.ts
 async function handleRequest(request, handlers, options, emitter, handleRequestOptions) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   emitter.emit("request:start", request);
   if (request.headers.get("x-msw-bypass") === "true") {
     emitter.emit("request:end", request);
@@ -1195,18 +1195,12 @@ async function handleRequest(request, handlers, options, emitter, handleRequestO
   }
   readResponseCookies(request, response2);
   emitter.emit("request:match", request);
-  return new Promise((resolve) => {
-    var _a2, _b2, _c2;
-    const requiredLookupResult = lookupResult;
-    const transformedResponse = ((_a2 = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _a2.call(handleRequestOptions, response2)) || response2;
-    (_b2 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _b2.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-    setTimeout(() => {
-      var _a3;
-      (_a3 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _a3.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-      emitter.emit("request:end", request);
-      resolve(transformedResponse);
-    }, (_c2 = response2.delay) != null ? _c2 : 0);
-  });
+  const requiredLookupResult = lookupResult;
+  const transformedResponse = ((_e = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _e.call(handleRequestOptions, response2)) || response2;
+  (_f = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _f.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  (_g = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _g.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  emitter.emit("request:end", request);
+  return transformedResponse;
 }
 
 // src/utils/internal/pipeEvents.ts
@@ -1242,7 +1236,7 @@ function createSetupServer(...interceptors) {
     let resolvedOptions = {};
     const interceptor = new import_interceptors.BatchInterceptor({
       name: "setup-server",
-      interceptors
+      interceptors: interceptors.map((Interceptor2) => new Interceptor2())
     });
     interceptor.on("request", async function setupServerListener(request) {
       const mockedRequest = parseIsomorphicRequest(request);
@@ -1252,11 +1246,17 @@ function createSetupServer(...interceptors) {
             status: response3.status,
             statusText: response3.statusText,
             headers: response3.headers.all(),
-            body: response3.body
+            body: response3.body,
+            delay: response3.delay
           };
         }
       });
       if (response2) {
+        if (response2.delay) {
+          await new Promise((resolve) => {
+            setTimeout(resolve, response2.delay);
+          });
+        }
         request.respondWith(response2);
       }
       return;
@@ -1315,7 +1315,7 @@ function createSetupServer(...interceptors) {
 }
 
 // src/native/index.ts
-var setupServer = createSetupServer(new import_XMLHttpRequest.XMLHttpRequestInterceptor());
+var setupServer = createSetupServer(import_XMLHttpRequest.XMLHttpRequestInterceptor);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   setupServer

package/lib/native/index.mjs

@@ -1145,7 +1145,7 @@ function readResponseCookies(request, response2) {
 
 // src/utils/handleRequest.ts
 async function handleRequest(request, handlers, options, emitter, handleRequestOptions) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   emitter.emit("request:start", request);
   if (request.headers.get("x-msw-bypass") === "true") {
     emitter.emit("request:end", request);
@@ -1183,18 +1183,12 @@ async function handleRequest(request, handlers, options, emitter, handleRequestO
   }
   readResponseCookies(request, response2);
   emitter.emit("request:match", request);
-  return new Promise((resolve) => {
-    var _a2, _b2, _c2;
-    const requiredLookupResult = lookupResult;
-    const transformedResponse = ((_a2 = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _a2.call(handleRequestOptions, response2)) || response2;
-    (_b2 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _b2.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-    setTimeout(() => {
-      var _a3;
-      (_a3 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _a3.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-      emitter.emit("request:end", request);
-      resolve(transformedResponse);
-    }, (_c2 = response2.delay) != null ? _c2 : 0);
-  });
+  const requiredLookupResult = lookupResult;
+  const transformedResponse = ((_e = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _e.call(handleRequestOptions, response2)) || response2;
+  (_f = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _f.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  (_g = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _g.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  emitter.emit("request:end", request);
+  return transformedResponse;
 }
 
 // src/utils/internal/pipeEvents.ts
@@ -1230,7 +1224,7 @@ function createSetupServer(...interceptors) {
     let resolvedOptions = {};
     const interceptor = new BatchInterceptor({
       name: "setup-server",
-      interceptors
+      interceptors: interceptors.map((Interceptor2) => new Interceptor2())
     });
     interceptor.on("request", async function setupServerListener(request) {
       const mockedRequest = parseIsomorphicRequest(request);
@@ -1240,11 +1234,17 @@ function createSetupServer(...interceptors) {
             status: response3.status,
             statusText: response3.statusText,
             headers: response3.headers.all(),
-            body: response3.body
+            body: response3.body,
+            delay: response3.delay
           };
         }
       });
       if (response2) {
+        if (response2.delay) {
+          await new Promise((resolve) => {
+            setTimeout(resolve, response2.delay);
+          });
+        }
         request.respondWith(response2);
       }
       return;
@@ -1303,7 +1303,7 @@ function createSetupServer(...interceptors) {
 }
 
 // src/native/index.ts
-var setupServer = createSetupServer(new XMLHttpRequestInterceptor());
+var setupServer = createSetupServer(XMLHttpRequestInterceptor);
 export {
   setupServer
 };

package/lib/node/index.js

@@ -1164,7 +1164,7 @@ function readResponseCookies(request, response2) {
 
 // src/utils/handleRequest.ts
 async function handleRequest(request, handlers, options, emitter, handleRequestOptions) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   emitter.emit("request:start", request);
   if (request.headers.get("x-msw-bypass") === "true") {
     emitter.emit("request:end", request);
@@ -1202,18 +1202,12 @@ async function handleRequest(request, handlers, options, emitter, handleRequestO
   }
   readResponseCookies(request, response2);
   emitter.emit("request:match", request);
-  return new Promise((resolve) => {
-    var _a2, _b2, _c2;
-    const requiredLookupResult = lookupResult;
-    const transformedResponse = ((_a2 = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _a2.call(handleRequestOptions, response2)) || response2;
-    (_b2 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _b2.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-    setTimeout(() => {
-      var _a3;
-      (_a3 = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _a3.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-      emitter.emit("request:end", request);
-      resolve(transformedResponse);
-    }, (_c2 = response2.delay) != null ? _c2 : 0);
-  });
+  const requiredLookupResult = lookupResult;
+  const transformedResponse = ((_e = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _e.call(handleRequestOptions, response2)) || response2;
+  (_f = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _f.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  (_g = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _g.call(handleRequestOptions, transformedResponse, requiredLookupResult);
+  emitter.emit("request:end", request);
+  return transformedResponse;
 }
 
 // src/utils/internal/pipeEvents.ts
@@ -1249,7 +1243,7 @@ function createSetupServer(...interceptors) {
     let resolvedOptions = {};
     const interceptor = new import_interceptors.BatchInterceptor({
       name: "setup-server",
-      interceptors
+      interceptors: interceptors.map((Interceptor2) => new Interceptor2())
     });
     interceptor.on("request", async function setupServerListener(request) {
       const mockedRequest = parseIsomorphicRequest(request);
@@ -1259,11 +1253,17 @@ function createSetupServer(...interceptors) {
             status: response3.status,
             statusText: response3.statusText,
             headers: response3.headers.all(),
-            body: response3.body
+            body: response3.body,
+            delay: response3.delay
           };
         }
       });
       if (response2) {
+        if (response2.delay) {
+          await new Promise((resolve) => {
+            setTimeout(resolve, response2.delay);
+          });
+        }
         request.respondWith(response2);
       }
       return;
@@ -1322,7 +1322,7 @@ function createSetupServer(...interceptors) {
 }
 
 // src/node/setupServer.ts
-var setupServer = createSetupServer(new import_ClientRequest.ClientRequestInterceptor(), new import_XMLHttpRequest.XMLHttpRequestInterceptor());
+var setupServer = createSetupServer(import_ClientRequest.ClientRequestInterceptor, import_XMLHttpRequest.XMLHttpRequestInterceptor);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   setupServer