@mswjs/interceptors 0.21.0 → 0.21.1

package/lib/node/RemoteHttpInterceptor.js

@@ -3,7 +3,7 @@
 var _chunkKZJG2UW7js = require('./chunk-KZJG2UW7.js');
 
 
-var _chunkVKKFXSTLjs = require('./chunk-VKKFXSTL.js');
+var _chunkUVNTVJHDjs = require('./chunk-UVNTVJHD.js');
 
 
 var _chunkHDUJCCWFjs = require('./chunk-HDUJCCWF.js');
@@ -27,7 +27,7 @@ var RemoteHttpInterceptor = class extends _chunkKZJG2UW7js.BatchInterceptor {
     super({
       name: "remote-interceptor",
       interceptors: [
-        new (0, _chunkVKKFXSTLjs.ClientRequestInterceptor)(),
+        new (0, _chunkUVNTVJHDjs.ClientRequestInterceptor)(),
         new (0, _chunkHDUJCCWFjs.XMLHttpRequestInterceptor)()
       ]
     });

package/lib/node/RemoteHttpInterceptor.mjs

@@ -3,7 +3,7 @@ import {
 } from "./chunk-JISWS3Y3.mjs";
 import {
   ClientRequestInterceptor
-} from "./chunk-FCIAOT7W.mjs";
+} from "./chunk-Z5JAVEOB.mjs";
 import {
   XMLHttpRequestInterceptor
 } from "./chunk-ZWCZGO3W.mjs";

package/lib/node/{chunk-VKKFXSTL.js → chunk-UVNTVJHD.js}

@@ -141,6 +141,7 @@ function createRequest(clientRequest) {
 }
 
 // src/interceptors/ClientRequest/NodeClientRequest.ts
+var _deferredpromise = require('@open-draft/deferred-promise');
 var _NodeClientRequest = class extends _http.ClientRequest {
   constructor([url, requestOptions, callback], options) {
     super(requestOptions, callback);
@@ -324,9 +325,13 @@ var _NodeClientRequest = class extends _http.ClientRequest {
       });
     }
     this.log("mocked response headers ready:", headers);
+    const isResponseStreamRead = new (0, _deferredpromise.DeferredPromise)();
     const closeResponseStream = () => {
+      this.log("closing response stream...");
       this.response.push(null);
       this.response.complete = true;
+      isResponseStreamRead.resolve();
+      this.log("closed response stream!");
     };
     if (body) {
       const bodyReader = body.getReader();
@@ -343,14 +348,16 @@ var _NodeClientRequest = class extends _http.ClientRequest {
     } else {
       closeResponseStream();
     }
-    this.res = this.response;
-    this.finished = true;
-    Object.defineProperty(this, "writableEnded", {
-      value: true
+    isResponseStreamRead.then(() => {
+      this.res = this.response;
+      this.finished = true;
+      Object.defineProperty(this, "writableEnded", {
+        value: true
+      });
+      this.emit("finish");
+      this.emit("response", this.response);
+      this.terminate();
     });
-    this.emit("finish");
-    this.emit("response", this.response);
-    this.terminate();
   }
   terminate() {
     var _a;

package/lib/node/{chunk-FCIAOT7W.mjs → chunk-Z5JAVEOB.mjs}

@@ -141,6 +141,7 @@ function createRequest(clientRequest) {
 }
 
 // src/interceptors/ClientRequest/NodeClientRequest.ts
+import { DeferredPromise } from "@open-draft/deferred-promise";
 var _NodeClientRequest = class extends ClientRequest {
   constructor([url, requestOptions, callback], options) {
     super(requestOptions, callback);
@@ -324,9 +325,13 @@ var _NodeClientRequest = class extends ClientRequest {
       });
     }
     this.log("mocked response headers ready:", headers);
+    const isResponseStreamRead = new DeferredPromise();
     const closeResponseStream = () => {
+      this.log("closing response stream...");
       this.response.push(null);
       this.response.complete = true;
+      isResponseStreamRead.resolve();
+      this.log("closed response stream!");
     };
     if (body) {
       const bodyReader = body.getReader();
@@ -343,14 +348,16 @@ var _NodeClientRequest = class extends ClientRequest {
     } else {
       closeResponseStream();
     }
-    this.res = this.response;
-    this.finished = true;
-    Object.defineProperty(this, "writableEnded", {
-      value: true
+    isResponseStreamRead.then(() => {
+      this.res = this.response;
+      this.finished = true;
+      Object.defineProperty(this, "writableEnded", {
+        value: true
+      });
+      this.emit("finish");
+      this.emit("response", this.response);
+      this.terminate();
     });
-    this.emit("finish");
-    this.emit("response", this.response);
-    this.terminate();
   }
   terminate() {
     var _a;

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

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkVKKFXSTLjs = require('../../chunk-VKKFXSTL.js');
+var _chunkUVNTVJHDjs = require('../../chunk-UVNTVJHD.js');
 require('../../chunk-6V3JXLBF.js');
 require('../../chunk-ZJOF5MEZ.js');
 require('../../chunk-QMIXLBOU.js');
 
 
-exports.ClientRequestInterceptor = _chunkVKKFXSTLjs.ClientRequestInterceptor;
+exports.ClientRequestInterceptor = _chunkUVNTVJHDjs.ClientRequestInterceptor;

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

@@ -1,6 +1,6 @@
 import {
   ClientRequestInterceptor
-} from "../../chunk-FCIAOT7W.mjs";
+} from "../../chunk-Z5JAVEOB.mjs";
 import "../../chunk-NNVTJLQA.mjs";
 import "../../chunk-STA6QBYM.mjs";
 import "../../chunk-ZSI7MX3V.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",
@@ -35,8 +35,8 @@
       "browser": {
         "types": "./lib/browser/interceptors/fetch/index.d.ts",
         "require": "./lib/browser/interceptors/fetch/index.js",
-        "default": "./lib/browser/interceptors/fetch/index.js",
-        "import": "./lib/browser/interceptors/fetch/index.mjs"
+        "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",
@@ -104,7 +104,7 @@
     "got": "^11.8.3",
     "jest": "^27.4.3",
     "node-fetch": "2.6.7",
-    "page-with": "^0.5.1",
+    "page-with": "^0.6.0",
     "rimraf": "^3.0.2",
     "simple-git-hooks": "^2.7.0",
     "superagent": "^6.1.0",
@@ -116,6 +116,7 @@
     "web-encoding": "^1.1.5"
   },
   "dependencies": {
+    "@open-draft/deferred-promise": "^2.1.0",
     "@open-draft/until": "^1.0.3",
     "@types/debug": "^4.1.7",
     "debug": "^4.3.3",
@@ -123,6 +124,9 @@
     "outvariant": "^1.2.1",
     "strict-event-emitter": "^0.4.6"
   },
+  "resolutions": {
+    "memfs": "^3.4.13"
+  },
   "keywords": [
     "request",
     "intercept",

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

@@ -153,7 +153,7 @@ test('emits the ENOTFOUND error connecting to a non-existing hostname given no m
 test('emits the ECONNREFUSED error connecting to an inactive server given no mocked response', (done) => {
   const emitter = new AsyncEventEmitter<HttpRequestEventMap>()
   const request = new NodeClientRequest(
-    normalizeClientRequestArgs('http:', 'http://localhost:12345'),
+    normalizeClientRequestArgs('http:', 'http://127.0.0.1:12345'),
     {
       emitter,
       log,

package/src/interceptors/ClientRequest/NodeClientRequest.ts

@@ -17,6 +17,7 @@ import { createResponse } from './utils/createResponse'
 import { createRequest } from './utils/createRequest'
 import { toInteractiveRequest } from '../../utils/toInteractiveRequest'
 import { uuidv4 } from '../../utils/uuid'
+import { DeferredPromise } from '@open-draft/deferred-promise'
 
 export type Protocol = 'http' | 'https'
 
@@ -372,11 +373,18 @@ export class NodeClientRequest extends ClientRequest {
     }
     this.log('mocked response headers ready:', headers)
 
+    const isResponseStreamRead = new DeferredPromise<void>()
+
     const closeResponseStream = () => {
+      this.log('closing response stream...')
+
       // Push "null" to indicate that the response body is complete
       // and shouldn't be written to anymore.
       this.response.push(null)
       this.response.complete = true
+
+      isResponseStreamRead.resolve()
+      this.log('closed response stream!')
     }
 
     if (body) {
@@ -400,24 +408,26 @@ export class NodeClientRequest extends ClientRequest {
       closeResponseStream()
     }
 
-    /**
-     * Set the internal "res" property to the mocked "OutgoingMessage"
-     * to make the "ClientRequest" instance think there's data received
-     * from the socket.
-     * @see https://github.com/nodejs/node/blob/9c405f2591f5833d0247ed0fafdcd68c5b14ce7a/lib/_http_client.js#L501
-     */
-    // @ts-ignore
-    this.res = this.response
-
-    this.finished = true
-    Object.defineProperty(this, 'writableEnded', {
-      value: true,
-    })
+    isResponseStreamRead.then(() => {
+      /**
+       * Set the internal "res" property to the mocked "OutgoingMessage"
+       * to make the "ClientRequest" instance think there's data received
+       * from the socket.
+       * @see https://github.com/nodejs/node/blob/9c405f2591f5833d0247ed0fafdcd68c5b14ce7a/lib/_http_client.js#L501
+       */
+      // @ts-ignore
+      this.res = this.response
+
+      this.finished = true
+      Object.defineProperty(this, 'writableEnded', {
+        value: true,
+      })
 
-    this.emit('finish')
-    this.emit('response', this.response)
+      this.emit('finish')
+      this.emit('response', this.response)
 
-    this.terminate()
+      this.terminate()
+    })
   }
 
   /**