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

package/lib/mockServiceWorker.js

@@ -8,7 +8,7 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.3.0-ws.rc-3'
+const PACKAGE_VERSION = '2.3.0-ws.rc-4'
 const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.3.0-ws.rc-3",
+  "version": "2.3.0-ws.rc-4",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -125,7 +125,7 @@
     "@bundled-es-modules/statuses": "^1.0.1",
     "@inquirer/confirm": "^3.0.0",
     "@mswjs/cookies": "^1.1.0",
-    "@mswjs/interceptors": "^0.26.15",
+    "@mswjs/interceptors": "^0.27.0",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",
     "@types/statuses": "^2.0.4",

package/src/core/ws/handleWebSocketEvent.ts

@@ -51,9 +51,6 @@ export function handleWebSocketEvent(options: HandleWebSocketEventOptions) {
       // If none of the "ws" handlers matched,
       // establish the WebSocket connection as-is.
       connection.server.connect()
-      connection.client.addEventListener('message', (event) => {
-        connection.server.send(event.data)
-      })
     }
   })
 }

package/src/core/ws/utils/attachWebSocketLogger.ts

@@ -9,6 +9,13 @@ import { toPublicUrl } from '../../utils/request/toPublicUrl'
 import { getMessageLength } from './getMessageLength'
 import { getPublicData } from './getPublicData'
 
+const colors = {
+  blue: '#3b82f6',
+  green: '#22c55e',
+  red: '#ef4444',
+  orange: '#ff6a33',
+}
+
 export function attachWebSocketLogger(
   connection: WebSocketConnectionData,
 ): void {
@@ -111,8 +118,8 @@ export function logConnectionOpen(client: WebSocketClientConnection) {
   const publicUrl = toPublicUrl(client.url)
 
   console.groupCollapsed(
-    devUtils.formatMessage(`${getTimestamp()} %c▸%c ${publicUrl}`),
-    'color:blue',
+    devUtils.formatMessage(`${getTimestamp()} %c▶%c ${publicUrl}`),
+    `color:${colors.blue}`,
     'color:inherit',
   )
   console.log('Client:', client.socket)
@@ -132,7 +139,7 @@ export async function logOutgoingClientMessage(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c↑%c ${publicData} %c${byteLength}%c`,
     ),
-    'color:green',
+    `color:${colors.green}`,
     'color:inherit',
     'color:gray;font-weight:normal',
     'color:inherit;font-weight:inherit',
@@ -155,7 +162,7 @@ export async function logOutgoingMockedClientMessage(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c⇡%c ${publicData} %c${byteLength}%c`,
     ),
-    'color:orangered',
+    `color:${colors.orange}`,
     'color:inherit',
     'color:gray;font-weight:normal',
     'color:inherit;font-weight:inherit',
@@ -180,7 +187,7 @@ export async function logIncomingClientMessage(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c↓%c ${publicData} %c${byteLength}%c`,
     ),
-    'color:red',
+    `color:${colors.red}`,
     'color:inherit',
     'color:gray;font-weight:normal',
     'color:inherit;font-weight:inherit',
@@ -203,7 +210,7 @@ export async function logIncomingMockedClientMessage(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c⇣%c ${publicData} %c${byteLength}%c`,
     ),
-    'color:orangered',
+    `color:${colors.orange}`,
     'color:inherit',
     'color:gray;font-weight:normal',
     'color:inherit;font-weight:inherit',
@@ -220,7 +227,7 @@ function logConnectionClose(event: CloseEvent) {
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c■%c ${publicUrl}`,
     ),
-    'color:blue',
+    `color:${colors.blue}`,
     'color:inherit',
   )
   console.log(event)
@@ -237,7 +244,7 @@ export async function logIncomingServerMessage(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c⇣%c ${publicData} %c${byteLength}%c`,
     ),
-    'color:orangered',
+    `color:${colors.green}`,
     'color:inherit',
     'color:gray;font-weight:normal',
     'color:inherit;font-weight:inherit',
@@ -254,7 +261,7 @@ function logClientError(event: Event) {
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c\u00D7%c ${publicUrl}`,
     ),
-    'color:red',
+    `color:${colors.blue}`,
     'color:inherit',
   )
   console.log(event)

package/src/core/ws.test.ts

@@ -19,5 +19,5 @@ it('throws an error when given a non-path argument to "ws.link()"', () => {
   expect(() =>
     // @ts-expect-error Intentionally invalid argument.
     ws.link(2),
-  ).toThrow('Expected a WebSocket server URL but got number')
+  ).toThrow('Expected a WebSocket server URL to be a valid path but got number')
 })