msw 2.3.0-ws.rc-6 → 2.3.0-ws.rc-7

package/lib/iife/index.js

@@ -145,6 +145,12 @@ var MockServiceWorker = (() => {
     warn,
     error
   };
+  var InternalError = class extends Error {
+    constructor(message3) {
+      super(message3);
+      this.name = "InternalError";
+    }
+  };
 
   // src/core/utils/internal/checkGlobals.ts
   function checkGlobals() {
@@ -345,8 +351,11 @@ var MockServiceWorker = (() => {
   // src/core/utils/internal/Disposable.ts
   var Disposable = class {
     subscriptions = [];
-    async dispose() {
-      await Promise.all(this.subscriptions.map((subscription) => subscription()));
+    dispose() {
+      let subscription;
+      while (subscription = this.subscriptions.shift()) {
+        subscription();
+      }
     }
   };
 
@@ -1129,7 +1138,7 @@ var MockServiceWorker = (() => {
     return stringToRegexp(path, keys, options);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
   var encoder = new TextEncoder();
   function encodeBuffer(text) {
     return encoder.encode(text);
@@ -1144,6 +1153,17 @@ var MockServiceWorker = (() => {
       array.byteOffset + array.byteLength
     );
   }
+
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-OMISYKWR.mjs
+  var IS_PATCHED_MODULE = Symbol("isPatchedModule");
+  function isPropertyAccessible(obj, key) {
+    try {
+      obj[key];
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
   var RESPONSE_STATUS_CODES_WITHOUT_BODY = /* @__PURE__ */ new Set([
     101,
     103,
@@ -1154,9 +1174,27 @@ var MockServiceWorker = (() => {
   function isResponseWithoutBody(status) {
     return RESPONSE_STATUS_CODES_WITHOUT_BODY.has(status);
   }
-
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-HAGW22AN.mjs
-  var IS_PATCHED_MODULE = Symbol("isPatchedModule");
+  function createServerErrorResponse(body) {
+    return new Response(
+      JSON.stringify(
+        body instanceof Error ? {
+          name: body.name,
+          message: body.message,
+          stack: body.stack
+        } : body
+      ),
+      {
+        status: 500,
+        statusText: "Unhandled Exception",
+        headers: {
+          "Content-Type": "application/json"
+        }
+      }
+    );
+  }
+  function isResponseError(response) {
+    return isPropertyAccessible(response, "type") && response.type === "error";
+  }
 
   // node_modules/.pnpm/is-node-process@1.2.0/node_modules/is-node-process/lib/index.mjs
   function isNodeProcess() {
@@ -1445,7 +1483,7 @@ var MockServiceWorker = (() => {
     return message3.toString();
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
   var INTERNAL_REQUEST_ID_HEADER_NAME = "x-interceptors-internal-request-id";
   function getGlobalSymbol(symbol) {
     return (
@@ -1593,7 +1631,7 @@ var MockServiceWorker = (() => {
     return Math.random().toString(16).slice(2);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/index.mjs
   var BatchInterceptor = class extends Interceptor {
     constructor(options) {
       BatchInterceptor.symbol = Symbol(options.name);
@@ -1645,6 +1683,9 @@ var MockServiceWorker = (() => {
     return new URL(`/${path}`, "http://localhost").searchParams;
   }
   function cleanUrl(path) {
+    if (path.endsWith("?")) {
+      return path;
+    }
     return path.replace(REDUNDANT_CHARACTERS_EXP, "");
   }
 
@@ -2087,7 +2128,7 @@ var MockServiceWorker = (() => {
       return false;
     }
   }
-  function isPropertyAccessible(object, method) {
+  function isPropertyAccessible2(object, method) {
     try {
       object[method];
       return true;
@@ -2100,7 +2141,7 @@ var MockServiceWorker = (() => {
       this.store = /* @__PURE__ */ new Map();
     }
     add(request, response) {
-      if (isPropertyAccessible(request, "credentials") && request.credentials === "omit") {
+      if (isPropertyAccessible2(request, "credentials") && request.credentials === "omit") {
         return;
       }
       const requestUrl = new URL(request.url);
@@ -2125,7 +2166,7 @@ var MockServiceWorker = (() => {
       this.deleteExpiredCookies();
       const requestUrl = new URL(request.url);
       const originCookies = this.store.get(requestUrl.origin) || /* @__PURE__ */ new Map();
-      if (!isPropertyAccessible(request, "credentials")) {
+      if (!isPropertyAccessible2(request, "credentials")) {
         return originCookies;
       }
       switch (request.credentials) {
@@ -5652,8 +5693,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
       const parsedResult = this.parse({ event });
       const connection = event.data;
       const resolvedConnection = {
-        client: connection.client,
-        server: connection.server,
+        ...connection,
         params: parsedResult.match.params || {}
       };
       this[kEmitter].emit("connection", resolvedConnection);
@@ -5881,7 +5921,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
   // src/core/utils/request/onUnhandledRequest.ts
   async function onUnhandledRequest(request, strategy = "warn") {
     const url = new URL(request.url);
-    const publicUrl = toPublicUrl(url);
+    const publicUrl = toPublicUrl(url) + url.search;
     const unhandledRequestMessage = `intercepted a request without a matching request handler:
 
   \u2022 ${request.method} ${publicUrl}
@@ -5892,7 +5932,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks`;
       switch (strategy2) {
         case "error": {
           devUtils.error("Error: %s", unhandledRequestMessage);
-          throw new Error(
+          throw new InternalError(
             devUtils.formatMessage(
               'Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'
             )
@@ -5905,7 +5945,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks`;
         case "bypass":
           break;
         default:
-          throw new Error(
+          throw new InternalError(
             devUtils.formatMessage(
               'Failed to react to an unhandled request: unknown strategy "%s". Please provide one of the supported strategies ("bypass", "warn", "error") or a custom callback function as the value of the "onUnhandledRequest" option.',
               strategy2
@@ -6545,6 +6585,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
             context.workerChannel.send("CLIENT_CLOSED");
           }
           window.clearInterval(context.keepAliveInterval);
+          localStorage.removeItem(MSW_WEBSOCKET_CLIENTS_KEY);
         });
         await checkWorkerIntegrity(context).catch((error3) => {
           devUtils.error(
@@ -6714,7 +6755,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   };
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-OUWBQF3Z.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-OUWBQF3Z.mjs
   var RequestController = class {
     constructor(request) {
       this.request = request;
@@ -6752,15 +6793,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-3FNUI33J.mjs
-  function isPropertyAccessible2(obj, key) {
-    try {
-      obj[key];
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-MAEPOYB6.mjs
   function canParseUrl(url) {
     try {
       new URL(url);
@@ -6813,64 +6846,113 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
             { once: true }
           );
         }
-        const resolverResult = await until(async () => {
-          const listenersFinished = emitAsync(this.emitter, "request", {
-            request: interactiveRequest,
-            requestId
+        const responsePromise = new DeferredPromise();
+        const respondWith = (response) => {
+          this.logger.info("responding with a mock response:", response);
+          if (this.emitter.listenerCount("response") > 0) {
+            this.logger.info('emitting the "response" event...');
+            const responseClone = response.clone();
+            this.emitter.emit("response", {
+              response: responseClone,
+              isMockedResponse: true,
+              request: interactiveRequest,
+              requestId
+            });
+          }
+          Object.defineProperty(response, "url", {
+            writable: false,
+            enumerable: true,
+            configurable: false,
+            value: request.url
           });
-          await Promise.race([
-            requestAborted,
-            // Put the listeners invocation Promise in the same race condition
-            // with the request abort Promise because otherwise awaiting the listeners
-            // would always yield some response (or undefined).
-            listenersFinished,
-            requestController.responsePromise
-          ]);
-          this.logger.info("all request listeners have been resolved!");
-          const mockedResponse2 = await requestController.responsePromise;
-          this.logger.info("event.respondWith called with:", mockedResponse2);
-          return mockedResponse2;
-        });
+          responsePromise.resolve(response);
+        };
+        const errorWith = (reason) => {
+          responsePromise.reject(reason);
+        };
+        const resolverResult = await until(
+          async () => {
+            const listenersFinished = emitAsync(this.emitter, "request", {
+              request: interactiveRequest,
+              requestId
+            });
+            await Promise.race([
+              requestAborted,
+              // Put the listeners invocation Promise in the same race condition
+              // with the request abort Promise because otherwise awaiting the listeners
+              // would always yield some response (or undefined).
+              listenersFinished,
+              requestController.responsePromise
+            ]);
+            this.logger.info("all request listeners have been resolved!");
+            const mockedResponse2 = await requestController.responsePromise;
+            this.logger.info("event.respondWith called with:", mockedResponse2);
+            return mockedResponse2;
+          }
+        );
         if (requestAborted.state === "rejected") {
-          return Promise.reject(requestAborted.rejectionReason);
+          this.logger.info(
+            "request has been aborted:",
+            requestAborted.rejectionReason
+          );
+          responsePromise.reject(requestAborted.rejectionReason);
+          return responsePromise;
         }
         if (resolverResult.error) {
-          return Promise.reject(createNetworkError(resolverResult.error));
+          this.logger.info(
+            "request listerner threw an error:",
+            resolverResult.error
+          );
+          if (resolverResult.error instanceof Response) {
+            if (isResponseError(resolverResult.error)) {
+              errorWith(createNetworkError(resolverResult.error));
+            } else {
+              respondWith(resolverResult.error);
+            }
+          }
+          if (this.emitter.listenerCount("unhandledException") > 0) {
+            await emitAsync(this.emitter, "unhandledException", {
+              error: resolverResult.error,
+              request,
+              requestId,
+              controller: {
+                respondWith,
+                errorWith
+              }
+            });
+            if (responsePromise.state !== "pending") {
+              return responsePromise;
+            }
+          }
+          respondWith(createServerErrorResponse(resolverResult.error));
+          return responsePromise;
         }
         const mockedResponse = resolverResult.data;
         if (mockedResponse && !((_a2 = request.signal) == null ? void 0 : _a2.aborted)) {
           this.logger.info("received mocked response:", mockedResponse);
-          if (isPropertyAccessible2(mockedResponse, "type") && mockedResponse.type === "error") {
+          if (isResponseError(mockedResponse)) {
             this.logger.info(
               "received a network error response, rejecting the request promise..."
             );
-            return Promise.reject(createNetworkError(mockedResponse));
+            errorWith(createNetworkError(mockedResponse));
+          } else {
+            respondWith(mockedResponse);
           }
-          const responseClone = mockedResponse.clone();
-          this.emitter.emit("response", {
-            response: responseClone,
-            isMockedResponse: true,
-            request: interactiveRequest,
-            requestId
-          });
-          Object.defineProperty(mockedResponse, "url", {
-            writable: false,
-            enumerable: true,
-            configurable: false,
-            value: request.url
-          });
-          return mockedResponse;
+          return responsePromise;
         }
         this.logger.info("no mocked response received!");
         return pureFetch(request).then((response) => {
-          const responseClone = response.clone();
-          this.logger.info("original fetch performed", responseClone);
-          this.emitter.emit("response", {
-            response: responseClone,
-            isMockedResponse: false,
-            request: interactiveRequest,
-            requestId
-          });
+          this.logger.info("original fetch performed", response);
+          if (this.emitter.listenerCount("response") > 0) {
+            this.logger.info('emitting the "response" event...');
+            const responseClone = response.clone();
+            this.emitter.emit("response", {
+              response: responseClone,
+              isMockedResponse: false,
+              request: interactiveRequest,
+              requestId
+            });
+          }
           return response;
         });
       };
@@ -6899,7 +6981,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     });
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/chunk-VYFS2IF2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/chunk-732REFPX.mjs
   function concatArrayBuffer(left, right) {
     const result = new Uint8Array(left.byteLength + right.byteLength);
     result.set(left, 0);
@@ -7550,7 +7632,31 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
               "request listener threw an exception, aborting request...",
               resolverResult.error
             );
-            xhrRequestController.errorWith(resolverResult.error);
+            if (resolverResult.error instanceof Response) {
+              if (isResponseError(resolverResult.error)) {
+                xhrRequestController.errorWith(new TypeError("Network error"));
+              } else {
+                this.respondWith(resolverResult.error);
+              }
+              return;
+            }
+            if (emitter.listenerCount("unhandledException") > 0) {
+              await emitAsync(emitter, "unhandledException", {
+                error: resolverResult.error,
+                request,
+                requestId,
+                controller: {
+                  respondWith: xhrRequestController.respondWith.bind(xhrRequestController),
+                  errorWith: xhrRequestController.errorWith.bind(xhrRequestController)
+                }
+              });
+              if (originalRequest.readyState > XMLHttpRequest.OPENED) {
+                return;
+              }
+            }
+            xhrRequestController.respondWith(
+              createServerErrorResponse(resolverResult.error)
+            );
             return;
           }
           const mockedResponse = resolverResult.data;
@@ -7560,7 +7666,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
               mockedResponse.status,
               mockedResponse.statusText
             );
-            if (mockedResponse.type === "error") {
+            if (isResponseError(mockedResponse)) {
               this.logger.info(
                 "received a network error response, rejecting the request promise..."
               );
@@ -7724,7 +7830,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.27.1/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.30.0/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
   function bindEvent(target, event) {
     Object.defineProperties(event, {
       target: {
@@ -7775,6 +7881,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   };
   var kEmitter2 = Symbol("kEmitter");
+  var kBoundListener = Symbol("kBoundListener");
   var WebSocketClientConnection = class {
     constructor(socket, transport) {
       this.socket = socket;
@@ -7806,7 +7913,16 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
      * Listen for the outgoing events from the connected WebSocket client.
      */
     addEventListener(type, listener, options) {
-      this[kEmitter2].addEventListener(type, listener, options);
+      const boundListener = listener.bind(this.socket);
+      Object.defineProperty(listener, kBoundListener, {
+        value: boundListener,
+        enumerable: false
+      });
+      this[kEmitter2].addEventListener(
+        type,
+        boundListener,
+        options
+      );
     }
     /**
      * Removes the listener for the given event.
@@ -7814,7 +7930,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     removeEventListener(event, listener, options) {
       this[kEmitter2].removeEventListener(
         event,
-        listener,
+        Reflect.get(listener, kBoundListener),
         options
       );
     }
@@ -7856,7 +7972,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       Reflect.set(this, "readyState", this.CONNECTING);
       queueMicrotask(() => {
         Reflect.set(this, "readyState", this.OPEN);
-        this.protocol = protocols ? protocols[0] : "ws";
+        this.protocol = typeof protocols === "string" ? protocols : Array.isArray(protocols) && protocols.length > 0 ? protocols[0] : "";
         this.dispatchEvent(bindEvent(this, new Event("open")));
       });
     }
@@ -7980,6 +8096,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     return data.byteLength;
   }
   var kEmitter22 = Symbol("kEmitter");
+  var kBoundListener2 = Symbol("kBoundListener");
   var WebSocketServerConnection = class {
     constructor(socket, transport, createConnection) {
       this.socket = socket;
@@ -8057,9 +8174,14 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
      * Listen for the incoming events from the original WebSocket server.
      */
     addEventListener(event, listener, options) {
+      const boundListener = listener.bind(this.socket);
+      Object.defineProperty(listener, kBoundListener2, {
+        value: boundListener,
+        enumerable: false
+      });
       this[kEmitter22].addEventListener(
         event,
-        listener.bind(this.realWebSocket),
+        boundListener,
         options
       );
     }
@@ -8069,7 +8191,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     removeEventListener(event, listener, options) {
       this[kEmitter22].removeEventListener(
         event,
-        listener,
+        Reflect.get(listener, kBoundListener2),
         options
       );
     }
@@ -8246,7 +8368,10 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
                 socket,
                 transport,
                 createConnection
-              )
+              ),
+              info: {
+                protocols
+              }
             });
           });
           return socket;