msw 2.1.4 → 2.1.6

package/lib/browser/index.js

@@ -293,6 +293,7 @@ function parseWorkerRequest(incomingRequest) {
 }
 
 // src/browser/setupWorker/start/createRequestListener.ts
+var import_RequestHandler = require("../core/handlers/RequestHandler.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils4 = require("../core/utils/internal/devUtils.js");
 var import_toResponseInit = require("../core/utils/toResponseInit.js");
@@ -302,6 +303,9 @@ var createRequestListener = (context, options) => {
     const requestId = message.payload.id;
     const request = parseWorkerRequest(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,
@@ -389,7 +393,7 @@ async function requestIntegrityCheck(context, serviceWorker) {
   return serviceWorker;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -852,7 +856,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 function getGlobalSymbol(symbol) {
   return (
@@ -997,7 +1001,7 @@ var Interceptor = class {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1044,6 +1048,9 @@ 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")) {
       return;
     }
@@ -1061,11 +1068,7 @@ function createResponseListener(context) {
       responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
       {
         response,
-        /**
-         * @todo @fixme In this context, we don't know anything about
-         * the request.
-         */
-        request: null,
+        request,
         requestId: responseJson.requestId
       }
     );
@@ -1282,7 +1285,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
 function uuidv4() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const r = Math.random() * 16 | 0;
@@ -1327,7 +1330,7 @@ async function emitAsync(emitter, eventName, ...data) {
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-KDHQ3KDO.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-44V5AUD6.mjs
 function isPropertyAccessible(obj, key) {
   try {
     obj[key];
@@ -1336,6 +1339,14 @@ function isPropertyAccessible(obj, key) {
     return false;
   }
 }
+function canParseUrl(url) {
+  try {
+    new URL(url);
+    return true;
+  } catch (_error) {
+    return false;
+  }
+}
 var _FetchInterceptor = class extends Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
@@ -1352,7 +1363,8 @@ var _FetchInterceptor = class extends Interceptor {
     globalThis.fetch = async (input, init) => {
       var _a;
       const requestId = uuidv4();
-      const request = new Request(input, init);
+      const resolvedInput = typeof input === "string" && typeof location !== "undefined" && !canParseUrl(input) ? new URL(input, location.origin) : input;
+      const request = new Request(resolvedInput, init);
       this.logger.info("[%s] %s", request.method, request.url);
       const { interactiveRequest, requestController } = toInteractiveRequest(request);
       this.logger.info(
@@ -1464,7 +1476,7 @@ function createNetworkError(cause) {
   });
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -2314,6 +2326,7 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
       worker: null,
       registration: null,
       requestHandlers: this.currentHandlers,
+      requests: /* @__PURE__ */ new Map(),
       emitter: this.emitter,
       workerChannel: {
         on: (eventType, callback) => {