@mswjs/interceptors 0.13.5 → 0.13.6

package/lib/interceptors/ClientRequest/utils/cloneIncomingMessage.d.ts

@@ -4,4 +4,7 @@ export declare const IS_CLONE: unique symbol;
 export interface ClonedIncomingMessage extends IncomingMessage {
     [IS_CLONE]: boolean;
 }
+/**
+ * Clones a given `http.IncomingMessage` instance.
+ */
 export declare function cloneIncomingMessage(message: IncomingMessage): ClonedIncomingMessage;

package/lib/interceptors/ClientRequest/utils/cloneIncomingMessage.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -44,20 +33,60 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cloneIncomingMessage = exports.IS_CLONE = void 0;
+var http_1 = require("http");
 var stream_1 = require("stream");
 exports.IS_CLONE = Symbol('isClone');
+/**
+ * Clones a given `http.IncomingMessage` instance.
+ */
 function cloneIncomingMessage(message) {
+    var clone = message.pipe(new stream_1.PassThrough());
+    // Inherit all direct "IncomingMessage" properties.
+    inheritProperties(message, clone);
+    // Deeply inherit the message prototypes (Readable, Stream, EventEmitter, etc.).
+    var clonedPrototype = Object.create(http_1.IncomingMessage.prototype);
+    getPrototypes(clone).forEach(function (prototype) {
+        inheritProperties(prototype, clonedPrototype);
+    });
+    Object.setPrototypeOf(clone, clonedPrototype);
+    Object.defineProperty(clone, exports.IS_CLONE, {
+        enumerable: true,
+        value: true,
+    });
+    return clone;
+}
+exports.cloneIncomingMessage = cloneIncomingMessage;
+/**
+ * Returns a list of all prototypes the given object extends.
+ */
+function getPrototypes(source) {
+    var prototypes = [];
+    var current = source;
+    while ((current = Object.getPrototypeOf(current))) {
+        prototypes.push(current);
+    }
+    return prototypes;
+}
+/**
+ * Inherits a given target object properties and symbols
+ * onto the given source object.
+ * @param source Object which should acquire properties.
+ * @param target Object to inherit the properties from.
+ */
+function inheritProperties(source, target) {
     var e_1, _a;
-    var stream = message.pipe(new stream_1.PassThrough());
-    var properties = __spreadArray(__spreadArray([], __read(Object.getOwnPropertyNames(message))), __read(Object.getOwnPropertySymbols(message)));
+    var properties = __spreadArray(__spreadArray([], __read(Object.getOwnPropertyNames(source))), __read(Object.getOwnPropertySymbols(source)));
     try {
         for (var properties_1 = __values(properties), properties_1_1 = properties_1.next(); !properties_1_1.done; properties_1_1 = properties_1.next()) {
-            var propertyName = properties_1_1.value;
-            if (stream.hasOwnProperty(propertyName)) {
+            var property = properties_1_1.value;
+            if (target.hasOwnProperty(property)) {
+                continue;
+            }
+            var descriptor = Object.getOwnPropertyDescriptor(source, property);
+            if (!descriptor) {
                 continue;
             }
-            var propertyDescriptor = Object.getOwnPropertyDescriptor(message, propertyName);
-            Object.defineProperty(stream, propertyName, __assign(__assign({}, propertyDescriptor), { value: message[propertyName] }));
+            Object.defineProperty(target, property, descriptor);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -67,11 +96,5 @@ function cloneIncomingMessage(message) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    Object.defineProperty(stream, exports.IS_CLONE, {
-        enumerable: true,
-        value: true,
-    });
-    return stream;
 }
-exports.cloneIncomingMessage = cloneIncomingMessage;
 //# sourceMappingURL=cloneIncomingMessage.js.map

package/lib/interceptors/ClientRequest/utils/cloneIncomingMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloneIncomingMessage.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/cloneIncomingMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iCAAoC;AAEvB,QAAA,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;AAMzC,SAAgB,oBAAoB,CAClC,OAAwB;;IAExB,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,oBAAW,EAAE,CAAC,CAAA;IAC9C,IAAM,UAAU,GAAG,uCACd,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,WACnC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,EACT,CAAA;;QAEjC,KAA2B,IAAA,eAAA,SAAA,UAAU,CAAA,sCAAA,8DAAE;YAAlC,IAAM,YAAY,uBAAA;YACrB,IAAI,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;gBACvC,SAAQ;aACT;YAED,IAAM,kBAAkB,GAAG,MAAM,CAAC,wBAAwB,CACxD,OAAO,EACP,YAAY,CACb,CAAA;YAED,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,wBACrC,kBAAkB,KACrB,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,IAC5B,CAAA;SACH;;;;;;;;;IAED,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAQ,EAAE;QACtC,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;IAEF,OAAO,MAA0C,CAAA;AACnD,CAAC;AA/BD,oDA+BC"}
+{"version":3,"file":"cloneIncomingMessage.js","sourceRoot":"","sources":["../../../../src/interceptors/ClientRequest/utils/cloneIncomingMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAsC;AACtC,iCAAoC;AAEvB,QAAA,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;AAMzC;;GAEG;AACH,SAAgB,oBAAoB,CAClC,OAAwB;IAExB,IAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,oBAAW,EAAE,CAAC,CAAA;IAE7C,mDAAmD;IACnD,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAEjC,gFAAgF;IAChF,IAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAe,CAAC,SAAS,CAAC,CAAA;IAChE,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,SAAS;QACrC,iBAAiB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAE7C,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,gBAAQ,EAAE;QACrC,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;IAEF,OAAO,KAAyC,CAAA;AAClD,CAAC;AArBD,oDAqBC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,MAAc;IACnC,IAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,IAAI,OAAO,GAAG,MAAM,CAAA;IAEpB,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;QACjD,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;KACzB;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,MAAc,EAAE,MAAc;;IACvD,IAAM,UAAU,0CACX,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAClC,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,EACxC,CAAA;;QAED,KAAuB,IAAA,eAAA,SAAA,UAAU,CAAA,sCAAA,8DAAE;YAA9B,IAAM,QAAQ,uBAAA;YACjB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;gBACnC,SAAQ;aACT;YAED,IAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACpE,IAAI,CAAC,UAAU,EAAE;gBACf,SAAQ;aACT;YAED,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;SACpD;;;;;;;;;AACH,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "author": "Artem Zakharchenko",

package/src/interceptors/ClientRequest/utils/cloneIncomingMessage.test.ts

@@ -1,13 +1,20 @@
 import { Socket } from 'net'
 import { IncomingMessage } from 'http'
+import { Stream, Readable, EventEmitter } from 'stream'
 import { cloneIncomingMessage, IS_CLONE } from './cloneIncomingMessage'
 
 test('clones a given IncomingMessage', () => {
-  const source = new IncomingMessage(new Socket())
-  source.statusCode = 200
-  source.statusMessage = 'OK'
-  source.headers = { 'x-powered-by': 'msw' }
-  const clone = cloneIncomingMessage(source)
+  const message = new IncomingMessage(new Socket())
+  message.statusCode = 200
+  message.statusMessage = 'OK'
+  message.headers = { 'x-powered-by': 'msw' }
+  const clone = cloneIncomingMessage(message)
+
+  // Prototypes must be preserved.
+  expect(clone).toBeInstanceOf(IncomingMessage)
+  expect(clone).toBeInstanceOf(EventEmitter)
+  expect(clone).toBeInstanceOf(Stream)
+  expect(clone).toBeInstanceOf(Readable)
 
   expect(clone.statusCode).toEqual(200)
   expect(clone.statusMessage).toEqual('OK')
@@ -15,6 +22,4 @@ test('clones a given IncomingMessage', () => {
 
   // Cloned IncomingMessage must be marked respectively.
   expect(clone[IS_CLONE]).toEqual(true)
-
-  expect(clone).toHaveProperty('_events')
 })

package/src/interceptors/ClientRequest/utils/cloneIncomingMessage.ts

@@ -7,35 +7,68 @@ export interface ClonedIncomingMessage extends IncomingMessage {
   [IS_CLONE]: boolean
 }
 
+/**
+ * Clones a given `http.IncomingMessage` instance.
+ */
 export function cloneIncomingMessage(
   message: IncomingMessage
 ): ClonedIncomingMessage {
-  const stream = message.pipe(new PassThrough())
-  const properties = [
-    ...Object.getOwnPropertyNames(message),
-    ...Object.getOwnPropertySymbols(message),
-  ] as Array<keyof IncomingMessage>
-
-  for (const propertyName of properties) {
-    if (stream.hasOwnProperty(propertyName)) {
-      continue
-    }
+  const clone = message.pipe(new PassThrough())
 
-    const propertyDescriptor = Object.getOwnPropertyDescriptor(
-      message,
-      propertyName
-    )
+  // Inherit all direct "IncomingMessage" properties.
+  inheritProperties(message, clone)
 
-    Object.defineProperty(stream, propertyName, {
-      ...propertyDescriptor,
-      value: message[propertyName],
-    })
-  }
+  // Deeply inherit the message prototypes (Readable, Stream, EventEmitter, etc.).
+  const clonedPrototype = Object.create(IncomingMessage.prototype)
+  getPrototypes(clone).forEach((prototype) => {
+    inheritProperties(prototype, clonedPrototype)
+  })
+  Object.setPrototypeOf(clone, clonedPrototype)
 
-  Object.defineProperty(stream, IS_CLONE, {
+  Object.defineProperty(clone, IS_CLONE, {
     enumerable: true,
     value: true,
   })
 
-  return stream as unknown as ClonedIncomingMessage
+  return clone as unknown as ClonedIncomingMessage
+}
+
+/**
+ * Returns a list of all prototypes the given object extends.
+ */
+function getPrototypes(source: object): object[] {
+  const prototypes: object[] = []
+  let current = source
+
+  while ((current = Object.getPrototypeOf(current))) {
+    prototypes.push(current)
+  }
+
+  return prototypes
+}
+
+/**
+ * Inherits a given target object properties and symbols
+ * onto the given source object.
+ * @param source Object which should acquire properties.
+ * @param target Object to inherit the properties from.
+ */
+function inheritProperties(source: object, target: object): void {
+  const properties = [
+    ...Object.getOwnPropertyNames(source),
+    ...Object.getOwnPropertySymbols(source),
+  ]
+
+  for (const property of properties) {
+    if (target.hasOwnProperty(property)) {
+      continue
+    }
+
+    const descriptor = Object.getOwnPropertyDescriptor(source, property)
+    if (!descriptor) {
+      continue
+    }
+
+    Object.defineProperty(target, property, descriptor)
+  }
 }