msw 2.3.0-ws.rc-3 → 2.3.0-ws.rc-4

package/lib/iife/index.js

@@ -1129,7 +1129,7 @@ var MockServiceWorker = (() => {
     return stringToRegexp(path, keys, options);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
   var encoder = new TextEncoder();
   function encodeBuffer(text) {
     return encoder.encode(text);
@@ -1155,7 +1155,7 @@ var MockServiceWorker = (() => {
     return RESPONSE_STATUS_CODES_WITHOUT_BODY.has(status);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-HAGW22AN.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/chunk-HAGW22AN.mjs
   var IS_PATCHED_MODULE = Symbol("isPatchedModule");
 
   // node_modules/.pnpm/is-node-process@1.2.0/node_modules/is-node-process/lib/index.mjs
@@ -1445,7 +1445,7 @@ var MockServiceWorker = (() => {
     return message3.toString();
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.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 +1593,7 @@ var MockServiceWorker = (() => {
     return Math.random().toString(16).slice(2);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/index.mjs
   var BatchInterceptor = class extends Interceptor {
     constructor(options) {
       BatchInterceptor.symbol = Symbol(options.name);
@@ -6674,7 +6674,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   };
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-OUWBQF3Z.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/chunk-OUWBQF3Z.mjs
   var RequestController = class {
     constructor(request) {
       this.request = request;
@@ -6712,7 +6712,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-3FNUI33J.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/chunk-3FNUI33J.mjs
   function isPropertyAccessible2(obj, key) {
     try {
       obj[key];
@@ -6859,7 +6859,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     });
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/chunk-VYFS2IF2.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/chunk-VYFS2IF2.mjs
   function concatArrayBuffer(left, right) {
     const result = new Uint8Array(left.byteLength + right.byteLength);
     result.set(left, 0);
@@ -7684,7 +7684,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.26.15/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.27.0/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.mjs
   function bindEvent(target, event) {
     Object.defineProperties(event, {
       target: {
@@ -7736,16 +7736,25 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       this.id = createRequestId();
       this.url = new URL(socket.url);
       this[kEmitter2] = new EventTarget();
-      this.transport.onOutgoing = (data) => {
-        this[kEmitter2].dispatchEvent(
-          bindEvent(this.socket, new MessageEvent("message", { data }))
+      this.transport.addEventListener("outgoing", (event) => {
+        const message3 = bindEvent(
+          this.socket,
+          new CancelableMessageEvent("message", {
+            data: event.data,
+            origin: event.origin,
+            cancelable: true
+          })
         );
-      };
-      this.transport.onClose = (event) => {
+        this[kEmitter2].dispatchEvent(message3);
+        if (message3.defaultPrevented) {
+          event.preventDefault();
+        }
+      });
+      this.transport.addEventListener("close", (event) => {
         this[kEmitter2].dispatchEvent(
           bindEvent(this.socket, new CloseEvent("close", event))
         );
-      };
+      });
     }
     /**
      * Listen for the outgoing events from the connected WebSocket client.
@@ -7932,35 +7941,20 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       this.createConnection = createConnection;
       this[kEmitter22] = new EventTarget();
       this.mockCloseController = new AbortController();
-      this.transport.onIncoming = (event) => {
-        const messageEvent = bindEvent(
-          this.realWebSocket,
-          new CancelableMessageEvent("message", {
-            data: event.data,
-            origin: event.origin,
-            cancelable: true
-          })
-        );
-        this[kEmitter22].dispatchEvent(messageEvent);
-        if (!messageEvent.defaultPrevented) {
-          this.socket.dispatchEvent(
-            bindEvent(
-              /**
-               * @note Bind the forwarded original server events
-               * to the mock WebSocket instance so it would
-               * dispatch them straight away.
-               */
-              this.socket,
-              // Clone the message event again to prevent
-              // the "already being dispatched" exception.
-              new MessageEvent("message", {
-                data: event.data,
-                origin: event.origin
-              })
-            )
-          );
+      this.transport.addEventListener("outgoing", (event) => {
+        if (this.readyState === -1) {
+          return;
         }
-      };
+        queueMicrotask(() => {
+          if (!event.defaultPrevented) {
+            this.send(event.data);
+          }
+        });
+      });
+      this.transport.addEventListener(
+        "incoming",
+        this.handleIncomingMessage.bind(this)
+      );
     }
     /**
      * Server ready state.
@@ -7994,7 +7988,15 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         { once: true }
       );
       realWebSocket.addEventListener("message", (event) => {
-        this.transport.onIncoming(event);
+        this.transport.dispatchEvent(
+          bindEvent(
+            this.realWebSocket,
+            new MessageEvent("incoming", {
+              data: event.data,
+              origin: event.origin
+            })
+          )
+        );
       });
       this.socket.addEventListener("close", this.handleMockClose.bind(this), {
         signal: this.mockCloseController.signal
@@ -8075,6 +8077,35 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
         );
       });
     }
+    handleIncomingMessage(event) {
+      const messageEvent = bindEvent(
+        event.target,
+        new CancelableMessageEvent("message", {
+          data: event.data,
+          origin: event.origin,
+          cancelable: true
+        })
+      );
+      this[kEmitter22].dispatchEvent(messageEvent);
+      if (!messageEvent.defaultPrevented) {
+        this.socket.dispatchEvent(
+          bindEvent(
+            /**
+             * @note Bind the forwarded original server events
+             * to the mock WebSocket instance so it would
+             * dispatch them straight away.
+             */
+            this.socket,
+            // Clone the message event again to prevent
+            // the "already being dispatched" exception.
+            new MessageEvent("message", {
+              data: event.data,
+              origin: event.origin
+            })
+          )
+        );
+      }
+    }
     handleMockClose(_event) {
       if (this.realWebSocket) {
         this.realWebSocket.close();
@@ -8092,41 +8123,53 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       }
     }
   };
-  var WebSocketTransport = class {
-  };
-  var WebSocketClassTransport = class extends WebSocketTransport {
+  var WebSocketClassTransport = class extends EventTarget {
     constructor(socket) {
       super();
       this.socket = socket;
-      this.onOutgoing = () => {
-      };
-      this.onIncoming = () => {
-      };
-      this.onClose = () => {
-      };
-      this.socket.addEventListener("close", (event) => this.onClose(event), {
-        once: true
+      this.socket.addEventListener("close", (event) => {
+        this.dispatchEvent(bindEvent(this.socket, new CloseEvent("close", event)));
       });
-      this.socket[kOnSend] = (...args) => this.onOutgoing(...args);
+      this.socket[kOnSend] = (data) => {
+        this.dispatchEvent(
+          bindEvent(
+            this.socket,
+            // Dispatch this as cancelable because "client" connection
+            // re-creates this message event (cannot dispatch the same event).
+            new CancelableMessageEvent("outgoing", {
+              data,
+              origin: this.socket.url,
+              cancelable: true
+            })
+          )
+        );
+      };
+    }
+    addEventListener(type, callback, options) {
+      return super.addEventListener(type, callback, options);
+    }
+    dispatchEvent(event) {
+      return super.dispatchEvent(event);
     }
     send(data) {
       queueMicrotask(() => {
-        const message3 = bindEvent(
-          /**
-           * @note Setting this event's "target" to the
-           * WebSocket override instance is important.
-           * This way it can tell apart original incoming events
-           * (must be forwarded to the transport) from the
-           * mocked message events like the one below
-           * (must be dispatched on the client instance).
-           */
-          this.socket,
-          new MessageEvent("message", {
-            data,
-            origin: this.socket.url
-          })
+        this.socket.dispatchEvent(
+          bindEvent(
+            /**
+             * @note Setting this event's "target" to the
+             * WebSocket override instance is important.
+             * This way it can tell apart original incoming events
+             * (must be forwarded to the transport) from the
+             * mocked message events like the one below
+             * (must be dispatched on the client instance).
+             */
+            this.socket,
+            new MessageEvent("message", {
+              data,
+              origin: this.socket.url
+            })
+          )
         );
-        this.socket.dispatchEvent(message3);
       });
     }
     close(code, reason) {
@@ -8203,9 +8246,6 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       } else {
         options?.onPassthroughConnection(connection);
         connection.server.connect();
-        connection.client.addEventListener("message", (event) => {
-          connection.server.send(event.data);
-        });
       }
     });
   }
@@ -8244,6 +8284,12 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
   }
 
   // src/core/ws/utils/attachWebSocketLogger.ts
+  var colors = {
+    blue: "#3b82f6",
+    green: "#22c55e",
+    red: "#ef4444",
+    orange: "#ff6a33"
+  };
   function attachWebSocketLogger(connection) {
     const { client, server } = connection;
     logConnectionOpen(client);
@@ -8312,8 +8358,8 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
   function logConnectionOpen(client) {
     const publicUrl = toPublicUrl(client.url);
     console.groupCollapsed(
-      devUtils.formatMessage(`${getTimestamp()} %c\u25B8%c ${publicUrl}`),
-      "color:blue",
+      devUtils.formatMessage(`${getTimestamp()} %c\u25B6%c ${publicUrl}`),
+      `color:${colors.blue}`,
       "color:inherit"
     );
     console.log("Client:", client.socket);
@@ -8326,7 +8372,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u2191%c ${publicData} %c${byteLength}%c`
       ),
-      "color:green",
+      `color:${colors.green}`,
       "color:inherit",
       "color:gray;font-weight:normal",
       "color:inherit;font-weight:inherit"
@@ -8341,7 +8387,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u21E1%c ${publicData} %c${byteLength}%c`
       ),
-      "color:orangered",
+      `color:${colors.orange}`,
       "color:inherit",
       "color:gray;font-weight:normal",
       "color:inherit;font-weight:inherit"
@@ -8356,7 +8402,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u2193%c ${publicData} %c${byteLength}%c`
       ),
-      "color:red",
+      `color:${colors.red}`,
       "color:inherit",
       "color:gray;font-weight:normal",
       "color:inherit;font-weight:inherit"
@@ -8371,7 +8417,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u21E3%c ${publicData} %c${byteLength}%c`
       ),
-      "color:orangered",
+      `color:${colors.orange}`,
       "color:inherit",
       "color:gray;font-weight:normal",
       "color:inherit;font-weight:inherit"
@@ -8386,7 +8432,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u25A0%c ${publicUrl}`
       ),
-      "color:blue",
+      `color:${colors.blue}`,
       "color:inherit"
     );
     console.log(event);
@@ -8399,7 +8445,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\u21E3%c ${publicData} %c${byteLength}%c`
       ),
-      "color:orangered",
+      `color:${colors.green}`,
       "color:inherit",
       "color:gray;font-weight:normal",
       "color:inherit;font-weight:inherit"
@@ -8414,7 +8460,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
       devUtils.formatMessage(
         `${getTimestamp({ milliseconds: true })} %c\xD7%c ${publicUrl}`
       ),
-      "color:red",
+      `color:${colors.blue}`,
       "color:inherit"
     );
     console.log(event);