msw 2.1.7 → 2.2.0

package/lib/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/node/SetupServerApi.ts","../../src/node/setupServer.ts"],"sourcesContent":["import {\n  BatchInterceptor,\n  HttpRequestEventMap,\n  Interceptor,\n  InterceptorReadyState,\n} from '@mswjs/interceptors'\nimport { invariant } from 'outvariant'\nimport { SetupApi } from '~/core/SetupApi'\nimport { RequestHandler } from '~/core/handlers/RequestHandler'\nimport { LifeCycleEventsMap, SharedOptions } from '~/core/sharedOptions'\nimport { RequiredDeep } from '~/core/typeUtils'\nimport { handleRequest } from '~/core/utils/handleRequest'\nimport { devUtils } from '~/core/utils/internal/devUtils'\nimport { mergeRight } from '~/core/utils/internal/mergeRight'\nimport { SetupServer } from './glossary'\n\nconst DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {\n  onUnhandledRequest: 'warn',\n}\n\nexport class SetupServerApi\n  extends SetupApi<LifeCycleEventsMap>\n  implements SetupServer\n{\n  protected readonly interceptor: BatchInterceptor<\n    Array<Interceptor<HttpRequestEventMap>>,\n    HttpRequestEventMap\n  >\n  private resolvedOptions: RequiredDeep<SharedOptions>\n\n  constructor(\n    interceptors: Array<{\n      new (): Interceptor<HttpRequestEventMap>\n    }>,\n    ...handlers: Array<RequestHandler>\n  ) {\n    super(...handlers)\n\n    this.interceptor = new BatchInterceptor({\n      name: 'setup-server',\n      interceptors: interceptors.map((Interceptor) => new Interceptor()),\n    })\n    this.resolvedOptions = {} as RequiredDeep<SharedOptions>\n\n    this.init()\n  }\n\n  /**\n   * Subscribe to all requests that are using the interceptor object\n   */\n  private init(): void {\n    this.interceptor.on('request', async ({ request, requestId }) => {\n      const response = await handleRequest(\n        request,\n        requestId,\n        this.currentHandlers,\n        this.resolvedOptions,\n        this.emitter,\n      )\n\n      if (response) {\n        request.respondWith(response)\n      }\n\n      return\n    })\n\n    this.interceptor.on(\n      'response',\n      ({ response, isMockedResponse, request, requestId }) => {\n        this.emitter.emit(\n          isMockedResponse ? 'response:mocked' : 'response:bypass',\n          {\n            response,\n            request,\n            requestId,\n          },\n        )\n      },\n    )\n  }\n\n  public listen(options: Partial<SharedOptions> = {}): void {\n    this.resolvedOptions = mergeRight(\n      DEFAULT_LISTEN_OPTIONS,\n      options,\n    ) as RequiredDeep<SharedOptions>\n\n    // Apply the interceptor when starting the server.\n    this.interceptor.apply()\n\n    this.subscriptions.push(() => {\n      this.interceptor.dispose()\n    })\n\n    // Assert that the interceptor has been applied successfully.\n    // Also guards us from forgetting to call \"interceptor.apply()\"\n    // as a part of the \"listen\" method.\n    invariant(\n      [InterceptorReadyState.APPLYING, InterceptorReadyState.APPLIED].includes(\n        this.interceptor.readyState,\n      ),\n      devUtils.formatMessage(\n        'Failed to start \"setupServer\": the interceptor failed to apply. This is likely an issue with the library and you should report it at \"%s\".',\n      ),\n      'https://github.com/mswjs/msw/issues/new/choose',\n    )\n  }\n\n  public close(): void {\n    this.dispose()\n  }\n}\n","import { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '@mswjs/interceptors/fetch'\nimport { RequestHandler } from '~/core/handlers/RequestHandler'\nimport { SetupServerApi } from './SetupServerApi'\nimport { SetupServer } from './glossary'\n\n/**\n * Sets up a requests interception in Node.js with the given request handlers.\n * @param {RequestHandler[]} handlers List of request handlers.\n *\n * @see {@link https://mswjs.io/docs/api/setup-server `setupServer()` API reference}\n */\nexport const setupServer = (\n  ...handlers: Array<RequestHandler>\n): SetupServer => {\n  return new SetupServerApi(\n    [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],\n    ...handlers,\n  )\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP,SAAS,iBAAiB;AAC1B,SAAS,gBAAgB;AAIzB,SAAS,qBAAqB;AAC9B,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAG3B,IAAM,yBAAsD;AAAA,EAC1D,oBAAoB;AACtB;AAEO,IAAM,iBAAN,cACG,SAEV;AAAA,EACqB;AAAA,EAIX;AAAA,EAER,YACE,iBAGG,UACH;AACA,UAAM,GAAG,QAAQ;AAEjB,SAAK,cAAc,IAAI,iBAAiB;AAAA,MACtC,MAAM;AAAA,MACN,cAAc,aAAa,IAAI,CAACA,iBAAgB,IAAIA,aAAY,CAAC;AAAA,IACnE,CAAC;AACD,SAAK,kBAAkB,CAAC;AAExB,SAAK,KAAK;AAAA,EACZ;AAAA;AAAA;AAAA;AAAA,EAKQ,OAAa;AACnB,SAAK,YAAY,GAAG,WAAW,OAAO,EAAE,SAAS,UAAU,MAAM;AAC/D,YAAM,WAAW,MAAM;AAAA,QACrB;AAAA,QACA;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,MACP;AAEA,UAAI,UAAU;AACZ,gBAAQ,YAAY,QAAQ;AAAA,MAC9B;AAEA;AAAA,IACF,CAAC;AAED,SAAK,YAAY;AAAA,MACf;AAAA,MACA,CAAC,EAAE,UAAU,kBAAkB,SAAS,UAAU,MAAM;AACtD,aAAK,QAAQ;AAAA,UACX,mBAAmB,oBAAoB;AAAA,UACvC;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEO,OAAO,UAAkC,CAAC,GAAS;AACxD,SAAK,kBAAkB;AAAA,MACrB;AAAA,MACA;AAAA,IACF;AAGA,SAAK,YAAY,MAAM;AAEvB,SAAK,cAAc,KAAK,MAAM;AAC5B,WAAK,YAAY,QAAQ;AAAA,IAC3B,CAAC;AAKD;AAAA,MACE,CAAC,sBAAsB,UAAU,sBAAsB,OAAO,EAAE;AAAA,QAC9D,KAAK,YAAY;AAAA,MACnB;AAAA,MACA,SAAS;AAAA,QACP;AAAA,MACF;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEO,QAAc;AACnB,SAAK,QAAQ;AAAA,EACf;AACF;;;AChHA,SAAS,gCAAgC;AACzC,SAAS,iCAAiC;AAC1C,SAAS,wBAAwB;AAW1B,IAAM,cAAc,IACtB,aACa;AAChB,SAAO,IAAI;AAAA,IACT,CAAC,0BAA0B,2BAA2B,gBAAgB;AAAA,IACtE,GAAG;AAAA,EACL;AACF;","names":["Interceptor"]}
+{"version":3,"sources":["../../src/node/SetupServerApi.ts","../../src/node/SetupServerCommonApi.ts","../../src/node/setupServer.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks'\nimport { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '@mswjs/interceptors/fetch'\nimport { HandlersController } from '~/core/SetupApi'\nimport type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport type { SetupServer } from './glossary'\nimport { SetupServerCommonApi } from './SetupServerCommonApi'\n\nconst store = new AsyncLocalStorage<RequestHandlersContext>()\n\ntype RequestHandlersContext = {\n  initialHandlers: Array<RequestHandler>\n  handlers: Array<RequestHandler>\n}\n\n/**\n * A handlers controller that utilizes `AsyncLocalStorage` in Node.js\n * to prevent the request handlers list from being a shared state\n * across mutliple tests.\n */\nclass AsyncHandlersController implements HandlersController {\n  private rootContext: RequestHandlersContext\n\n  constructor(initialHandlers: Array<RequestHandler>) {\n    this.rootContext = { initialHandlers, handlers: [] }\n  }\n\n  get context(): RequestHandlersContext {\n    return store.getStore() || this.rootContext\n  }\n\n  public prepend(runtimeHandlers: Array<RequestHandler>) {\n    this.context.handlers.unshift(...runtimeHandlers)\n  }\n\n  public reset(nextHandlers: Array<RequestHandler>) {\n    const context = this.context\n    context.handlers = []\n    context.initialHandlers =\n      nextHandlers.length > 0 ? nextHandlers : context.initialHandlers\n  }\n\n  public currentHandlers(): Array<RequestHandler> {\n    const { initialHandlers, handlers } = this.context\n    return handlers.concat(initialHandlers)\n  }\n}\n\nexport class SetupServerApi\n  extends SetupServerCommonApi\n  implements SetupServer\n{\n  constructor(handlers: Array<RequestHandler>) {\n    super(\n      [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],\n      handlers,\n    )\n\n    this.handlersController = new AsyncHandlersController(handlers)\n  }\n\n  public boundary<Fn extends (...args: Array<any>) => unknown>(\n    callback: Fn,\n  ): (...args: Parameters<Fn>) => ReturnType<Fn> {\n    return (...args: Parameters<Fn>): ReturnType<Fn> => {\n      return store.run<any, any>(\n        {\n          initialHandlers: this.handlersController.currentHandlers(),\n          handlers: [],\n        },\n        callback,\n        ...args,\n      )\n    }\n  }\n\n  public close(): void {\n    super.close()\n    store.disable()\n  }\n}\n","/**\n * @note This API is extended by both \"msw/node\" and \"msw/native\"\n * so be minding about the things you import!\n */\nimport type { RequiredDeep } from 'type-fest'\nimport { invariant } from 'outvariant'\nimport {\n  BatchInterceptor,\n  InterceptorReadyState,\n  type HttpRequestEventMap,\n  type Interceptor,\n} from '@mswjs/interceptors'\nimport type { LifeCycleEventsMap, SharedOptions } from '~/core/sharedOptions'\nimport { SetupApi } from '~/core/SetupApi'\nimport { handleRequest } from '~/core/utils/handleRequest'\nimport type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport { mergeRight } from '~/core/utils/internal/mergeRight'\nimport { devUtils } from '~/core/utils/internal/devUtils'\nimport type { SetupServerCommon } from './glossary'\n\nexport const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {\n  onUnhandledRequest: 'warn',\n}\n\nexport class SetupServerCommonApi\n  extends SetupApi<LifeCycleEventsMap>\n  implements SetupServerCommon\n{\n  protected readonly interceptor: BatchInterceptor<\n    Array<Interceptor<HttpRequestEventMap>>,\n    HttpRequestEventMap\n  >\n  private resolvedOptions: RequiredDeep<SharedOptions>\n\n  constructor(\n    interceptors: Array<{ new (): Interceptor<HttpRequestEventMap> }>,\n    handlers: Array<RequestHandler>,\n  ) {\n    super(...handlers)\n\n    this.interceptor = new BatchInterceptor({\n      name: 'setup-server',\n      interceptors: interceptors.map((Interceptor) => new Interceptor()),\n    })\n\n    this.resolvedOptions = {} as RequiredDeep<SharedOptions>\n\n    this.init()\n  }\n\n  /**\n   * Subscribe to all requests that are using the interceptor object\n   */\n  private init(): void {\n    this.interceptor.on('request', async ({ request, requestId }) => {\n      const response = await handleRequest(\n        request,\n        requestId,\n        this.handlersController.currentHandlers(),\n        this.resolvedOptions,\n        this.emitter,\n      )\n\n      if (response) {\n        request.respondWith(response)\n      }\n\n      return\n    })\n\n    this.interceptor.on(\n      'response',\n      ({ response, isMockedResponse, request, requestId }) => {\n        this.emitter.emit(\n          isMockedResponse ? 'response:mocked' : 'response:bypass',\n          {\n            response,\n            request,\n            requestId,\n          },\n        )\n      },\n    )\n  }\n\n  public listen(options: Partial<SharedOptions> = {}): void {\n    this.resolvedOptions = mergeRight(\n      DEFAULT_LISTEN_OPTIONS,\n      options,\n    ) as RequiredDeep<SharedOptions>\n\n    // Apply the interceptor when starting the server.\n    this.interceptor.apply()\n\n    this.subscriptions.push(() => {\n      this.interceptor.dispose()\n    })\n\n    // Assert that the interceptor has been applied successfully.\n    // Also guards us from forgetting to call \"interceptor.apply()\"\n    // as a part of the \"listen\" method.\n    invariant(\n      [InterceptorReadyState.APPLYING, InterceptorReadyState.APPLIED].includes(\n        this.interceptor.readyState,\n      ),\n      devUtils.formatMessage(\n        'Failed to start \"setupServer\": the interceptor failed to apply. This is likely an issue with the library and you should report it at \"%s\".',\n      ),\n      'https://github.com/mswjs/msw/issues/new/choose',\n    )\n  }\n\n  public close(): void {\n    this.dispose()\n  }\n}\n","import type { RequestHandler } from '~/core/handlers/RequestHandler'\nimport { SetupServerApi } from './SetupServerApi'\n\n/**\n * Sets up a requests interception in Node.js with the given request handlers.\n * @param {RequestHandler[]} handlers List of request handlers.\n *\n * @see {@link https://mswjs.io/docs/api/setup-server `setupServer()` API reference}\n */\nexport const setupServer = (\n  ...handlers: Array<RequestHandler>\n): SetupServerApi => {\n  return new SetupServerApi(handlers)\n}\n"],"mappings":";AAAA,SAAS,yBAAyB;AAClC,SAAS,gCAAgC;AACzC,SAAS,iCAAiC;AAC1C,SAAS,wBAAwB;;;ACEjC,SAAS,iBAAiB;AAC1B;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AAEP,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;AAGlB,IAAM,yBAAsD;AAAA,EACjE,oBAAoB;AACtB;AAEO,IAAM,uBAAN,cACG,SAEV;AAAA,EACqB;AAAA,EAIX;AAAA,EAER,YACE,cACA,UACA;AACA,UAAM,GAAG,QAAQ;AAEjB,SAAK,cAAc,IAAI,iBAAiB;AAAA,MACtC,MAAM;AAAA,MACN,cAAc,aAAa,IAAI,CAAC,gBAAgB,IAAI,YAAY,CAAC;AAAA,IACnE,CAAC;AAED,SAAK,kBAAkB,CAAC;AAExB,SAAK,KAAK;AAAA,EACZ;AAAA;AAAA;AAAA;AAAA,EAKQ,OAAa;AACnB,SAAK,YAAY,GAAG,WAAW,OAAO,EAAE,SAAS,UAAU,MAAM;AAC/D,YAAM,WAAW,MAAM;AAAA,QACrB;AAAA,QACA;AAAA,QACA,KAAK,mBAAmB,gBAAgB;AAAA,QACxC,KAAK;AAAA,QACL,KAAK;AAAA,MACP;AAEA,UAAI,UAAU;AACZ,gBAAQ,YAAY,QAAQ;AAAA,MAC9B;AAEA;AAAA,IACF,CAAC;AAED,SAAK,YAAY;AAAA,MACf;AAAA,MACA,CAAC,EAAE,UAAU,kBAAkB,SAAS,UAAU,MAAM;AACtD,aAAK,QAAQ;AAAA,UACX,mBAAmB,oBAAoB;AAAA,UACvC;AAAA,YACE;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEO,OAAO,UAAkC,CAAC,GAAS;AACxD,SAAK,kBAAkB;AAAA,MACrB;AAAA,MACA;AAAA,IACF;AAGA,SAAK,YAAY,MAAM;AAEvB,SAAK,cAAc,KAAK,MAAM;AAC5B,WAAK,YAAY,QAAQ;AAAA,IAC3B,CAAC;AAKD;AAAA,MACE,CAAC,sBAAsB,UAAU,sBAAsB,OAAO,EAAE;AAAA,QAC9D,KAAK,YAAY;AAAA,MACnB;AAAA,MACA,SAAS;AAAA,QACP;AAAA,MACF;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EAEO,QAAc;AACnB,SAAK,QAAQ;AAAA,EACf;AACF;;;AD1GA,IAAM,QAAQ,IAAI,kBAA0C;AAY5D,IAAM,0BAAN,MAA4D;AAAA,EAClD;AAAA,EAER,YAAY,iBAAwC;AAClD,SAAK,cAAc,EAAE,iBAAiB,UAAU,CAAC,EAAE;AAAA,EACrD;AAAA,EAEA,IAAI,UAAkC;AACpC,WAAO,MAAM,SAAS,KAAK,KAAK;AAAA,EAClC;AAAA,EAEO,QAAQ,iBAAwC;AACrD,SAAK,QAAQ,SAAS,QAAQ,GAAG,eAAe;AAAA,EAClD;AAAA,EAEO,MAAM,cAAqC;AAChD,UAAM,UAAU,KAAK;AACrB,YAAQ,WAAW,CAAC;AACpB,YAAQ,kBACN,aAAa,SAAS,IAAI,eAAe,QAAQ;AAAA,EACrD;AAAA,EAEO,kBAAyC;AAC9C,UAAM,EAAE,iBAAiB,SAAS,IAAI,KAAK;AAC3C,WAAO,SAAS,OAAO,eAAe;AAAA,EACxC;AACF;AAEO,IAAM,iBAAN,cACG,qBAEV;AAAA,EACE,YAAY,UAAiC;AAC3C;AAAA,MACE,CAAC,0BAA0B,2BAA2B,gBAAgB;AAAA,MACtE;AAAA,IACF;AAEA,SAAK,qBAAqB,IAAI,wBAAwB,QAAQ;AAAA,EAChE;AAAA,EAEO,SACL,UAC6C;AAC7C,WAAO,IAAI,SAAyC;AAClD,aAAO,MAAM;AAAA,QACX;AAAA,UACE,iBAAiB,KAAK,mBAAmB,gBAAgB;AAAA,UACzD,UAAU,CAAC;AAAA,QACb;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAAA,IACF;AAAA,EACF;AAAA,EAEO,QAAc;AACnB,UAAM,MAAM;AACZ,UAAM,QAAQ;AAAA,EAChB;AACF;;;AExEO,IAAM,cAAc,IACtB,aACgB;AACnB,SAAO,IAAI,eAAe,QAAQ;AACpC;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -34,6 +34,18 @@
       "import": "./lib/native/index.mjs",
       "default": "./lib/native/index.js"
     },
+    "./core/http": {
+      "types": "./lib/core/http.d.ts",
+      "require": "./lib/core/http.js",
+      "import": "./lib/core/http.mjs",
+      "default": "./lib/core/http.js"
+    },
+    "./core/graphql": {
+      "types": "./lib/core/graphql.d.ts",
+      "require": "./lib/core/graphql.js",
+      "import": "./lib/core/graphql.mjs",
+      "default": "./lib/core/graphql.js"
+    },
     "./mockServiceWorker.js": "./lib/mockServiceWorker.js",
     "./package.json": "./package.json"
   },
@@ -94,16 +106,15 @@
   "dependencies": {
     "@bundled-es-modules/cookie": "^2.0.0",
     "@bundled-es-modules/statuses": "^1.0.1",
+    "@inquirer/confirm": "^3.0.0",
     "@mswjs/cookies": "^1.1.0",
     "@mswjs/interceptors": "^0.25.16",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",
     "@types/statuses": "^2.0.4",
     "chalk": "^4.1.2",
-    "chokidar": "^3.4.2",
     "graphql": "^16.8.1",
     "headers-polyfill": "^4.0.2",
-    "inquirer": "^8.2.0",
     "is-node-process": "^1.2.0",
     "outvariant": "^1.4.2",
     "path-to-regexp": "^6.2.0",
@@ -167,9 +178,6 @@
       "optional": true
     }
   },
-  "resolutions": {
-    "chokidar": "3.4.1"
-  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
@@ -189,7 +197,7 @@
     "check:exports": "node \"./config/scripts/validate-esm.js\"",
     "test": "pnpm test:unit && pnpm test:node && pnpm test:browser && pnpm test:native",
     "test:unit": "vitest",
-    "test:node": "vitest --config=./test/node/vitest.config.ts",
+    "test:node": "vitest run --config=./test/node/vitest.config.ts",
     "test:native": "vitest --config=./test/native/vitest.config.ts",
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
     "test:modules:node": "vitest --config=./test/modules/node/vitest.config.ts",

package/src/browser/setupWorker/glossary.ts

@@ -102,7 +102,7 @@ export interface SetupWorkerInternalContext {
   startOptions: RequiredDeep<StartOptions>
   worker: ServiceWorker | null
   registration: ServiceWorkerRegistration | null
-  requestHandlers: Array<RequestHandler>
+  getRequestHandlers(): Array<RequestHandler>
   requests: Map<string, Request>
   emitter: Emitter<LifeCycleEventsMap>
   keepAliveInterval?: number

package/src/browser/setupWorker/setupWorker.ts

@@ -58,8 +58,10 @@ export class SetupWorkerApi
       isMockingEnabled: false,
       startOptions: null as any,
       worker: null,
+      getRequestHandlers: () => {
+        return this.handlersController.currentHandlers()
+      },
       registration: null,
-      requestHandlers: this.currentHandlers,
       requests: new Map(),
       emitter: this.emitter,
       workerChannel: {
@@ -151,16 +153,6 @@ export class SetupWorkerApi
       },
     }
 
-    /**
-     * @todo Not sure I like this but "this.currentHandlers"
-     * updates never bubble to "this.context.requestHandlers".
-     */
-    Object.defineProperties(context, {
-      requestHandlers: {
-        get: () => this.currentHandlers,
-      },
-    })
-
     this.startHandler = context.supports.serviceWorkerApi
       ? createFallbackStart(context)
       : createStartHandler(context)

package/src/browser/setupWorker/start/createFallbackRequestListener.ts

@@ -24,7 +24,7 @@ export function createFallbackRequestListener(
     const response = await handleRequest(
       request,
       requestId,
-      context.requestHandlers,
+      context.getRequestHandlers(),
       options,
       context.emitter,
       {

package/src/browser/setupWorker/start/createRequestListener.ts

@@ -43,7 +43,7 @@ export const createRequestListener = (
       await handleRequest(
         request,
         requestId,
-        context.requestHandlers,
+        context.getRequestHandlers(),
         options,
         context.emitter,
         {

package/src/browser/setupWorker/start/createResponseListener.ts

@@ -48,6 +48,19 @@ export function createResponseListener(context: SetupWorkerInternalContext) {
             responseJson,
           )
 
+    /**
+     * Set response URL if it's not set already.
+     * @see https://github.com/mswjs/msw/issues/2030
+     * @see https://developer.mozilla.org/en-US/docs/Web/API/Response/url
+     */
+    if (!response.url) {
+      Object.defineProperty(response, 'url', {
+        value: request.url,
+        enumerable: true,
+        writable: false,
+      })
+    }
+
     context.emitter.emit(
       responseJson.isMockedResponse ? 'response:mocked' : 'response:bypass',
       {

package/src/core/HttpResponse.test.ts

@@ -22,15 +22,14 @@ describe('HttpResponse.text()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.text()).toBe('hello world')
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '11',
       'content-type': 'text/plain',
     })
   })
 
   it('allows overriding the "Content-Type" response header', async () => {
     const response = HttpResponse.text('hello world', {
-      headers: {
-        'Content-Type': 'text/plain; charset=utf-8',
-      },
+      headers: { 'Content-Type': 'text/plain; charset=utf-8' },
     })
 
     expect(response.status).toBe(200)
@@ -38,9 +37,21 @@ describe('HttpResponse.text()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.text()).toBe('hello world')
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '11',
       'content-type': 'text/plain; charset=utf-8',
     })
   })
+
+  it('allows overriding the "Content-Length" response header', async () => {
+    const response = HttpResponse.text('hello world', {
+      headers: { 'Content-Length': '32' },
+    })
+
+    expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '32',
+      'content-type': 'text/plain',
+    })
+  })
 })
 
 describe('HttpResponse.json()', () => {
@@ -52,6 +63,7 @@ describe('HttpResponse.json()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.json()).toEqual({ firstName: 'John' })
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '20',
       'content-type': 'application/json',
     })
   })
@@ -64,6 +76,7 @@ describe('HttpResponse.json()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.json()).toEqual([1, 2, 3])
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '7',
       'content-type': 'application/json',
     })
   })
@@ -76,6 +89,7 @@ describe('HttpResponse.json()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.json()).toBe(`"hello"`)
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '11',
       'content-type': 'application/json',
     })
   })
@@ -88,6 +102,7 @@ describe('HttpResponse.json()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.json()).toBe(123)
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '3',
       'content-type': 'application/json',
     })
   })
@@ -112,6 +127,7 @@ describe('HttpResponse.json()', () => {
     // into a plain object.
     expect(await response.json()).toEqual({})
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '2',
       'content-type': 'application/json',
     })
   })
@@ -131,9 +147,24 @@ describe('HttpResponse.json()', () => {
     expect(response.body).toBeInstanceOf(ReadableStream)
     expect(await response.json()).toEqual({ a: 1 })
     expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '7',
       'content-type': 'application/hal+json',
     })
   })
+
+  it('allows overriding the "Content-Length" response header', async () => {
+    const response = HttpResponse.json(
+      { a: 1 },
+      {
+        headers: { 'Content-Length': '32' },
+      },
+    )
+
+    expect(Object.fromEntries(response.headers.entries())).toEqual({
+      'content-length': '32',
+      'content-type': 'application/json',
+    })
+  })
 })
 
 describe('HttpResponse.xml()', () => {

package/src/core/HttpResponse.ts

@@ -57,6 +57,16 @@ export class HttpResponse extends Response {
       responseInit.headers.set('Content-Type', 'text/plain')
     }
 
+    // Automatically set the "Content-Length" response header
+    // for non-empty text responses. This enforces consistency and
+    // brings mocked responses closer to production.
+    if (!responseInit.headers.has('Content-Length')) {
+      responseInit.headers.set(
+        'Content-Length',
+        body ? body.length.toString() : '0',
+      )
+    }
+
     return new HttpResponse(body, responseInit) as StrictResponse<BodyType>
   }
 
@@ -76,8 +86,21 @@ export class HttpResponse extends Response {
       responseInit.headers.set('Content-Type', 'application/json')
     }
 
+    /**
+     * @note TypeScript is incorrect here.
+     * Stringifying undefined will return undefined.
+     */
+    const responseText = JSON.stringify(body) as string | undefined
+
+    if (!responseInit.headers.has('Content-Length')) {
+      responseInit.headers.set(
+        'Content-Length',
+        responseText ? responseText.length.toString() : '0',
+      )
+    }
+
     return new HttpResponse(
-      JSON.stringify(body),
+      responseText,
       responseInit,
     ) as StrictResponse<BodyType>
   }

package/src/core/SetupApi.ts

@@ -10,12 +10,38 @@ import { pipeEvents } from './utils/internal/pipeEvents'
 import { toReadonlyArray } from './utils/internal/toReadonlyArray'
 import { Disposable } from './utils/internal/Disposable'
 
+export abstract class HandlersController {
+  abstract prepend(runtimeHandlers: Array<RequestHandler>): void
+  abstract reset(nextHandles: Array<RequestHandler>): void
+  abstract currentHandlers(): Array<RequestHandler>
+}
+
+export class InMemoryHandlersController implements HandlersController {
+  private handlers: Array<RequestHandler>
+
+  constructor(private initialHandlers: Array<RequestHandler>) {
+    this.handlers = [...initialHandlers]
+  }
+
+  public prepend(runtimeHandles: Array<RequestHandler>): void {
+    this.handlers.unshift(...runtimeHandles)
+  }
+
+  public reset(nextHandlers: Array<RequestHandler>): void {
+    this.handlers =
+      nextHandlers.length > 0 ? [...nextHandlers] : [...this.initialHandlers]
+  }
+
+  public currentHandlers(): Array<RequestHandler> {
+    return this.handlers
+  }
+}
+
 /**
  * Generic class for the mock API setup.
  */
 export abstract class SetupApi<EventsMap extends EventMap> extends Disposable {
-  protected initialHandlers: ReadonlyArray<RequestHandler>
-  protected currentHandlers: Array<RequestHandler>
+  protected handlersController: HandlersController
   protected readonly emitter: Emitter<EventsMap>
   protected readonly publicEmitter: Emitter<EventsMap>
 
@@ -31,8 +57,7 @@ export abstract class SetupApi<EventsMap extends EventMap> extends Disposable {
       ),
     )
 
-    this.initialHandlers = toReadonlyArray(initialHandlers)
-    this.currentHandlers = [...initialHandlers]
+    this.handlersController = new InMemoryHandlersController(initialHandlers)
 
     this.emitter = new Emitter<EventsMap>()
     this.publicEmitter = new Emitter<EventsMap>()
@@ -59,24 +84,23 @@ export abstract class SetupApi<EventsMap extends EventMap> extends Disposable {
       ),
     )
 
-    this.currentHandlers.unshift(...runtimeHandlers)
+    this.handlersController.prepend(runtimeHandlers)
   }
 
   public restoreHandlers(): void {
-    this.currentHandlers.forEach((handler) => {
+    this.handlersController.currentHandlers().forEach((handler) => {
       handler.isUsed = false
     })
   }
 
   public resetHandlers(...nextHandlers: Array<RequestHandler>): void {
-    this.currentHandlers =
-      nextHandlers.length > 0 ? [...nextHandlers] : [...this.initialHandlers]
+    this.handlersController.reset(nextHandlers)
   }
 
   public listHandlers(): ReadonlyArray<
     RequestHandler<RequestHandlerDefaultInfo, any, any>
   > {
-    return toReadonlyArray(this.currentHandlers)
+    return toReadonlyArray(this.handlersController.currentHandlers())
   }
 
   private createLifeCycleEvents(): LifeCycleEventEmitter<EventsMap> {

package/src/native/index.ts

@@ -1,7 +1,7 @@
 import { FetchInterceptor } from '@mswjs/interceptors/fetch'
 import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'
-import { RequestHandler } from '~/core/handlers/RequestHandler'
-import { SetupServerApi } from '../node/SetupServerApi'
+import type { RequestHandler } from '~/core/handlers/RequestHandler'
+import { SetupServerCommonApi } from '../node/SetupServerCommonApi'
 
 /**
  * Sets up a requests interception in React Native with the given request handlers.
@@ -11,11 +11,11 @@ import { SetupServerApi } from '../node/SetupServerApi'
  */
 export function setupServer(
   ...handlers: Array<RequestHandler>
-): SetupServerApi {
+): SetupServerCommonApi {
   // Provision request interception via patching the `XMLHttpRequest` class only
   // in React Native. There is no `http`/`https` modules in that environment.
-  return new SetupServerApi(
+  return new SetupServerCommonApi(
     [FetchInterceptor, XMLHttpRequestInterceptor],
-    ...handlers,
+    handlers,
   )
 }

package/src/node/SetupServerApi.ts

@@ -1,113 +1,82 @@
-import {
-  BatchInterceptor,
-  HttpRequestEventMap,
-  Interceptor,
-  InterceptorReadyState,
-} from '@mswjs/interceptors'
-import { invariant } from 'outvariant'
-import { SetupApi } from '~/core/SetupApi'
-import { RequestHandler } from '~/core/handlers/RequestHandler'
-import { LifeCycleEventsMap, SharedOptions } from '~/core/sharedOptions'
-import { RequiredDeep } from '~/core/typeUtils'
-import { handleRequest } from '~/core/utils/handleRequest'
-import { devUtils } from '~/core/utils/internal/devUtils'
-import { mergeRight } from '~/core/utils/internal/mergeRight'
-import { SetupServer } from './glossary'
+import { AsyncLocalStorage } from 'node:async_hooks'
+import { ClientRequestInterceptor } from '@mswjs/interceptors/ClientRequest'
+import { XMLHttpRequestInterceptor } from '@mswjs/interceptors/XMLHttpRequest'
+import { FetchInterceptor } from '@mswjs/interceptors/fetch'
+import { HandlersController } from '~/core/SetupApi'
+import type { RequestHandler } from '~/core/handlers/RequestHandler'
+import type { SetupServer } from './glossary'
+import { SetupServerCommonApi } from './SetupServerCommonApi'
 
-const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {
-  onUnhandledRequest: 'warn',
-}
-
-export class SetupServerApi
-  extends SetupApi<LifeCycleEventsMap>
-  implements SetupServer
-{
-  protected readonly interceptor: BatchInterceptor<
-    Array<Interceptor<HttpRequestEventMap>>,
-    HttpRequestEventMap
-  >
-  private resolvedOptions: RequiredDeep<SharedOptions>
+const store = new AsyncLocalStorage<RequestHandlersContext>()
 
-  constructor(
-    interceptors: Array<{
-      new (): Interceptor<HttpRequestEventMap>
-    }>,
-    ...handlers: Array<RequestHandler>
-  ) {
-    super(...handlers)
+type RequestHandlersContext = {
+  initialHandlers: Array<RequestHandler>
+  handlers: Array<RequestHandler>
+}
 
-    this.interceptor = new BatchInterceptor({
-      name: 'setup-server',
-      interceptors: interceptors.map((Interceptor) => new Interceptor()),
-    })
-    this.resolvedOptions = {} as RequiredDeep<SharedOptions>
+/**
+ * A handlers controller that utilizes `AsyncLocalStorage` in Node.js
+ * to prevent the request handlers list from being a shared state
+ * across mutliple tests.
+ */
+class AsyncHandlersController implements HandlersController {
+  private rootContext: RequestHandlersContext
 
-    this.init()
+  constructor(initialHandlers: Array<RequestHandler>) {
+    this.rootContext = { initialHandlers, handlers: [] }
   }
 
-  /**
-   * Subscribe to all requests that are using the interceptor object
-   */
-  private init(): void {
-    this.interceptor.on('request', async ({ request, requestId }) => {
-      const response = await handleRequest(
-        request,
-        requestId,
-        this.currentHandlers,
-        this.resolvedOptions,
-        this.emitter,
-      )
-
-      if (response) {
-        request.respondWith(response)
-      }
+  get context(): RequestHandlersContext {
+    return store.getStore() || this.rootContext
+  }
 
-      return
-    })
+  public prepend(runtimeHandlers: Array<RequestHandler>) {
+    this.context.handlers.unshift(...runtimeHandlers)
+  }
 
-    this.interceptor.on(
-      'response',
-      ({ response, isMockedResponse, request, requestId }) => {
-        this.emitter.emit(
-          isMockedResponse ? 'response:mocked' : 'response:bypass',
-          {
-            response,
-            request,
-            requestId,
-          },
-        )
-      },
-    )
+  public reset(nextHandlers: Array<RequestHandler>) {
+    const context = this.context
+    context.handlers = []
+    context.initialHandlers =
+      nextHandlers.length > 0 ? nextHandlers : context.initialHandlers
   }
 
-  public listen(options: Partial<SharedOptions> = {}): void {
-    this.resolvedOptions = mergeRight(
-      DEFAULT_LISTEN_OPTIONS,
-      options,
-    ) as RequiredDeep<SharedOptions>
+  public currentHandlers(): Array<RequestHandler> {
+    const { initialHandlers, handlers } = this.context
+    return handlers.concat(initialHandlers)
+  }
+}
 
-    // Apply the interceptor when starting the server.
-    this.interceptor.apply()
+export class SetupServerApi
+  extends SetupServerCommonApi
+  implements SetupServer
+{
+  constructor(handlers: Array<RequestHandler>) {
+    super(
+      [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],
+      handlers,
+    )
 
-    this.subscriptions.push(() => {
-      this.interceptor.dispose()
-    })
+    this.handlersController = new AsyncHandlersController(handlers)
+  }
 
-    // Assert that the interceptor has been applied successfully.
-    // Also guards us from forgetting to call "interceptor.apply()"
-    // as a part of the "listen" method.
-    invariant(
-      [InterceptorReadyState.APPLYING, InterceptorReadyState.APPLIED].includes(
-        this.interceptor.readyState,
-      ),
-      devUtils.formatMessage(
-        'Failed to start "setupServer": the interceptor failed to apply. This is likely an issue with the library and you should report it at "%s".',
-      ),
-      'https://github.com/mswjs/msw/issues/new/choose',
-    )
+  public boundary<Fn extends (...args: Array<any>) => unknown>(
+    callback: Fn,
+  ): (...args: Parameters<Fn>) => ReturnType<Fn> {
+    return (...args: Parameters<Fn>): ReturnType<Fn> => {
+      return store.run<any, any>(
+        {
+          initialHandlers: this.handlersController.currentHandlers(),
+          handlers: [],
+        },
+        callback,
+        ...args,
+      )
+    }
   }
 
   public close(): void {
-    this.dispose()
+    super.close()
+    store.disable()
   }
 }