msw 2.14.2 → 2.14.3

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

@@ -72,16 +72,20 @@ class InterceptorSource extends import_network_source.NetworkSource {
       return;
     }
     queueMicrotask(() => {
-      httpFrame.events.emit(
-        new import_http_frame.ResponseEvent(
-          isMockedResponse ? "response:mocked" : "response:bypass",
-          {
-            requestId,
-            request,
-            response
-          }
-        )
-      );
+      try {
+        httpFrame.events.emit(
+          new import_http_frame.ResponseEvent(
+            isMockedResponse ? "response:mocked" : "response:bypass",
+            {
+              requestId,
+              request,
+              response
+            }
+          )
+        );
+      } finally {
+        httpFrame.events.removeAllListeners();
+      }
     });
   }
   async #handleWebSocketConnection(connection) {

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      httpFrame.events.emit(\n        new ResponseEvent(\n          isMockedResponse ? 'response:mocked' : 'response:bypass',\n          {\n            requestId,\n            request,\n            response,\n          },\n        ),\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  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

@@ -49,16 +49,20 @@ class InterceptorSource extends NetworkSource {
       return;
     }
     queueMicrotask(() => {
-      httpFrame.events.emit(
-        new ResponseEvent(
-          isMockedResponse ? "response:mocked" : "response:bypass",
-          {
-            requestId,
-            request,
-            response
-          }
-        )
-      );
+      try {
+        httpFrame.events.emit(
+          new ResponseEvent(
+            isMockedResponse ? "response:mocked" : "response:bypass",
+            {
+              requestId,
+              request,
+              response
+            }
+          )
+        );
+      } finally {
+        httpFrame.events.removeAllListeners();
+      }
     });
   }
   async #handleWebSocketConnection(connection) {

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      httpFrame.events.emit(\n        new ResponseEvent(\n          isMockedResponse ? 'response:mocked' : 'response:bypass',\n          {\n            requestId,\n            request,\n            response,\n          },\n        ),\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":"AACA,SAAS,wBAAkD;AAK3D,SAAS,qBAAqB;AAC9B,SAAS,qBAAqB;AAC9B,SAAS,kBAAkB,qBAAqB;AAChD,SAAS,6BAA6B;AACtC,SAAS,sCAAsC;AASxC,MAAM,0BAA0B,cAAc;AAAA,EACnD;AAAA,EAKA;AAAA,EAEA,YAAY,SAAmC;AAC7C,UAAM;AAEN,SAAK,eAAe,IAAI,iBAAiB;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,gBAAU,OAAO;AAAA,QACf,IAAI;AAAA,UACF,mBAAmB,oBAAoB;AAAA,UACvC;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAAA,MACF;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,iBAAiB;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,mCAA+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,eAAe;AACnC,WAAK,YAAY,UAAU,MAAM;AAAA,IACnC;AAEA,UAAM;AAAA,EACR;AACF;AAEA,MAAM,yCAAyC,sBAAsB;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  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/iife/index.js

@@ -14335,7 +14335,7 @@ ${operationTypes.join("\n")}
     );
   }
 
-  // node_modules/.pnpm/rettime@0.11.7/node_modules/rettime/build/lens-list.mjs
+  // node_modules/.pnpm/rettime@0.11.11/node_modules/rettime/build/lens-list.mjs
   var LensList = class {
     #list;
     #lens;
@@ -14377,15 +14377,17 @@ ${operationTypes.join("\n")}
     }
     /**
     * Delete the value belonging to the given key.
+    * Returns `true` if the value was present and removed, `false` otherwise.
     */
     delete(key, value) {
-      if (this.size === 0) return;
-      this.#list = this.#list.filter((item) => item[1] !== value);
+      if (this.size === 0) return false;
       const values = this.#lens.get(key);
-      if (values) {
-        const index = values.indexOf(value);
-        if (index !== -1) values.splice(index, 1);
-      }
+      if (!values) return false;
+      const index = values.indexOf(value);
+      if (index === -1) return false;
+      values.splice(index, 1);
+      this.#list.splice(this.#list.findIndex((item) => item[0] === key && item[1] === value), 1);
+      return true;
     }
     /**
     * Delete all values belogning to the given key.
@@ -14408,7 +14410,7 @@ ${operationTypes.join("\n")}
     }
   };
 
-  // node_modules/.pnpm/rettime@0.11.7/node_modules/rettime/build/index.mjs
+  // node_modules/.pnpm/rettime@0.11.11/node_modules/rettime/build/index.mjs
   var kDefaultPrevented = Symbol("kDefaultPrevented");
   var kPropagationStopped = Symbol("kPropagationStopped");
   var kImmediatePropagationStopped = Symbol("kImmediatePropagationStopped");
@@ -14441,37 +14443,66 @@ ${operationTypes.join("\n")}
   var Emitter = class {
     #listeners;
     #listenerOptions;
+    #listenerAbortCleanups;
     #typelessListeners;
     #hookListeners;
     #hookListenerOptions;
+    #hookListenerAbortCleanups;
     hooks;
     constructor() {
       this.#listeners = new LensList();
       this.#listenerOptions = /* @__PURE__ */ new WeakMap();
+      this.#listenerAbortCleanups = /* @__PURE__ */ new WeakMap();
       this.#typelessListeners = /* @__PURE__ */ new WeakSet();
       this.#hookListeners = new LensList();
       this.#hookListenerOptions = /* @__PURE__ */ new WeakMap();
+      this.#hookListenerAbortCleanups = /* @__PURE__ */ new WeakMap();
       this.hooks = {
         on: (hook, callback, options) => {
+          if (options?.signal?.aborted) return;
           if (options?.once) {
             const original = callback;
             const wrapper = ((...args) => {
-              this.#hookListeners.delete(hook, wrapper);
+              this.#deleteHookListener(hook, wrapper);
               return original(...args);
             });
             callback = wrapper;
           }
           this.#hookListeners.append(hook, callback);
           if (options) this.#hookListenerOptions.set(callback, options);
-          if (options?.signal) options.signal.addEventListener("abort", () => {
-            this.#hookListeners.delete(hook, callback);
-          }, { once: true });
+          if (options?.signal) {
+            const { signal } = options;
+            const onAbort = () => {
+              this.#deleteHookListener(hook, callback);
+            };
+            signal.addEventListener("abort", onAbort, { once: true });
+            this.#hookListenerAbortCleanups.set(callback, () => {
+              signal.removeEventListener("abort", onAbort);
+            });
+          }
         },
         removeListener: (hook, callback) => {
-          this.#hookListeners.delete(hook, callback);
+          this.#deleteHookListener(hook, callback);
         }
       };
     }
+    #deleteHookListener(hook, callback) {
+      this.#hookListeners.delete(hook, callback);
+      const cleanup = this.#hookListenerAbortCleanups.get(callback);
+      if (cleanup) {
+        cleanup();
+        this.#hookListenerAbortCleanups.delete(callback);
+      }
+    }
+    #deleteListener(type, listener) {
+      const removed = this.#listeners.delete(type, listener);
+      const cleanup = this.#listenerAbortCleanups.get(listener);
+      if (cleanup) {
+        cleanup();
+        this.#listenerAbortCleanups.delete(listener);
+      }
+      return removed;
+    }
     /**
     * Adds a listener for the given event type.
     */
@@ -14573,8 +14604,8 @@ ${operationTypes.join("\n")}
     */
     removeListener(type, listener) {
       const options = this.#listenerOptions.get(listener);
-      this.#listeners.delete(type, listener);
-      for (const hook of this.#hookListeners.get("removeListener")) hook(type, listener, options);
+      if (!this.#deleteListener(type, listener)) return;
+      for (const hook of this.#hookListeners.get("removeListener").slice()) hook(type, listener, options);
     }
     /**
     * Removes all listeners for the given event type.
@@ -14582,11 +14613,12 @@ ${operationTypes.join("\n")}
     */
     removeAllListeners(type) {
       if (type == null) {
-        this.#listeners.clear();
-        for (const [hookType, hookListener] of this.#hookListeners) if (!this.#hookListenerOptions.get(hookListener)?.persist) this.#hookListeners.delete(hookType, hookListener);
+        for (const [listenerType, listeners$1] of this.#listeners.entries()) while (listeners$1.length > 0) this.removeListener(listenerType, listeners$1[0]);
+        for (const [hookType, hookListener] of [...this.#hookListeners]) if (!this.#hookListenerOptions.get(hookListener)?.persist) this.#deleteHookListener(hookType, hookListener);
         return;
       }
-      this.#listeners.deleteAll(type);
+      const listeners = this.listeners(type);
+      while (listeners.length > 0) this.removeListener(type, listeners[0]);
     }
     /**
     * Returns the list of listeners for the given event type.
@@ -14605,15 +14637,23 @@ ${operationTypes.join("\n")}
       return this.listeners(type).length;
     }
     #addListener(type, listener, options, insertMode = "append") {
-      for (const hook of this.#hookListeners.get("newListener")) hook(type, listener, options);
+      if (options?.signal?.aborted) return;
+      for (const hook of this.#hookListeners.get("newListener").slice()) hook(type, listener, options);
       if (type === "*") this.#typelessListeners.add(listener);
       if (insertMode === "prepend") this.#listeners.prepend(type, listener);
       else this.#listeners.append(type, listener);
       if (options) {
         this.#listenerOptions.set(listener, options);
-        if (options.signal) options.signal.addEventListener("abort", () => {
-          this.removeListener(type, listener);
-        }, { once: true });
+        if (options.signal) {
+          const { signal } = options;
+          const onAbort = () => {
+            this.removeListener(type, listener);
+          };
+          signal.addEventListener("abort", onAbort, { once: true });
+          this.#listenerAbortCleanups.set(listener, () => {
+            signal.removeEventListener("abort", onAbort);
+          });
+        }
       }
     }
     #proxyEvent(event) {
@@ -14630,22 +14670,27 @@ ${operationTypes.join("\n")}
       };
     }
     #callListener(event, listener) {
-      for (const hook of this.#hookListeners.get("beforeEmit")) if (hook(event) === false) return;
+      for (const hook of this.#hookListeners.get("beforeEmit").slice()) if (hook(event) === false) return;
       const returnValue = listener.call(this, event);
       const options = this.#listenerOptions.get(listener);
       if (options?.once) {
         const type = this.#isTypelessListener(listener) ? "*" : event.type;
-        this.#listeners.delete(type, listener);
-        for (const hook of this.#hookListeners.get("removeListener")) hook(type, listener, options);
+        if (this.#deleteListener(type, listener)) for (const hook of this.#hookListeners.get("removeListener").slice()) hook(type, listener, options);
       }
       return returnValue;
     }
     /**
     * Return a list of all event listeners relevant for the given event type.
     * This includes the explicit event listeners and also typeless event listeners.
+    *
+    * @note Snapshot the matching listeners before yielding. Listeners can add or
+    * remove other listeners during emission (e.g. `earlyOn` unshifts `#list`),
+    * which would otherwise shift the live iterator and re-yield prior entries.
     */
     *#matchListeners(type) {
-      for (const [key, listener] of this.#listeners) if (key === "*" || key === type) yield listener;
+      const snapshot = [];
+      for (const [key, listener] of this.#listeners) if (key === "*" || key === type) snapshot.push(listener);
+      yield* snapshot;
     }
     #isTypelessListener(listener) {
       return this.#typelessListeners.has(listener);
@@ -22937,16 +22982,20 @@ Read more: https://mswjs.io/docs/websocket`;
         return;
       }
       queueMicrotask(() => {
-        httpFrame.events.emit(
-          new ResponseEvent(
-            isMockedResponse ? "response:mocked" : "response:bypass",
-            {
-              requestId,
-              request,
-              response
-            }
-          )
-        );
+        try {
+          httpFrame.events.emit(
+            new ResponseEvent(
+              isMockedResponse ? "response:mocked" : "response:bypass",
+              {
+                requestId,
+                request,
+                response
+              }
+            )
+          );
+        } finally {
+          httpFrame.events.removeAllListeners();
+        }
       });
     }
     async #handleWebSocketConnection(connection) {
@@ -23439,11 +23488,12 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
     }
     async #handleResponse(event) {
       const { request, response, isMockedResponse } = event.data;
+      const frame = this.#frames.get(request.id);
       if (response.type?.includes("opaque")) {
         this.#frames.delete(request.id);
+        frame?.events.removeAllListeners();
         return;
       }
-      const frame = this.#frames.get(request.id);
       this.#frames.delete(request.id);
       if (frame == null) {
         return;
@@ -23467,17 +23517,21 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
           url: request.url
         }
       );
-      frame.events.emit(
-        new ResponseEvent(
-          isMockedResponse ? "response:mocked" : "response:bypass",
-          {
-            requestId: frame.data.id,
-            request: fetchRequest,
-            response: fetchResponse,
-            isMockedResponse
-          }
-        )
-      );
+      try {
+        frame.events.emit(
+          new ResponseEvent(
+            isMockedResponse ? "response:mocked" : "response:bypass",
+            {
+              requestId: frame.data.id,
+              request: fetchRequest,
+              response: fetchResponse,
+              isMockedResponse
+            }
+          )
+        );
+      } finally {
+        frame.events.removeAllListeners();
+      }
     }
     #defaultFindWorker = (workerUrl, mockServiceWorkerUrl) => {
       return workerUrl === mockServiceWorkerUrl;