msw 2.12.13 → 2.13.0

package/lib/node/index.mjs

@@ -1,184 +1,184 @@
-// src/node/SetupServerApi.ts
-import { AsyncLocalStorage } from "async_hooks";
+// src/node/setup-server.ts
 import { ClientRequestInterceptor } from "@mswjs/interceptors/ClientRequest";
 import { XMLHttpRequestInterceptor } from "@mswjs/interceptors/XMLHttpRequest";
 import { FetchInterceptor } from "@mswjs/interceptors/fetch";
-
-// src/node/SetupServerCommonApi.ts
-import { invariant } from "outvariant";
+import { WebSocketInterceptor } from "@mswjs/interceptors/WebSocket";
 import {
-  BatchInterceptor,
-  InterceptorReadyState
-} from "@mswjs/interceptors";
-import { SetupApi } from '../core/SetupApi.mjs';
-import { handleRequest } from '../core/utils/handleRequest.mjs';
-import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
-import { InternalError, devUtils } from '../core/utils/internal/devUtils.mjs';
-import { handleWebSocketEvent } from '../core/ws/handleWebSocketEvent.mjs';
-import { webSocketInterceptor } from '../core/ws/webSocketInterceptor.mjs';
-import { isHandlerKind } from '../core/utils/internal/isHandlerKind.mjs';
-var DEFAULT_LISTEN_OPTIONS = {
-  onUnhandledRequest: "warn"
-};
-var SetupServerCommonApi = class extends SetupApi {
-  interceptor;
-  resolvedOptions;
-  constructor(interceptors, handlers) {
-    super(...handlers);
-    this.interceptor = new BatchInterceptor({
-      name: "setup-server",
-      interceptors
-    });
-    this.resolvedOptions = {};
-  }
-  /**
-   * Subscribe to all requests that are using the interceptor object
-   */
-  init() {
-    this.interceptor.on(
-      "request",
-      async ({ request, requestId, controller }) => {
-        const response = await handleRequest(
-          request,
-          requestId,
-          this.handlersController.currentHandlers().filter(isHandlerKind("RequestHandler")),
-          this.resolvedOptions,
-          this.emitter,
-          {
-            onPassthroughResponse(request2) {
-              const acceptHeader = request2.headers.get("accept");
-              if (acceptHeader) {
-                const nextAcceptHeader = acceptHeader.replace(
-                  /(,\s+)?msw\/passthrough/,
-                  ""
-                );
-                if (nextAcceptHeader) {
-                  request2.headers.set("accept", nextAcceptHeader);
-                } else {
-                  request2.headers.delete("accept");
-                }
-              }
-            }
-          }
-        );
-        if (response) {
-          controller.respondWith(response);
-        }
-        return;
-      }
-    );
-    this.interceptor.on("unhandledException", ({ error }) => {
-      if (error instanceof InternalError) {
-        throw error;
-      }
-    });
-    this.interceptor.on(
-      "response",
-      ({ response, isMockedResponse, request, requestId }) => {
-        this.emitter.emit(
-          isMockedResponse ? "response:mocked" : "response:bypass",
-          {
-            response,
-            request,
-            requestId
-          }
-        );
-      }
-    );
-    handleWebSocketEvent({
-      getUnhandledRequestStrategy: () => {
-        return this.resolvedOptions.onUnhandledRequest;
-      },
-      getHandlers: () => {
-        return this.handlersController.currentHandlers();
-      },
-      onMockedConnection: () => {
-      },
-      onPassthroughConnection: () => {
-      }
-    });
-  }
-  listen(options = {}) {
-    this.resolvedOptions = mergeRight(
-      DEFAULT_LISTEN_OPTIONS,
-      options
-    );
-    this.interceptor.apply();
-    this.init();
-    this.subscriptions.push(() => this.interceptor.dispose());
-    webSocketInterceptor.apply();
-    this.subscriptions.push(() => webSocketInterceptor.dispose());
-    invariant(
-      [InterceptorReadyState.APPLYING, InterceptorReadyState.APPLIED].includes(
-        this.interceptor.readyState
-      ),
-      devUtils.formatMessage(
-        'Failed to start "setupServer": the interceptor failed to apply. This is likely an issue with the library and you should report it at "%s".'
-      ),
-      "https://github.com/mswjs/msw/issues/new/choose"
-    );
-  }
-  close() {
-    this.dispose();
-  }
-};
+  defineNetwork as defineNetwork2
+} from '../core/experimental/define-network.mjs';
+import { InterceptorSource as InterceptorSource2 } from '../core/experimental/sources/interceptor-source.mjs';
 
-// src/node/SetupServerApi.ts
-var store = new AsyncLocalStorage();
-var AsyncHandlersController = class {
-  rootContext;
+// src/node/async-handlers-controller.ts
+import { AsyncLocalStorage } from "async_hooks";
+import {
+  HandlersController
+} from '../core/experimental/handlers-controller.mjs';
+var AsyncHandlersController = class extends HandlersController {
+  #asyncContext;
+  #fallbackContext;
   constructor(initialHandlers) {
-    this.rootContext = { initialHandlers, handlers: [] };
-  }
-  get context() {
-    return store.getStore() || this.rootContext;
-  }
-  prepend(runtimeHandlers) {
-    this.context.handlers.unshift(...runtimeHandlers);
+    super();
+    const initialState = this.getInitialState(initialHandlers);
+    this.#asyncContext = new AsyncLocalStorage();
+    this.#fallbackContext = {
+      initialHandlers: initialState.initialHandlers,
+      handlers: initialState.handlers
+    };
   }
-  reset(nextHandlers) {
-    const context = this.context;
-    context.handlers = [];
-    context.initialHandlers = nextHandlers.length > 0 ? nextHandlers : context.initialHandlers;
+  getState() {
+    const { initialHandlers, handlers } = this.#getContext();
+    return {
+      initialHandlers,
+      handlers
+    };
   }
-  currentHandlers() {
-    const { initialHandlers, handlers } = this.context;
-    return handlers.concat(initialHandlers);
-  }
-};
-var SetupServerApi = class extends SetupServerCommonApi {
-  constructor(handlers, interceptors = [
-    new ClientRequestInterceptor(),
-    new XMLHttpRequestInterceptor(),
-    new FetchInterceptor()
-  ]) {
-    super(interceptors, handlers);
-    this.handlersController = new AsyncHandlersController(handlers);
+  setState(nextState) {
+    const context = this.#getContext();
+    if (nextState.initialHandlers) {
+      context.initialHandlers = nextState.initialHandlers;
+    }
+    if (nextState.handlers) {
+      context.handlers = nextState.handlers;
+    }
   }
   boundary(callback) {
     return (...args) => {
-      return store.run(
+      const initialHandlers = { ...this.getState().handlers };
+      return this.#asyncContext.run(
         {
-          initialHandlers: this.handlersController.currentHandlers(),
-          handlers: []
+          initialHandlers,
+          handlers: { ...initialHandlers }
         },
         callback,
         ...args
       );
     };
   }
+  #getContext() {
+    return this.#asyncContext.getStore() || this.#fallbackContext;
+  }
+};
+
+// src/node/setup-server-common.ts
+import {
+  NetworkReadyState,
+  defineNetwork
+} from '../core/experimental/define-network.mjs';
+import { InterceptorSource } from '../core/experimental/sources/interceptor-source.mjs';
+import { fromLegacyOnUnhandledRequest } from '../core/experimental/compat.mjs';
+function defineSetupServerApi(network) {
+  return {
+    events: network.events,
+    listen(options) {
+      network.configure({
+        onUnhandledFrame: fromLegacyOnUnhandledRequest(() => {
+          return options?.onUnhandledRequest || "warn";
+        })
+      });
+      network.enable();
+    },
+    use: network.use.bind(network),
+    resetHandlers: network.resetHandlers.bind(network),
+    restoreHandlers: network.restoreHandlers.bind(network),
+    listHandlers: network.listHandlers.bind(network),
+    close() {
+      if (network.readyState === NetworkReadyState.DISABLED) {
+        return;
+      }
+      network.disable();
+    }
+  };
+}
+var SetupServerCommonApi = class {
+  network;
+  constructor(interceptors, handlers) {
+    this.network = defineNetwork({
+      sources: [new InterceptorSource({ interceptors })],
+      handlers
+    });
+  }
+  get events() {
+    return this.network.events;
+  }
+  listen(options) {
+    this.network.configure({
+      onUnhandledFrame: fromLegacyOnUnhandledRequest(() => {
+        return options?.onUnhandledRequest || "warn";
+      })
+    });
+    this.network.enable();
+  }
+  use(...handlers) {
+    this.network.use(...handlers);
+  }
+  resetHandlers(...nextHandlers) {
+    return this.network.resetHandlers(...nextHandlers);
+  }
+  restoreHandlers() {
+    return this.network.restoreHandlers();
+  }
+  listHandlers() {
+    return this.network.listHandlers();
+  }
   close() {
-    super.close();
-    store.disable();
+    this.network.disable();
   }
 };
 
-// src/node/setupServer.ts
-var setupServer = (...handlers) => {
-  return new SetupServerApi(handlers);
+// src/node/setup-server.ts
+var defaultInterceptors = [
+  new ClientRequestInterceptor(),
+  new XMLHttpRequestInterceptor(),
+  new FetchInterceptor(),
+  /**
+   * @fixme WebSocketInterceptor is in a browser-only export of Interceptors
+   * while the Interceptor class imported from the root module points to `lib/node`.
+   * An absolute madness to solve as it requires to duplicate the build config we have
+   * in MSW: shared core, CJS/ESM patching, .d.ts patching...
+   */
+  new WebSocketInterceptor()
+];
+var defaultNetworkOptions = {
+  sources: [
+    new InterceptorSource2({
+      interceptors: defaultInterceptors
+    })
+  ],
+  onUnhandledFrame: "warn",
+  context: {
+    quiet: true
+  }
+};
+function setupServer(...handlers) {
+  const handlersController = new AsyncHandlersController(handlers);
+  const network = defineNetwork2({
+    ...defaultNetworkOptions,
+    handlers: handlersController
+  });
+  const commonApi = defineSetupServerApi(network);
+  return {
+    ...commonApi,
+    boundary: handlersController.boundary.bind(handlersController)
+  };
+}
+var SetupServerApi = class extends SetupServerCommonApi {
+  #handlersController;
+  boundary;
+  constructor(handlers, interceptors) {
+    const controller = new AsyncHandlersController(handlers);
+    super(interceptors, controller);
+    const { sources: _, ...networkOptions } = defaultNetworkOptions;
+    this.network.configure(networkOptions);
+    this.#handlersController = controller;
+    this.boundary = this.#handlersController.boundary.bind(
+      this.#handlersController
+    );
+  }
 };
 export {
   SetupServerApi,
+  SetupServerCommonApi,
+  defaultNetworkOptions,
   setupServer
 };
 //# sourceMappingURL=index.mjs.map

package/lib/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/node/SetupServerApi.ts","../../src/node/SetupServerCommonApi.ts","../../src/node/setupServer.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks'\nimport type { HttpRequestEventMap, Interceptor } from '@mswjs/interceptors'\nimport { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '@mswjs/interceptors/fetch'\nimport { HandlersController } from '~/core/SetupApi'\nimport type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'\nimport type { SetupServer } from './glossary'\nimport { SetupServerCommonApi } from './SetupServerCommonApi'\n\nconst store = new AsyncLocalStorage<RequestHandlersContext>()\n\ntype RequestHandlersContext = {\n  initialHandlers: Array<RequestHandler | WebSocketHandler>\n  handlers: Array<RequestHandler | WebSocketHandler>\n}\n\n/**\n * A handlers controller that utilizes `AsyncLocalStorage` in Node.js\n * to prevent the request handlers list from being a shared state\n * across multiple tests.\n */\nclass AsyncHandlersController implements HandlersController {\n  private rootContext: RequestHandlersContext\n\n  constructor(initialHandlers: Array<RequestHandler | WebSocketHandler>) {\n    this.rootContext = { initialHandlers, handlers: [] }\n  }\n\n  get context(): RequestHandlersContext {\n    return store.getStore() || this.rootContext\n  }\n\n  public prepend(runtimeHandlers: Array<RequestHandler | WebSocketHandler>) {\n    this.context.handlers.unshift(...runtimeHandlers)\n  }\n\n  public reset(nextHandlers: Array<RequestHandler | WebSocketHandler>) {\n    const context = this.context\n    context.handlers = []\n    context.initialHandlers =\n      nextHandlers.length > 0 ? nextHandlers : context.initialHandlers\n  }\n\n  public currentHandlers(): Array<RequestHandler | WebSocketHandler> {\n    const { initialHandlers, handlers } = this.context\n    return handlers.concat(initialHandlers)\n  }\n}\nexport class SetupServerApi\n  extends SetupServerCommonApi\n  implements SetupServer\n{\n  constructor(\n    handlers: Array<RequestHandler | WebSocketHandler>,\n    interceptors: Array<Interceptor<HttpRequestEventMap>> = [\n      new ClientRequestInterceptor(),\n      new XMLHttpRequestInterceptor(),\n      new FetchInterceptor(),\n    ],\n  ) {\n    super(interceptors, handlers)\n\n    this.handlersController = new AsyncHandlersController(handlers)\n  }\n\n  public boundary<Args extends Array<any>, R>(\n    callback: (...args: Args) => R,\n  ): (...args: Args) => R {\n    return (...args: Args): R => {\n      return store.run<any, any>(\n        {\n          initialHandlers: this.handlersController.currentHandlers(),\n          handlers: [],\n        },\n        callback,\n        ...args,\n      )\n    }\n  }\n\n  public close(): void {\n    super.close()\n    store.disable()\n  }\n}\n","/**\n * @note This API is extended by both \"msw/node\" and \"msw/native\"\n * so be minding about the things you import!\n */\nimport type { RequiredDeep } from 'type-fest'\nimport { invariant } from 'outvariant'\nimport {\n  BatchInterceptor,\n  InterceptorReadyState,\n  type HttpRequestEventMap,\n  type Interceptor,\n} from '@mswjs/interceptors'\nimport type { LifeCycleEventsMap, SharedOptions } from '~/core/sharedOptions'\nimport { SetupApi } from '~/core/SetupApi'\nimport { handleRequest } from '~/core/utils/handleRequest'\nimport type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'\nimport { mergeRight } from '~/core/utils/internal/mergeRight'\nimport { InternalError, devUtils } from '~/core/utils/internal/devUtils'\nimport type { SetupServerCommon } from './glossary'\nimport { handleWebSocketEvent } from '~/core/ws/handleWebSocketEvent'\nimport { webSocketInterceptor } from '~/core/ws/webSocketInterceptor'\nimport { isHandlerKind } from '~/core/utils/internal/isHandlerKind'\n\nconst DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {\n  onUnhandledRequest: 'warn',\n}\n\nexport class SetupServerCommonApi\n  extends SetupApi<LifeCycleEventsMap>\n  implements SetupServerCommon\n{\n  protected readonly interceptor: BatchInterceptor<\n    Array<Interceptor<HttpRequestEventMap>>,\n    HttpRequestEventMap\n  >\n  private resolvedOptions: RequiredDeep<SharedOptions>\n\n  constructor(\n    interceptors: Array<Interceptor<HttpRequestEventMap>>,\n    handlers: Array<RequestHandler | WebSocketHandler>,\n  ) {\n    super(...handlers)\n\n    this.interceptor = new BatchInterceptor({\n      name: 'setup-server',\n      interceptors,\n    })\n\n    this.resolvedOptions = {} as RequiredDeep<SharedOptions>\n  }\n\n  /**\n   * Subscribe to all requests that are using the interceptor object\n   */\n  private init(): void {\n    this.interceptor.on(\n      'request',\n      async ({ request, requestId, controller }) => {\n        const response = await handleRequest(\n          request,\n          requestId,\n          this.handlersController\n            .currentHandlers()\n            .filter(isHandlerKind('RequestHandler')),\n          this.resolvedOptions,\n          this.emitter,\n          {\n            onPassthroughResponse(request) {\n              const acceptHeader = request.headers.get('accept')\n\n              /**\n               * @note Remove the internal bypass request header.\n               * In the browser, this is done by the worker script.\n               * In Node.js, it has to be done here.\n               */\n              if (acceptHeader) {\n                const nextAcceptHeader = acceptHeader.replace(\n                  /(,\\s+)?msw\\/passthrough/,\n                  '',\n                )\n\n                if (nextAcceptHeader) {\n                  request.headers.set('accept', nextAcceptHeader)\n                } else {\n                  request.headers.delete('accept')\n                }\n              }\n            },\n          },\n        )\n\n        if (response) {\n          controller.respondWith(response)\n        }\n\n        return\n      },\n    )\n\n    this.interceptor.on('unhandledException', ({ error }) => {\n      if (error instanceof InternalError) {\n        throw error\n      }\n    })\n\n    this.interceptor.on(\n      'response',\n      ({ response, isMockedResponse, request, requestId }) => {\n        this.emitter.emit(\n          isMockedResponse ? 'response:mocked' : 'response:bypass',\n          {\n            response,\n            request,\n            requestId,\n          },\n        )\n      },\n    )\n\n    // Preconfigure the WebSocket interception but don't enable it just yet.\n    // It will be enabled when the server starts.\n    handleWebSocketEvent({\n      getUnhandledRequestStrategy: () => {\n        return this.resolvedOptions.onUnhandledRequest\n      },\n      getHandlers: () => {\n        return this.handlersController.currentHandlers()\n      },\n      onMockedConnection: () => {},\n      onPassthroughConnection: () => {},\n    })\n  }\n\n  public listen(options: Partial<SharedOptions> = {}): void {\n    this.resolvedOptions = mergeRight(\n      DEFAULT_LISTEN_OPTIONS,\n      options,\n    ) as RequiredDeep<SharedOptions>\n\n    // Apply the interceptor when starting the server.\n    // Attach the event listeners to the interceptor here\n    // so they get re-attached whenever `.listen()` is called.\n    this.interceptor.apply()\n    this.init()\n    this.subscriptions.push(() => this.interceptor.dispose())\n\n    // Apply the WebSocket interception.\n    webSocketInterceptor.apply()\n    this.subscriptions.push(() => webSocketInterceptor.dispose())\n\n    // Assert that the interceptor has been applied successfully.\n    // Also guards us from forgetting to call \"interceptor.apply()\"\n    // as a part of the \"listen\" method.\n    invariant(\n      [InterceptorReadyState.APPLYING, InterceptorReadyState.APPLIED].includes(\n        this.interceptor.readyState,\n      ),\n      devUtils.formatMessage(\n        'Failed to start \"setupServer\": the interceptor failed to apply. This is likely an issue with the library and you should report it at \"%s\".',\n      ),\n      'https://github.com/mswjs/msw/issues/new/choose',\n    )\n  }\n\n  public close(): void {\n    this.dispose()\n  }\n}\n","import type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'\nimport { SetupServerApi } from './SetupServerApi'\n\n/**\n * Sets up a requests interception in Node.js with the given request handlers.\n * @param {RequestHandler[]} handlers List of request handlers.\n *\n * @see {@link https://mswjs.io/docs/api/setup-server `setupServer()` API reference}\n */\nexport const setupServer = (\n  ...handlers: Array<RequestHandler | WebSocketHandler>\n): SetupServerApi => {\n  return new SetupServerApi(handlers)\n}\n"],"mappings":"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","names":["request"]}
+{"version":3,"sources":["../../src/node/setup-server.ts","../../src/node/async-handlers-controller.ts","../../src/node/setup-server-common.ts"],"sourcesContent":["import type { Interceptor } from '@mswjs/interceptors'\nimport { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '@mswjs/interceptors/fetch'\nimport { WebSocketInterceptor } from '@mswjs/interceptors/WebSocket'\nimport {\n  defineNetwork,\n  type DefineNetworkOptions,\n} from '#core/experimental/define-network'\nimport { type AnyHandler } from '#core/experimental/handlers-controller'\nimport { InterceptorSource } from '#core/experimental/sources/interceptor-source'\nimport { SetupServer } from './glossary'\nimport { AsyncHandlersController } from './async-handlers-controller'\nimport {\n  defineSetupServerApi,\n  SetupServerCommonApi,\n} from './setup-server-common'\n\nconst defaultInterceptors: Array<Interceptor<any>> = [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n  new FetchInterceptor(),\n  /**\n   * @fixme WebSocketInterceptor is in a browser-only export of Interceptors\n   * while the Interceptor class imported from the root module points to `lib/node`.\n   * An absolute madness to solve as it requires to duplicate the build config we have\n   * in MSW: shared core, CJS/ESM patching, .d.ts patching...\n   */\n  new WebSocketInterceptor() as any,\n]\n\nexport const defaultNetworkOptions: DefineNetworkOptions<[InterceptorSource]> =\n  {\n    sources: [\n      new InterceptorSource({\n        interceptors: defaultInterceptors,\n      }),\n    ],\n    onUnhandledFrame: 'warn',\n    context: {\n      quiet: true,\n    },\n  }\n\n/**\n * Enables request interception in Node.js with the given request handlers.\n * @see {@link https://mswjs.io/docs/api/setup-server `setupServer()` API reference}\n */\nexport function setupServer(...handlers: Array<AnyHandler>): SetupServer {\n  const handlersController = new AsyncHandlersController(handlers)\n  const network = defineNetwork({\n    ...defaultNetworkOptions,\n    handlers: handlersController,\n  })\n\n  const commonApi = defineSetupServerApi(network)\n\n  return {\n    ...commonApi,\n    boundary: handlersController.boundary.bind(handlersController),\n  }\n}\n\n/**\n * @deprecated\n * Please use the `defineNetwork` API instead.\n */\nexport class SetupServerApi\n  extends SetupServerCommonApi\n  implements SetupServer\n{\n  #handlersController: AsyncHandlersController\n\n  public boundary: AsyncHandlersController['boundary']\n\n  constructor(\n    handlers: Array<AnyHandler>,\n    interceptors: Array<Interceptor<any>>,\n  ) {\n    const controller = new AsyncHandlersController(handlers)\n    super(interceptors, controller)\n\n    const { sources: _, ...networkOptions } = defaultNetworkOptions\n    this.network.configure(networkOptions)\n\n    this.#handlersController = controller\n    this.boundary = this.#handlersController.boundary.bind(\n      this.#handlersController,\n    )\n  }\n}\n","import { AsyncLocalStorage } from 'node:async_hooks'\nimport {\n  type AnyHandler,\n  type HandlersMap,\n  HandlersController,\n  HandlersControllerState,\n} from '#core/experimental/handlers-controller'\n\nexport interface AsyncHandlersControllerContext {\n  initialHandlers: HandlersMap\n  handlers: HandlersMap\n}\n\nexport class AsyncHandlersController extends HandlersController {\n  #asyncContext: AsyncLocalStorage<AsyncHandlersControllerContext>\n  #fallbackContext: AsyncHandlersControllerContext\n\n  constructor(initialHandlers: Array<AnyHandler>) {\n    super()\n\n    const initialState = this.getInitialState(initialHandlers)\n\n    this.#asyncContext = new AsyncLocalStorage()\n    this.#fallbackContext = {\n      initialHandlers: initialState.initialHandlers,\n      handlers: initialState.handlers,\n    }\n  }\n\n  protected getState() {\n    const { initialHandlers, handlers } = this.#getContext()\n\n    return {\n      initialHandlers,\n      handlers,\n    }\n  }\n\n  protected setState(nextState: HandlersControllerState): void {\n    const context = this.#getContext()\n\n    if (nextState.initialHandlers) {\n      context.initialHandlers = nextState.initialHandlers\n    }\n\n    if (nextState.handlers) {\n      context.handlers = nextState.handlers\n    }\n  }\n\n  public boundary<Args extends Array<any>, R>(callback: (...args: Args) => R) {\n    return (...args: Args) => {\n      const initialHandlers = { ...this.getState().handlers }\n\n      return this.#asyncContext.run(\n        {\n          initialHandlers,\n          handlers: { ...initialHandlers },\n        },\n        callback,\n        ...args,\n      )\n    }\n  }\n\n  #getContext() {\n    return this.#asyncContext.getStore() || this.#fallbackContext\n  }\n}\n","import type { PartialDeep } from 'type-fest'\nimport { Interceptor } from '@mswjs/interceptors'\nimport {\n  type NetworkApi,\n  NetworkReadyState,\n  defineNetwork,\n} from '#core/experimental/define-network'\nimport { type AnyHandler } from '#core/experimental/handlers-controller'\nimport { type HandlersController } from '#core/experimental/handlers-controller'\nimport { InterceptorSource } from '#core/experimental/sources/interceptor-source'\nimport { fromLegacyOnUnhandledRequest } from '#core/experimental/compat'\nimport type { ListenOptions, SetupServerCommon } from './glossary'\n\n/**\n * Define the common `setupServer` API around the given network.\n * This is used by both `msw/node` and `msw/native` to implement the same\n * baseline setup methods, like `.use()`, `.resetHandlers()`, `.close()`, etc.\n */\nexport function defineSetupServerApi(\n  network: NetworkApi<any>,\n): SetupServerCommon {\n  return {\n    events: network.events,\n    listen(options) {\n      network.configure({\n        onUnhandledFrame: fromLegacyOnUnhandledRequest(() => {\n          return options?.onUnhandledRequest || 'warn'\n        }),\n      })\n\n      network.enable()\n    },\n    use: network.use.bind(network),\n    resetHandlers: network.resetHandlers.bind(network),\n    restoreHandlers: network.restoreHandlers.bind(network),\n    listHandlers: network.listHandlers.bind(network),\n    close() {\n      /**\n       * @note Ignore closing after closed for backwards compatibility.\n       */\n      if (network.readyState === NetworkReadyState.DISABLED) {\n        return\n      }\n\n      network.disable()\n    },\n  }\n}\n\n/**\n * @deprecated\n * Please use the `defineNetwork` API instead.\n */\nexport class SetupServerCommonApi implements SetupServerCommon {\n  protected network: NetworkApi<[InterceptorSource]>\n\n  constructor(\n    interceptors: Array<Interceptor<any>>,\n    handlers: Array<AnyHandler> | HandlersController,\n  ) {\n    this.network = defineNetwork({\n      sources: [new InterceptorSource({ interceptors })],\n      handlers,\n    })\n  }\n\n  get events() {\n    return this.network.events\n  }\n\n  public listen(options?: PartialDeep<ListenOptions>): void {\n    this.network.configure({\n      onUnhandledFrame: fromLegacyOnUnhandledRequest(() => {\n        return options?.onUnhandledRequest || 'warn'\n      }),\n    })\n\n    this.network.enable()\n  }\n\n  public use(...handlers: Array<AnyHandler>): void {\n    this.network.use(...handlers)\n  }\n\n  public resetHandlers(...nextHandlers: Array<AnyHandler>): void {\n    return this.network.resetHandlers(...nextHandlers)\n  }\n\n  public restoreHandlers(): void {\n    return this.network.restoreHandlers()\n  }\n\n  public listHandlers(): ReadonlyArray<AnyHandler> {\n    return this.network.listHandlers()\n  }\n\n  public close(): void {\n    this.network.disable()\n  }\n}\n"],"mappings":"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","names":["defineNetwork","InterceptorSource","InterceptorSource","defineNetwork"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.12.13",
+  "version": "2.13.0",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -158,9 +158,17 @@
         "default": "./lib/core/ws.js"
       }
     },
+    "./experimental": {
+      "import": "./lib/core/experimental/index.mjs",
+      "default": "./lib/core/experimental/index.js"
+    },
     "./mockServiceWorker.js": "./lib/mockServiceWorker.js",
     "./package.json": "./package.json"
   },
+  "imports": {
+    "#core": "./src/core",
+    "#core/*": "./src/core/*"
+  },
   "bin": {
     "msw": "cli/index.js"
   },
@@ -285,7 +293,7 @@
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
     "webpack-http-server": "^0.5.0",
-    "msw": "2.12.13"
+    "msw": "2.13.0"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

package/src/browser/{setupWorker/glossary.ts → glossary.ts}

@@ -1,33 +1,13 @@
-import { Emitter } from 'strict-event-emitter'
-import type { HttpRequestEventMap, Interceptor } from '@mswjs/interceptors'
-import type { DeferredPromise } from '@open-draft/deferred-promise'
-import {
-  LifeCycleEventEmitter,
-  LifeCycleEventsMap,
-  SharedOptions,
-} from '~/core/sharedOptions'
-import { RequestHandler } from '~/core/handlers/RequestHandler'
-import type { RequiredDeep } from '~/core/typeUtils'
-import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
-import type { WorkerChannel } from '../utils/workerChannel'
+import type { LifeCycleEventEmitter, SharedOptions } from '#core/sharedOptions'
+import type { RequiredDeep } from '#core/typeUtils'
+import type { HttpNetworkFrameEventMap } from '#core/experimental/frames/http-frame'
+import type { WebSocketNetworkFrameEventMap } from '#core/experimental/frames/websocket-frame'
+import { AnyHandler } from '#core/experimental/handlers-controller'
 
 export interface StringifiedResponse extends ResponseInit {
   body: string | ArrayBuffer | ReadableStream<Uint8Array> | null
 }
 
-export type SetupWorkerInternalContext = {
-  isMockingEnabled: boolean
-  workerStoppedAt?: number
-  startOptions: RequiredDeep<StartOptions>
-  workerPromise: DeferredPromise<ServiceWorker>
-  registration: ServiceWorkerRegistration | undefined
-  getRequestHandlers: () => Array<RequestHandler | WebSocketHandler>
-  emitter: Emitter<LifeCycleEventsMap>
-  keepAliveInterval?: number
-  workerChannel: WorkerChannel
-  fallbackInterceptor?: Interceptor<HttpRequestEventMap>
-}
-
 export type ServiceWorkerInstanceTuple = [
   ServiceWorker | null,
   ServiceWorkerRegistration,
@@ -62,6 +42,9 @@ export interface StartOptions extends SharedOptions {
    * Defers any network requests until the Service Worker
    * instance is activated.
    * @default true
+   * @deprecated
+   * Please use a proper browser integration instead.
+   * @see https://mswjs.io/docs/integrations/browser
    */
   waitUntilReady?: boolean
 
@@ -98,11 +81,11 @@ export interface SetupWorker {
 
   /**
    * Prepends given request handlers to the list of existing handlers.
-   * @param {RequestHandler[]} handlers List of runtime request handlers.
+   * @param {Array<AnyHandler>} handlers List of runtime request handlers.
    *
    * @see {@link https://mswjs.io/docs/api/setup-worker/use `worker.use()` API reference}
    */
-  use: (...handlers: Array<RequestHandler | WebSocketHandler>) => void
+  use: (...handlers: Array<AnyHandler>) => void
 
   /**
    * Marks all request handlers that respond using `res.once()` as unused.
@@ -113,20 +96,18 @@ export interface SetupWorker {
 
   /**
    * Resets request handlers to the initial list given to the `setupWorker` call, or to the explicit next request handlers list, if given.
-   * @param {RequestHandler[]} nextHandlers List of the new initial request handlers.
+   * @param {Array<AnyHandler>} nextHandlers List of the new initial request handlers.
    *
    * @see {@link https://mswjs.io/docs/api/setup-worker/reset-handlers `worker.resetHandlers()` API reference}
    */
-  resetHandlers: (
-    ...nextHandlers: Array<RequestHandler | WebSocketHandler>
-  ) => void
+  resetHandlers: (...nextHandlers: Array<AnyHandler>) => 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 | WebSocketHandler>
+  listHandlers: () => ReadonlyArray<AnyHandler>
 
   /**
    * Life-cycle events.
@@ -134,5 +115,7 @@ export interface SetupWorker {
    *
    * @see {@link https://mswjs.io/docs/api/life-cycle-events Life-cycle Events API reference}
    */
-  events: LifeCycleEventEmitter<LifeCycleEventsMap>
+  events: LifeCycleEventEmitter<
+    HttpNetworkFrameEventMap | WebSocketNetworkFrameEventMap
+  >
 }

package/src/browser/index.ts

@@ -1,3 +1,2 @@
-export { setupWorker } from './setupWorker/setupWorker'
-export type { SetupWorker, StartOptions } from './setupWorker/glossary'
-export { SetupWorkerApi } from './setupWorker/setupWorker'
+export { setupWorker, SetupWorkerApi } from './setup-worker'
+export type { SetupWorker, StartOptions } from './glossary'

package/src/browser/{setupWorker/setupWorker.node.test.ts → setup-worker.node.test.ts}

@@ -1,7 +1,5 @@
-/**
- * @vitest-environment node
- */
-import { setupWorker } from './setupWorker'
+// @vitest-environment node
+import { setupWorker } from './setup-worker'
 
 test('returns an error when run in a Node.js environment', () => {
   expect(setupWorker).toThrow(