msw 2.14.4 → 2.14.5

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":"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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/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/iife/index.js

@@ -23116,6 +23116,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) {