msw 2.6.0 → 2.6.2

package/lib/browser/index.mjs

@@ -272,11 +272,10 @@ function parseWorkerRequest(incomingRequest) {
 
 // src/browser/setupWorker/start/createRequestListener.ts
 import { RequestHandler } from '../core/handlers/RequestHandler.mjs';
-import { HttpHandler } from '../core/handlers/HttpHandler.mjs';
-import { GraphQLHandler } from '../core/handlers/GraphQLHandler.mjs';
 import { handleRequest } from '../core/utils/handleRequest.mjs';
 import { devUtils as devUtils4 } from '../core/utils/internal/devUtils.mjs';
 import { toResponseInit } from '../core/utils/toResponseInit.mjs';
+import { isHandlerKind } from '../core/utils/internal/isHandlerKind.mjs';
 var createRequestListener = (context, options) => {
   return async (event, message) => {
     const messageChannel = new WorkerChannel(event.ports[0]);
@@ -290,9 +289,7 @@ var createRequestListener = (context, options) => {
       await handleRequest(
         request,
         requestId,
-        context.getRequestHandlers().filter((handler) => {
-          return handler instanceof HttpHandler || handler instanceof GraphQLHandler;
-        }),
+        context.getRequestHandlers().filter(isHandlerKind("RequestHandler")),
         options,
         context.emitter,
         {
@@ -379,7 +376,7 @@ You can also automate this process and make the worker script update automatical
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -395,7 +392,7 @@ function toArrayBuffer(array) {
   );
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-XVPRNJO7.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-6MOMO77R.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 function isPropertyAccessible(obj, key) {
   try {
@@ -881,7 +878,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
 var INTERNAL_REQUEST_ID_HEADER_NAME = "x-interceptors-internal-request-id";
 function getGlobalSymbol(symbol) {
   return (
@@ -1029,7 +1026,7 @@ function createRequestId() {
   return Math.random().toString(16).slice(2);
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1315,7 +1312,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-THPGBWJQ.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-4RQHC4IY.mjs
 var InterceptorError = class extends Error {
   constructor(message) {
     super(message);
@@ -1419,13 +1416,17 @@ async function handleRequest2(options) {
   });
   const requestAbortPromise = new DeferredPromise();
   if (options.request.signal) {
-    options.request.signal.addEventListener(
-      "abort",
-      () => {
-        requestAbortPromise.reject(options.request.signal.reason);
-      },
-      { once: true }
-    );
+    if (options.request.signal.aborted) {
+      requestAbortPromise.reject(options.request.signal.reason);
+    } else {
+      options.request.signal.addEventListener(
+        "abort",
+        () => {
+          requestAbortPromise.reject(options.request.signal.reason);
+        },
+        { once: true }
+      );
+    }
   }
   const result = await until(async () => {
     const requestListtenersPromise = emitAsync(options.emitter, "request", {
@@ -1483,7 +1484,28 @@ async function handleRequest2(options) {
   return false;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-GHRPKS6J.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-TX5GBTFY.mjs
+function hasConfigurableGlobal(propertyName) {
+  const descriptor = Object.getOwnPropertyDescriptor(globalThis, propertyName);
+  if (typeof descriptor === "undefined") {
+    return false;
+  }
+  if (typeof descriptor.get === "function" && typeof descriptor.get() === "undefined") {
+    return false;
+  }
+  if (typeof descriptor.get === "undefined" && descriptor.value == null) {
+    return false;
+  }
+  if (typeof descriptor.set === "undefined" && !descriptor.configurable) {
+    console.error(
+      `[MSW] Failed to apply interceptor: the global \`${propertyName}\` property is non-configurable. This is likely an issue with your environment. If you are using a framework, please open an issue about this in their repository.`
+    );
+    return false;
+  }
+  return true;
+}
+
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-VXLPKFY4.mjs
 function canParseUrl(url) {
   try {
     new URL(url);
@@ -1558,12 +1580,78 @@ function sameOrigin(left, right) {
   }
   return false;
 }
+var BrotliDecompressionStream = class extends TransformStream {
+  constructor() {
+    console.warn(
+      "[Interceptors]: Brotli decompression of response streams is not supported in the browser"
+    );
+    super({
+      transform(chunk, controller) {
+        controller.enqueue(chunk);
+      }
+    });
+  }
+};
+var PipelineStream = class extends TransformStream {
+  constructor(transformStreams, ...strategies) {
+    super({}, ...strategies);
+    const readable = [super.readable, ...transformStreams].reduce(
+      (readable2, transform) => readable2.pipeThrough(transform)
+    );
+    Object.defineProperty(this, "readable", {
+      get() {
+        return readable;
+      }
+    });
+  }
+};
+function parseContentEncoding(contentEncoding) {
+  return contentEncoding.toLowerCase().split(",").map((coding) => coding.trim());
+}
+function createDecompressionStream(contentEncoding) {
+  if (contentEncoding === "") {
+    return null;
+  }
+  const codings = parseContentEncoding(contentEncoding);
+  if (codings.length === 0) {
+    return null;
+  }
+  const transformers = codings.reduceRight(
+    (transformers2, coding) => {
+      if (coding === "gzip" || coding === "x-gzip") {
+        return transformers2.concat(new DecompressionStream("gzip"));
+      } else if (coding === "deflate") {
+        return transformers2.concat(new DecompressionStream("deflate"));
+      } else if (coding === "br") {
+        return transformers2.concat(new BrotliDecompressionStream());
+      } else {
+        transformers2.length = 0;
+      }
+      return transformers2;
+    },
+    []
+  );
+  return new PipelineStream(transformers);
+}
+function decompressResponse(response) {
+  if (response.body === null) {
+    return null;
+  }
+  const decompressionStream = createDecompressionStream(
+    response.headers.get("content-encoding") || ""
+  );
+  if (!decompressionStream) {
+    return null;
+  }
+  response.body.pipeTo(decompressionStream.writable);
+  return decompressionStream.readable;
+}
 var _FetchInterceptor = class extends Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
   }
   checkEnvironment() {
-    return typeof globalThis !== "undefined" && typeof globalThis.fetch !== "undefined";
+    return hasConfigurableGlobal("fetch");
   }
   async setup() {
     const pureFetch = globalThis.fetch;
@@ -1588,10 +1676,12 @@ var _FetchInterceptor = class extends Interceptor {
         requestId,
         emitter: this.emitter,
         controller,
-        onResponse: async (response) => {
+        onResponse: async (rawResponse) => {
           this.logger.info("received mocked response!", {
-            response
+            rawResponse
           });
+          const decompressedStream = decompressResponse(rawResponse);
+          const response = decompressedStream === null ? rawResponse : new Response(decompressedStream, rawResponse);
           if (RESPONSE_STATUS_CODES_WITH_REDIRECT.has(response.status)) {
             if (request.redirect === "error") {
               responsePromise.reject(createNetworkError("unexpected redirect"));
@@ -1609,6 +1699,12 @@ var _FetchInterceptor = class extends Interceptor {
               return;
             }
           }
+          Object.defineProperty(response, "url", {
+            writable: false,
+            enumerable: true,
+            configurable: false,
+            value: request.url
+          });
           if (this.emitter.listenerCount("response") > 0) {
             this.logger.info('emitting the "response" event...');
             await emitAsync(this.emitter, "response", {
@@ -1621,12 +1717,6 @@ var _FetchInterceptor = class extends Interceptor {
               requestId
             });
           }
-          Object.defineProperty(response, "url", {
-            writable: false,
-            enumerable: true,
-            configurable: false,
-            value: request.url
-          });
           responsePromise.resolve(response);
         },
         onRequestError: (response) => {
@@ -1680,7 +1770,7 @@ var _FetchInterceptor = class extends Interceptor {
 var FetchInterceptor = _FetchInterceptor;
 FetchInterceptor.symbol = Symbol("fetch");
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.5/node_modules/@mswjs/interceptors/lib/browser/chunk-SUQ32ZQK.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-MMAVIMED.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -2427,7 +2517,7 @@ var _XMLHttpRequestInterceptor = class extends Interceptor {
     super(_XMLHttpRequestInterceptor.interceptorSymbol);
   }
   checkEnvironment() {
-    return typeof globalThis.XMLHttpRequest !== "undefined";
+    return hasConfigurableGlobal("XMLHttpRequest");
   }
   setup() {
     const logger = this.logger.extend("setup");
@@ -2467,6 +2557,7 @@ XMLHttpRequestInterceptor.interceptorSymbol = Symbol("xhr");
 
 // src/browser/setupWorker/start/createFallbackRequestListener.ts
 import { handleRequest as handleRequest3 } from '../core/utils/handleRequest.mjs';
+import { isHandlerKind as isHandlerKind2 } from '../core/utils/internal/isHandlerKind.mjs';
 function createFallbackRequestListener(context, options) {
   const interceptor = new BatchInterceptor({
     name: "fallback",
@@ -2477,7 +2568,7 @@ function createFallbackRequestListener(context, options) {
     const response = await handleRequest3(
       request,
       requestId,
-      context.getRequestHandlers(),
+      context.getRequestHandlers().filter(isHandlerKind2("RequestHandler")),
       options,
       context.emitter,
       {