msw 2.3.0-ws.rc-6 → 2.3.1

package/src/core/utils/request/onUnhandledRequest.test.ts

@@ -7,10 +7,10 @@ import {
 } from './onUnhandledRequest'
 
 const fixtures = {
-  warningWithoutSuggestions: `\
+  warningWithoutSuggestions: (url = `/api`) => `\
 [MSW] Warning: intercepted a request without a matching request handler:
 
-  • GET /api
+  • GET ${url}
 
 If you still wish to intercept this unhandled request, please create a request handler for it.
 Read more: https://mswjs.io/docs/getting-started/mocks`,
@@ -46,7 +46,9 @@ test('supports the "bypass" request strategy', async () => {
 test('supports the "warn" request strategy', async () => {
   await onUnhandledRequest(new Request(new URL('http://localhost/api')), 'warn')
 
-  expect(console.warn).toHaveBeenCalledWith(fixtures.warningWithoutSuggestions)
+  expect(console.warn).toHaveBeenCalledWith(
+    fixtures.warningWithoutSuggestions(),
+  )
 })
 
 test('supports the "error" request strategy', async () => {
@@ -103,7 +105,9 @@ test('supports calling default strategies from the custom callback function', as
 test('does not print any suggestions given no handlers to suggest', async () => {
   await onUnhandledRequest(new Request(new URL('http://localhost/api')), 'warn')
 
-  expect(console.warn).toHaveBeenCalledWith(fixtures.warningWithoutSuggestions)
+  expect(console.warn).toHaveBeenCalledWith(
+    fixtures.warningWithoutSuggestions(),
+  )
 })
 
 test('throws an exception given unknown request strategy', async () => {
@@ -117,3 +121,25 @@ test('throws an exception given unknown request strategy', async () => {
     '[MSW] Failed to react to an unhandled request: unknown strategy "invalid-strategy". Please provide one of the supported strategies ("bypass", "warn", "error") or a custom callback function as the value of the "onUnhandledRequest" option.',
   )
 })
+
+test('prints with a relative URL and search params', async () => {
+  await onUnhandledRequest(
+    new Request(new URL('http://localhost/api?foo=boo')),
+    'warn',
+  )
+
+  expect(console.warn).toHaveBeenCalledWith(
+    fixtures.warningWithoutSuggestions(`/api?foo=boo`),
+  )
+})
+
+test('prints with an absolute URL and search params', async () => {
+  await onUnhandledRequest(
+    new Request(new URL('https://mswjs.io/api?foo=boo')),
+    'warn',
+  )
+
+  expect(console.warn).toHaveBeenCalledWith(
+    fixtures.warningWithoutSuggestions(`https://mswjs.io/api?foo=boo`),
+  )
+})

package/src/core/utils/request/onUnhandledRequest.ts

@@ -1,5 +1,5 @@
 import { toPublicUrl } from './toPublicUrl'
-import { devUtils } from '../internal/devUtils'
+import { InternalError, devUtils } from '../internal/devUtils'
 
 export interface UnhandledRequestPrint {
   warning(): void
@@ -22,7 +22,7 @@ export async function onUnhandledRequest(
   strategy: UnhandledRequestStrategy = 'warn',
 ): Promise<void> {
   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:\n\n  \u2022 ${request.method} ${publicUrl}\n\nIf you still wish to intercept this unhandled request, please create a request handler for it.\nRead more: https://mswjs.io/docs/getting-started/mocks`
 
@@ -33,7 +33,7 @@ export async function onUnhandledRequest(
         devUtils.error('Error: %s', unhandledRequestMessage)
 
         // Throw an exception to halt request processing and not perform the original request.
-        throw new Error(
+        throw new InternalError(
           devUtils.formatMessage(
             'Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.',
           ),
@@ -49,7 +49,7 @@ export async function onUnhandledRequest(
         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.',
             strategy,

package/src/core/utils/url/cleanUrl.test.ts

@@ -1,17 +1,22 @@
 import { cleanUrl } from './cleanUrl'
 
-test('removes query parameters from a URL string', () => {
+it('removes query parameters from a URL string', () => {
   expect(cleanUrl('/user?id=123')).toEqual('/user')
   expect(cleanUrl('/user?id=123&id=456')).toEqual('/user')
   expect(cleanUrl('/user?id=123&role=admin')).toEqual('/user')
 })
 
-test('removes hashes from a URL string', () => {
+it('removes hashes from a URL string', () => {
   expect(cleanUrl('/user#hash')).toEqual('/user')
   expect(cleanUrl('/user#hash-with-dashes')).toEqual('/user')
 })
 
-test('removes both query parameters and hashes from a URL string', () => {
+it('removes both query parameters and hashes from a URL string', () => {
   expect(cleanUrl('/user?id=123#some')).toEqual('/user')
   expect(cleanUrl('/user?id=123&role=admin#some')).toEqual('/user')
 })
+
+it('preserves optional path parameters', () => {
+  expect(cleanUrl('/user/:id?')).toEqual('/user/:id?')
+  expect(cleanUrl('/user/:id?/:messageId?')).toEqual('/user/:id?/:messageId?')
+})

package/src/core/utils/url/cleanUrl.ts

@@ -5,8 +5,16 @@ export function getSearchParams(path: string) {
 }
 
 /**
- * Removes query parameters and hashes from a given URL string.
+ * Removes search parameters and the fragment
+ * from a given URL string.
  */
 export function cleanUrl(path: string): string {
+  // If the path ends with an optional path parameter,
+  // return it as-is.
+  if (path.endsWith('?')) {
+    return path
+  }
+
+  // Otherwise, remove the search and fragment from it.
   return path.replace(REDUNDANT_CHARACTERS_EXP, '')
 }

package/src/core/utils/url/getAbsoluteUrl.node.test.ts

@@ -3,16 +3,16 @@
  */
 import { getAbsoluteUrl } from './getAbsoluteUrl'
 
-test('returns a given relative URL as-is', () => {
+it('returns a given relative URL as-is', () => {
   expect(getAbsoluteUrl('/reviews')).toBe('/reviews')
 })
 
-test('rebases a relative URL against a custom base URL', () => {
+it('rebases a relative URL against a custom base URL', () => {
   expect(getAbsoluteUrl('/user', 'https://api.github.com')).toEqual(
     'https://api.github.com/user',
   )
 })
-test('returns a given absolute URL as-is', () => {
+it('returns a given absolute URL as-is', () => {
   expect(getAbsoluteUrl('https://api.mswjs.io/users')).toBe(
     'https://api.mswjs.io/users',
   )

package/src/core/utils/url/getAbsoluteUrl.test.ts

@@ -3,27 +3,27 @@
  */
 import { getAbsoluteUrl } from './getAbsoluteUrl'
 
-test('rebases a relative URL against the current "baseURI" (default)', () => {
+it('rebases a relative URL against the current "baseURI" (default)', () => {
   expect(getAbsoluteUrl('/reviews')).toEqual('http://localhost/reviews')
 })
 
-test('rebases a relative URL against a custom base URL', () => {
+it('rebases a relative URL against a custom base URL', () => {
   expect(getAbsoluteUrl('/user', 'https://api.github.com')).toEqual(
     'https://api.github.com/user',
   )
 })
 
-test('returns a given absolute URL as-is', () => {
+it('returns a given absolute URL as-is', () => {
   expect(getAbsoluteUrl('https://api.mswjs.io/users')).toEqual(
     'https://api.mswjs.io/users',
   )
 })
 
-test('returns an absolute URL given a relative path without a leading slash', () => {
+it('returns an absolute URL given a relative path without a leading slash', () => {
   expect(getAbsoluteUrl('users')).toEqual('http://localhost/users')
 })
 
-test('returns a path with a pattern as-is', () => {
+it('returns a path with a pattern as-is', () => {
   expect(getAbsoluteUrl(':api/user')).toEqual('http://localhost/:api/user')
   expect(getAbsoluteUrl('*/resource/*')).toEqual('*/resource/*')
 })

package/src/core/utils/url/isAbsoluteUrl.test.ts

@@ -3,30 +3,30 @@
  */
 import { isAbsoluteUrl } from './isAbsoluteUrl'
 
-test('returns true for the "http" scheme', () => {
+it('returns true for the "http" scheme', () => {
   expect(isAbsoluteUrl('http://www.domain.com')).toEqual(true)
 })
 
-test('returns true for the "https" scheme', () => {
+it('returns true for the "https" scheme', () => {
   expect(isAbsoluteUrl('https://www.domain.com')).toEqual(true)
 })
 
-test('returns true for the "ws" scheme', () => {
+it('returns true for the "ws" scheme', () => {
   expect(isAbsoluteUrl('ws://www.domain.com')).toEqual(true)
 })
 
-test('returns true for the "ftp" scheme', () => {
+it('returns true for the "ftp" scheme', () => {
   expect(isAbsoluteUrl('ftp://www.domain.com')).toEqual(true)
 })
 
-test('returns true for the custom scheme', () => {
+it('returns true for the custom scheme', () => {
   expect(isAbsoluteUrl('web+my://www.example.com')).toEqual(true)
 })
 
-test('returns false for the relative URL', () => {
+it('returns false for the relative URL', () => {
   expect(isAbsoluteUrl('/test')).toEqual(false)
 })
 
-test('returns false for the relative URL without a leading slash', () => {
+it('returns false for the relative URL without a leading slash', () => {
   expect(isAbsoluteUrl('test')).toEqual(false)
 })

package/src/node/SetupServerApi.ts

@@ -4,15 +4,14 @@ import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'
 import { FetchInterceptor } from '@mswjs/interceptors/fetch'
 import { HandlersController } from '~/core/SetupApi'
 import type { RequestHandler } from '~/core/handlers/RequestHandler'
-import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
 import type { SetupServer } from './glossary'
 import { SetupServerCommonApi } from './SetupServerCommonApi'
 
 const store = new AsyncLocalStorage<RequestHandlersContext>()
 
 type RequestHandlersContext = {
-  initialHandlers: Array<RequestHandler | WebSocketHandler>
-  handlers: Array<RequestHandler | WebSocketHandler>
+  initialHandlers: Array<RequestHandler>
+  handlers: Array<RequestHandler>
 }
 
 /**
@@ -23,7 +22,7 @@ type RequestHandlersContext = {
 class AsyncHandlersController implements HandlersController {
   private rootContext: RequestHandlersContext
 
-  constructor(initialHandlers: Array<RequestHandler | WebSocketHandler>) {
+  constructor(initialHandlers: Array<RequestHandler>) {
     this.rootContext = { initialHandlers, handlers: [] }
   }
 
@@ -31,18 +30,18 @@ class AsyncHandlersController implements HandlersController {
     return store.getStore() || this.rootContext
   }
 
-  public prepend(runtimeHandlers: Array<RequestHandler | WebSocketHandler>) {
+  public prepend(runtimeHandlers: Array<RequestHandler>) {
     this.context.handlers.unshift(...runtimeHandlers)
   }
 
-  public reset(nextHandlers: Array<RequestHandler | WebSocketHandler>) {
+  public reset(nextHandlers: Array<RequestHandler>) {
     const context = this.context
     context.handlers = []
     context.initialHandlers =
       nextHandlers.length > 0 ? nextHandlers : context.initialHandlers
   }
 
-  public currentHandlers(): Array<RequestHandler | WebSocketHandler> {
+  public currentHandlers(): Array<RequestHandler> {
     const { initialHandlers, handlers } = this.context
     return handlers.concat(initialHandlers)
   }
@@ -52,7 +51,7 @@ export class SetupServerApi
   extends SetupServerCommonApi
   implements SetupServer
 {
-  constructor(handlers: Array<RequestHandler | WebSocketHandler>) {
+  constructor(handlers: Array<RequestHandler>) {
     super(
       [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],
       handlers,

package/src/node/SetupServerCommonApi.ts

@@ -14,12 +14,9 @@ import type { LifeCycleEventsMap, SharedOptions } from '~/core/sharedOptions'
 import { SetupApi } from '~/core/SetupApi'
 import { handleRequest } from '~/core/utils/handleRequest'
 import type { RequestHandler } from '~/core/handlers/RequestHandler'
-import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
 import { mergeRight } from '~/core/utils/internal/mergeRight'
-import { devUtils } from '~/core/utils/internal/devUtils'
+import { InternalError, devUtils } from '~/core/utils/internal/devUtils'
 import type { SetupServerCommon } from './glossary'
-import { handleWebSocketEvent } from '~/core/ws/handleWebSocketEvent'
-import { webSocketInterceptor } from '~/core/ws/webSocketInterceptor'
 
 export const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {
   onUnhandledRequest: 'warn',
@@ -37,7 +34,7 @@ export class SetupServerCommonApi
 
   constructor(
     interceptors: Array<{ new (): Interceptor<HttpRequestEventMap> }>,
-    handlers: Array<RequestHandler | WebSocketHandler>,
+    handlers: Array<RequestHandler>,
   ) {
     super(...handlers)
 
@@ -71,6 +68,12 @@ export class SetupServerCommonApi
       return
     })
 
+    this.interceptor.on('unhandledException', ({ error }) => {
+      if (error instanceof InternalError) {
+        throw error
+      }
+    })
+
     this.interceptor.on(
       'response',
       ({ response, isMockedResponse, request, requestId }) => {
@@ -84,14 +87,6 @@ export class SetupServerCommonApi
         )
       },
     )
-
-    handleWebSocketEvent({
-      getHandlers: () => {
-        return this.handlersController.currentHandlers()
-      },
-      onMockedConnection: () => {},
-      onPassthroughConnection: () => {},
-    })
   }
 
   public listen(options: Partial<SharedOptions> = {}): void {
@@ -102,11 +97,9 @@ export class SetupServerCommonApi
 
     // Apply the interceptor when starting the server.
     this.interceptor.apply()
-    webSocketInterceptor.apply()
 
     this.subscriptions.push(() => {
       this.interceptor.dispose()
-      webSocketInterceptor.dispose()
     })
 
     // Assert that the interceptor has been applied successfully.

package/src/node/glossary.ts

@@ -1,6 +1,8 @@
 import type { PartialDeep } from 'type-fest'
-import type { RequestHandler } from '~/core/handlers/RequestHandler'
-import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
+import type {
+  RequestHandler,
+  RequestHandlerDefaultInfo,
+} from '~/core/handlers/RequestHandler'
 import type {
   LifeCycleEventEmitter,
   LifeCycleEventsMap,
@@ -27,7 +29,7 @@ export interface SetupServerCommon {
    *
    * @see {@link https://mswjs.io/docs/api/setup-server/use `server.use()` API reference}
    */
-  use(...handlers: Array<RequestHandler | WebSocketHandler>): void
+  use(...handlers: Array<RequestHandler>): void
 
   /**
    * Marks all request handlers that respond using `res.once()` as unused.
@@ -41,14 +43,14 @@ export interface SetupServerCommon {
    *
    * @see {@link https://mswjs.io/docs/api/setup-server/reset-handlers `server.reset-handlers()` API reference}
    */
-  resetHandlers(...nextHandlers: Array<RequestHandler | WebSocketHandler>): void
+  resetHandlers(...nextHandlers: Array<RequestHandler>): void
 
   /**
    * Returns a readonly list of currently active request handlers.
    *
    * @see {@link https://mswjs.io/docs/api/setup-server/list-handlers `server.listHandlers()` API reference}
    */
-  listHandlers(): ReadonlyArray<RequestHandler | WebSocketHandler>
+  listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>
 
   /**
    * Life-cycle events.

package/src/node/setupServer.ts

@@ -1,5 +1,4 @@
 import type { RequestHandler } from '~/core/handlers/RequestHandler'
-import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
 import { SetupServerApi } from './SetupServerApi'
 
 /**
@@ -9,7 +8,7 @@ import { SetupServerApi } from './SetupServerApi'
  * @see {@link https://mswjs.io/docs/api/setup-server `setupServer()` API reference}
  */
 export const setupServer = (
-  ...handlers: Array<RequestHandler | WebSocketHandler>
+  ...handlers: Array<RequestHandler>
 ): SetupServerApi => {
   return new SetupServerApi(handlers)
 }

package/lib/core/handlers/WebSocketHandler.d.mts

@@ -1,32 +0,0 @@
-import { Emitter } from 'strict-event-emitter';
-import { WebSocketConnectionData } from '@mswjs/interceptors/WebSocket';
-import { PathParams, Path, Match } from '../utils/matching/matchRequestUrl.mjs';
-
-type WebSocketHandlerParsedResult = {
-    match: Match;
-};
-type WebSocketHandlerEventMap = {
-    connection: [args: WebSocketHandlerConnection];
-};
-interface WebSocketHandlerConnection extends WebSocketConnectionData {
-    params: PathParams;
-}
-declare const kEmitter: unique symbol;
-declare const kDispatchEvent: unique symbol;
-declare const kSender: unique symbol;
-declare class WebSocketHandler {
-    private readonly url;
-    callFrame?: string;
-    protected [kEmitter]: Emitter<WebSocketHandlerEventMap>;
-    constructor(url: Path);
-    parse(args: {
-        event: MessageEvent<WebSocketConnectionData>;
-    }): WebSocketHandlerParsedResult;
-    predicate(args: {
-        event: MessageEvent<WebSocketConnectionData>;
-        parsedResult: WebSocketHandlerParsedResult;
-    }): boolean;
-    [kDispatchEvent](event: MessageEvent<WebSocketConnectionData>): Promise<void>;
-}
-
-export { WebSocketHandler, type WebSocketHandlerEventMap, kDispatchEvent, kEmitter, kSender };

package/lib/core/handlers/WebSocketHandler.d.ts

@@ -1,32 +0,0 @@
-import { Emitter } from 'strict-event-emitter';
-import { WebSocketConnectionData } from '@mswjs/interceptors/WebSocket';
-import { PathParams, Path, Match } from '../utils/matching/matchRequestUrl.js';
-
-type WebSocketHandlerParsedResult = {
-    match: Match;
-};
-type WebSocketHandlerEventMap = {
-    connection: [args: WebSocketHandlerConnection];
-};
-interface WebSocketHandlerConnection extends WebSocketConnectionData {
-    params: PathParams;
-}
-declare const kEmitter: unique symbol;
-declare const kDispatchEvent: unique symbol;
-declare const kSender: unique symbol;
-declare class WebSocketHandler {
-    private readonly url;
-    callFrame?: string;
-    protected [kEmitter]: Emitter<WebSocketHandlerEventMap>;
-    constructor(url: Path);
-    parse(args: {
-        event: MessageEvent<WebSocketConnectionData>;
-    }): WebSocketHandlerParsedResult;
-    predicate(args: {
-        event: MessageEvent<WebSocketConnectionData>;
-        parsedResult: WebSocketHandlerParsedResult;
-    }): boolean;
-    [kDispatchEvent](event: MessageEvent<WebSocketConnectionData>): Promise<void>;
-}
-
-export { WebSocketHandler, type WebSocketHandlerEventMap, kDispatchEvent, kEmitter, kSender };

package/lib/core/handlers/WebSocketHandler.js

@@ -1,62 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var WebSocketHandler_exports = {};
-__export(WebSocketHandler_exports, {
-  WebSocketHandler: () => WebSocketHandler,
-  kDispatchEvent: () => kDispatchEvent,
-  kEmitter: () => kEmitter,
-  kSender: () => kSender
-});
-module.exports = __toCommonJS(WebSocketHandler_exports);
-var import_strict_event_emitter = require("strict-event-emitter");
-var import_matchRequestUrl = require("../utils/matching/matchRequestUrl.js");
-var import_getCallFrame = require("../utils/internal/getCallFrame.js");
-const kEmitter = Symbol("kEmitter");
-const kDispatchEvent = Symbol("kDispatchEvent");
-const kSender = Symbol("kSender");
-class WebSocketHandler {
-  constructor(url) {
-    this.url = url;
-    this[kEmitter] = new import_strict_event_emitter.Emitter();
-    this.callFrame = (0, import_getCallFrame.getCallFrame)(new Error());
-  }
-  callFrame;
-  [kEmitter];
-  parse(args) {
-    const connection = args.event.data;
-    const match = (0, import_matchRequestUrl.matchRequestUrl)(connection.client.url, this.url);
-    return {
-      match
-    };
-  }
-  predicate(args) {
-    return args.parsedResult.match.matches;
-  }
-  async [kDispatchEvent](event) {
-    const parsedResult = this.parse({ event });
-    const connection = event.data;
-    const resolvedConnection = {
-      client: connection.client,
-      server: connection.server,
-      params: parsedResult.match.params || {}
-    };
-    this[kEmitter].emit("connection", resolvedConnection);
-  }
-}
-//# sourceMappingURL=WebSocketHandler.js.map

package/lib/core/handlers/WebSocketHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/core/handlers/WebSocketHandler.ts"],"sourcesContent":["import { Emitter } from 'strict-event-emitter'\nimport type { WebSocketConnectionData } from '@mswjs/interceptors/WebSocket'\nimport {\n  type Match,\n  type Path,\n  type PathParams,\n  matchRequestUrl,\n} from '../utils/matching/matchRequestUrl'\nimport { getCallFrame } from '../utils/internal/getCallFrame'\n\ntype WebSocketHandlerParsedResult = {\n  match: Match\n}\n\nexport type WebSocketHandlerEventMap = {\n  connection: [args: WebSocketHandlerConnection]\n}\n\ninterface WebSocketHandlerConnection extends WebSocketConnectionData {\n  params: PathParams\n}\n\nexport const kEmitter = Symbol('kEmitter')\nexport const kDispatchEvent = Symbol('kDispatchEvent')\nexport const kSender = Symbol('kSender')\n\nexport class WebSocketHandler {\n  public callFrame?: string\n\n  protected [kEmitter]: Emitter<WebSocketHandlerEventMap>\n\n  constructor(private readonly url: Path) {\n    this[kEmitter] = new Emitter()\n    this.callFrame = getCallFrame(new Error())\n  }\n\n  public parse(args: {\n    event: MessageEvent<WebSocketConnectionData>\n  }): WebSocketHandlerParsedResult {\n    const connection = args.event.data\n    const match = matchRequestUrl(connection.client.url, this.url)\n\n    return {\n      match,\n    }\n  }\n\n  public predicate(args: {\n    event: MessageEvent<WebSocketConnectionData>\n    parsedResult: WebSocketHandlerParsedResult\n  }): boolean {\n    return args.parsedResult.match.matches\n  }\n\n  async [kDispatchEvent](\n    event: MessageEvent<WebSocketConnectionData>,\n  ): Promise<void> {\n    const parsedResult = this.parse({ event })\n    const connection = event.data\n\n    const resolvedConnection: WebSocketHandlerConnection = {\n      client: connection.client,\n      server: connection.server,\n      params: parsedResult.match.params || {},\n    }\n\n    // Emit the connection event on the handler.\n    // This is what the developer adds listeners for.\n    this[kEmitter].emit('connection', resolvedConnection)\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kCAAwB;AAExB,6BAKO;AACP,0BAA6B;AActB,MAAM,WAAW,OAAO,UAAU;AAClC,MAAM,iBAAiB,OAAO,gBAAgB;AAC9C,MAAM,UAAU,OAAO,SAAS;AAEhC,MAAM,iBAAiB;AAAA,EAK5B,YAA6B,KAAW;AAAX;AAC3B,SAAK,QAAQ,IAAI,IAAI,oCAAQ;AAC7B,SAAK,gBAAY,kCAAa,IAAI,MAAM,CAAC;AAAA,EAC3C;AAAA,EAPO;AAAA,EAEP,CAAW,QAAQ;AAAA,EAOZ,MAAM,MAEoB;AAC/B,UAAM,aAAa,KAAK,MAAM;AAC9B,UAAM,YAAQ,wCAAgB,WAAW,OAAO,KAAK,KAAK,GAAG;AAE7D,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF;AAAA,EAEO,UAAU,MAGL;AACV,WAAO,KAAK,aAAa,MAAM;AAAA,EACjC;AAAA,EAEA,OAAO,cAAc,EACnB,OACe;AACf,UAAM,eAAe,KAAK,MAAM,EAAE,MAAM,CAAC;AACzC,UAAM,aAAa,MAAM;AAEzB,UAAM,qBAAiD;AAAA,MACrD,QAAQ,WAAW;AAAA,MACnB,QAAQ,WAAW;AAAA,MACnB,QAAQ,aAAa,MAAM,UAAU,CAAC;AAAA,IACxC;AAIA,SAAK,QAAQ,EAAE,KAAK,cAAc,kBAAkB;AAAA,EACtD;AACF;","names":[]}

package/lib/core/handlers/WebSocketHandler.mjs

@@ -1,44 +0,0 @@
-import { Emitter } from "strict-event-emitter";
-import {
-  matchRequestUrl
-} from '../utils/matching/matchRequestUrl.mjs';
-import { getCallFrame } from '../utils/internal/getCallFrame.mjs';
-const kEmitter = Symbol("kEmitter");
-const kDispatchEvent = Symbol("kDispatchEvent");
-const kSender = Symbol("kSender");
-class WebSocketHandler {
-  constructor(url) {
-    this.url = url;
-    this[kEmitter] = new Emitter();
-    this.callFrame = getCallFrame(new Error());
-  }
-  callFrame;
-  [kEmitter];
-  parse(args) {
-    const connection = args.event.data;
-    const match = matchRequestUrl(connection.client.url, this.url);
-    return {
-      match
-    };
-  }
-  predicate(args) {
-    return args.parsedResult.match.matches;
-  }
-  async [kDispatchEvent](event) {
-    const parsedResult = this.parse({ event });
-    const connection = event.data;
-    const resolvedConnection = {
-      client: connection.client,
-      server: connection.server,
-      params: parsedResult.match.params || {}
-    };
-    this[kEmitter].emit("connection", resolvedConnection);
-  }
-}
-export {
-  WebSocketHandler,
-  kDispatchEvent,
-  kEmitter,
-  kSender
-};
-//# sourceMappingURL=WebSocketHandler.mjs.map

package/lib/core/handlers/WebSocketHandler.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/core/handlers/WebSocketHandler.ts"],"sourcesContent":["import { Emitter } from 'strict-event-emitter'\nimport type { WebSocketConnectionData } from '@mswjs/interceptors/WebSocket'\nimport {\n  type Match,\n  type Path,\n  type PathParams,\n  matchRequestUrl,\n} from '../utils/matching/matchRequestUrl'\nimport { getCallFrame } from '../utils/internal/getCallFrame'\n\ntype WebSocketHandlerParsedResult = {\n  match: Match\n}\n\nexport type WebSocketHandlerEventMap = {\n  connection: [args: WebSocketHandlerConnection]\n}\n\ninterface WebSocketHandlerConnection extends WebSocketConnectionData {\n  params: PathParams\n}\n\nexport const kEmitter = Symbol('kEmitter')\nexport const kDispatchEvent = Symbol('kDispatchEvent')\nexport const kSender = Symbol('kSender')\n\nexport class WebSocketHandler {\n  public callFrame?: string\n\n  protected [kEmitter]: Emitter<WebSocketHandlerEventMap>\n\n  constructor(private readonly url: Path) {\n    this[kEmitter] = new Emitter()\n    this.callFrame = getCallFrame(new Error())\n  }\n\n  public parse(args: {\n    event: MessageEvent<WebSocketConnectionData>\n  }): WebSocketHandlerParsedResult {\n    const connection = args.event.data\n    const match = matchRequestUrl(connection.client.url, this.url)\n\n    return {\n      match,\n    }\n  }\n\n  public predicate(args: {\n    event: MessageEvent<WebSocketConnectionData>\n    parsedResult: WebSocketHandlerParsedResult\n  }): boolean {\n    return args.parsedResult.match.matches\n  }\n\n  async [kDispatchEvent](\n    event: MessageEvent<WebSocketConnectionData>,\n  ): Promise<void> {\n    const parsedResult = this.parse({ event })\n    const connection = event.data\n\n    const resolvedConnection: WebSocketHandlerConnection = {\n      client: connection.client,\n      server: connection.server,\n      params: parsedResult.match.params || {},\n    }\n\n    // Emit the connection event on the handler.\n    // This is what the developer adds listeners for.\n    this[kEmitter].emit('connection', resolvedConnection)\n  }\n}\n"],"mappings":"AAAA,SAAS,eAAe;AAExB;AAAA,EAIE;AAAA,OACK;AACP,SAAS,oBAAoB;AActB,MAAM,WAAW,OAAO,UAAU;AAClC,MAAM,iBAAiB,OAAO,gBAAgB;AAC9C,MAAM,UAAU,OAAO,SAAS;AAEhC,MAAM,iBAAiB;AAAA,EAK5B,YAA6B,KAAW;AAAX;AAC3B,SAAK,QAAQ,IAAI,IAAI,QAAQ;AAC7B,SAAK,YAAY,aAAa,IAAI,MAAM,CAAC;AAAA,EAC3C;AAAA,EAPO;AAAA,EAEP,CAAW,QAAQ;AAAA,EAOZ,MAAM,MAEoB;AAC/B,UAAM,aAAa,KAAK,MAAM;AAC9B,UAAM,QAAQ,gBAAgB,WAAW,OAAO,KAAK,KAAK,GAAG;AAE7D,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF;AAAA,EAEO,UAAU,MAGL;AACV,WAAO,KAAK,aAAa,MAAM;AAAA,EACjC;AAAA,EAEA,OAAO,cAAc,EACnB,OACe;AACf,UAAM,eAAe,KAAK,MAAM,EAAE,MAAM,CAAC;AACzC,UAAM,aAAa,MAAM;AAEzB,UAAM,qBAAiD;AAAA,MACrD,QAAQ,WAAW;AAAA,MACnB,QAAQ,WAAW;AAAA,MACnB,QAAQ,aAAa,MAAM,UAAU,CAAC;AAAA,IACxC;AAIA,SAAK,QAAQ,EAAE,KAAK,cAAc,kBAAkB;AAAA,EACtD;AACF;","names":[]}

package/lib/core/ws/WebSocketClientManager.d.mts

@@ -1,58 +0,0 @@
-import { WebSocketData, WebSocketClientConnectionProtocol, WebSocketClientConnection } from '@mswjs/interceptors/WebSocket';
-import { Path } from '../utils/matching/matchRequestUrl.mjs';
-
-declare const MSW_WEBSOCKET_CLIENTS_KEY = "msw:ws:clients";
-type WebSocketBroadcastChannelMessage = {
-    type: 'extraneous:send';
-    payload: {
-        clientId: string;
-        data: WebSocketData;
-    };
-} | {
-    type: 'extraneous:close';
-    payload: {
-        clientId: string;
-        code?: number;
-        reason?: string;
-    };
-};
-/**
- * A manager responsible for accumulating WebSocket client
- * connections across different browser runtimes.
- */
-declare class WebSocketClientManager {
-    private channel;
-    private url;
-    private inMemoryClients;
-    constructor(channel: BroadcastChannel, url: Path);
-    /**
-     * All active WebSocket client connections.
-     */
-    get clients(): Set<WebSocketClientConnectionProtocol>;
-    private getSerializedClients;
-    private addClient;
-    /**
-     * Adds the given `WebSocket` client connection to the set
-     * of all connections. The given connection is always the complete
-     * connection object because `addConnection()` is called only
-     * for the opened connections in the same runtime.
-     */
-    addConnection(client: WebSocketClientConnection): void;
-}
-/**
- * A wrapper class to operate with WebSocket client connections
- * from other runtimes. This class maintains 1-1 public API
- * compatibility to the `WebSocketClientConnection` but relies
- * on the given `BroadcastChannel` to communicate instructions
- * with the client connections from other runtimes.
- */
-declare class WebSocketRemoteClientConnection implements WebSocketClientConnectionProtocol {
-    readonly id: string;
-    readonly url: URL;
-    private channel;
-    constructor(id: string, url: URL, channel: BroadcastChannel);
-    send(data: WebSocketData): void;
-    close(code?: number | undefined, reason?: string | undefined): void;
-}
-
-export { MSW_WEBSOCKET_CLIENTS_KEY, type WebSocketBroadcastChannelMessage, WebSocketClientManager, WebSocketRemoteClientConnection };