msw 2.3.0-ws.rc-8 → 2.3.0-ws.rc-10

package/lib/iife/index.js

@@ -14412,7 +14412,7 @@ ${operationTypes.join("\n")}
     return stringToRegexp(path, keys, options);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
   var encoder = new TextEncoder();
   function encodeBuffer(text) {
     return encoder.encode(text);
@@ -14428,7 +14428,7 @@ ${operationTypes.join("\n")}
     );
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-XVPRNJO7.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/chunk-XVPRNJO7.mjs
   var IS_PATCHED_MODULE = Symbol("isPatchedModule");
   function isPropertyAccessible(obj, key) {
     try {
@@ -14848,7 +14848,7 @@ ${operationTypes.join("\n")}
     return message3.toString();
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.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 (
@@ -14996,7 +14996,7 @@ ${operationTypes.join("\n")}
     return Math.random().toString(16).slice(2);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/index.mjs
   var BatchInterceptor = class extends Interceptor {
     constructor(options) {
       BatchInterceptor.symbol = Symbol(options.name);
@@ -28366,7 +28366,7 @@ Consider naming this operation or using "graphql.operation()" request handler to
     async add(client) {
       const promise = new DeferredPromise();
       const store2 = await this.getStore();
-      const request = store2.add({
+      const request = store2.put({
         id: client.id,
         url: client.url.href
       });
@@ -28374,7 +28374,12 @@ Consider naming this operation or using "graphql.operation()" request handler to
         promise.resolve();
       };
       request.onerror = () => {
-        promise.reject(new Error(`Failed to add WebSocket client ${client.id}`));
+        console.error(request.error);
+        promise.reject(
+          new Error(
+            `Failed to add WebSocket client "${client.id}". There is likely an additional output above.`
+          )
+        );
       };
       return promise;
     }
@@ -28386,7 +28391,12 @@ Consider naming this operation or using "graphql.operation()" request handler to
         promise.resolve(request.result);
       };
       request.onerror = () => {
-        promise.reject(new Error(`Failed to get all WebSocket clients`));
+        console.log(request.error);
+        promise.reject(
+          new Error(
+            `Failed to get all WebSocket clients. There is likely an additional output above.`
+          )
+        );
       };
       return promise;
     }
@@ -28400,9 +28410,10 @@ Consider naming this operation or using "graphql.operation()" request handler to
         promise.resolve();
       };
       store2.transaction.onerror = () => {
+        console.error(store2.transaction.error);
         promise.reject(
           new Error(
-            `Failed to delete WebSocket clients [${clientIds.join(", ")}]`
+            `Failed to delete WebSocket clients [${clientIds.join(", ")}]. There is likely an additional output above.`
           )
         );
       };
@@ -28427,11 +28438,21 @@ Consider naming this operation or using "graphql.operation()" request handler to
           promise.resolve(db);
         };
         store2.transaction.onerror = () => {
-          promise.reject(new Error("Failed to create WebSocket client store"));
+          console.error(store2.transaction.error);
+          promise.reject(
+            new Error(
+              "Failed to create WebSocket client store. There is likely an additional output above."
+            )
+          );
         };
       };
       request.onerror = () => {
-        promise.reject(new Error("Failed to open an IndexedDB database"));
+        console.error(request.error);
+        promise.reject(
+          new Error(
+            "Failed to open an IndexedDB database. There is likely an additional output above."
+          )
+        );
       };
       return promise;
     }
@@ -28443,9 +28464,8 @@ Consider naming this operation or using "graphql.operation()" request handler to
 
   // src/core/ws/WebSocketClientManager.ts
   var WebSocketClientManager = class {
-    constructor(channel, url) {
+    constructor(channel) {
       this.channel = channel;
-      this.url = url;
       this.store = typeof indexedDB !== "undefined" ? new WebSocketIndexedDBClientStore() : new WebSocketMemoryClientStore();
       this.runtimeClients = /* @__PURE__ */ new Map();
       this.allClients = /* @__PURE__ */ new Set();
@@ -28581,12 +28601,12 @@ Consider naming this operation or using "graphql.operation()" request handler to
       "Expected a WebSocket server URL to be a valid path but got %s",
       typeof url
     );
-    const clientManager = new WebSocketClientManager(webSocketChannel, url);
+    const clientManager = new WebSocketClientManager(webSocketChannel);
     return {
       get clients() {
         return clientManager.clients;
       },
-      on(event, listener) {
+      addEventListener(event, listener) {
         const handler = new WebSocketHandler(url);
         handler[kEmitter].on("connection", async ({ client }) => {
           await clientManager.addConnection(client);
@@ -29171,7 +29191,9 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
         await handleRequest(
           request,
           requestId,
-          context.getRequestHandlers(),
+          context.getRequestHandlers().filter((handler) => {
+            return handler instanceof HttpHandler || handler instanceof GraphQLHandler;
+          }),
           options,
           context.emitter,
           {
@@ -29453,7 +29475,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   };
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-THPGBWJQ.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/chunk-THPGBWJQ.mjs
   var InterceptorError = class extends Error {
     constructor(message3) {
       super(message3);
@@ -29621,7 +29643,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     return false;
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-G5SOR3ND.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/chunk-G5SOR3ND.mjs
   function canParseUrl(url) {
     try {
       new URL(url);
@@ -29818,7 +29840,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
   var FetchInterceptor = _FetchInterceptor;
   FetchInterceptor.symbol = Symbol("fetch");
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/chunk-SUQ32ZQK.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/chunk-SUQ32ZQK.mjs
   function concatArrayBuffer(left, right) {
     const result = new Uint8Array(left.byteLength + right.byteLength);
     result.set(left, 0);
@@ -30689,7 +30711,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.35.6/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.36.0/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
   function bindEvent(target, event) {
     Object.defineProperties(event, {
       target: {
@@ -30739,6 +30761,30 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       this.wasClean = init.wasClean === void 0 ? false : init.wasClean;
     }
   };
+  var CancelableCloseEvent = class extends CloseEvent {
+    constructor(type, init = {}) {
+      super(type, init);
+      this[kCancelable] = !!init.cancelable;
+      this[kDefaultPrevented] = false;
+    }
+    get cancelable() {
+      return this[kCancelable];
+    }
+    set cancelable(nextCancelable) {
+      this[kCancelable] = nextCancelable;
+    }
+    get defaultPrevented() {
+      return this[kDefaultPrevented];
+    }
+    set defaultPrevented(nextDefaultPrevented) {
+      this[kDefaultPrevented] = nextDefaultPrevented;
+    }
+    preventDefault() {
+      if (this.cancelable && !this[kDefaultPrevented]) {
+        this[kDefaultPrevented] = true;
+      }
+    }
+  };
   var kEmitter2 = Symbol("kEmitter");
   var kBoundListener = Symbol("kBoundListener");
   var WebSocketClientConnection = class {
@@ -30958,15 +31004,15 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
   var kEmitter22 = Symbol("kEmitter");
   var kBoundListener2 = Symbol("kBoundListener");
   var WebSocketServerConnection = class {
-    constructor(socket, transport, createConnection) {
-      this.socket = socket;
+    constructor(client, transport, createConnection) {
+      this.client = client;
       this.transport = transport;
       this.createConnection = createConnection;
       this[kEmitter22] = new EventTarget();
       this.mockCloseController = new AbortController();
       this.realCloseController = new AbortController();
       this.transport.addEventListener("outgoing", (event) => {
-        if (this.readyState === -1) {
+        if (typeof this.realWebSocket === "undefined") {
           return;
         }
         queueMicrotask(() => {
@@ -30981,16 +31027,15 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       );
     }
     /**
-     * Server ready state.
-     * Proxies the ready state of the original WebSocket instance,
-     * if set. If the original connection hasn't been established,
-     * defaults to `-1`.
+     * The `WebSocket` instance connected to the original server.
+     * Accessing this before calling `server.connect()` will throw.
      */
-    get readyState() {
-      if (this.realWebSocket) {
-        return this.realWebSocket.readyState;
-      }
-      return -1;
+    get socket() {
+      invariant2(
+        this.realWebSocket,
+        'Cannot access "socket" on the original WebSocket server object: the connection is not open. Did you forget to call `server.connect()`?'
+      );
+      return this.realWebSocket;
     }
     /**
      * Open connection to the original WebSocket server.
@@ -31001,7 +31046,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         'Failed to call "connect()" on the original WebSocket instance: the connection already open'
       );
       const realWebSocket = this.createConnection();
-      realWebSocket.binaryType = this.socket.binaryType;
+      realWebSocket.binaryType = this.client.binaryType;
       realWebSocket.addEventListener(
         "open",
         (event) => {
@@ -31022,7 +31067,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
           )
         );
       });
-      this.socket.addEventListener("close", this.handleMockClose.bind(this), {
+      this.client.addEventListener("close", this.handleMockClose.bind(this), {
         signal: this.mockCloseController.signal
       });
       realWebSocket.addEventListener("close", this.handleRealClose.bind(this), {
@@ -31030,7 +31075,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       });
       realWebSocket.addEventListener("error", () => {
         this[kEmitter22].dispatchEvent(bindEvent(realWebSocket, new Event("error")));
-        this.socket.dispatchEvent(bindEvent(this.socket, new Event("error")));
+        this.client.dispatchEvent(bindEvent(this.client, new Event("error")));
       });
       this.realWebSocket = realWebSocket;
     }
@@ -31038,7 +31083,7 @@ 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);
+      const boundListener = listener.bind(this.client);
       Object.defineProperty(listener, kBoundListener2, {
         value: boundListener,
         enumerable: false
@@ -31071,7 +31116,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       invariant2(
         realWebSocket,
         'Failed to call "server.send()" for "%s": the connection is not open. Did you forget to call "server.connect()"?',
-        this.socket.url
+        this.client.url
       );
       if (realWebSocket.readyState === WebSocket.CLOSING || realWebSocket.readyState === WebSocket.CLOSED) {
         return;
@@ -31096,7 +31141,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       invariant2(
         realWebSocket,
         'Failed to close server connection for "%s": the connection is not open. Did you forget to call "server.connect()"?',
-        this.socket.url
+        this.client.url
       );
       this.realCloseController.abort();
       if (realWebSocket.readyState === WebSocket.CLOSING || realWebSocket.readyState === WebSocket.CLOSED) {
@@ -31107,12 +31152,13 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         this[kEmitter22].dispatchEvent(
           bindEvent(
             this.realWebSocket,
-            new CloseEvent("close", {
+            new CancelableCloseEvent("close", {
               /**
                * @note `server.close()` in the interceptor
                * always results in clean closures.
                */
-              code: 1e3
+              code: 1e3,
+              cancelable: true
             })
           )
         );
@@ -31129,14 +31175,14 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       );
       this[kEmitter22].dispatchEvent(messageEvent);
       if (!messageEvent.defaultPrevented) {
-        this.socket.dispatchEvent(
+        this.client.dispatchEvent(
           bindEvent(
             /**
              * @note Bind the forwarded original server events
              * to the mock WebSocket instance so it would
              * dispatch them straight away.
              */
-            this.socket,
+            this.client,
             // Clone the message event again to prevent
             // the "already being dispatched" exception.
             new MessageEvent("message", {
@@ -31156,11 +31202,16 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       this.mockCloseController.abort();
       const closeEvent = bindEvent(
         this.realWebSocket,
-        new CloseEvent("close", event)
+        new CancelableCloseEvent("close", {
+          code: event.code,
+          reason: event.reason,
+          wasClean: event.wasClean,
+          cancelable: true
+        })
       );
       this[kEmitter22].dispatchEvent(closeEvent);
       if (!closeEvent.defaultPrevented) {
-        this.socket[kClose](event.code, event.reason);
+        this.client[kClose](event.code, event.reason);
       }
     }
   };
@@ -31287,30 +31338,46 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
 
   // src/core/ws/handleWebSocketEvent.ts
   function handleWebSocketEvent(options) {
-    webSocketInterceptor.on("connection", (connection) => {
+    webSocketInterceptor.on("connection", async (connection) => {
       const handlers = options.getHandlers();
       const connectionEvent = new MessageEvent("connection", {
         data: connection
       });
-      const matchingHandlers = handlers.filter(
-        (handler) => {
-          if (handler instanceof WebSocketHandler) {
-            return handler.predicate({
-              event: connectionEvent,
-              parsedResult: handler.parse({
-                event: connectionEvent
-              })
-            });
-          }
-          return false;
+      const matchingHandlers = [];
+      for (const handler of handlers) {
+        if (handler instanceof WebSocketHandler && handler.predicate({
+          event: connectionEvent,
+          parsedResult: handler.parse({
+            event: connectionEvent
+          })
+        })) {
+          matchingHandlers.push(handler);
         }
-      );
+      }
       if (matchingHandlers.length > 0) {
         options?.onMockedConnection(connection);
         for (const handler of matchingHandlers) {
           handler[kDispatchEvent](connectionEvent);
         }
       } else {
+        const request = new Request(connection.client.url, {
+          headers: {
+            upgrade: "websocket",
+            connection: "upgrade"
+          }
+        });
+        await onUnhandledRequest(
+          request,
+          options.getUnhandledRequestStrategy()
+        ).catch((error3) => {
+          const errorEvent = new Event("error");
+          Object.defineProperty(errorEvent, "cause", {
+            enumerable: true,
+            configurable: false,
+            value: error3
+          });
+          connection.client.socket.dispatchEvent(errorEvent);
+        });
         options?.onPassthroughConnection(connection);
         connection.server.connect();
       }
@@ -31409,12 +31476,12 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
           currentTarget: {
             enumerable: true,
             writable: false,
-            value: server["realWebSocket"]
+            value: server.socket
           },
           target: {
             enumerable: true,
             writable: false,
-            value: server["realWebSocket"]
+            value: server.socket
           }
         });
         logOutgoingMockedClientMessage(messageEvent);
@@ -31651,6 +31718,9 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         options
       );
       handleWebSocketEvent({
+        getUnhandledRequestStrategy: () => {
+          return this.context.startOptions.onUnhandledRequest;
+        },
         getHandlers: () => {
           return this.handlersController.currentHandlers();
         },