@mswjs/interceptors 0.24.0 → 0.24.1

package/lib/browser/{chunk-B74BGPYH.mjs → chunk-BRIUGDYQ.mjs}

@@ -202,8 +202,10 @@ function parseJson(data) {
 }
 
 // src/interceptors/XMLHttpRequest/utils/createResponse.ts
+var statusCodesWithoutBody = [204, 205, 304];
 function createResponse(request, body) {
-  return new Response(body, {
+  const responseBodyOrNull = statusCodesWithoutBody.includes(request.status) ? null : body;
+  return new Response(responseBodyOrNull, {
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(

package/lib/browser/{chunk-LHYX2GOM.mjs → chunk-KSCN3JS4.mjs}

@@ -8,6 +8,7 @@ import {
 } from "./chunk-GXJLJMOT.mjs";
 
 // src/interceptors/fetch/index.ts
+import { DeferredPromise } from "@open-draft/deferred-promise";
 import { invariant } from "outvariant";
 import { until } from "@open-draft/until";
 var _FetchInterceptor = class extends Interceptor {
@@ -38,18 +39,31 @@ var _FetchInterceptor = class extends Interceptor {
         requestId
       });
       this.logger.info("awaiting for the mocked response...");
+      const signal = interactiveRequest.signal;
+      const requestAborted = new DeferredPromise();
+      signal.addEventListener(
+        "abort",
+        () => {
+          requestAborted.reject(signal.reason);
+        },
+        { once: true }
+      );
       const resolverResult = await until(async () => {
-        await this.emitter.untilIdle(
+        const allListenersResolved = this.emitter.untilIdle(
           "request",
           ({ args: [{ requestId: pendingRequestId }] }) => {
             return pendingRequestId === requestId;
           }
         );
+        await Promise.race([requestAborted, allListenersResolved]);
         this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
         this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
+      if (requestAborted.state === "rejected") {
+        return Promise.reject(requestAborted.rejectionReason);
+      }
       if (resolverResult.error) {
         const error = Object.assign(new TypeError("Failed to fetch"), {
           cause: resolverResult.error

package/lib/browser/{chunk-2TENISKM.js → chunk-XAQQ5IUC.js}

@@ -8,6 +8,7 @@ var _chunkPCFJD76Xjs = require('./chunk-PCFJD76X.js');
 var _chunk4CFMDU7Zjs = require('./chunk-4CFMDU7Z.js');
 
 // src/interceptors/fetch/index.ts
+var _deferredpromise = require('@open-draft/deferred-promise');
 var _outvariant = require('outvariant');
 var _until = require('@open-draft/until');
 var _FetchInterceptor = class extends _chunk4CFMDU7Zjs.Interceptor {
@@ -38,18 +39,31 @@ var _FetchInterceptor = class extends _chunk4CFMDU7Zjs.Interceptor {
         requestId
       });
       this.logger.info("awaiting for the mocked response...");
+      const signal = interactiveRequest.signal;
+      const requestAborted = new (0, _deferredpromise.DeferredPromise)();
+      signal.addEventListener(
+        "abort",
+        () => {
+          requestAborted.reject(signal.reason);
+        },
+        { once: true }
+      );
       const resolverResult = await _until.until.call(void 0, async () => {
-        await this.emitter.untilIdle(
+        const allListenersResolved = this.emitter.untilIdle(
           "request",
           ({ args: [{ requestId: pendingRequestId }] }) => {
             return pendingRequestId === requestId;
           }
         );
+        await Promise.race([requestAborted, allListenersResolved]);
         this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
         this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
+      if (requestAborted.state === "rejected") {
+        return Promise.reject(requestAborted.rejectionReason);
+      }
       if (resolverResult.error) {
         const error = Object.assign(new TypeError("Failed to fetch"), {
           cause: resolverResult.error

package/lib/browser/{chunk-UGP4JOAM.js → chunk-Y4XXQXAW.js}

@@ -202,8 +202,10 @@ function parseJson(data) {
 }
 
 // src/interceptors/XMLHttpRequest/utils/createResponse.ts
+var statusCodesWithoutBody = [204, 205, 304];
 function createResponse(request, body) {
-  return new Response(body, {
+  const responseBodyOrNull = statusCodesWithoutBody.includes(request.status) ? null : body;
+  return new Response(responseBodyOrNull, {
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(

package/lib/browser/interceptors/XMLHttpRequest/index.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkUGP4JOAMjs = require('../../chunk-UGP4JOAM.js');
+var _chunkY4XXQXAWjs = require('../../chunk-Y4XXQXAW.js');
 require('../../chunk-3LFH2WCF.js');
 require('../../chunk-PCFJD76X.js');
 require('../../chunk-4CFMDU7Z.js');
 
 
-exports.XMLHttpRequestInterceptor = _chunkUGP4JOAMjs.XMLHttpRequestInterceptor;
+exports.XMLHttpRequestInterceptor = _chunkY4XXQXAWjs.XMLHttpRequestInterceptor;

package/lib/browser/interceptors/XMLHttpRequest/index.mjs

@@ -1,6 +1,6 @@
 import {
   XMLHttpRequestInterceptor
-} from "../../chunk-B74BGPYH.mjs";
+} from "../../chunk-BRIUGDYQ.mjs";
 import "../../chunk-7II4SWKS.mjs";
 import "../../chunk-RT3ATOJH.mjs";
 import "../../chunk-GXJLJMOT.mjs";

package/lib/browser/interceptors/fetch/index.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk2TENISKMjs = require('../../chunk-2TENISKM.js');
+var _chunkXAQQ5IUCjs = require('../../chunk-XAQQ5IUC.js');
 require('../../chunk-PCFJD76X.js');
 require('../../chunk-4CFMDU7Z.js');
 
 
-exports.FetchInterceptor = _chunk2TENISKMjs.FetchInterceptor;
+exports.FetchInterceptor = _chunkXAQQ5IUCjs.FetchInterceptor;

package/lib/browser/interceptors/fetch/index.mjs

@@ -1,6 +1,6 @@
 import {
   FetchInterceptor
-} from "../../chunk-LHYX2GOM.mjs";
+} from "../../chunk-KSCN3JS4.mjs";
 import "../../chunk-RT3ATOJH.mjs";
 import "../../chunk-GXJLJMOT.mjs";
 export {

package/lib/browser/presets/browser.js

@@ -1,17 +1,17 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkUGP4JOAMjs = require('../chunk-UGP4JOAM.js');
+var _chunkY4XXQXAWjs = require('../chunk-Y4XXQXAW.js');
 require('../chunk-3LFH2WCF.js');
 
 
-var _chunk2TENISKMjs = require('../chunk-2TENISKM.js');
+var _chunkXAQQ5IUCjs = require('../chunk-XAQQ5IUC.js');
 require('../chunk-PCFJD76X.js');
 require('../chunk-4CFMDU7Z.js');
 
 // src/presets/browser.ts
 var browser_default = [
-  new (0, _chunk2TENISKMjs.FetchInterceptor)(),
-  new (0, _chunkUGP4JOAMjs.XMLHttpRequestInterceptor)()
+  new (0, _chunkXAQQ5IUCjs.FetchInterceptor)(),
+  new (0, _chunkY4XXQXAWjs.XMLHttpRequestInterceptor)()
 ];
 
 

package/lib/browser/presets/browser.mjs

@@ -1,10 +1,10 @@
 import {
   XMLHttpRequestInterceptor
-} from "../chunk-B74BGPYH.mjs";
+} from "../chunk-BRIUGDYQ.mjs";
 import "../chunk-7II4SWKS.mjs";
 import {
   FetchInterceptor
-} from "../chunk-LHYX2GOM.mjs";
+} from "../chunk-KSCN3JS4.mjs";
 import "../chunk-RT3ATOJH.mjs";
 import "../chunk-GXJLJMOT.mjs";
 

package/lib/node/RemoteHttpInterceptor.js

@@ -6,7 +6,7 @@ var _chunkMVPEJK4Vjs = require('./chunk-MVPEJK4V.js');
 var _chunkOOSIWXHXjs = require('./chunk-OOSIWXHX.js');
 
 
-var _chunkYCEMBJEMjs = require('./chunk-YCEMBJEM.js');
+var _chunkNM5BWVVBjs = require('./chunk-NM5BWVVB.js');
 require('./chunk-3LFH2WCF.js');
 require('./chunk-VQ4DZOBB.js');
 
@@ -23,7 +23,7 @@ var RemoteHttpInterceptor = class extends _chunkMVPEJK4Vjs.BatchInterceptor {
       name: "remote-interceptor",
       interceptors: [
         new (0, _chunkOOSIWXHXjs.ClientRequestInterceptor)(),
-        new (0, _chunkYCEMBJEMjs.XMLHttpRequestInterceptor)()
+        new (0, _chunkNM5BWVVBjs.XMLHttpRequestInterceptor)()
       ]
     });
   }

package/lib/node/RemoteHttpInterceptor.mjs

@@ -6,7 +6,7 @@ import {
 } from "./chunk-PSIO3L7D.mjs";
 import {
   XMLHttpRequestInterceptor
-} from "./chunk-UWSK5F3S.mjs";
+} from "./chunk-SOWOSKLO.mjs";
 import "./chunk-7II4SWKS.mjs";
 import "./chunk-GFH37L5D.mjs";
 import {

package/lib/node/{chunk-YCEMBJEM.js → chunk-NM5BWVVB.js}

@@ -204,8 +204,10 @@ function parseJson(data) {
 }
 
 // src/interceptors/XMLHttpRequest/utils/createResponse.ts
+var statusCodesWithoutBody = [204, 205, 304];
 function createResponse(request, body) {
-  return new Response(body, {
+  const responseBodyOrNull = statusCodesWithoutBody.includes(request.status) ? null : body;
+  return new Response(responseBodyOrNull, {
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(

package/lib/node/{chunk-UWSK5F3S.mjs → chunk-SOWOSKLO.mjs}

@@ -204,8 +204,10 @@ function parseJson(data) {
 }
 
 // src/interceptors/XMLHttpRequest/utils/createResponse.ts
+var statusCodesWithoutBody = [204, 205, 304];
 function createResponse(request, body) {
-  return new Response(body, {
+  const responseBodyOrNull = statusCodesWithoutBody.includes(request.status) ? null : body;
+  return new Response(responseBodyOrNull, {
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(

package/lib/node/interceptors/XMLHttpRequest/index.js

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkYCEMBJEMjs = require('../../chunk-YCEMBJEM.js');
+var _chunkNM5BWVVBjs = require('../../chunk-NM5BWVVB.js');
 require('../../chunk-3LFH2WCF.js');
 require('../../chunk-VQ4DZOBB.js');
 require('../../chunk-ZJOF5MEZ.js');
 require('../../chunk-XYZRP5S2.js');
 
 
-exports.XMLHttpRequestInterceptor = _chunkYCEMBJEMjs.XMLHttpRequestInterceptor;
+exports.XMLHttpRequestInterceptor = _chunkNM5BWVVBjs.XMLHttpRequestInterceptor;

package/lib/node/interceptors/XMLHttpRequest/index.mjs

@@ -1,6 +1,6 @@
 import {
   XMLHttpRequestInterceptor
-} from "../../chunk-UWSK5F3S.mjs";
+} from "../../chunk-SOWOSKLO.mjs";
 import "../../chunk-7II4SWKS.mjs";
 import "../../chunk-GFH37L5D.mjs";
 import "../../chunk-STA6QBYM.mjs";

package/lib/node/interceptors/fetch/index.js

@@ -10,6 +10,7 @@ var _chunkZJOF5MEZjs = require('../../chunk-ZJOF5MEZ.js');
 var _chunkXYZRP5S2js = require('../../chunk-XYZRP5S2.js');
 
 // src/interceptors/fetch/index.ts
+var _deferredpromise = require('@open-draft/deferred-promise');
 var _outvariant = require('outvariant');
 var _until = require('@open-draft/until');
 var _FetchInterceptor = class extends _chunkXYZRP5S2js.Interceptor {
@@ -40,18 +41,31 @@ var _FetchInterceptor = class extends _chunkXYZRP5S2js.Interceptor {
         requestId
       });
       this.logger.info("awaiting for the mocked response...");
+      const signal = interactiveRequest.signal;
+      const requestAborted = new (0, _deferredpromise.DeferredPromise)();
+      signal.addEventListener(
+        "abort",
+        () => {
+          requestAborted.reject(signal.reason);
+        },
+        { once: true }
+      );
       const resolverResult = await _until.until.call(void 0, async () => {
-        await this.emitter.untilIdle(
+        const allListenersResolved = this.emitter.untilIdle(
           "request",
           ({ args: [{ requestId: pendingRequestId }] }) => {
             return pendingRequestId === requestId;
           }
         );
+        await Promise.race([requestAborted, allListenersResolved]);
         this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
         this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
+      if (requestAborted.state === "rejected") {
+        return Promise.reject(requestAborted.rejectionReason);
+      }
       if (resolverResult.error) {
         const error = Object.assign(new TypeError("Failed to fetch"), {
           cause: resolverResult.error

package/lib/node/interceptors/fetch/index.mjs

@@ -10,6 +10,7 @@ import {
 } from "../../chunk-RGYCLCLK.mjs";
 
 // src/interceptors/fetch/index.ts
+import { DeferredPromise } from "@open-draft/deferred-promise";
 import { invariant } from "outvariant";
 import { until } from "@open-draft/until";
 var _FetchInterceptor = class extends Interceptor {
@@ -40,18 +41,31 @@ var _FetchInterceptor = class extends Interceptor {
         requestId
       });
       this.logger.info("awaiting for the mocked response...");
+      const signal = interactiveRequest.signal;
+      const requestAborted = new DeferredPromise();
+      signal.addEventListener(
+        "abort",
+        () => {
+          requestAborted.reject(signal.reason);
+        },
+        { once: true }
+      );
       const resolverResult = await until(async () => {
-        await this.emitter.untilIdle(
+        const allListenersResolved = this.emitter.untilIdle(
           "request",
           ({ args: [{ requestId: pendingRequestId }] }) => {
             return pendingRequestId === requestId;
           }
         );
+        await Promise.race([requestAborted, allListenersResolved]);
         this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
         this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
+      if (requestAborted.state === "rejected") {
+        return Promise.reject(requestAborted.rejectionReason);
+      }
       if (resolverResult.error) {
         const error = Object.assign(new TypeError("Failed to fetch"), {
           cause: resolverResult.error

package/lib/node/presets/node.js

@@ -3,7 +3,7 @@
 var _chunkOOSIWXHXjs = require('../chunk-OOSIWXHX.js');
 
 
-var _chunkYCEMBJEMjs = require('../chunk-YCEMBJEM.js');
+var _chunkNM5BWVVBjs = require('../chunk-NM5BWVVB.js');
 require('../chunk-3LFH2WCF.js');
 require('../chunk-VQ4DZOBB.js');
 require('../chunk-ZJOF5MEZ.js');
@@ -12,7 +12,7 @@ require('../chunk-XYZRP5S2.js');
 // src/presets/node.ts
 var node_default = [
   new (0, _chunkOOSIWXHXjs.ClientRequestInterceptor)(),
-  new (0, _chunkYCEMBJEMjs.XMLHttpRequestInterceptor)()
+  new (0, _chunkNM5BWVVBjs.XMLHttpRequestInterceptor)()
 ];
 
 

package/lib/node/presets/node.mjs

@@ -3,7 +3,7 @@ import {
 } from "../chunk-PSIO3L7D.mjs";
 import {
   XMLHttpRequestInterceptor
-} from "../chunk-UWSK5F3S.mjs";
+} from "../chunk-SOWOSKLO.mjs";
 import "../chunk-7II4SWKS.mjs";
 import "../chunk-GFH37L5D.mjs";
 import "../chunk-STA6QBYM.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",
@@ -45,10 +45,10 @@
     },
     "./RemoteHttpInterceptor": {
       "browser": null,
-      "types": "./lib/node/interceptors/RemoteHttpInterceptor.d.ts",
-      "require": "./lib/node/interceptors/RemoteHttpInterceptor.js",
-      "import": "./lib/node/interceptors/RemoteHttpInterceptor.mjs",
-      "default": "./lib/node/interceptors/RemoteHttpInterceptor.js"
+      "types": "./lib/node/RemoteHttpInterceptor.d.ts",
+      "require": "./lib/node/RemoteHttpInterceptor.js",
+      "import": "./lib/node/RemoteHttpInterceptor.mjs",
+      "default": "./lib/node/RemoteHttpInterceptor.js"
     },
     "./presets/node": {
       "browser": null,

package/src/interceptors/ClientRequest/index.test.ts

@@ -3,6 +3,7 @@ import http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
 import { DeferredPromise } from '@open-draft/deferred-promise'
 import { ClientRequestInterceptor } from '.'
+import { sleep } from '../../../test/helpers'
 
 const httpServer = new HttpServer((app) => {
   app.get('/', (_req, res) => {
@@ -55,3 +56,30 @@ it('forbids calling "respondWith" multiple times for the same request', async ()
   expect(response.statusCode).toBe(200)
   expect(response.statusMessage).toBe('')
 })
+
+
+it('abort the request if the abort signal is emitted', async () => {
+  const requestUrl = httpServer.http.url('/')
+
+  const requestEmitted = new DeferredPromise<void>()
+  interceptor.on('request', async function delayedResponse({ request }) {
+    requestEmitted.resolve()
+    await sleep(10000)
+    request.respondWith(new Response())
+  })
+
+  const abortController = new AbortController()
+  const request = http.get(requestUrl, { signal: abortController.signal })
+
+  await requestEmitted
+
+  abortController.abort()
+
+  const requestAborted = new DeferredPromise<void>()
+  request.on('error', function(err) {
+    expect(err.name).toEqual('AbortError')
+    requestAborted.resolve()
+  })
+
+  await requestAborted
+})

package/src/interceptors/XMLHttpRequest/utils/createResponse.ts

@@ -1,3 +1,5 @@
+const statusCodesWithoutBody = [204, 205, 304]
+
 /**
  * Creates a Fetch API `Response` instance from the given
  * `XMLHttpRequest` instance and a response body.
@@ -6,7 +8,19 @@ export function createResponse(
   request: XMLHttpRequest,
   body: BodyInit | null
 ): Response {
-  return new Response(body, {
+  /**
+   * Handle XMLHttpRequest responses that must have null as the
+   * response body when represented using Fetch API Response.
+   * XMLHttpRequest response will always have an empty string
+   * as the "request.response" in those cases, resulting in an error
+   * when constructing a Response instance.
+   * @see https://github.com/mswjs/interceptors/issues/379
+   */
+  const responseBodyOrNull = statusCodesWithoutBody.includes(request.status)
+    ? null
+    : body
+
+  return new Response(responseBodyOrNull, {
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(

package/src/interceptors/fetch/index.ts

@@ -1,3 +1,4 @@
+import { DeferredPromise } from '@open-draft/deferred-promise'
 import { invariant } from 'outvariant'
 import { until } from '@open-draft/until'
 import { HttpRequestEventMap, IS_PATCHED_MODULE } from '../../glossary'
@@ -46,13 +47,27 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
 
       this.logger.info('awaiting for the mocked response...')
 
+      const signal = interactiveRequest.signal
+      const requestAborted = new DeferredPromise()
+
+      signal.addEventListener(
+        'abort',
+        () => {
+          requestAborted.reject(signal.reason)
+        },
+        { once: true }
+      )
+
       const resolverResult = await until(async () => {
-        await this.emitter.untilIdle(
+        const allListenersResolved = this.emitter.untilIdle(
           'request',
           ({ args: [{ requestId: pendingRequestId }] }) => {
             return pendingRequestId === requestId
           }
         )
+
+        await Promise.race([requestAborted, allListenersResolved])
+
         this.logger.info('all request listeners have been resolved!')
 
         const [mockedResponse] = await interactiveRequest.respondWith.invoked()
@@ -61,10 +76,15 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
         return mockedResponse
       })
 
+      if (requestAborted.state === 'rejected') {
+        return Promise.reject(requestAborted.rejectionReason)
+      }
+
       if (resolverResult.error) {
         const error = Object.assign(new TypeError('Failed to fetch'), {
           cause: resolverResult.error,
         })
+
         return Promise.reject(error)
       }