msw 2.5.2 → 2.6.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

@@ -302,6 +302,7 @@ var import_RequestHandler = require("../core/handlers/RequestHandler.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils4 = require("../core/utils/internal/devUtils.js");
 var import_toResponseInit = require("../core/utils/toResponseInit.js");
+var import_isHandlerKind = require("../core/utils/internal/isHandlerKind.js");
 var createRequestListener = (context, options) => {
   return async (event, message) => {
     const messageChannel = new WorkerChannel(event.ports[0]);
@@ -315,7 +316,7 @@ var createRequestListener = (context, options) => {
       await (0, import_handleRequest.handleRequest)(
         request,
         requestId,
-        context.getRequestHandlers(),
+        context.getRequestHandlers().filter((0, import_isHandlerKind.isHandlerKind)("RequestHandler")),
         options,
         context.emitter,
         {
@@ -1188,6 +1189,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
           context.workerChannel.send("CLIENT_CLOSED");
         }
         window.clearInterval(context.keepAliveInterval);
+        window.postMessage({ type: "msw/worker:stop" });
       });
       await checkWorkerIntegrity(context).catch((error2) => {
         import_devUtils7.devUtils.error(
@@ -1251,6 +1253,7 @@ var createStop = (context) => {
     context.workerChannel.send("MOCK_DEACTIVATE");
     context.isMockingEnabled = false;
     window.clearInterval(context.keepAliveInterval);
+    window.postMessage({ type: "msw/worker:stop" });
     printStopMessage({ quiet: context.startOptions?.quiet });
   };
 };
@@ -2488,6 +2491,7 @@ XMLHttpRequestInterceptor.interceptorSymbol = Symbol("xhr");
 
 // src/browser/setupWorker/start/createFallbackRequestListener.ts
 var import_handleRequest2 = require("../core/utils/handleRequest.js");
+var import_isHandlerKind2 = require("../core/utils/internal/isHandlerKind.js");
 function createFallbackRequestListener(context, options) {
   const interceptor = new BatchInterceptor({
     name: "fallback",
@@ -2498,7 +2502,7 @@ function createFallbackRequestListener(context, options) {
     const response = await (0, import_handleRequest2.handleRequest)(
       request,
       requestId,
-      context.getRequestHandlers(),
+      context.getRequestHandlers().filter((0, import_isHandlerKind2.isHandlerKind)("RequestHandler")),
       options,
       context.emitter,
       {
@@ -2579,6 +2583,9 @@ function supportsReadableStreamTransfer() {
 }
 
 // src/browser/setupWorker/setupWorker.ts
+var import_webSocketInterceptor = require("../core/ws/webSocketInterceptor.js");
+var import_handleWebSocketEvent = require("../core/ws/handleWebSocketEvent.js");
+var import_attachWebSocketLogger = require("../core/ws/utils/attachWebSocketLogger.js");
 var SetupWorkerApi = class extends import_SetupApi.SetupApi {
   context;
   startHandler = null;
@@ -2694,6 +2701,25 @@ var SetupWorkerApi = class extends import_SetupApi.SetupApi {
       DEFAULT_START_OPTIONS,
       options
     );
+    (0, import_handleWebSocketEvent.handleWebSocketEvent)({
+      getUnhandledRequestStrategy: () => {
+        return this.context.startOptions.onUnhandledRequest;
+      },
+      getHandlers: () => {
+        return this.handlersController.currentHandlers();
+      },
+      onMockedConnection: (connection) => {
+        if (!this.context.startOptions.quiet) {
+          (0, import_attachWebSocketLogger.attachWebSocketLogger)(connection);
+        }
+      },
+      onPassthroughConnection() {
+      }
+    });
+    import_webSocketInterceptor.webSocketInterceptor.apply();
+    this.subscriptions.push(() => {
+      import_webSocketInterceptor.webSocketInterceptor.dispose();
+    });
     return await this.startHandler(this.context.startOptions, options);
   }
   stop() {