msw 2.2.3 → 2.3.0-ws.rc-1

package/lib/browser/index.d.mts

@@ -1,5 +1,6 @@
 import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from '~/core/sharedOptions';
-import { RequestHandler, RequestHandlerDefaultInfo } from '~/core/handlers/RequestHandler';
+import { RequestHandler } from '~/core/handlers/RequestHandler';
+import { WebSocketHandler } from '~/core/handlers/WebSocketHandler';
 import { SetupApi } from '~/core/SetupApi';
 
 type FindWorker = (scriptUrl: string, mockServiceWorkerUrl: string) => boolean;
@@ -54,7 +55,7 @@ interface SetupWorker {
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/use `worker.use()` API reference}
      */
-    use: (...handlers: RequestHandler[]) => void;
+    use: (...handlers: Array<RequestHandler | WebSocketHandler>) => void;
     /**
      * Marks all request handlers that respond using `res.once()` as unused.
      *
@@ -67,13 +68,13 @@ interface SetupWorker {
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/reset-handlers `worker.resetHandlers()` API reference}
      */
-    resetHandlers: (...nextHandlers: RequestHandler[]) => void;
+    resetHandlers: (...nextHandlers: Array<RequestHandler | WebSocketHandler>) => void;
     /**
      * Returns a readonly list of currently active request handlers.
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/list-handlers `worker.listHandlers()` API reference}
      */
-    listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>;
+    listHandlers(): ReadonlyArray<RequestHandler | WebSocketHandler>;
     /**
      * Life-cycle events.
      * Life-cycle events allow you to subscribe to the internal library events occurring during the request/response handling.
@@ -88,7 +89,7 @@ declare class SetupWorkerApi extends SetupApi<LifeCycleEventsMap> implements Set
     private startHandler;
     private stopHandler;
     private listeners;
-    constructor(...handlers: Array<RequestHandler>);
+    constructor(...handlers: Array<RequestHandler | WebSocketHandler>);
     private createWorkerContext;
     start(options?: StartOptions): StartReturnType;
     stop(): void;
@@ -99,6 +100,6 @@ declare class SetupWorkerApi extends SetupApi<LifeCycleEventsMap> implements Set
  *
  * @see {@link https://mswjs.io/docs/api/setup-worker `setupWorker()` API reference}
  */
-declare function setupWorker(...handlers: Array<RequestHandler>): SetupWorker;
+declare function setupWorker(...handlers: Array<RequestHandler | WebSocketHandler>): SetupWorker;
 
 export { type SetupWorker, SetupWorkerApi, type StartOptions, setupWorker };

package/lib/browser/index.d.ts

@@ -1,5 +1,6 @@
 import { SharedOptions, LifeCycleEventEmitter, LifeCycleEventsMap } from "../core/sharedOptions";
-import { RequestHandler, RequestHandlerDefaultInfo } from "../core/handlers/RequestHandler";
+import { RequestHandler } from "../core/handlers/RequestHandler";
+import { WebSocketHandler } from "../core/handlers/WebSocketHandler";
 import { SetupApi } from "../core/SetupApi";
 
 type FindWorker = (scriptUrl: string, mockServiceWorkerUrl: string) => boolean;
@@ -54,7 +55,7 @@ interface SetupWorker {
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/use `worker.use()` API reference}
      */
-    use: (...handlers: RequestHandler[]) => void;
+    use: (...handlers: Array<RequestHandler | WebSocketHandler>) => void;
     /**
      * Marks all request handlers that respond using `res.once()` as unused.
      *
@@ -67,13 +68,13 @@ interface SetupWorker {
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/reset-handlers `worker.resetHandlers()` API reference}
      */
-    resetHandlers: (...nextHandlers: RequestHandler[]) => void;
+    resetHandlers: (...nextHandlers: Array<RequestHandler | WebSocketHandler>) => void;
     /**
      * Returns a readonly list of currently active request handlers.
      *
      * @see {@link https://mswjs.io/docs/api/setup-worker/list-handlers `worker.listHandlers()` API reference}
      */
-    listHandlers(): ReadonlyArray<RequestHandler<RequestHandlerDefaultInfo, any>>;
+    listHandlers(): ReadonlyArray<RequestHandler | WebSocketHandler>;
     /**
      * Life-cycle events.
      * Life-cycle events allow you to subscribe to the internal library events occurring during the request/response handling.
@@ -88,7 +89,7 @@ declare class SetupWorkerApi extends SetupApi<LifeCycleEventsMap> implements Set
     private startHandler;
     private stopHandler;
     private listeners;
-    constructor(...handlers: Array<RequestHandler>);
+    constructor(...handlers: Array<RequestHandler | WebSocketHandler>);
     private createWorkerContext;
     start(options?: StartOptions): StartReturnType;
     stop(): void;
@@ -99,6 +100,6 @@ declare class SetupWorkerApi extends SetupApi<LifeCycleEventsMap> implements Set
  *
  * @see {@link https://mswjs.io/docs/api/setup-worker `setupWorker()` API reference}
  */
-declare function setupWorker(...handlers: Array<RequestHandler>): SetupWorker;
+declare function setupWorker(...handlers: Array<RequestHandler | WebSocketHandler>): SetupWorker;
 
 export { type SetupWorker, SetupWorkerApi, type StartOptions, setupWorker };

package/lib/browser/index.js

@@ -393,7 +393,7 @@ async function requestIntegrityCheck(context, serviceWorker) {
   return serviceWorker;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -419,6 +419,9 @@ function isResponseWithoutBody(status) {
   return RESPONSE_STATUS_CODES_WITHOUT_BODY.has(status);
 }
 
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-HAGW22AN.mjs
+var IS_PATCHED_MODULE = Symbol("isPatchedModule");
+
 // node_modules/.pnpm/@open-draft+logger@0.3.0/node_modules/@open-draft/logger/lib/index.mjs
 var __defProp2 = Object.defineProperty;
 var __export2 = (target, all) => {
@@ -856,8 +859,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
-var IS_PATCHED_MODULE = Symbol("isPatchedModule");
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-SGO3INLV.mjs
 function getGlobalSymbol(symbol) {
   return (
     // @ts-ignore https://github.com/Microsoft/TypeScript/issues/24587
@@ -1001,7 +1003,7 @@ var Interceptor = class {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1292,14 +1294,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
-function uuidv4() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    const r = Math.random() * 16 | 0;
-    const v = c == "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-}
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-OUWBQF3Z.mjs
 var RequestController = class {
   constructor(request) {
     this.request = request;
@@ -1337,7 +1332,16 @@ async function emitAsync(emitter, eventName, ...data) {
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-XQZ6GVNB.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-CEKC26XE.mjs
+function uuidv4() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c == "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
+
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-65OQZE6W.mjs
 function isPropertyAccessible(obj, key) {
   try {
     obj[key];
@@ -1484,7 +1488,7 @@ function createNetworkError(cause) {
   });
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.25.16/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.26.8/node_modules/@mswjs/interceptors/lib/browser/chunk-6ZIL5FW4.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -2083,7 +2087,11 @@ function createXMLHttpRequestProxy({
   const XMLHttpRequestProxy = new Proxy(globalThis.XMLHttpRequest, {
     construct(target, args, newTarget) {
       logger.info("constructed new XMLHttpRequest");
-      const originalRequest = Reflect.construct(target, args, newTarget);
+      const originalRequest = Reflect.construct(
+        target,
+        args,
+        newTarget
+      );
       const prototypeDescriptors = Object.getOwnPropertyDescriptors(
         target.prototype
       );
@@ -2309,6 +2317,8 @@ function supportsReadableStreamTransfer() {
 }
 
 // src/browser/setupWorker/setupWorker.ts
+var import_webSocketInterceptor = require("../core/ws/webSocketInterceptor.js");
+var import_handleWebSocketEvent = require("../core/utils/handleWebSocketEvent.js");
 var SetupWorkerApi = class extends import_SetupApi.SetupApi {
   context;
   startHandler = null;
@@ -2424,6 +2434,13 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
       DEFAULT_START_OPTIONS,
       options
     );
+    (0, import_handleWebSocketEvent.handleWebSocketEvent)(() => {
+      return this.handlersController.currentHandlers();
+    });
+    import_webSocketInterceptor.webSocketInterceptor.apply();
+    this.subscriptions.push(() => {
+      import_webSocketInterceptor.webSocketInterceptor.dispose();
+    });
     return await this.startHandler(this.context.startOptions, options);
   }
   stop() {