@mswjs/interceptors 0.39.8 → 0.41.0

package/lib/node/presets/node.mjs

@@ -1,27 +1,22 @@
-import {
-  ClientRequestInterceptor
-} from "../chunk-EKNRB5ZS.mjs";
-import "../chunk-TJDMZZXE.mjs";
-import {
-  XMLHttpRequestInterceptor
-} from "../chunk-4NEYTVWD.mjs";
-import "../chunk-6HYIRFX2.mjs";
-import {
-  FetchInterceptor
-} from "../chunk-3CNGDJFB.mjs";
-import "../chunk-TX5GBTFY.mjs";
-import "../chunk-6YM4PLBI.mjs";
-import "../chunk-A7Q4RTDJ.mjs";
-import "../chunk-IHJSPMYM.mjs";
-import "../chunk-3GJB4JDF.mjs";
+import "../fetchUtils-CoU35g3M.mjs";
+import "../bufferUtils-_8XfKIfX.mjs";
+import { t as ClientRequestInterceptor } from "../ClientRequest-Ca8Qykuv.mjs";
+import "../handleRequest-Y97UwBbF.mjs";
+import "../node-DwCc6iuP.mjs";
+import { t as XMLHttpRequestInterceptor } from "../XMLHttpRequest-C8dIZpds.mjs";
+import { t as FetchInterceptor } from "../fetch-G1DVwDKG.mjs";
 
-// src/presets/node.ts
+//#region src/presets/node.ts
+/**
+* The default preset provisions the interception of requests
+* regardless of their type (http/https/XMLHttpRequest).
+*/
 var node_default = [
-  new ClientRequestInterceptor(),
-  new XMLHttpRequestInterceptor(),
-  new FetchInterceptor()
+	new ClientRequestInterceptor(),
+	new XMLHttpRequestInterceptor(),
+	new FetchInterceptor()
 ];
-export {
-  node_default as default
-};
+
+//#endregion
+export { node_default as default };
 //# sourceMappingURL=node.mjs.map

package/lib/node/presets/node.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presets/node.ts"],"sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '../interceptors/fetch'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n  new FetchInterceptor(),\n] as const\n"],"mappings":";;;;;;;;;;;;;;;;;;AAQA,IAAO,eAAQ;AAAA,EACb,IAAI,yBAAyB;AAAA,EAC7B,IAAI,0BAA0B;AAAA,EAC9B,IAAI,iBAAiB;AACvB;","names":[]}
+{"version":3,"file":"node.mjs","names":[],"sources":["../../../src/presets/node.ts"],"sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '../interceptors/fetch'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n  new FetchInterceptor(),\n] as const\n"],"mappings":";;;;;;;;;;;;;AAQA,mBAAe;CACb,IAAI,0BAA0B;CAC9B,IAAI,2BAA2B;CAC/B,IAAI,kBAAkB;CACvB"}

package/lib/node/utils/node/index.cjs

@@ -0,0 +1,4 @@
+const require_node = require('../../node-dKdAf3tC.cjs');
+
+exports.getClientRequestBodyStream = require_node.getClientRequestBodyStream;
+exports.setRawRequestBodyStream = require_node.setRawRequestBodyStream;

package/lib/node/utils/node/{index.d.ts → index.d.cts}

@@ -1,4 +1,6 @@
-import { Readable } from 'node:stream';
+import { Readable } from "node:stream";
+
+//#region src/utils/node/index.d.ts
 
 /**
  * Returns the request body stream of the given request.
@@ -9,5 +11,6 @@ import { Readable } from 'node:stream';
  */
 declare function getClientRequestBodyStream(request: Request): Readable;
 declare function setRawRequestBodyStream(request: Request, stream: Readable): void;
-
+//#endregion
 export { getClientRequestBodyStream, setRawRequestBodyStream };
+//# sourceMappingURL=index.d.cts.map

package/lib/node/utils/node/index.d.mts

@@ -0,0 +1,16 @@
+import { Readable } from "node:stream";
+
+//#region src/utils/node/index.d.ts
+
+/**
+ * Returns the request body stream of the given request.
+ * @note This is only relevant in the context of `http.ClientRequest`.
+ * This function will throw if the given `request` wasn't created based on
+ * the `http.ClientRequest` instance.
+ * You must rely on the web stream consumers for other request clients.
+ */
+declare function getClientRequestBodyStream(request: Request): Readable;
+declare function setRawRequestBodyStream(request: Request, stream: Readable): void;
+//#endregion
+export { getClientRequestBodyStream, setRawRequestBodyStream };
+//# sourceMappingURL=index.d.mts.map

package/lib/node/utils/node/index.mjs

@@ -1,10 +1,3 @@
-import {
-  getClientRequestBodyStream,
-  setRawRequestBodyStream
-} from "../../chunk-TJDMZZXE.mjs";
-import "../../chunk-3GJB4JDF.mjs";
-export {
-  getClientRequestBodyStream,
-  setRawRequestBodyStream
-};
-//# sourceMappingURL=index.mjs.map
+import { n as setRawRequestBodyStream, t as getClientRequestBodyStream } from "../../node-DwCc6iuP.mjs";
+
+export { getClientRequestBodyStream, setRawRequestBodyStream };

package/package.json

@@ -1,104 +1,80 @@
 {
+  "type": "commonjs",
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.39.8",
-  "main": "./lib/node/index.js",
+  "version": "0.41.0",
+  "main": "./lib/node/index.cjs",
   "module": "./lib/node/index.mjs",
-  "types": "./lib/node/index.d.ts",
+  "types": "./lib/node/index.d.cts",
   "exports": {
     ".": {
-      "types": "./lib/node/index.d.ts",
       "browser": {
-        "types": "./lib/browser/index.d.ts",
-        "require": "./lib/browser/index.js",
         "import": "./lib/browser/index.mjs",
-        "default": "./lib/browser/index.js"
+        "default": "./lib/browser/index.cjs"
       },
-      "require": "./lib/node/index.js",
       "import": "./lib/node/index.mjs",
-      "default": "./lib/node/index.js"
+      "default": "./lib/node/index.cjs"
     },
     "./ClientRequest": {
-      "types": "./lib/node/interceptors/ClientRequest/index.d.ts",
       "node": {
-        "require": "./lib/node/interceptors/ClientRequest/index.js",
+        "require": "./lib/node/interceptors/ClientRequest/index.cjs",
         "import": "./lib/node/interceptors/ClientRequest/index.mjs"
       },
       "browser": null,
-      "require": "./lib/node/interceptors/ClientRequest/index.js",
+      "require": "./lib/node/interceptors/ClientRequest/index.cjs",
       "import": "./lib/node/interceptors/ClientRequest/index.mjs",
-      "default": "./lib/node/interceptors/ClientRequest/index.js"
+      "default": "./lib/node/interceptors/ClientRequest/index.cjs"
     },
     "./XMLHttpRequest": {
-      "browser": {
-        "types": "./lib/browser/interceptors/XMLHttpRequest/index.d.ts",
-        "require": "./lib/browser/interceptors/XMLHttpRequest/index.js",
-        "import": "./lib/browser/interceptors/XMLHttpRequest/index.mjs",
-        "default": "./lib/browser/interceptors/XMLHttpRequest/index.js"
-      },
-      "types": "./lib/node/interceptors/XMLHttpRequest/index.d.ts",
-      "require": "./lib/node/interceptors/XMLHttpRequest/index.js",
+      "browser": "./lib/browser/interceptors/XMLHttpRequest/index.mjs",
+      "require": "./lib/node/interceptors/XMLHttpRequest/index.cjs",
       "import": "./lib/node/interceptors/XMLHttpRequest/index.mjs",
-      "default": "./lib/node/interceptors/XMLHttpRequest/index.js"
+      "default": "./lib/node/interceptors/XMLHttpRequest/index.cjs"
     },
     "./fetch": {
-      "browser": {
-        "types": "./lib/browser/interceptors/fetch/index.d.ts",
-        "require": "./lib/browser/interceptors/fetch/index.js",
-        "import": "./lib/browser/interceptors/fetch/index.mjs",
-        "default": "./lib/browser/interceptors/fetch/index.js"
-      },
-      "types": "./lib/node/interceptors/fetch/index.d.ts",
-      "require": "./lib/node/interceptors/fetch/index.js",
+      "browser": "./lib/browser/interceptors/fetch/index.mjs",
+      "require": "./lib/node/interceptors/fetch/index.cjs",
       "import": "./lib/node/interceptors/fetch/index.mjs",
-      "default": "./lib/node/interceptors/fetch/index.js"
+      "default": "./lib/node/interceptors/fetch/index.cjs"
     },
     "./WebSocket": {
-      "types": "./lib/browser/interceptors/WebSocket/index.d.ts",
-      "require": "./lib/browser/interceptors/WebSocket/index.js",
+      "require": "./lib/browser/interceptors/WebSocket/index.cjs",
       "import": "./lib/browser/interceptors/WebSocket/index.mjs",
-      "default": "./lib/browser/interceptors/WebSocket/index.js"
+      "default": "./lib/browser/interceptors/WebSocket/index.cjs"
     },
     "./RemoteHttpInterceptor": {
-      "types": "./lib/node/RemoteHttpInterceptor.d.ts",
       "node": {
-        "require": "./lib/node/RemoteHttpInterceptor.js",
+        "require": "./lib/node/RemoteHttpInterceptor.cjs",
         "import": "./lib/node/RemoteHttpInterceptor.mjs"
       },
       "browser": null,
-      "require": "./lib/node/RemoteHttpInterceptor.js",
+      "require": "./lib/node/RemoteHttpInterceptor.cjs",
       "import": "./lib/node/RemoteHttpInterceptor.mjs",
-      "default": "./lib/node/RemoteHttpInterceptor.js"
+      "default": "./lib/node/RemoteHttpInterceptor.cjs"
     },
     "./presets/node": {
-      "types": "./lib/node/presets/node.d.ts",
       "node": {
-        "require": "./lib/node/presets/node.js",
+        "require": "./lib/node/presets/node.cjs",
         "import": "./lib/node/presets/node.mjs"
       },
       "browser": null,
-      "require": "./lib/node/presets/node.js",
+      "require": "./lib/node/presets/node.cjs",
       "import": "./lib/node/presets/node.mjs",
-      "default": "./lib/node/presets/node.js"
+      "default": "./lib/node/presets/node.cjs"
     },
     "./presets/browser": {
-      "browser": {
-        "types": "./lib/browser/presets/browser.d.ts",
-        "require": "./lib/browser/presets/browser.js",
-        "import": "./lib/browser/presets/browser.mjs",
-        "default": "./lib/browser/presets/browser.js"
-      }
+      "browser": "./lib/browser/presets/browser.mjs",
+      "node": null
     },
     "./utils/node": {
-      "types": "./lib/node/utils/node/index.d.ts",
       "node": {
-        "require": "./lib/node/utils/node/index.js",
+        "require": "./lib/node/utils/node/index.cjs",
         "import": "./lib/node/utils/node/index.mjs"
       },
       "browser": null,
-      "require": "./lib/node/utils/node/index.js",
+      "require": "./lib/node/utils/node/index.cjs",
       "import": "./lib/node/utils/node/index.mjs",
-      "default": "./lib/node/utils/node/index.js"
+      "default": "./lib/node/utils/node/index.cjs"
     }
   },
   "author": "Artem Zakharchenko",
@@ -118,14 +94,13 @@
     "presets"
   ],
   "repository": {
-    "type": "git",
     "url": "https://github.com/mswjs/interceptors"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
     "@open-draft/test-server": "^0.5.1",
-    "@ossjs/release": "^0.8.1",
+    "@ossjs/release": "^0.10.1",
     "@playwright/test": "^1.51.0",
     "@types/cors": "^2.8.12",
     "@types/express": "^5.0.0",
@@ -151,20 +126,20 @@
     "happy-dom": "^17.3.0",
     "jsdom": "^26.1.0",
     "node-fetch": "3.3.2",
-    "rimraf": "^6.0.1",
     "simple-git-hooks": "^2.7.0",
     "socket.io": "^4.7.4",
     "socket.io-client": "^4.7.4",
     "socket.io-parser": "^4.2.4",
     "superagent": "^10.1.1",
     "supertest": "^7.0.0",
-    "tsup": "^6.5.0",
+    "tsdown": "^0.18.1",
     "typescript": "^5.8.2",
     "undici": "^7.4.0",
     "vitest": "^3.0.8",
     "vitest-environment-miniflare": "^2.14.1",
     "wait-for-expect": "^3.0.2",
     "web-encoding": "^1.1.5",
+    "webpack": "^5.105.0",
     "webpack-http-server": "^0.5.0",
     "ws": "^8.18.1"
   },
@@ -198,14 +173,14 @@
     }
   },
   "scripts": {
-    "start": "tsc --build -w",
+    "start": "tsdown --watch",
     "test": "pnpm test:unit && pnpm test:integration",
     "test:unit": "vitest",
     "test:integration": "pnpm test:node && pnpm test:browser",
     "test:node": "vitest -c test/vitest.config.js",
     "test:browser": "pnpm playwright test -c test/playwright.config.ts",
-    "clean": "rimraf lib",
-    "build": "pnpm clean && cross-env NODE_ENV=production tsup --splitting",
+    "test:nock": "./test/third-party/nock.sh",
+    "build": "tsdown",
     "release": "release publish"
   }
 }

package/presets/browser/package.json

@@ -1,6 +1,5 @@
 {
-  "main": "../../lib/browser/presets/browser.js",
+  "main": "../../lib/browser/presets/browser.mjs",
   "module": "../../lib/browser/presets/browser.mjs",
-  "browser": "../../lib/browser/presets/browser.js",
-  "types": "../../lib/browser/presets/browser.d.ts"
+  "browser": "../../lib/browser/presets/browser.mjs"
 }

package/presets/node/package.json

@@ -1,6 +1,11 @@
 {
-  "main": "../../lib/node/presets/node.js",
+  "main": "../../lib/node/presets/node.cjs",
   "module": "../../lib/node/presets/node.mjs",
   "browser": null,
-  "types": "../../lib/node/presets/node.d.ts"
+  "exports": {
+    ".": {
+      "import": "./../lib/node/presets/node.mjs",
+      "default": "./../lib/node/presets/node.cjs"
+    }
+  }
 }

package/src/RemoteHttpInterceptor.ts

@@ -8,6 +8,7 @@ import { FetchInterceptor } from './interceptors/fetch'
 import { handleRequest } from './utils/handleRequest'
 import { RequestController } from './RequestController'
 import { FetchResponse } from './utils/fetchUtils'
+import { isResponseError } from './utils/responseUtils'
 
 export interface SerializedRequest {
   id: string
@@ -178,13 +179,14 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
         body: requestJson.body,
       })
 
-      const controller = new RequestController(request)
-      await handleRequest({
-        request,
-        requestId: requestJson.id,
-        controller,
-        emitter: this.emitter,
-        onResponse: async (response) => {
+      const controller = new RequestController(request, {
+        passthrough: () => {},
+        respondWith: async (response) => {
+          if (isResponseError(response)) {
+            this.logger.info('received a network error!', { response })
+            throw new Error('Not implemented')
+          }
+
           this.logger.info('received mocked response!', { response })
 
           const responseClone = response.clone()
@@ -221,15 +223,18 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
             serializedResponse
           )
         },
-        onRequestError: (response) => {
-          this.logger.info('received a network error!', { response })
-          throw new Error('Not implemented')
-        },
-        onError: (error) => {
-          this.logger.info('request has errored!', { error })
+        errorWith: (reason) => {
+          this.logger.info('request has errored!', { error: reason })
           throw new Error('Not implemented')
         },
       })
+
+      await handleRequest({
+        request,
+        requestId: requestJson.id,
+        controller,
+        emitter: this.emitter,
+      })
     }
 
     this.subscriptions.push(() => {

package/src/RequestController.test.ts

@@ -1,57 +1,104 @@
-import { it, expect } from 'vitest'
-import { kResponsePromise, RequestController } from './RequestController'
+import { vi, it, expect } from 'vitest'
+import {
+  RequestController,
+  type RequestControllerSource,
+} from './RequestController'
+import { InterceptorError } from './InterceptorError'
 
-it('creates a pending response promise on construction', () => {
-  const controller = new RequestController(new Request('http://localhost'))
-  expect(controller[kResponsePromise]).toBeInstanceOf(Promise)
-  expect(controller[kResponsePromise].state).toBe('pending')
+const defaultSource = {
+  passthrough() {},
+  respondWith() {},
+  errorWith() {},
+} satisfies RequestControllerSource
+
+it('has a pending state upon construction', () => {
+  const controller = new RequestController(
+    new Request('http://localhost'),
+    defaultSource
+  )
+
+  expect(controller.handled).toBeInstanceOf(Promise)
+  expect(controller.readyState).toBe(RequestController.PENDING)
 })
 
-it('resolves the response promise with the response provided to "respondWith"', async () => {
-  const controller = new RequestController(new Request('http://localhost'))
-  controller.respondWith(new Response('hello world'))
+it('handles a request when calling ".respondWith()" with a mocked response', async () => {
+  const respondWith = vi.fn<RequestControllerSource['respondWith']>()
+  const controller = new RequestController(new Request('http://localhost'), {
+    ...defaultSource,
+    respondWith,
+  })
+
+  await controller.respondWith(new Response('hello world'))
+
+  expect(controller.readyState).toBe(RequestController.RESPONSE)
+  await expect(controller.handled).resolves.toBeUndefined()
 
-  const response = (await controller[kResponsePromise]) as Response
+  expect(respondWith).toHaveBeenCalledOnce()
+  const [response] = respondWith.mock.calls[0]
 
   expect(response).toBeInstanceOf(Response)
   expect(response.status).toBe(200)
-  expect(await response.text()).toBe('hello world')
+  await expect(response.text()).resolves.toBe('hello world')
 })
 
-it('resolves the response promise with the error provided to "errorWith"', async () => {
-  const controller = new RequestController(new Request('http://localhost'))
+it('handles the request when calling ".errorWith()" with an error', async () => {
+  const errorWith = vi.fn<RequestControllerSource['errorWith']>()
+  const controller = new RequestController(new Request('http://localhost'), {
+    ...defaultSource,
+    errorWith,
+  })
+
   const error = new Error('Oops!')
-  controller.errorWith(error)
+  await controller.errorWith(error)
+
+  expect(controller.readyState).toBe(RequestController.ERROR)
+  await expect(controller.handled).resolves.toBeUndefined()
 
-  await expect(controller[kResponsePromise]).resolves.toEqual(error)
+  expect(errorWith).toHaveBeenCalledOnce()
+  expect(errorWith).toHaveBeenCalledWith(error)
 })
 
-it('resolves the response promise with an arbitrary object provided to "errorWith"', async () => {
-  const controller = new RequestController(new Request('http://localhost'))
+it('handles the request when calling ".errorWith()" with an arbitrary object', async () => {
+  const errorWith = vi.fn<RequestControllerSource['errorWith']>()
+  const controller = new RequestController(new Request('http://localhost'), {
+    ...defaultSource,
+    errorWith,
+  })
+
   const error = { message: 'Oops!' }
-  controller.errorWith(error)
+  await controller.errorWith(error)
 
-  await expect(controller[kResponsePromise]).resolves.toEqual(error)
+  expect(controller.readyState).toBe(RequestController.ERROR)
+  await expect(controller.handled).resolves.toBeUndefined()
+
+  expect(errorWith).toHaveBeenCalledOnce()
+  expect(errorWith).toHaveBeenCalledWith(error)
 })
 
-it('throws when calling "respondWith" multiple times', () => {
-  const controller = new RequestController(new Request('http://localhost'))
+it('throws when calling "respondWith" multiple times', async () => {
+  const controller = new RequestController(
+    new Request('http://localhost'),
+    defaultSource
+  )
   controller.respondWith(new Response('hello world'))
 
-  expect(() => {
-    controller.respondWith(new Response('second response'))
-  }).toThrow(
-    'Failed to respond to the "GET http://localhost/" request: the "request" event has already been handled.'
+  expect(() => controller.respondWith(new Response('second response'))).toThrow(
+    new InterceptorError(
+      'Failed to respond to the "GET http://localhost/" request with "200 OK": the request has already been handled (2)'
+    )
   )
 })
 
-it('throws when calling "errorWith" multiple times', () => {
-  const controller = new RequestController(new Request('http://localhost'))
+it('throws when calling "errorWith" multiple times', async () => {
+  const controller = new RequestController(
+    new Request('http://localhost'),
+    defaultSource
+  )
   controller.errorWith(new Error('Oops!'))
 
-  expect(() => {
-    controller.errorWith(new Error('second error'))
-  }).toThrow(
-    'Failed to error the "GET http://localhost/" request: the "request" event has already been handled.'
+  expect(() => controller.errorWith(new Error('second error'))).toThrow(
+    new InterceptorError(
+      'Failed to error the "GET http://localhost/" request with "Error: second error": the request has already been handled (3)'
+    )
   )
 })