msw 2.14.4 → 2.14.6

package/lib/core/experimental/define-network.js

@@ -29,6 +29,7 @@ var import_network_frame = require("./frames/network-frame");
 var import_on_unhandled_frame = require("./on-unhandled-frame");
 var import_handlers_controller = require("./handlers-controller");
 var import_toReadonlyArray = require("../utils/internal/toReadonlyArray");
+var import_Disposable = require("../utils/internal/Disposable");
 function colorlessPromiseAll(values) {
   const promises = [];
   for (const value of values) {
@@ -49,6 +50,7 @@ var NetworkReadyState = /* @__PURE__ */ ((NetworkReadyState2) => {
 function defineNetwork(options) {
   let readyState = 0 /* DISABLED */;
   const events = new import_rettime.Emitter();
+  const disposable = new import_Disposable.Disposable();
   const deriveHandlersController = (handlers) => {
     return handlers instanceof import_handlers_controller.HandlersController ? handlers : new import_handlers_controller.InMemoryHandlersController(handlers || []);
   };
@@ -56,14 +58,16 @@ function defineNetwork(options) {
     ...options
   };
   let handlersController = deriveHandlersController(resolvedOptions.handlers);
-  let listenersController;
   return {
     get readyState() {
       return readyState;
     },
     events,
     configure(options2) {
-      (0, import_outvariant.invariant)(readyState === 0 /* DISABLED */, "");
+      (0, import_outvariant.invariant)(
+        readyState === 0 /* DISABLED */,
+        'Failed to call "configure()" on the network: cannot configure an already enabled network.'
+      );
       if (options2.handlers && !Object.is(options2.handlers, resolvedOptions.handlers)) {
         handlersController = deriveHandlersController(options2.handlers);
       }
@@ -77,13 +81,19 @@ function defineNetwork(options) {
         readyState === 0 /* DISABLED */,
         'Failed to call "enable" on the network: already enabled'
       );
-      listenersController = new AbortController();
       readyState = 1 /* ENABLED */;
+      const session = { active: true };
+      disposable["subscriptions"].push(() => {
+        session.active = false;
+      });
       const result = resolvedOptions.sources.map((source) => {
         import_network_source.NetworkSource.prototype.disable.call(source);
         source.on("frame", async ({ frame }) => {
-          frame.events.on("*", (event) => events.emit(event), {
-            signal: listenersController.signal
+          frame.events.on("*", (event) => {
+            if (!session.active) {
+              return;
+            }
+            events.emit(event);
           });
           const handlers = frame.getHandlers(handlersController);
           await frame.resolve(
@@ -101,8 +111,8 @@ function defineNetwork(options) {
         readyState === 1 /* ENABLED */,
         'Failed to call "disable" on the network: already disabled'
       );
-      listenersController.abort();
       readyState = 0 /* DISABLED */;
+      disposable.dispose();
       return colorlessPromiseAll(
         resolvedOptions.sources.map((source) => source.disable())
       );

package/lib/core/experimental/define-network.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/core/experimental/define-network.ts"],"sourcesContent":["import { invariant } from 'outvariant'\nimport { Emitter, type DefaultEventMap } from 'rettime'\nimport {\n  NetworkSource,\n  type ExtractSourceEvents,\n} from './sources/network-source'\nimport { type NetworkFrameResolutionContext } from './frames/network-frame'\nimport { type UnhandledFrameHandle } from './on-unhandled-frame'\nimport {\n  HandlersController,\n  InMemoryHandlersController,\n  type AnyHandler,\n} from './handlers-controller'\nimport { toReadonlyArray } from '../utils/internal/toReadonlyArray'\n\ntype UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (\n  k: infer I,\n) => void\n  ? I\n  : never\n\ntype MergeEventMaps<Sources extends Array<NetworkSource<any>>> =\n  UnionToIntersection<ExtractSourceEvents<Sources[number]>> extends infer R\n    ? R extends Record<string, any>\n      ? R\n      : DefaultEventMap\n    : DefaultEventMap\n\ntype MaybePromise<T> =\n  Extract<T, Promise<unknown>> extends never ? void : Promise<void>\n\nexport interface DefineNetworkOptions<\n  Sources extends Array<NetworkSource<any>>,\n> {\n  /**\n   * List of the network sources.\n   * Every network source emits frames, and every frame describes how\n   * to handle the various network scenarios, like mocking a response,\n   * erroring the request, or performing it as-is.\n   */\n  sources: Sources\n  /**\n   * List of handlers to describe the network.\n   */\n  handlers?: Array<AnyHandler> | HandlersController\n  context?: NetworkFrameResolutionContext\n  onUnhandledFrame?: UnhandledFrameHandle\n}\n\nexport interface NetworkApi<\n  Sources extends Array<NetworkSource<any>>,\n> extends NetworkHandlersApi {\n  readyState: NetworkReadyState\n  /**\n   * Enable the network interception and handling.\n   */\n  enable: () => MaybePromise<ReturnType<Sources[number]['enable']>>\n  /**\n   * Disable the network interception and handling.\n   */\n  disable: () => MaybePromise<ReturnType<Sources[number]['disable']>>\n  /**\n   * Configure the network instance with additional options.\n   * The options provided in the `.configure()` call will override the same\n   * options in the `defineNetwork()` call.\n   */\n  configure: (options: Partial<DefineNetworkOptions<Sources>>) => void\n  events: Emitter<MergeEventMaps<Sources>>\n}\n\nexport interface NetworkHandlersApi {\n  use: (...handlers: Array<AnyHandler>) => void\n  resetHandlers: (...handlers: Array<AnyHandler>) => void\n  restoreHandlers: () => void\n  listHandlers: () => ReadonlyArray<AnyHandler>\n}\n\nfunction colorlessPromiseAll<T>(values: Array<T>): MaybePromise<T>\nfunction colorlessPromiseAll(values: Array<unknown>): Promise<void> | void {\n  const promises: Array<Promise<void>> = []\n\n  for (const value of values) {\n    if (value instanceof Promise) {\n      promises.push(value)\n    }\n  }\n\n  if (promises.length > 0) {\n    return Promise.all(promises).then(() => {})\n  }\n}\n\nexport enum NetworkReadyState {\n  DISABLED,\n  ENABLED,\n}\n\n/**\n * Define a network instance with the given configuration.\n * @example\n * import { InterceptorSource } from 'msw/experimental'\n * import { handlers } from './handlers'\n *\n * const network = defineNetwork({\n *   sources: [new InterceptorSource({ interceptors })],\n *   handlers,\n * })\n * await network.enable()\n */\nexport function defineNetwork<Sources extends Array<NetworkSource<any>>>(\n  options: DefineNetworkOptions<Sources>,\n): NetworkApi<Sources> {\n  let readyState: NetworkReadyState = NetworkReadyState.DISABLED\n  const events = new Emitter<MergeEventMaps<Sources>>()\n\n  const deriveHandlersController = (\n    handlers: DefineNetworkOptions<Sources>['handlers'],\n  ) => {\n    return handlers instanceof HandlersController\n      ? handlers\n      : new InMemoryHandlersController(handlers || [])\n  }\n\n  let resolvedOptions: DefineNetworkOptions<Sources> = {\n    ...options,\n  }\n\n  /**\n   * @note Create the handlers controller immediately because\n   * certain setup APIs, like `setupServer`, don't await `.enable` (`.listen`).\n   */\n  let handlersController = deriveHandlersController(resolvedOptions.handlers)\n  let listenersController: AbortController\n\n  return {\n    get readyState() {\n      return readyState\n    },\n    events,\n    configure(options) {\n      invariant(readyState === NetworkReadyState.DISABLED, '')\n\n      if (\n        options.handlers &&\n        !Object.is(options.handlers, resolvedOptions.handlers)\n      ) {\n        handlersController = deriveHandlersController(options.handlers)\n      }\n\n      resolvedOptions = {\n        ...resolvedOptions,\n        ...options,\n      }\n    },\n    enable() {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"enable\" on the network: already enabled',\n      )\n\n      listenersController = new AbortController()\n      readyState = NetworkReadyState.ENABLED\n\n      const result = resolvedOptions.sources.map((source) => {\n        /**\n         * @note Preemptively disable the network source before enabling.\n         * This intentionally calls only the prototype method that clears the\n         * event listeners and nothing else. This prevents the \"frame\" listeners\n         * from accumulating across enable/disable in case the source is a singleton.\n         */\n        NetworkSource.prototype.disable.call(source)\n\n        source.on('frame', async ({ frame }) => {\n          frame.events.on('*', (event) => events.emit(event), {\n            signal: listenersController.signal,\n          })\n\n          const handlers = frame.getHandlers(handlersController)\n\n          await frame.resolve(\n            handlers,\n            resolvedOptions.onUnhandledFrame || 'warn',\n            resolvedOptions.context,\n          )\n        })\n\n        return source.enable()\n      })\n\n      return colorlessPromiseAll(result) as MaybePromise<\n        ReturnType<Sources[number]['enable']>\n      >\n    },\n    disable() {\n      invariant(\n        readyState === NetworkReadyState.ENABLED,\n        'Failed to call \"disable\" on the network: already disabled',\n      )\n\n      listenersController.abort()\n      readyState = NetworkReadyState.DISABLED\n\n      return colorlessPromiseAll(\n        resolvedOptions.sources.map((source) => source.disable()),\n      ) as MaybePromise<ReturnType<Sources[number]['disable']>>\n    },\n    use(...handlers) {\n      handlersController.use(handlers)\n    },\n    resetHandlers(...handlers) {\n      handlersController.reset(handlers)\n    },\n    restoreHandlers() {\n      handlersController.restore()\n    },\n    listHandlers() {\n      return toReadonlyArray(handlersController.currentHandlers())\n    },\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAA0B;AAC1B,qBAA8C;AAC9C,4BAGO;AACP,2BAAmD;AACnD,gCAA0C;AAC1C,iCAIO;AACP,6BAAgC;AAiEhC,SAAS,oBAAoB,QAA8C;AACzE,QAAM,WAAiC,CAAC;AAExC,aAAW,SAAS,QAAQ;AAC1B,QAAI,iBAAiB,SAAS;AAC5B,eAAS,KAAK,KAAK;AAAA,IACrB;AAAA,EACF;AAEA,MAAI,SAAS,SAAS,GAAG;AACvB,WAAO,QAAQ,IAAI,QAAQ,EAAE,KAAK,MAAM;AAAA,IAAC,CAAC;AAAA,EAC5C;AACF;AAEO,IAAK,oBAAL,kBAAKA,uBAAL;AACL,EAAAA,sCAAA;AACA,EAAAA,sCAAA;AAFU,SAAAA;AAAA,GAAA;AAiBL,SAAS,cACd,SACqB;AACrB,MAAI,aAAgC;AACpC,QAAM,SAAS,IAAI,uBAAiC;AAEpD,QAAM,2BAA2B,CAC/B,aACG;AACH,WAAO,oBAAoB,gDACvB,WACA,IAAI,sDAA2B,YAAY,CAAC,CAAC;AAAA,EACnD;AAEA,MAAI,kBAAiD;AAAA,IACnD,GAAG;AAAA,EACL;AAMA,MAAI,qBAAqB,yBAAyB,gBAAgB,QAAQ;AAC1E,MAAI;AAEJ,SAAO;AAAA,IACL,IAAI,aAAa;AACf,aAAO;AAAA,IACT;AAAA,IACA;AAAA,IACA,UAAUC,UAAS;AACjB,uCAAU,eAAe,kBAA4B,EAAE;AAEvD,UACEA,SAAQ,YACR,CAAC,OAAO,GAAGA,SAAQ,UAAU,gBAAgB,QAAQ,GACrD;AACA,6BAAqB,yBAAyBA,SAAQ,QAAQ;AAAA,MAChE;AAEA,wBAAkB;AAAA,QAChB,GAAG;AAAA,QACH,GAAGA;AAAA,MACL;AAAA,IACF;AAAA,IACA,SAAS;AACP;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,4BAAsB,IAAI,gBAAgB;AAC1C,mBAAa;AAEb,YAAM,SAAS,gBAAgB,QAAQ,IAAI,CAAC,WAAW;AAOrD,4CAAc,UAAU,QAAQ,KAAK,MAAM;AAE3C,eAAO,GAAG,SAAS,OAAO,EAAE,MAAM,MAAM;AACtC,gBAAM,OAAO,GAAG,KAAK,CAAC,UAAU,OAAO,KAAK,KAAK,GAAG;AAAA,YAClD,QAAQ,oBAAoB;AAAA,UAC9B,CAAC;AAED,gBAAM,WAAW,MAAM,YAAY,kBAAkB;AAErD,gBAAM,MAAM;AAAA,YACV;AAAA,YACA,gBAAgB,oBAAoB;AAAA,YACpC,gBAAgB;AAAA,UAClB;AAAA,QACF,CAAC;AAED,eAAO,OAAO,OAAO;AAAA,MACvB,CAAC;AAED,aAAO,oBAAoB,MAAM;AAAA,IAGnC;AAAA,IACA,UAAU;AACR;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,0BAAoB,MAAM;AAC1B,mBAAa;AAEb,aAAO;AAAA,QACL,gBAAgB,QAAQ,IAAI,CAAC,WAAW,OAAO,QAAQ,CAAC;AAAA,MAC1D;AAAA,IACF;AAAA,IACA,OAAO,UAAU;AACf,yBAAmB,IAAI,QAAQ;AAAA,IACjC;AAAA,IACA,iBAAiB,UAAU;AACzB,yBAAmB,MAAM,QAAQ;AAAA,IACnC;AAAA,IACA,kBAAkB;AAChB,yBAAmB,QAAQ;AAAA,IAC7B;AAAA,IACA,eAAe;AACb,iBAAO,wCAAgB,mBAAmB,gBAAgB,CAAC;AAAA,IAC7D;AAAA,EACF;AACF;","names":["NetworkReadyState","options"]}
+{"version":3,"sources":["../../../src/core/experimental/define-network.ts"],"sourcesContent":["import { invariant } from 'outvariant'\nimport { Emitter, type DefaultEventMap } from 'rettime'\nimport {\n  NetworkSource,\n  type ExtractSourceEvents,\n} from './sources/network-source'\nimport { type NetworkFrameResolutionContext } from './frames/network-frame'\nimport { type UnhandledFrameHandle } from './on-unhandled-frame'\nimport {\n  HandlersController,\n  InMemoryHandlersController,\n  type AnyHandler,\n} from './handlers-controller'\nimport { toReadonlyArray } from '../utils/internal/toReadonlyArray'\nimport { Disposable } from '../utils/internal/Disposable'\n\ntype UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (\n  k: infer I,\n) => void\n  ? I\n  : never\n\ntype MergeEventMaps<Sources extends Array<NetworkSource<any>>> =\n  UnionToIntersection<ExtractSourceEvents<Sources[number]>> extends infer R\n    ? R extends Record<string, any>\n      ? R\n      : DefaultEventMap\n    : DefaultEventMap\n\ntype MaybePromise<T> =\n  Extract<T, Promise<unknown>> extends never ? void : Promise<void>\n\nexport interface DefineNetworkOptions<\n  Sources extends Array<NetworkSource<any>>,\n> {\n  /**\n   * List of the network sources.\n   * Every network source emits frames, and every frame describes how\n   * to handle the various network scenarios, like mocking a response,\n   * erroring the request, or performing it as-is.\n   */\n  sources: Sources\n  /**\n   * List of handlers to describe the network.\n   */\n  handlers?: Array<AnyHandler> | HandlersController\n  context?: NetworkFrameResolutionContext\n  onUnhandledFrame?: UnhandledFrameHandle\n}\n\nexport interface NetworkApi<\n  Sources extends Array<NetworkSource<any>>,\n> extends NetworkHandlersApi {\n  readyState: NetworkReadyState\n  /**\n   * Enable the network interception and handling.\n   */\n  enable: () => MaybePromise<ReturnType<Sources[number]['enable']>>\n  /**\n   * Disable the network interception and handling.\n   */\n  disable: () => MaybePromise<ReturnType<Sources[number]['disable']>>\n  /**\n   * Configure the network instance with additional options.\n   * The options provided in the `.configure()` call will override the same\n   * options in the `defineNetwork()` call.\n   */\n  configure: (options: Partial<DefineNetworkOptions<Sources>>) => void\n  events: Emitter<MergeEventMaps<Sources>>\n}\n\nexport interface NetworkHandlersApi {\n  use: (...handlers: Array<AnyHandler>) => void\n  resetHandlers: (...handlers: Array<AnyHandler>) => void\n  restoreHandlers: () => void\n  listHandlers: () => ReadonlyArray<AnyHandler>\n}\n\nfunction colorlessPromiseAll<T>(values: Array<T>): MaybePromise<T>\nfunction colorlessPromiseAll(values: Array<unknown>): Promise<void> | void {\n  const promises: Array<Promise<void>> = []\n\n  for (const value of values) {\n    if (value instanceof Promise) {\n      promises.push(value)\n    }\n  }\n\n  if (promises.length > 0) {\n    return Promise.all(promises).then(() => {})\n  }\n}\n\nexport enum NetworkReadyState {\n  DISABLED,\n  ENABLED,\n}\n\n/**\n * Define a network instance with the given configuration.\n * @example\n * import { InterceptorSource } from 'msw/experimental'\n * import { handlers } from './handlers'\n *\n * const network = defineNetwork({\n *   sources: [new InterceptorSource({ interceptors })],\n *   handlers,\n * })\n * await network.enable()\n */\nexport function defineNetwork<Sources extends Array<NetworkSource<any>>>(\n  options: DefineNetworkOptions<Sources>,\n): NetworkApi<Sources> {\n  let readyState: NetworkReadyState = NetworkReadyState.DISABLED\n  const events = new Emitter<MergeEventMaps<Sources>>()\n  const disposable = new Disposable()\n\n  const deriveHandlersController = (\n    handlers: DefineNetworkOptions<Sources>['handlers'],\n  ) => {\n    return handlers instanceof HandlersController\n      ? handlers\n      : new InMemoryHandlersController(handlers || [])\n  }\n\n  let resolvedOptions: DefineNetworkOptions<Sources> = {\n    ...options,\n  }\n\n  /**\n   * @note Create the handlers controller immediately because\n   * certain setup APIs, like `setupServer`, don't await `.enable` (`.listen`).\n   */\n  let handlersController = deriveHandlersController(resolvedOptions.handlers)\n\n  return {\n    get readyState() {\n      return readyState\n    },\n    events,\n    configure(options) {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"configure()\" on the network: cannot configure an already enabled network.',\n      )\n\n      if (\n        options.handlers &&\n        !Object.is(options.handlers, resolvedOptions.handlers)\n      ) {\n        handlersController = deriveHandlersController(options.handlers)\n      }\n\n      resolvedOptions = {\n        ...resolvedOptions,\n        ...options,\n      }\n    },\n    enable() {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"enable\" on the network: already enabled',\n      )\n\n      readyState = NetworkReadyState.ENABLED\n\n      /**\n       * @note Use a session object scoped to the current \"enable()\"\n       * to prevent \"frame.events\" listeners from surviving across enable/disable cycles.\n       * @see The note about `AbortController` below.\n       */\n      const session = { active: true }\n      disposable['subscriptions'].push(() => {\n        session.active = false\n      })\n\n      const result = resolvedOptions.sources.map((source) => {\n        /**\n         * @note Preemptively disable the network source before enabling.\n         * This intentionally calls only the prototype method that clears the\n         * event listeners and nothing else. This prevents the \"frame\" listeners\n         * from accumulating across enable/disable in case the source is a singleton.\n         */\n        NetworkSource.prototype.disable.call(source)\n\n        source.on('frame', async ({ frame }) => {\n          frame.events.on('*', (event) => {\n            /**\n             * @note Prevent event forwarding manually and not via an AbortController\n             * because certain runtimes, like Cloudflare, throw when referencing an\n             * AbortController created in a different context. Bear in mind that the frame\n             * events run in the patched request client context while the AbortController\n             * is created outside, in the \"defineNetwork\" closure, which is a test context.\n             */\n            if (!session.active) {\n              return\n            }\n\n            events.emit(event)\n          })\n\n          const handlers = frame.getHandlers(handlersController)\n\n          await frame.resolve(\n            handlers,\n            resolvedOptions.onUnhandledFrame || 'warn',\n            resolvedOptions.context,\n          )\n        })\n\n        return source.enable()\n      })\n\n      return colorlessPromiseAll(result) as MaybePromise<\n        ReturnType<Sources[number]['enable']>\n      >\n    },\n    disable() {\n      invariant(\n        readyState === NetworkReadyState.ENABLED,\n        'Failed to call \"disable\" on the network: already disabled',\n      )\n\n      readyState = NetworkReadyState.DISABLED\n      disposable.dispose()\n\n      return colorlessPromiseAll(\n        resolvedOptions.sources.map((source) => source.disable()),\n      ) as MaybePromise<ReturnType<Sources[number]['disable']>>\n    },\n    use(...handlers) {\n      handlersController.use(handlers)\n    },\n    resetHandlers(...handlers) {\n      handlersController.reset(handlers)\n    },\n    restoreHandlers() {\n      handlersController.restore()\n    },\n    listHandlers() {\n      return toReadonlyArray(handlersController.currentHandlers())\n    },\n  }\n}\n"],"mappings":"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","names":["NetworkReadyState","options"]}

package/lib/core/experimental/define-network.mjs

@@ -10,6 +10,7 @@ import {
   InMemoryHandlersController
 } from './handlers-controller.mjs';
 import { toReadonlyArray } from '../utils/internal/toReadonlyArray.mjs';
+import { Disposable } from '../utils/internal/Disposable.mjs';
 function colorlessPromiseAll(values) {
   const promises = [];
   for (const value of values) {
@@ -30,6 +31,7 @@ var NetworkReadyState = /* @__PURE__ */ ((NetworkReadyState2) => {
 function defineNetwork(options) {
   let readyState = 0 /* DISABLED */;
   const events = new Emitter();
+  const disposable = new Disposable();
   const deriveHandlersController = (handlers) => {
     return handlers instanceof HandlersController ? handlers : new InMemoryHandlersController(handlers || []);
   };
@@ -37,14 +39,16 @@ function defineNetwork(options) {
     ...options
   };
   let handlersController = deriveHandlersController(resolvedOptions.handlers);
-  let listenersController;
   return {
     get readyState() {
       return readyState;
     },
     events,
     configure(options2) {
-      invariant(readyState === 0 /* DISABLED */, "");
+      invariant(
+        readyState === 0 /* DISABLED */,
+        'Failed to call "configure()" on the network: cannot configure an already enabled network.'
+      );
       if (options2.handlers && !Object.is(options2.handlers, resolvedOptions.handlers)) {
         handlersController = deriveHandlersController(options2.handlers);
       }
@@ -58,13 +62,19 @@ function defineNetwork(options) {
         readyState === 0 /* DISABLED */,
         'Failed to call "enable" on the network: already enabled'
       );
-      listenersController = new AbortController();
       readyState = 1 /* ENABLED */;
+      const session = { active: true };
+      disposable["subscriptions"].push(() => {
+        session.active = false;
+      });
       const result = resolvedOptions.sources.map((source) => {
         NetworkSource.prototype.disable.call(source);
         source.on("frame", async ({ frame }) => {
-          frame.events.on("*", (event) => events.emit(event), {
-            signal: listenersController.signal
+          frame.events.on("*", (event) => {
+            if (!session.active) {
+              return;
+            }
+            events.emit(event);
           });
           const handlers = frame.getHandlers(handlersController);
           await frame.resolve(
@@ -82,8 +92,8 @@ function defineNetwork(options) {
         readyState === 1 /* ENABLED */,
         'Failed to call "disable" on the network: already disabled'
       );
-      listenersController.abort();
       readyState = 0 /* DISABLED */;
+      disposable.dispose();
       return colorlessPromiseAll(
         resolvedOptions.sources.map((source) => source.disable())
       );

package/lib/core/experimental/define-network.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/core/experimental/define-network.ts"],"sourcesContent":["import { invariant } from 'outvariant'\nimport { Emitter, type DefaultEventMap } from 'rettime'\nimport {\n  NetworkSource,\n  type ExtractSourceEvents,\n} from './sources/network-source'\nimport { type NetworkFrameResolutionContext } from './frames/network-frame'\nimport { type UnhandledFrameHandle } from './on-unhandled-frame'\nimport {\n  HandlersController,\n  InMemoryHandlersController,\n  type AnyHandler,\n} from './handlers-controller'\nimport { toReadonlyArray } from '../utils/internal/toReadonlyArray'\n\ntype UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (\n  k: infer I,\n) => void\n  ? I\n  : never\n\ntype MergeEventMaps<Sources extends Array<NetworkSource<any>>> =\n  UnionToIntersection<ExtractSourceEvents<Sources[number]>> extends infer R\n    ? R extends Record<string, any>\n      ? R\n      : DefaultEventMap\n    : DefaultEventMap\n\ntype MaybePromise<T> =\n  Extract<T, Promise<unknown>> extends never ? void : Promise<void>\n\nexport interface DefineNetworkOptions<\n  Sources extends Array<NetworkSource<any>>,\n> {\n  /**\n   * List of the network sources.\n   * Every network source emits frames, and every frame describes how\n   * to handle the various network scenarios, like mocking a response,\n   * erroring the request, or performing it as-is.\n   */\n  sources: Sources\n  /**\n   * List of handlers to describe the network.\n   */\n  handlers?: Array<AnyHandler> | HandlersController\n  context?: NetworkFrameResolutionContext\n  onUnhandledFrame?: UnhandledFrameHandle\n}\n\nexport interface NetworkApi<\n  Sources extends Array<NetworkSource<any>>,\n> extends NetworkHandlersApi {\n  readyState: NetworkReadyState\n  /**\n   * Enable the network interception and handling.\n   */\n  enable: () => MaybePromise<ReturnType<Sources[number]['enable']>>\n  /**\n   * Disable the network interception and handling.\n   */\n  disable: () => MaybePromise<ReturnType<Sources[number]['disable']>>\n  /**\n   * Configure the network instance with additional options.\n   * The options provided in the `.configure()` call will override the same\n   * options in the `defineNetwork()` call.\n   */\n  configure: (options: Partial<DefineNetworkOptions<Sources>>) => void\n  events: Emitter<MergeEventMaps<Sources>>\n}\n\nexport interface NetworkHandlersApi {\n  use: (...handlers: Array<AnyHandler>) => void\n  resetHandlers: (...handlers: Array<AnyHandler>) => void\n  restoreHandlers: () => void\n  listHandlers: () => ReadonlyArray<AnyHandler>\n}\n\nfunction colorlessPromiseAll<T>(values: Array<T>): MaybePromise<T>\nfunction colorlessPromiseAll(values: Array<unknown>): Promise<void> | void {\n  const promises: Array<Promise<void>> = []\n\n  for (const value of values) {\n    if (value instanceof Promise) {\n      promises.push(value)\n    }\n  }\n\n  if (promises.length > 0) {\n    return Promise.all(promises).then(() => {})\n  }\n}\n\nexport enum NetworkReadyState {\n  DISABLED,\n  ENABLED,\n}\n\n/**\n * Define a network instance with the given configuration.\n * @example\n * import { InterceptorSource } from 'msw/experimental'\n * import { handlers } from './handlers'\n *\n * const network = defineNetwork({\n *   sources: [new InterceptorSource({ interceptors })],\n *   handlers,\n * })\n * await network.enable()\n */\nexport function defineNetwork<Sources extends Array<NetworkSource<any>>>(\n  options: DefineNetworkOptions<Sources>,\n): NetworkApi<Sources> {\n  let readyState: NetworkReadyState = NetworkReadyState.DISABLED\n  const events = new Emitter<MergeEventMaps<Sources>>()\n\n  const deriveHandlersController = (\n    handlers: DefineNetworkOptions<Sources>['handlers'],\n  ) => {\n    return handlers instanceof HandlersController\n      ? handlers\n      : new InMemoryHandlersController(handlers || [])\n  }\n\n  let resolvedOptions: DefineNetworkOptions<Sources> = {\n    ...options,\n  }\n\n  /**\n   * @note Create the handlers controller immediately because\n   * certain setup APIs, like `setupServer`, don't await `.enable` (`.listen`).\n   */\n  let handlersController = deriveHandlersController(resolvedOptions.handlers)\n  let listenersController: AbortController\n\n  return {\n    get readyState() {\n      return readyState\n    },\n    events,\n    configure(options) {\n      invariant(readyState === NetworkReadyState.DISABLED, '')\n\n      if (\n        options.handlers &&\n        !Object.is(options.handlers, resolvedOptions.handlers)\n      ) {\n        handlersController = deriveHandlersController(options.handlers)\n      }\n\n      resolvedOptions = {\n        ...resolvedOptions,\n        ...options,\n      }\n    },\n    enable() {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"enable\" on the network: already enabled',\n      )\n\n      listenersController = new AbortController()\n      readyState = NetworkReadyState.ENABLED\n\n      const result = resolvedOptions.sources.map((source) => {\n        /**\n         * @note Preemptively disable the network source before enabling.\n         * This intentionally calls only the prototype method that clears the\n         * event listeners and nothing else. This prevents the \"frame\" listeners\n         * from accumulating across enable/disable in case the source is a singleton.\n         */\n        NetworkSource.prototype.disable.call(source)\n\n        source.on('frame', async ({ frame }) => {\n          frame.events.on('*', (event) => events.emit(event), {\n            signal: listenersController.signal,\n          })\n\n          const handlers = frame.getHandlers(handlersController)\n\n          await frame.resolve(\n            handlers,\n            resolvedOptions.onUnhandledFrame || 'warn',\n            resolvedOptions.context,\n          )\n        })\n\n        return source.enable()\n      })\n\n      return colorlessPromiseAll(result) as MaybePromise<\n        ReturnType<Sources[number]['enable']>\n      >\n    },\n    disable() {\n      invariant(\n        readyState === NetworkReadyState.ENABLED,\n        'Failed to call \"disable\" on the network: already disabled',\n      )\n\n      listenersController.abort()\n      readyState = NetworkReadyState.DISABLED\n\n      return colorlessPromiseAll(\n        resolvedOptions.sources.map((source) => source.disable()),\n      ) as MaybePromise<ReturnType<Sources[number]['disable']>>\n    },\n    use(...handlers) {\n      handlersController.use(handlers)\n    },\n    resetHandlers(...handlers) {\n      handlersController.reset(handlers)\n    },\n    restoreHandlers() {\n      handlersController.restore()\n    },\n    listHandlers() {\n      return toReadonlyArray(handlersController.currentHandlers())\n    },\n  }\n}\n"],"mappings":"AAAA,SAAS,iBAAiB;AAC1B,SAAS,eAAqC;AAC9C;AAAA,EACE;AAAA,OAEK;AACP,eAAmD;AACnD,eAA0C;AAC1C;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AACP,SAAS,uBAAuB;AAiEhC,SAAS,oBAAoB,QAA8C;AACzE,QAAM,WAAiC,CAAC;AAExC,aAAW,SAAS,QAAQ;AAC1B,QAAI,iBAAiB,SAAS;AAC5B,eAAS,KAAK,KAAK;AAAA,IACrB;AAAA,EACF;AAEA,MAAI,SAAS,SAAS,GAAG;AACvB,WAAO,QAAQ,IAAI,QAAQ,EAAE,KAAK,MAAM;AAAA,IAAC,CAAC;AAAA,EAC5C;AACF;AAEO,IAAK,oBAAL,kBAAKA,uBAAL;AACL,EAAAA,sCAAA;AACA,EAAAA,sCAAA;AAFU,SAAAA;AAAA,GAAA;AAiBL,SAAS,cACd,SACqB;AACrB,MAAI,aAAgC;AACpC,QAAM,SAAS,IAAI,QAAiC;AAEpD,QAAM,2BAA2B,CAC/B,aACG;AACH,WAAO,oBAAoB,qBACvB,WACA,IAAI,2BAA2B,YAAY,CAAC,CAAC;AAAA,EACnD;AAEA,MAAI,kBAAiD;AAAA,IACnD,GAAG;AAAA,EACL;AAMA,MAAI,qBAAqB,yBAAyB,gBAAgB,QAAQ;AAC1E,MAAI;AAEJ,SAAO;AAAA,IACL,IAAI,aAAa;AACf,aAAO;AAAA,IACT;AAAA,IACA;AAAA,IACA,UAAUC,UAAS;AACjB,gBAAU,eAAe,kBAA4B,EAAE;AAEvD,UACEA,SAAQ,YACR,CAAC,OAAO,GAAGA,SAAQ,UAAU,gBAAgB,QAAQ,GACrD;AACA,6BAAqB,yBAAyBA,SAAQ,QAAQ;AAAA,MAChE;AAEA,wBAAkB;AAAA,QAChB,GAAG;AAAA,QACH,GAAGA;AAAA,MACL;AAAA,IACF;AAAA,IACA,SAAS;AACP;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,4BAAsB,IAAI,gBAAgB;AAC1C,mBAAa;AAEb,YAAM,SAAS,gBAAgB,QAAQ,IAAI,CAAC,WAAW;AAOrD,sBAAc,UAAU,QAAQ,KAAK,MAAM;AAE3C,eAAO,GAAG,SAAS,OAAO,EAAE,MAAM,MAAM;AACtC,gBAAM,OAAO,GAAG,KAAK,CAAC,UAAU,OAAO,KAAK,KAAK,GAAG;AAAA,YAClD,QAAQ,oBAAoB;AAAA,UAC9B,CAAC;AAED,gBAAM,WAAW,MAAM,YAAY,kBAAkB;AAErD,gBAAM,MAAM;AAAA,YACV;AAAA,YACA,gBAAgB,oBAAoB;AAAA,YACpC,gBAAgB;AAAA,UAClB;AAAA,QACF,CAAC;AAED,eAAO,OAAO,OAAO;AAAA,MACvB,CAAC;AAED,aAAO,oBAAoB,MAAM;AAAA,IAGnC;AAAA,IACA,UAAU;AACR;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,0BAAoB,MAAM;AAC1B,mBAAa;AAEb,aAAO;AAAA,QACL,gBAAgB,QAAQ,IAAI,CAAC,WAAW,OAAO,QAAQ,CAAC;AAAA,MAC1D;AAAA,IACF;AAAA,IACA,OAAO,UAAU;AACf,yBAAmB,IAAI,QAAQ;AAAA,IACjC;AAAA,IACA,iBAAiB,UAAU;AACzB,yBAAmB,MAAM,QAAQ;AAAA,IACnC;AAAA,IACA,kBAAkB;AAChB,yBAAmB,QAAQ;AAAA,IAC7B;AAAA,IACA,eAAe;AACb,aAAO,gBAAgB,mBAAmB,gBAAgB,CAAC;AAAA,IAC7D;AAAA,EACF;AACF;","names":["NetworkReadyState","options"]}
+{"version":3,"sources":["../../../src/core/experimental/define-network.ts"],"sourcesContent":["import { invariant } from 'outvariant'\nimport { Emitter, type DefaultEventMap } from 'rettime'\nimport {\n  NetworkSource,\n  type ExtractSourceEvents,\n} from './sources/network-source'\nimport { type NetworkFrameResolutionContext } from './frames/network-frame'\nimport { type UnhandledFrameHandle } from './on-unhandled-frame'\nimport {\n  HandlersController,\n  InMemoryHandlersController,\n  type AnyHandler,\n} from './handlers-controller'\nimport { toReadonlyArray } from '../utils/internal/toReadonlyArray'\nimport { Disposable } from '../utils/internal/Disposable'\n\ntype UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (\n  k: infer I,\n) => void\n  ? I\n  : never\n\ntype MergeEventMaps<Sources extends Array<NetworkSource<any>>> =\n  UnionToIntersection<ExtractSourceEvents<Sources[number]>> extends infer R\n    ? R extends Record<string, any>\n      ? R\n      : DefaultEventMap\n    : DefaultEventMap\n\ntype MaybePromise<T> =\n  Extract<T, Promise<unknown>> extends never ? void : Promise<void>\n\nexport interface DefineNetworkOptions<\n  Sources extends Array<NetworkSource<any>>,\n> {\n  /**\n   * List of the network sources.\n   * Every network source emits frames, and every frame describes how\n   * to handle the various network scenarios, like mocking a response,\n   * erroring the request, or performing it as-is.\n   */\n  sources: Sources\n  /**\n   * List of handlers to describe the network.\n   */\n  handlers?: Array<AnyHandler> | HandlersController\n  context?: NetworkFrameResolutionContext\n  onUnhandledFrame?: UnhandledFrameHandle\n}\n\nexport interface NetworkApi<\n  Sources extends Array<NetworkSource<any>>,\n> extends NetworkHandlersApi {\n  readyState: NetworkReadyState\n  /**\n   * Enable the network interception and handling.\n   */\n  enable: () => MaybePromise<ReturnType<Sources[number]['enable']>>\n  /**\n   * Disable the network interception and handling.\n   */\n  disable: () => MaybePromise<ReturnType<Sources[number]['disable']>>\n  /**\n   * Configure the network instance with additional options.\n   * The options provided in the `.configure()` call will override the same\n   * options in the `defineNetwork()` call.\n   */\n  configure: (options: Partial<DefineNetworkOptions<Sources>>) => void\n  events: Emitter<MergeEventMaps<Sources>>\n}\n\nexport interface NetworkHandlersApi {\n  use: (...handlers: Array<AnyHandler>) => void\n  resetHandlers: (...handlers: Array<AnyHandler>) => void\n  restoreHandlers: () => void\n  listHandlers: () => ReadonlyArray<AnyHandler>\n}\n\nfunction colorlessPromiseAll<T>(values: Array<T>): MaybePromise<T>\nfunction colorlessPromiseAll(values: Array<unknown>): Promise<void> | void {\n  const promises: Array<Promise<void>> = []\n\n  for (const value of values) {\n    if (value instanceof Promise) {\n      promises.push(value)\n    }\n  }\n\n  if (promises.length > 0) {\n    return Promise.all(promises).then(() => {})\n  }\n}\n\nexport enum NetworkReadyState {\n  DISABLED,\n  ENABLED,\n}\n\n/**\n * Define a network instance with the given configuration.\n * @example\n * import { InterceptorSource } from 'msw/experimental'\n * import { handlers } from './handlers'\n *\n * const network = defineNetwork({\n *   sources: [new InterceptorSource({ interceptors })],\n *   handlers,\n * })\n * await network.enable()\n */\nexport function defineNetwork<Sources extends Array<NetworkSource<any>>>(\n  options: DefineNetworkOptions<Sources>,\n): NetworkApi<Sources> {\n  let readyState: NetworkReadyState = NetworkReadyState.DISABLED\n  const events = new Emitter<MergeEventMaps<Sources>>()\n  const disposable = new Disposable()\n\n  const deriveHandlersController = (\n    handlers: DefineNetworkOptions<Sources>['handlers'],\n  ) => {\n    return handlers instanceof HandlersController\n      ? handlers\n      : new InMemoryHandlersController(handlers || [])\n  }\n\n  let resolvedOptions: DefineNetworkOptions<Sources> = {\n    ...options,\n  }\n\n  /**\n   * @note Create the handlers controller immediately because\n   * certain setup APIs, like `setupServer`, don't await `.enable` (`.listen`).\n   */\n  let handlersController = deriveHandlersController(resolvedOptions.handlers)\n\n  return {\n    get readyState() {\n      return readyState\n    },\n    events,\n    configure(options) {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"configure()\" on the network: cannot configure an already enabled network.',\n      )\n\n      if (\n        options.handlers &&\n        !Object.is(options.handlers, resolvedOptions.handlers)\n      ) {\n        handlersController = deriveHandlersController(options.handlers)\n      }\n\n      resolvedOptions = {\n        ...resolvedOptions,\n        ...options,\n      }\n    },\n    enable() {\n      invariant(\n        readyState === NetworkReadyState.DISABLED,\n        'Failed to call \"enable\" on the network: already enabled',\n      )\n\n      readyState = NetworkReadyState.ENABLED\n\n      /**\n       * @note Use a session object scoped to the current \"enable()\"\n       * to prevent \"frame.events\" listeners from surviving across enable/disable cycles.\n       * @see The note about `AbortController` below.\n       */\n      const session = { active: true }\n      disposable['subscriptions'].push(() => {\n        session.active = false\n      })\n\n      const result = resolvedOptions.sources.map((source) => {\n        /**\n         * @note Preemptively disable the network source before enabling.\n         * This intentionally calls only the prototype method that clears the\n         * event listeners and nothing else. This prevents the \"frame\" listeners\n         * from accumulating across enable/disable in case the source is a singleton.\n         */\n        NetworkSource.prototype.disable.call(source)\n\n        source.on('frame', async ({ frame }) => {\n          frame.events.on('*', (event) => {\n            /**\n             * @note Prevent event forwarding manually and not via an AbortController\n             * because certain runtimes, like Cloudflare, throw when referencing an\n             * AbortController created in a different context. Bear in mind that the frame\n             * events run in the patched request client context while the AbortController\n             * is created outside, in the \"defineNetwork\" closure, which is a test context.\n             */\n            if (!session.active) {\n              return\n            }\n\n            events.emit(event)\n          })\n\n          const handlers = frame.getHandlers(handlersController)\n\n          await frame.resolve(\n            handlers,\n            resolvedOptions.onUnhandledFrame || 'warn',\n            resolvedOptions.context,\n          )\n        })\n\n        return source.enable()\n      })\n\n      return colorlessPromiseAll(result) as MaybePromise<\n        ReturnType<Sources[number]['enable']>\n      >\n    },\n    disable() {\n      invariant(\n        readyState === NetworkReadyState.ENABLED,\n        'Failed to call \"disable\" on the network: already disabled',\n      )\n\n      readyState = NetworkReadyState.DISABLED\n      disposable.dispose()\n\n      return colorlessPromiseAll(\n        resolvedOptions.sources.map((source) => source.disable()),\n      ) as MaybePromise<ReturnType<Sources[number]['disable']>>\n    },\n    use(...handlers) {\n      handlersController.use(handlers)\n    },\n    resetHandlers(...handlers) {\n      handlersController.reset(handlers)\n    },\n    restoreHandlers() {\n      handlersController.restore()\n    },\n    listHandlers() {\n      return toReadonlyArray(handlersController.currentHandlers())\n    },\n  }\n}\n"],"mappings":"AAAA,SAAS,iBAAiB;AAC1B,SAAS,eAAqC;AAC9C;AAAA,EACE;AAAA,OAEK;AACP,eAAmD;AACnD,eAA0C;AAC1C;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AACP,SAAS,uBAAuB;AAChC,SAAS,kBAAkB;AAiE3B,SAAS,oBAAoB,QAA8C;AACzE,QAAM,WAAiC,CAAC;AAExC,aAAW,SAAS,QAAQ;AAC1B,QAAI,iBAAiB,SAAS;AAC5B,eAAS,KAAK,KAAK;AAAA,IACrB;AAAA,EACF;AAEA,MAAI,SAAS,SAAS,GAAG;AACvB,WAAO,QAAQ,IAAI,QAAQ,EAAE,KAAK,MAAM;AAAA,IAAC,CAAC;AAAA,EAC5C;AACF;AAEO,IAAK,oBAAL,kBAAKA,uBAAL;AACL,EAAAA,sCAAA;AACA,EAAAA,sCAAA;AAFU,SAAAA;AAAA,GAAA;AAiBL,SAAS,cACd,SACqB;AACrB,MAAI,aAAgC;AACpC,QAAM,SAAS,IAAI,QAAiC;AACpD,QAAM,aAAa,IAAI,WAAW;AAElC,QAAM,2BAA2B,CAC/B,aACG;AACH,WAAO,oBAAoB,qBACvB,WACA,IAAI,2BAA2B,YAAY,CAAC,CAAC;AAAA,EACnD;AAEA,MAAI,kBAAiD;AAAA,IACnD,GAAG;AAAA,EACL;AAMA,MAAI,qBAAqB,yBAAyB,gBAAgB,QAAQ;AAE1E,SAAO;AAAA,IACL,IAAI,aAAa;AACf,aAAO;AAAA,IACT;AAAA,IACA;AAAA,IACA,UAAUC,UAAS;AACjB;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,UACEA,SAAQ,YACR,CAAC,OAAO,GAAGA,SAAQ,UAAU,gBAAgB,QAAQ,GACrD;AACA,6BAAqB,yBAAyBA,SAAQ,QAAQ;AAAA,MAChE;AAEA,wBAAkB;AAAA,QAChB,GAAG;AAAA,QACH,GAAGA;AAAA,MACL;AAAA,IACF;AAAA,IACA,SAAS;AACP;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,mBAAa;AAOb,YAAM,UAAU,EAAE,QAAQ,KAAK;AAC/B,iBAAW,eAAe,EAAE,KAAK,MAAM;AACrC,gBAAQ,SAAS;AAAA,MACnB,CAAC;AAED,YAAM,SAAS,gBAAgB,QAAQ,IAAI,CAAC,WAAW;AAOrD,sBAAc,UAAU,QAAQ,KAAK,MAAM;AAE3C,eAAO,GAAG,SAAS,OAAO,EAAE,MAAM,MAAM;AACtC,gBAAM,OAAO,GAAG,KAAK,CAAC,UAAU;AAQ9B,gBAAI,CAAC,QAAQ,QAAQ;AACnB;AAAA,YACF;AAEA,mBAAO,KAAK,KAAK;AAAA,UACnB,CAAC;AAED,gBAAM,WAAW,MAAM,YAAY,kBAAkB;AAErD,gBAAM,MAAM;AAAA,YACV;AAAA,YACA,gBAAgB,oBAAoB;AAAA,YACpC,gBAAgB;AAAA,UAClB;AAAA,QACF,CAAC;AAED,eAAO,OAAO,OAAO;AAAA,MACvB,CAAC;AAED,aAAO,oBAAoB,MAAM;AAAA,IAGnC;AAAA,IACA,UAAU;AACR;AAAA,QACE,eAAe;AAAA,QACf;AAAA,MACF;AAEA,mBAAa;AACb,iBAAW,QAAQ;AAEnB,aAAO;AAAA,QACL,gBAAgB,QAAQ,IAAI,CAAC,WAAW,OAAO,QAAQ,CAAC;AAAA,MAC1D;AAAA,IACF;AAAA,IACA,OAAO,UAAU;AACf,yBAAmB,IAAI,QAAQ;AAAA,IACjC;AAAA,IACA,iBAAiB,UAAU;AACzB,yBAAmB,MAAM,QAAQ;AAAA,IACnC;AAAA,IACA,kBAAkB;AAChB,yBAAmB,QAAQ;AAAA,IAC7B;AAAA,IACA,eAAe;AACb,aAAO,gBAAgB,mBAAmB,gBAAgB,CAAC;AAAA,IAC7D;AAAA,EACF;AACF;","names":["NetworkReadyState","options"]}

package/lib/core/experimental/sources/interceptor-source.js

@@ -126,6 +126,15 @@ class InterceptorHttpNetworkFrame extends import_http_frame.HttpNetworkFrame {
 class InterceptorWebSocketNetworkFrame extends import_websocket_frame.WebSocketNetworkFrame {
   constructor(args) {
     super({ connection: args.connection });
+    args.connection.client.addEventListener(
+      "close",
+      () => {
+        this.events.removeAllListeners();
+      },
+      {
+        once: true
+      }
+    );
   }
   errorWith(reason) {
     if (reason instanceof Error) {

package/lib/core/experimental/sources/interceptor-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/core/experimental/sources/interceptor-source.ts"],"sourcesContent":["import type { Interceptor, RequestController } from '@mswjs/interceptors'\nimport { BatchInterceptor, type HttpRequestEventMap } from '@mswjs/interceptors'\nimport type {\n  WebSocketConnectionData,\n  WebSocketEventMap,\n} from '@mswjs/interceptors/WebSocket'\nimport { NetworkSource } from './network-source'\nimport { InternalError } from '../../utils/internal/devUtils'\nimport { HttpNetworkFrame, ResponseEvent } from '../frames/http-frame'\nimport { WebSocketNetworkFrame } from '../frames/websocket-frame'\nimport { deleteRequestPassthroughHeader } from '../request-utils'\n\nexport interface InterceptorSourceOptions {\n  interceptors: Array<Interceptor<HttpRequestEventMap | WebSocketEventMap>>\n}\n\n/**\n * Create a network source from the given list of interceptors.\n */\nexport class InterceptorSource extends NetworkSource {\n  #interceptor: BatchInterceptor<\n    InterceptorSourceOptions['interceptors'],\n    HttpRequestEventMap | WebSocketEventMap\n  >\n\n  #frames: Map<string, HttpNetworkFrame>\n\n  constructor(options: InterceptorSourceOptions) {\n    super()\n\n    this.#interceptor = new BatchInterceptor({\n      name: 'interceptor-source',\n      interceptors: options.interceptors,\n    })\n    this.#frames = new Map()\n  }\n\n  public enable(): void {\n    this.#interceptor.apply()\n\n    /**\n     * @todo @fixme BatchInterceptor infers event types but not listener types.\n     */\n    this.#interceptor\n      .on('request', this.#handleRequest.bind(this) as any)\n      .on('response', this.#handleResponse.bind(this) as any)\n      .on('connection', this.#handleWebSocketConnection.bind(this) as any)\n  }\n\n  public disable(): void {\n    super.disable()\n    this.#interceptor.dispose()\n\n    /**\n     * @todo We can also abort any pending frames here, given we implement\n     * the `NetworkFrame.abort()` method.\n     */\n    this.#frames.clear()\n  }\n\n  async #handleRequest({\n    requestId,\n    request,\n    controller,\n  }: HttpRequestEventMap['request'][0]): Promise<void> {\n    const httpFrame = new InterceptorHttpNetworkFrame({\n      id: requestId,\n      request,\n      controller,\n    })\n\n    this.#frames.set(requestId, httpFrame)\n    await this.queue(httpFrame)\n  }\n\n  async #handleResponse({\n    requestId,\n    request,\n    response,\n    isMockedResponse,\n  }: HttpRequestEventMap['response'][0]): Promise<void> {\n    const httpFrame = this.#frames.get(requestId)\n    this.#frames.delete(requestId)\n\n    if (httpFrame == null) {\n      return\n    }\n\n    queueMicrotask(() => {\n      try {\n        httpFrame.events.emit(\n          new ResponseEvent(\n            isMockedResponse ? 'response:mocked' : 'response:bypass',\n            {\n              requestId,\n              request,\n              response,\n            },\n          ),\n        )\n      } finally {\n        /**\n         * @note Remove any listeners from this frame.\n         * Past this point, it won't emit anything. The removal is crucial\n         * to prevent \"rettime\" from keeping the abort cleanup listeners internally.\n         * @see https://github.com/mswjs/msw/issues/2735\n         */\n        httpFrame.events.removeAllListeners()\n      }\n    })\n  }\n\n  async #handleWebSocketConnection(\n    connection: WebSocketEventMap['connection'][0],\n  ): Promise<void> {\n    await this.queue(\n      new InterceptorWebSocketNetworkFrame({\n        connection,\n      }),\n    )\n  }\n}\n\nclass InterceptorHttpNetworkFrame extends HttpNetworkFrame {\n  #controller: RequestController\n\n  constructor(options: {\n    id: string\n    request: Request\n    controller: RequestController\n  }) {\n    super({\n      id: options.id,\n      request: options.request,\n    })\n\n    this.#controller = options.controller\n  }\n\n  public passthrough(): void {\n    deleteRequestPassthroughHeader(this.data.request)\n  }\n\n  public respondWith(response?: Response): void {\n    if (response) {\n      this.#controller.respondWith(response)\n    }\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Response) {\n      return this.respondWith(reason)\n    }\n\n    if (reason instanceof InternalError) {\n      this.#controller.errorWith(reason)\n    }\n\n    throw reason\n  }\n}\n\nclass InterceptorWebSocketNetworkFrame extends WebSocketNetworkFrame {\n  constructor(args: { connection: WebSocketConnectionData }) {\n    super({ connection: args.connection })\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Error) {\n      const { client } = this.data.connection\n\n      /**\n       * Use `client.errorWith(reason)` in the future.\n       * @see https://github.com/mswjs/interceptors/issues/747\n       */\n      const errorEvent = new Event('error')\n\n      Object.defineProperty(errorEvent, 'cause', {\n        enumerable: true,\n        configurable: false,\n        value: reason,\n      })\n\n      client.socket.dispatchEvent(errorEvent)\n    }\n  }\n\n  public passthrough() {\n    this.data.connection.server.connect()\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAA2D;AAK3D,4BAA8B;AAC9B,sBAA8B;AAC9B,wBAAgD;AAChD,6BAAsC;AACtC,2BAA+C;AASxC,MAAM,0BAA0B,oCAAc;AAAA,EACnD;AAAA,EAKA;AAAA,EAEA,YAAY,SAAmC;AAC7C,UAAM;AAEN,SAAK,eAAe,IAAI,qCAAiB;AAAA,MACvC,MAAM;AAAA,MACN,cAAc,QAAQ;AAAA,IACxB,CAAC;AACD,SAAK,UAAU,oBAAI,IAAI;AAAA,EACzB;AAAA,EAEO,SAAe;AACpB,SAAK,aAAa,MAAM;AAKxB,SAAK,aACF,GAAG,WAAW,KAAK,eAAe,KAAK,IAAI,CAAQ,EACnD,GAAG,YAAY,KAAK,gBAAgB,KAAK,IAAI,CAAQ,EACrD,GAAG,cAAc,KAAK,2BAA2B,KAAK,IAAI,CAAQ;AAAA,EACvE;AAAA,EAEO,UAAgB;AACrB,UAAM,QAAQ;AACd,SAAK,aAAa,QAAQ;AAM1B,SAAK,QAAQ,MAAM;AAAA,EACrB;AAAA,EAEA,MAAM,eAAe;AAAA,IACnB;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAqD;AACnD,UAAM,YAAY,IAAI,4BAA4B;AAAA,MAChD,IAAI;AAAA,MACJ;AAAA,MACA;AAAA,IACF,CAAC;AAED,SAAK,QAAQ,IAAI,WAAW,SAAS;AACrC,UAAM,KAAK,MAAM,SAAS;AAAA,EAC5B;AAAA,EAEA,MAAM,gBAAgB;AAAA,IACpB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAsD;AACpD,UAAM,YAAY,KAAK,QAAQ,IAAI,SAAS;AAC5C,SAAK,QAAQ,OAAO,SAAS;AAE7B,QAAI,aAAa,MAAM;AACrB;AAAA,IACF;AAEA,mBAAe,MAAM;AACnB,UAAI;AACF,kBAAU,OAAO;AAAA,UACf,IAAI;AAAA,YACF,mBAAmB,oBAAoB;AAAA,YACvC;AAAA,cACE;AAAA,cACA;AAAA,cACA;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF,UAAE;AAOA,kBAAU,OAAO,mBAAmB;AAAA,MACtC;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,2BACJ,YACe;AACf,UAAM,KAAK;AAAA,MACT,IAAI,iCAAiC;AAAA,QACnC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEA,MAAM,oCAAoC,mCAAiB;AAAA,EACzD;AAAA,EAEA,YAAY,SAIT;AACD,UAAM;AAAA,MACJ,IAAI,QAAQ;AAAA,MACZ,SAAS,QAAQ;AAAA,IACnB,CAAC;AAED,SAAK,cAAc,QAAQ;AAAA,EAC7B;AAAA,EAEO,cAAoB;AACzB,6DAA+B,KAAK,KAAK,OAAO;AAAA,EAClD;AAAA,EAEO,YAAY,UAA2B;AAC5C,QAAI,UAAU;AACZ,WAAK,YAAY,YAAY,QAAQ;AAAA,IACvC;AAAA,EACF;AAAA,EAEO,UAAU,QAAwB;AACvC,QAAI,kBAAkB,UAAU;AAC9B,aAAO,KAAK,YAAY,MAAM;AAAA,IAChC;AAEA,QAAI,kBAAkB,+BAAe;AACnC,WAAK,YAAY,UAAU,MAAM;AAAA,IACnC;AAEA,UAAM;AAAA,EACR;AACF;AAEA,MAAM,yCAAyC,6CAAsB;AAAA,EACnE,YAAY,MAA+C;AACzD,UAAM,EAAE,YAAY,KAAK,WAAW,CAAC;AAAA,EACvC;AAAA,EAEO,UAAU,QAAwB;AACvC,QAAI,kBAAkB,OAAO;AAC3B,YAAM,EAAE,OAAO,IAAI,KAAK,KAAK;AAM7B,YAAM,aAAa,IAAI,MAAM,OAAO;AAEpC,aAAO,eAAe,YAAY,SAAS;AAAA,QACzC,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,OAAO;AAAA,MACT,CAAC;AAED,aAAO,OAAO,cAAc,UAAU;AAAA,IACxC;AAAA,EACF;AAAA,EAEO,cAAc;AACnB,SAAK,KAAK,WAAW,OAAO,QAAQ;AAAA,EACtC;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/core/experimental/sources/interceptor-source.ts"],"sourcesContent":["import type { Interceptor, RequestController } from '@mswjs/interceptors'\nimport { BatchInterceptor, type HttpRequestEventMap } from '@mswjs/interceptors'\nimport type {\n  WebSocketConnectionData,\n  WebSocketEventMap,\n} from '@mswjs/interceptors/WebSocket'\nimport { NetworkSource } from './network-source'\nimport { InternalError } from '../../utils/internal/devUtils'\nimport { HttpNetworkFrame, ResponseEvent } from '../frames/http-frame'\nimport { WebSocketNetworkFrame } from '../frames/websocket-frame'\nimport { deleteRequestPassthroughHeader } from '../request-utils'\n\nexport interface InterceptorSourceOptions {\n  interceptors: Array<Interceptor<HttpRequestEventMap | WebSocketEventMap>>\n}\n\n/**\n * Create a network source from the given list of interceptors.\n */\nexport class InterceptorSource extends NetworkSource {\n  #interceptor: BatchInterceptor<\n    InterceptorSourceOptions['interceptors'],\n    HttpRequestEventMap | WebSocketEventMap\n  >\n\n  #frames: Map<string, HttpNetworkFrame>\n\n  constructor(options: InterceptorSourceOptions) {\n    super()\n\n    this.#interceptor = new BatchInterceptor({\n      name: 'interceptor-source',\n      interceptors: options.interceptors,\n    })\n    this.#frames = new Map()\n  }\n\n  public enable(): void {\n    this.#interceptor.apply()\n\n    /**\n     * @todo @fixme BatchInterceptor infers event types but not listener types.\n     */\n    this.#interceptor\n      .on('request', this.#handleRequest.bind(this) as any)\n      .on('response', this.#handleResponse.bind(this) as any)\n      .on('connection', this.#handleWebSocketConnection.bind(this) as any)\n  }\n\n  public disable(): void {\n    super.disable()\n    this.#interceptor.dispose()\n\n    /**\n     * @todo We can also abort any pending frames here, given we implement\n     * the `NetworkFrame.abort()` method.\n     */\n    this.#frames.clear()\n  }\n\n  async #handleRequest({\n    requestId,\n    request,\n    controller,\n  }: HttpRequestEventMap['request'][0]): Promise<void> {\n    const httpFrame = new InterceptorHttpNetworkFrame({\n      id: requestId,\n      request,\n      controller,\n    })\n\n    this.#frames.set(requestId, httpFrame)\n    await this.queue(httpFrame)\n  }\n\n  async #handleResponse({\n    requestId,\n    request,\n    response,\n    isMockedResponse,\n  }: HttpRequestEventMap['response'][0]): Promise<void> {\n    const httpFrame = this.#frames.get(requestId)\n    this.#frames.delete(requestId)\n\n    if (httpFrame == null) {\n      return\n    }\n\n    queueMicrotask(() => {\n      try {\n        httpFrame.events.emit(\n          new ResponseEvent(\n            isMockedResponse ? 'response:mocked' : 'response:bypass',\n            {\n              requestId,\n              request,\n              response,\n            },\n          ),\n        )\n      } finally {\n        /**\n         * @note Remove any listeners from this frame.\n         * Past this point, it won't emit anything. The removal is crucial\n         * to prevent \"rettime\" from keeping the abort cleanup listeners internally.\n         * @see https://github.com/mswjs/msw/issues/2735\n         */\n        httpFrame.events.removeAllListeners()\n      }\n    })\n  }\n\n  async #handleWebSocketConnection(\n    connection: WebSocketEventMap['connection'][0],\n  ): Promise<void> {\n    await this.queue(\n      new InterceptorWebSocketNetworkFrame({\n        connection,\n      }),\n    )\n  }\n}\n\nclass InterceptorHttpNetworkFrame extends HttpNetworkFrame {\n  #controller: RequestController\n\n  constructor(options: {\n    id: string\n    request: Request\n    controller: RequestController\n  }) {\n    super({\n      id: options.id,\n      request: options.request,\n    })\n\n    this.#controller = options.controller\n  }\n\n  public passthrough(): void {\n    deleteRequestPassthroughHeader(this.data.request)\n  }\n\n  public respondWith(response?: Response): void {\n    if (response) {\n      this.#controller.respondWith(response)\n    }\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Response) {\n      return this.respondWith(reason)\n    }\n\n    if (reason instanceof InternalError) {\n      this.#controller.errorWith(reason)\n    }\n\n    throw reason\n  }\n}\n\nclass InterceptorWebSocketNetworkFrame extends WebSocketNetworkFrame {\n  constructor(args: { connection: WebSocketConnectionData }) {\n    super({ connection: args.connection })\n\n    /**\n     * @note Provide a similar frame listener cleanup as for HTTP.\n     * When the client connection closes, the handler can no longer be used.\n     */\n    args.connection.client.addEventListener(\n      'close',\n      () => {\n        this.events.removeAllListeners()\n      },\n      {\n        once: true,\n      },\n    )\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Error) {\n      const { client } = this.data.connection\n\n      /**\n       * Use `client.errorWith(reason)` in the future.\n       * @see https://github.com/mswjs/interceptors/issues/747\n       */\n      const errorEvent = new Event('error')\n\n      Object.defineProperty(errorEvent, 'cause', {\n        enumerable: true,\n        configurable: false,\n        value: reason,\n      })\n\n      client.socket.dispatchEvent(errorEvent)\n    }\n  }\n\n  public passthrough() {\n    this.data.connection.server.connect()\n  }\n}\n"],"mappings":"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","names":[]}

package/lib/core/experimental/sources/interceptor-source.mjs

@@ -103,6 +103,15 @@ class InterceptorHttpNetworkFrame extends HttpNetworkFrame {
 class InterceptorWebSocketNetworkFrame extends WebSocketNetworkFrame {
   constructor(args) {
     super({ connection: args.connection });
+    args.connection.client.addEventListener(
+      "close",
+      () => {
+        this.events.removeAllListeners();
+      },
+      {
+        once: true
+      }
+    );
   }
   errorWith(reason) {
     if (reason instanceof Error) {

package/lib/core/experimental/sources/interceptor-source.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/core/experimental/sources/interceptor-source.ts"],"sourcesContent":["import type { Interceptor, RequestController } from '@mswjs/interceptors'\nimport { BatchInterceptor, type HttpRequestEventMap } from '@mswjs/interceptors'\nimport type {\n  WebSocketConnectionData,\n  WebSocketEventMap,\n} from '@mswjs/interceptors/WebSocket'\nimport { NetworkSource } from './network-source'\nimport { InternalError } from '../../utils/internal/devUtils'\nimport { HttpNetworkFrame, ResponseEvent } from '../frames/http-frame'\nimport { WebSocketNetworkFrame } from '../frames/websocket-frame'\nimport { deleteRequestPassthroughHeader } from '../request-utils'\n\nexport interface InterceptorSourceOptions {\n  interceptors: Array<Interceptor<HttpRequestEventMap | WebSocketEventMap>>\n}\n\n/**\n * Create a network source from the given list of interceptors.\n */\nexport class InterceptorSource extends NetworkSource {\n  #interceptor: BatchInterceptor<\n    InterceptorSourceOptions['interceptors'],\n    HttpRequestEventMap | WebSocketEventMap\n  >\n\n  #frames: Map<string, HttpNetworkFrame>\n\n  constructor(options: InterceptorSourceOptions) {\n    super()\n\n    this.#interceptor = new BatchInterceptor({\n      name: 'interceptor-source',\n      interceptors: options.interceptors,\n    })\n    this.#frames = new Map()\n  }\n\n  public enable(): void {\n    this.#interceptor.apply()\n\n    /**\n     * @todo @fixme BatchInterceptor infers event types but not listener types.\n     */\n    this.#interceptor\n      .on('request', this.#handleRequest.bind(this) as any)\n      .on('response', this.#handleResponse.bind(this) as any)\n      .on('connection', this.#handleWebSocketConnection.bind(this) as any)\n  }\n\n  public disable(): void {\n    super.disable()\n    this.#interceptor.dispose()\n\n    /**\n     * @todo We can also abort any pending frames here, given we implement\n     * the `NetworkFrame.abort()` method.\n     */\n    this.#frames.clear()\n  }\n\n  async #handleRequest({\n    requestId,\n    request,\n    controller,\n  }: HttpRequestEventMap['request'][0]): Promise<void> {\n    const httpFrame = new InterceptorHttpNetworkFrame({\n      id: requestId,\n      request,\n      controller,\n    })\n\n    this.#frames.set(requestId, httpFrame)\n    await this.queue(httpFrame)\n  }\n\n  async #handleResponse({\n    requestId,\n    request,\n    response,\n    isMockedResponse,\n  }: HttpRequestEventMap['response'][0]): Promise<void> {\n    const httpFrame = this.#frames.get(requestId)\n    this.#frames.delete(requestId)\n\n    if (httpFrame == null) {\n      return\n    }\n\n    queueMicrotask(() => {\n      try {\n        httpFrame.events.emit(\n          new ResponseEvent(\n            isMockedResponse ? 'response:mocked' : 'response:bypass',\n            {\n              requestId,\n              request,\n              response,\n            },\n          ),\n        )\n      } finally {\n        /**\n         * @note Remove any listeners from this frame.\n         * Past this point, it won't emit anything. The removal is crucial\n         * to prevent \"rettime\" from keeping the abort cleanup listeners internally.\n         * @see https://github.com/mswjs/msw/issues/2735\n         */\n        httpFrame.events.removeAllListeners()\n      }\n    })\n  }\n\n  async #handleWebSocketConnection(\n    connection: WebSocketEventMap['connection'][0],\n  ): Promise<void> {\n    await this.queue(\n      new InterceptorWebSocketNetworkFrame({\n        connection,\n      }),\n    )\n  }\n}\n\nclass InterceptorHttpNetworkFrame extends HttpNetworkFrame {\n  #controller: RequestController\n\n  constructor(options: {\n    id: string\n    request: Request\n    controller: RequestController\n  }) {\n    super({\n      id: options.id,\n      request: options.request,\n    })\n\n    this.#controller = options.controller\n  }\n\n  public passthrough(): void {\n    deleteRequestPassthroughHeader(this.data.request)\n  }\n\n  public respondWith(response?: Response): void {\n    if (response) {\n      this.#controller.respondWith(response)\n    }\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Response) {\n      return this.respondWith(reason)\n    }\n\n    if (reason instanceof InternalError) {\n      this.#controller.errorWith(reason)\n    }\n\n    throw reason\n  }\n}\n\nclass InterceptorWebSocketNetworkFrame extends WebSocketNetworkFrame {\n  constructor(args: { connection: WebSocketConnectionData }) {\n    super({ connection: args.connection })\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Error) {\n      const { client } = this.data.connection\n\n      /**\n       * Use `client.errorWith(reason)` in the future.\n       * @see https://github.com/mswjs/interceptors/issues/747\n       */\n      const errorEvent = new Event('error')\n\n      Object.defineProperty(errorEvent, 'cause', {\n        enumerable: true,\n        configurable: false,\n        value: reason,\n      })\n\n      client.socket.dispatchEvent(errorEvent)\n    }\n  }\n\n  public passthrough() {\n    this.data.connection.server.connect()\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/core/experimental/sources/interceptor-source.ts"],"sourcesContent":["import type { Interceptor, RequestController } from '@mswjs/interceptors'\nimport { BatchInterceptor, type HttpRequestEventMap } from '@mswjs/interceptors'\nimport type {\n  WebSocketConnectionData,\n  WebSocketEventMap,\n} from '@mswjs/interceptors/WebSocket'\nimport { NetworkSource } from './network-source'\nimport { InternalError } from '../../utils/internal/devUtils'\nimport { HttpNetworkFrame, ResponseEvent } from '../frames/http-frame'\nimport { WebSocketNetworkFrame } from '../frames/websocket-frame'\nimport { deleteRequestPassthroughHeader } from '../request-utils'\n\nexport interface InterceptorSourceOptions {\n  interceptors: Array<Interceptor<HttpRequestEventMap | WebSocketEventMap>>\n}\n\n/**\n * Create a network source from the given list of interceptors.\n */\nexport class InterceptorSource extends NetworkSource {\n  #interceptor: BatchInterceptor<\n    InterceptorSourceOptions['interceptors'],\n    HttpRequestEventMap | WebSocketEventMap\n  >\n\n  #frames: Map<string, HttpNetworkFrame>\n\n  constructor(options: InterceptorSourceOptions) {\n    super()\n\n    this.#interceptor = new BatchInterceptor({\n      name: 'interceptor-source',\n      interceptors: options.interceptors,\n    })\n    this.#frames = new Map()\n  }\n\n  public enable(): void {\n    this.#interceptor.apply()\n\n    /**\n     * @todo @fixme BatchInterceptor infers event types but not listener types.\n     */\n    this.#interceptor\n      .on('request', this.#handleRequest.bind(this) as any)\n      .on('response', this.#handleResponse.bind(this) as any)\n      .on('connection', this.#handleWebSocketConnection.bind(this) as any)\n  }\n\n  public disable(): void {\n    super.disable()\n    this.#interceptor.dispose()\n\n    /**\n     * @todo We can also abort any pending frames here, given we implement\n     * the `NetworkFrame.abort()` method.\n     */\n    this.#frames.clear()\n  }\n\n  async #handleRequest({\n    requestId,\n    request,\n    controller,\n  }: HttpRequestEventMap['request'][0]): Promise<void> {\n    const httpFrame = new InterceptorHttpNetworkFrame({\n      id: requestId,\n      request,\n      controller,\n    })\n\n    this.#frames.set(requestId, httpFrame)\n    await this.queue(httpFrame)\n  }\n\n  async #handleResponse({\n    requestId,\n    request,\n    response,\n    isMockedResponse,\n  }: HttpRequestEventMap['response'][0]): Promise<void> {\n    const httpFrame = this.#frames.get(requestId)\n    this.#frames.delete(requestId)\n\n    if (httpFrame == null) {\n      return\n    }\n\n    queueMicrotask(() => {\n      try {\n        httpFrame.events.emit(\n          new ResponseEvent(\n            isMockedResponse ? 'response:mocked' : 'response:bypass',\n            {\n              requestId,\n              request,\n              response,\n            },\n          ),\n        )\n      } finally {\n        /**\n         * @note Remove any listeners from this frame.\n         * Past this point, it won't emit anything. The removal is crucial\n         * to prevent \"rettime\" from keeping the abort cleanup listeners internally.\n         * @see https://github.com/mswjs/msw/issues/2735\n         */\n        httpFrame.events.removeAllListeners()\n      }\n    })\n  }\n\n  async #handleWebSocketConnection(\n    connection: WebSocketEventMap['connection'][0],\n  ): Promise<void> {\n    await this.queue(\n      new InterceptorWebSocketNetworkFrame({\n        connection,\n      }),\n    )\n  }\n}\n\nclass InterceptorHttpNetworkFrame extends HttpNetworkFrame {\n  #controller: RequestController\n\n  constructor(options: {\n    id: string\n    request: Request\n    controller: RequestController\n  }) {\n    super({\n      id: options.id,\n      request: options.request,\n    })\n\n    this.#controller = options.controller\n  }\n\n  public passthrough(): void {\n    deleteRequestPassthroughHeader(this.data.request)\n  }\n\n  public respondWith(response?: Response): void {\n    if (response) {\n      this.#controller.respondWith(response)\n    }\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Response) {\n      return this.respondWith(reason)\n    }\n\n    if (reason instanceof InternalError) {\n      this.#controller.errorWith(reason)\n    }\n\n    throw reason\n  }\n}\n\nclass InterceptorWebSocketNetworkFrame extends WebSocketNetworkFrame {\n  constructor(args: { connection: WebSocketConnectionData }) {\n    super({ connection: args.connection })\n\n    /**\n     * @note Provide a similar frame listener cleanup as for HTTP.\n     * When the client connection closes, the handler can no longer be used.\n     */\n    args.connection.client.addEventListener(\n      'close',\n      () => {\n        this.events.removeAllListeners()\n      },\n      {\n        once: true,\n      },\n    )\n  }\n\n  public errorWith(reason?: unknown): void {\n    if (reason instanceof Error) {\n      const { client } = this.data.connection\n\n      /**\n       * Use `client.errorWith(reason)` in the future.\n       * @see https://github.com/mswjs/interceptors/issues/747\n       */\n      const errorEvent = new Event('error')\n\n      Object.defineProperty(errorEvent, 'cause', {\n        enumerable: true,\n        configurable: false,\n        value: reason,\n      })\n\n      client.socket.dispatchEvent(errorEvent)\n    }\n  }\n\n  public passthrough() {\n    this.data.connection.server.connect()\n  }\n}\n"],"mappings":"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","names":[]}

package/lib/core/utils/internal/Disposable.js

@@ -21,12 +21,30 @@ __export(Disposable_exports, {
   Disposable: () => Disposable
 });
 module.exports = __toCommonJS(Disposable_exports);
+var import_devUtils = require("./devUtils");
 class Disposable {
   subscriptions = [];
   dispose() {
     let subscription;
+    const errors = [];
     while (subscription = this.subscriptions.shift()) {
-      subscription();
+      try {
+        subscription();
+      } catch (error) {
+        if (error instanceof Error) {
+          errors.push(error);
+        }
+      }
+    }
+    if (errors.length > 0) {
+      console.error(
+        new AggregateError(
+          errors,
+          import_devUtils.devUtils.formatMessage(
+            "Failed to dispose of some side effects. This is likely an issue with MSW, please report it on GitHub: https://github.com/mswjs/msw/issues"
+          )
+        )
+      );
     }
   }
 }

package/lib/core/utils/internal/Disposable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/Disposable.ts"],"sourcesContent":["export type DisposableSubscription = () => void\n\nexport class Disposable {\n  protected subscriptions: Array<DisposableSubscription> = []\n\n  public dispose() {\n    let subscription: DisposableSubscription | undefined\n    while ((subscription = this.subscriptions.shift())) {\n      subscription()\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,WAAW;AAAA,EACZ,gBAA+C,CAAC;AAAA,EAEnD,UAAU;AACf,QAAI;AACJ,WAAQ,eAAe,KAAK,cAAc,MAAM,GAAI;AAClD,mBAAa;AAAA,IACf;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/core/utils/internal/Disposable.ts"],"sourcesContent":["import { devUtils } from './devUtils'\n\nexport type DisposableSubscription = () => void\n\nexport class Disposable {\n  protected subscriptions: Array<DisposableSubscription> = []\n\n  public dispose() {\n    let subscription: DisposableSubscription | undefined\n    const errors: Array<Error> = []\n\n    while ((subscription = this.subscriptions.shift())) {\n      try {\n        subscription()\n      } catch (error) {\n        if (error instanceof Error) {\n          errors.push(error)\n        }\n      }\n    }\n\n    if (errors.length > 0) {\n      console.error(\n        new AggregateError(\n          errors,\n          devUtils.formatMessage(\n            'Failed to dispose of some side effects. This is likely an issue with MSW, please report it on GitHub: https://github.com/mswjs/msw/issues',\n          ),\n        ),\n      )\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAyB;AAIlB,MAAM,WAAW;AAAA,EACZ,gBAA+C,CAAC;AAAA,EAEnD,UAAU;AACf,QAAI;AACJ,UAAM,SAAuB,CAAC;AAE9B,WAAQ,eAAe,KAAK,cAAc,MAAM,GAAI;AAClD,UAAI;AACF,qBAAa;AAAA,MACf,SAAS,OAAO;AACd,YAAI,iBAAiB,OAAO;AAC1B,iBAAO,KAAK,KAAK;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAEA,QAAI,OAAO,SAAS,GAAG;AACrB,cAAQ;AAAA,QACN,IAAI;AAAA,UACF;AAAA,UACA,yBAAS;AAAA,YACP;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/lib/core/utils/internal/Disposable.mjs

@@ -1,9 +1,27 @@
+import { devUtils } from './devUtils.mjs';
 class Disposable {
   subscriptions = [];
   dispose() {
     let subscription;
+    const errors = [];
     while (subscription = this.subscriptions.shift()) {
-      subscription();
+      try {
+        subscription();
+      } catch (error) {
+        if (error instanceof Error) {
+          errors.push(error);
+        }
+      }
+    }
+    if (errors.length > 0) {
+      console.error(
+        new AggregateError(
+          errors,
+          devUtils.formatMessage(
+            "Failed to dispose of some side effects. This is likely an issue with MSW, please report it on GitHub: https://github.com/mswjs/msw/issues"
+          )
+        )
+      );
     }
   }
 }

package/lib/core/utils/internal/Disposable.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/Disposable.ts"],"sourcesContent":["export type DisposableSubscription = () => void\n\nexport class Disposable {\n  protected subscriptions: Array<DisposableSubscription> = []\n\n  public dispose() {\n    let subscription: DisposableSubscription | undefined\n    while ((subscription = this.subscriptions.shift())) {\n      subscription()\n    }\n  }\n}\n"],"mappings":"AAEO,MAAM,WAAW;AAAA,EACZ,gBAA+C,CAAC;AAAA,EAEnD,UAAU;AACf,QAAI;AACJ,WAAQ,eAAe,KAAK,cAAc,MAAM,GAAI;AAClD,mBAAa;AAAA,IACf;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/core/utils/internal/Disposable.ts"],"sourcesContent":["import { devUtils } from './devUtils'\n\nexport type DisposableSubscription = () => void\n\nexport class Disposable {\n  protected subscriptions: Array<DisposableSubscription> = []\n\n  public dispose() {\n    let subscription: DisposableSubscription | undefined\n    const errors: Array<Error> = []\n\n    while ((subscription = this.subscriptions.shift())) {\n      try {\n        subscription()\n      } catch (error) {\n        if (error instanceof Error) {\n          errors.push(error)\n        }\n      }\n    }\n\n    if (errors.length > 0) {\n      console.error(\n        new AggregateError(\n          errors,\n          devUtils.formatMessage(\n            'Failed to dispose of some side effects. This is likely an issue with MSW, please report it on GitHub: https://github.com/mswjs/msw/issues',\n          ),\n        ),\n      )\n    }\n  }\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAIlB,MAAM,WAAW;AAAA,EACZ,gBAA+C,CAAC;AAAA,EAEnD,UAAU;AACf,QAAI;AACJ,UAAM,SAAuB,CAAC;AAE9B,WAAQ,eAAe,KAAK,cAAc,MAAM,GAAI;AAClD,UAAI;AACF,qBAAa;AAAA,MACf,SAAS,OAAO;AACd,YAAI,iBAAiB,OAAO;AAC1B,iBAAO,KAAK,KAAK;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAEA,QAAI,OAAO,SAAS,GAAG;AACrB,cAAQ;AAAA,QACN,IAAI;AAAA,UACF;AAAA,UACA,SAAS;AAAA,YACP;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/lib/iife/index.js

@@ -17355,8 +17355,25 @@ ${operationTypes.join("\n")}
     subscriptions = [];
     dispose() {
       let subscription;
+      const errors = [];
       while (subscription = this.subscriptions.shift()) {
-        subscription();
+        try {
+          subscription();
+        } catch (error3) {
+          if (error3 instanceof Error) {
+            errors.push(error3);
+          }
+        }
+      }
+      if (errors.length > 0) {
+        console.error(
+          new AggregateError(
+            errors,
+            devUtils.formatMessage(
+              "Failed to dispose of some side effects. This is likely an issue with MSW, please report it on GitHub: https://github.com/mswjs/msw/issues"
+            )
+          )
+        );
       }
     }
   };
@@ -22841,6 +22858,7 @@ Read more: https://mswjs.io/docs/http/intercepting-requests`;
   function defineNetwork(options) {
     let readyState = 0 /* DISABLED */;
     const events = new Emitter();
+    const disposable = new Disposable();
     const deriveHandlersController = (handlers) => {
       return handlers instanceof HandlersController ? handlers : new InMemoryHandlersController(handlers || []);
     };
@@ -22848,14 +22866,16 @@ Read more: https://mswjs.io/docs/http/intercepting-requests`;
       ...options
     };
     let handlersController = deriveHandlersController(resolvedOptions.handlers);
-    let listenersController;
     return {
       get readyState() {
         return readyState;
       },
       events,
       configure(options2) {
-        invariant(readyState === 0 /* DISABLED */, "");
+        invariant(
+          readyState === 0 /* DISABLED */,
+          'Failed to call "configure()" on the network: cannot configure an already enabled network.'
+        );
         if (options2.handlers && !Object.is(options2.handlers, resolvedOptions.handlers)) {
           handlersController = deriveHandlersController(options2.handlers);
         }
@@ -22869,13 +22889,19 @@ Read more: https://mswjs.io/docs/http/intercepting-requests`;
           readyState === 0 /* DISABLED */,
           'Failed to call "enable" on the network: already enabled'
         );
-        listenersController = new AbortController();
         readyState = 1 /* ENABLED */;
+        const session = { active: true };
+        disposable["subscriptions"].push(() => {
+          session.active = false;
+        });
         const result = resolvedOptions.sources.map((source) => {
           NetworkSource.prototype.disable.call(source);
           source.on("frame", async ({ frame }) => {
-            frame.events.on("*", (event) => events.emit(event), {
-              signal: listenersController.signal
+            frame.events.on("*", (event) => {
+              if (!session.active) {
+                return;
+              }
+              events.emit(event);
             });
             const handlers = frame.getHandlers(handlersController);
             await frame.resolve(
@@ -22893,8 +22919,8 @@ Read more: https://mswjs.io/docs/http/intercepting-requests`;
           readyState === 1 /* ENABLED */,
           'Failed to call "disable" on the network: already disabled'
         );
-        listenersController.abort();
         readyState = 0 /* DISABLED */;
+        disposable.dispose();
         return colorlessPromiseAll(
           resolvedOptions.sources.map((source) => source.disable())
         );
@@ -23116,6 +23142,15 @@ Read more: https://mswjs.io/docs/websocket`;
   var InterceptorWebSocketNetworkFrame = class extends WebSocketNetworkFrame {
     constructor(args) {
       super({ connection: args.connection });
+      args.connection.client.addEventListener(
+        "close",
+        () => {
+          this.events.removeAllListeners();
+        },
+        {
+          once: true
+        }
+      );
     }
     errorWith(reason) {
       if (reason instanceof Error) {