@mswjs/interceptors 0.22.2 → 0.22.4

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

@@ -121,12 +121,28 @@ function optionsToProxyHandler(options) {
       return constructorCall.call(newTarget, args, next);
     };
   }
-  if (typeof setProperty !== "undefined") {
-    handler.set = function(target, propertyName, nextValue, receiver) {
-      const next = () => Reflect.set(target, propertyName, nextValue, receiver);
-      return setProperty.call(target, [propertyName, nextValue], next);
+  handler.set = function(target, propertyName, nextValue, receiver) {
+    const next = () => {
+      const ownDescriptors = Reflect.getOwnPropertyDescriptor(
+        target,
+        propertyName
+      );
+      if (typeof (ownDescriptors == null ? void 0 : ownDescriptors.set) !== "undefined") {
+        ownDescriptors.set.apply(target, [nextValue]);
+        return true;
+      }
+      return Reflect.defineProperty(target, propertyName, {
+        writable: true,
+        enumerable: true,
+        configurable: true,
+        value: nextValue
+      });
     };
-  }
+    if (typeof setProperty !== "undefined") {
+      return setProperty.call(target, [propertyName, nextValue], next);
+    }
+    return next();
+  };
   handler.get = function(target, propertyName, receiver) {
     const next = () => target[propertyName];
     const value = typeof getProperty !== "undefined" ? getProperty.call(target, [propertyName, receiver], next) : next();
@@ -191,11 +207,25 @@ var XMLHttpRequestController = class {
     this.responseBuffer = new Uint8Array();
     this.request = createProxy(initialRequest, {
       setProperty: ([propertyName, nextValue], invoke) => {
-        if (propertyName === "withCredentials") {
-          define(this.request, "withCredentials", nextValue);
-          return true;
+        switch (propertyName) {
+          case "onabort":
+          case "onerror":
+          case "onload":
+          case "onloadend":
+          case "onloadstart":
+          case "onprogress":
+          case "ontimeout":
+          case "onreadystatechange": {
+            const eventName = propertyName.slice(
+              2
+            );
+            this.request.addEventListener(eventName, nextValue);
+            return invoke();
+          }
+          default: {
+            return invoke();
+          }
         }
-        return invoke();
       },
       methodCall: ([methodName, args], invoke) => {
         var _a;
@@ -259,21 +289,6 @@ var XMLHttpRequestController = class {
             });
             break;
           }
-          case "onabort":
-          case "onerror":
-          case "onload":
-          case "onloadend":
-          case "onloadstart":
-          case "onprogress":
-          case "ontimeout":
-          case "onreadystatechange": {
-            const [listener] = args;
-            this.registerEvent(
-              methodName,
-              listener
-            );
-            return invoke();
-          }
           default: {
             return invoke();
           }
@@ -326,14 +341,17 @@ var XMLHttpRequestController = class {
     Object.defineProperties(this.request, {
       response: {
         enumerable: true,
+        configurable: false,
         get: () => this.response
       },
       responseText: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseText
       },
       responseXML: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseXML
       }
     });
@@ -547,9 +565,19 @@ function createXMLHttpRequestProxy({
   log
 }) {
   const XMLHttpRequestProxy = new Proxy(globalThis.XMLHttpRequest, {
-    construct(target, args) {
+    construct(target, args, newTarget) {
       log("constructed new XMLHttpRequest");
-      const originalRequest = Reflect.construct(target, args);
+      const originalRequest = Reflect.construct(target, args, newTarget);
+      const prototypeDescriptors = Object.getOwnPropertyDescriptors(
+        target.prototype
+      );
+      for (const propertyName in prototypeDescriptors) {
+        Reflect.defineProperty(
+          originalRequest,
+          propertyName,
+          prototypeDescriptors[propertyName]
+        );
+      }
       const requestController = new XMLHttpRequestController(
         originalRequest,
         log

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

@@ -121,12 +121,28 @@ function optionsToProxyHandler(options) {
       return constructorCall.call(newTarget, args, next);
     };
   }
-  if (typeof setProperty !== "undefined") {
-    handler.set = function(target, propertyName, nextValue, receiver) {
-      const next = () => Reflect.set(target, propertyName, nextValue, receiver);
-      return setProperty.call(target, [propertyName, nextValue], next);
+  handler.set = function(target, propertyName, nextValue, receiver) {
+    const next = () => {
+      const ownDescriptors = Reflect.getOwnPropertyDescriptor(
+        target,
+        propertyName
+      );
+      if (typeof (ownDescriptors == null ? void 0 : ownDescriptors.set) !== "undefined") {
+        ownDescriptors.set.apply(target, [nextValue]);
+        return true;
+      }
+      return Reflect.defineProperty(target, propertyName, {
+        writable: true,
+        enumerable: true,
+        configurable: true,
+        value: nextValue
+      });
     };
-  }
+    if (typeof setProperty !== "undefined") {
+      return setProperty.call(target, [propertyName, nextValue], next);
+    }
+    return next();
+  };
   handler.get = function(target, propertyName, receiver) {
     const next = () => target[propertyName];
     const value = typeof getProperty !== "undefined" ? getProperty.call(target, [propertyName, receiver], next) : next();
@@ -191,11 +207,25 @@ var XMLHttpRequestController = class {
     this.responseBuffer = new Uint8Array();
     this.request = createProxy(initialRequest, {
       setProperty: ([propertyName, nextValue], invoke) => {
-        if (propertyName === "withCredentials") {
-          define(this.request, "withCredentials", nextValue);
-          return true;
+        switch (propertyName) {
+          case "onabort":
+          case "onerror":
+          case "onload":
+          case "onloadend":
+          case "onloadstart":
+          case "onprogress":
+          case "ontimeout":
+          case "onreadystatechange": {
+            const eventName = propertyName.slice(
+              2
+            );
+            this.request.addEventListener(eventName, nextValue);
+            return invoke();
+          }
+          default: {
+            return invoke();
+          }
         }
-        return invoke();
       },
       methodCall: ([methodName, args], invoke) => {
         var _a;
@@ -259,21 +289,6 @@ var XMLHttpRequestController = class {
             });
             break;
           }
-          case "onabort":
-          case "onerror":
-          case "onload":
-          case "onloadend":
-          case "onloadstart":
-          case "onprogress":
-          case "ontimeout":
-          case "onreadystatechange": {
-            const [listener] = args;
-            this.registerEvent(
-              methodName,
-              listener
-            );
-            return invoke();
-          }
           default: {
             return invoke();
           }
@@ -326,14 +341,17 @@ var XMLHttpRequestController = class {
     Object.defineProperties(this.request, {
       response: {
         enumerable: true,
+        configurable: false,
         get: () => this.response
       },
       responseText: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseText
       },
       responseXML: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseXML
       }
     });
@@ -547,9 +565,19 @@ function createXMLHttpRequestProxy({
   log
 }) {
   const XMLHttpRequestProxy = new Proxy(globalThis.XMLHttpRequest, {
-    construct(target, args) {
+    construct(target, args, newTarget) {
       log("constructed new XMLHttpRequest");
-      const originalRequest = Reflect.construct(target, args);
+      const originalRequest = Reflect.construct(target, args, newTarget);
+      const prototypeDescriptors = Object.getOwnPropertyDescriptors(
+        target.prototype
+      );
+      for (const propertyName in prototypeDescriptors) {
+        Reflect.defineProperty(
+          originalRequest,
+          propertyName,
+          prototypeDescriptors[propertyName]
+        );
+      }
       const requestController = new XMLHttpRequestController(
         originalRequest,
         log

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

@@ -9,6 +9,7 @@ var _chunkQWL3EOEYjs = require('../../chunk-QWL3EOEY.js');
 
 // src/interceptors/fetch/index.ts
 var _outvariant = require('outvariant');
+var _until = require('@open-draft/until');
 var _FetchInterceptor = class extends _chunkQWL3EOEYjs.Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
@@ -33,15 +34,25 @@ var _FetchInterceptor = class extends _chunkQWL3EOEYjs.Interceptor {
       );
       this.emitter.emit("request", interactiveRequest, requestId);
       this.log("awaiting for the mocked response...");
-      await this.emitter.untilIdle(
-        "request",
-        ({ args: [, pendingRequestId] }) => {
-          return pendingRequestId === requestId;
-        }
-      );
-      this.log("all request listeners have been resolved!");
-      const [mockedResponse] = await interactiveRequest.respondWith.invoked();
-      this.log("event.respondWith called with:", mockedResponse);
+      const [middlewareException, mockedResponse] = await _until.until.call(void 0, async () => {
+        await this.emitter.untilIdle(
+          "request",
+          ({ args: [, pendingRequestId] }) => {
+            return pendingRequestId === requestId;
+          }
+        );
+        this.log("all request listeners have been resolved!");
+        const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
+        this.log("event.respondWith called with:", mockedResponse2);
+        return mockedResponse2;
+      });
+      if (middlewareException) {
+        console.error(`${request.method} ${request.url} net::ERR_FAILED`);
+        const error = Object.assign(new TypeError("Failed to fetch"), {
+          cause: middlewareException
+        });
+        return Promise.reject(error);
+      }
       if (mockedResponse) {
         this.log("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();

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

@@ -9,6 +9,7 @@ import {
 
 // src/interceptors/fetch/index.ts
 import { invariant } from "outvariant";
+import { until } from "@open-draft/until";
 var _FetchInterceptor = class extends Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
@@ -33,15 +34,25 @@ var _FetchInterceptor = class extends Interceptor {
       );
       this.emitter.emit("request", interactiveRequest, requestId);
       this.log("awaiting for the mocked response...");
-      await this.emitter.untilIdle(
-        "request",
-        ({ args: [, pendingRequestId] }) => {
-          return pendingRequestId === requestId;
-        }
-      );
-      this.log("all request listeners have been resolved!");
-      const [mockedResponse] = await interactiveRequest.respondWith.invoked();
-      this.log("event.respondWith called with:", mockedResponse);
+      const [middlewareException, mockedResponse] = await until(async () => {
+        await this.emitter.untilIdle(
+          "request",
+          ({ args: [, pendingRequestId] }) => {
+            return pendingRequestId === requestId;
+          }
+        );
+        this.log("all request listeners have been resolved!");
+        const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
+        this.log("event.respondWith called with:", mockedResponse2);
+        return mockedResponse2;
+      });
+      if (middlewareException) {
+        console.error(`${request.method} ${request.url} net::ERR_FAILED`);
+        const error = Object.assign(new TypeError("Failed to fetch"), {
+          cause: middlewareException
+        });
+        return Promise.reject(error);
+      }
       if (mockedResponse) {
         this.log("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();

package/lib/node/RemoteHttpInterceptor.js

@@ -3,10 +3,10 @@
 var _chunkQ56TMOP5js = require('./chunk-Q56TMOP5.js');
 
 
-var _chunkPRX3F52Mjs = require('./chunk-PRX3F52M.js');
+var _chunkXLZJAPVSjs = require('./chunk-XLZJAPVS.js');
 
 
-var _chunkGGD5JOGBjs = require('./chunk-GGD5JOGB.js');
+var _chunkRVLLS44Wjs = require('./chunk-RVLLS44W.js');
 require('./chunk-SNNL2EXF.js');
 require('./chunk-VQ4DZOBB.js');
 
@@ -23,8 +23,8 @@ var RemoteHttpInterceptor = class extends _chunkQ56TMOP5js.BatchInterceptor {
     super({
       name: "remote-interceptor",
       interceptors: [
-        new (0, _chunkPRX3F52Mjs.ClientRequestInterceptor)(),
-        new (0, _chunkGGD5JOGBjs.XMLHttpRequestInterceptor)()
+        new (0, _chunkXLZJAPVSjs.ClientRequestInterceptor)(),
+        new (0, _chunkRVLLS44Wjs.XMLHttpRequestInterceptor)()
       ]
     });
   }

package/lib/node/RemoteHttpInterceptor.mjs

@@ -3,10 +3,10 @@ import {
 } from "./chunk-KZEQH4YW.mjs";
 import {
   ClientRequestInterceptor
-} from "./chunk-SWJ33XIS.mjs";
+} from "./chunk-FGPCRIW6.mjs";
 import {
   XMLHttpRequestInterceptor
-} from "./chunk-CYWTKHFI.mjs";
+} from "./chunk-P7NKDCFD.mjs";
 import "./chunk-G6ZTHYZQ.mjs";
 import "./chunk-GFH37L5D.mjs";
 import {

package/lib/node/{chunk-SWJ33XIS.mjs → chunk-FGPCRIW6.mjs}

@@ -404,7 +404,6 @@ var debug3 = __require("debug")("utils getUrlByRequestOptions");
 var DEFAULT_PATH = "/";
 var DEFAULT_PROTOCOL = "http:";
 var DEFAULT_HOST = "localhost";
-var DEFAULT_PORT = 80;
 var SSL_PORT = 443;
 function getAgent(options) {
   return options.agent instanceof Agent ? options.agent : void 0;
@@ -424,16 +423,30 @@ function getProtocolByRequestOptions(options) {
   return isSecureRequest ? "https:" : ((_a = options.uri) == null ? void 0 : _a.protocol) || DEFAULT_PROTOCOL;
 }
 function getPortByRequestOptions(options) {
+  if (options.port) {
+    return Number(options.port);
+  }
+  if (options.hostname != null) {
+    const [, extractedPort] = options.hostname.match(/:(\d+)$/) || [];
+    if (extractedPort != null) {
+      return Number(extractedPort);
+    }
+  }
   const agent = getAgent(options);
-  const agentPort = (agent == null ? void 0 : agent.options.port) || (agent == null ? void 0 : agent.defaultPort);
-  const optionsPort = options.port;
-  if (optionsPort || agentPort) {
-    const explicitPort = optionsPort || agentPort || DEFAULT_PORT;
-    return Number(explicitPort);
+  if (agent == null ? void 0 : agent.options.port) {
+    return Number(agent.options.port);
+  }
+  if (agent == null ? void 0 : agent.defaultPort) {
+    return Number(agent.defaultPort);
   }
+  return void 0;
 }
 function getHostByRequestOptions(options) {
-  return options.hostname || options.host || DEFAULT_HOST;
+  const { hostname, host } = options;
+  if (hostname != null) {
+    return hostname.replace(/:\d+$/, "");
+  }
+  return host || DEFAULT_HOST;
 }
 function getAuthByRequestOptions(options) {
   if (options.auth) {
@@ -444,30 +457,42 @@ function getAuthByRequestOptions(options) {
 function isRawIPv6Address(host) {
   return host.includes(":") && !host.startsWith("[") && !host.endsWith("]");
 }
+function getHostname(host, port) {
+  const portString = typeof port !== "undefined" ? `:${port}` : "";
+  if (isRawIPv6Address(host)) {
+    return `[${host}]${portString}`;
+  }
+  if (typeof port === "undefined") {
+    return host;
+  }
+  return `${host}${portString}`;
+}
 function getUrlByRequestOptions(options) {
   debug3("request options", options);
+  if (options.uri) {
+    debug3(
+      'constructing url from explicitly provided "options.uri": %s',
+      options.uri
+    );
+    return new URL(options.uri.href);
+  }
+  debug3("figuring out url from request options...");
   const protocol = getProtocolByRequestOptions(options);
-  const host = getHostByRequestOptions(options);
-  const port = getPortByRequestOptions(options);
-  const path = options.path || DEFAULT_PATH;
-  const auth = getAuthByRequestOptions(options);
   debug3("protocol", protocol);
+  const host = getHostByRequestOptions(options);
   debug3("host", host);
+  const port = getPortByRequestOptions(options);
   debug3("port", port);
+  const hostname = getHostname(host, port);
+  debug3("hostname", hostname);
+  const path = options.path || DEFAULT_PATH;
   debug3("path", path);
-  const baseUrl = `${protocol}//${isRawIPv6Address(host) ? `[${host}]` : host}`;
-  debug3("base URL:", baseUrl);
-  const url = options.uri ? new URL(options.uri.href) : new URL(path, baseUrl);
-  if (port) {
-    debug3("detected explicit port", port);
-    url.port = port.toString();
-  }
-  if (auth) {
-    debug3("resolved auth", auth);
-    url.username = auth.username;
-    url.password = auth.password;
-  }
-  debug3("created URL:", url);
+  const credentials = getAuthByRequestOptions(options);
+  debug3("credentials", credentials);
+  const authString = credentials ? `${credentials.username}:${credentials.password}@` : "";
+  debug3("auth string:", authString);
+  const url = new URL(`${protocol}//${authString}${hostname}${path}`);
+  debug3("created url:", url);
   return url;
 }
 

package/lib/node/{chunk-CYWTKHFI.mjs → chunk-P7NKDCFD.mjs}

@@ -123,12 +123,28 @@ function optionsToProxyHandler(options) {
       return constructorCall.call(newTarget, args, next);
     };
   }
-  if (typeof setProperty !== "undefined") {
-    handler.set = function(target, propertyName, nextValue, receiver) {
-      const next = () => Reflect.set(target, propertyName, nextValue, receiver);
-      return setProperty.call(target, [propertyName, nextValue], next);
+  handler.set = function(target, propertyName, nextValue, receiver) {
+    const next = () => {
+      const ownDescriptors = Reflect.getOwnPropertyDescriptor(
+        target,
+        propertyName
+      );
+      if (typeof (ownDescriptors == null ? void 0 : ownDescriptors.set) !== "undefined") {
+        ownDescriptors.set.apply(target, [nextValue]);
+        return true;
+      }
+      return Reflect.defineProperty(target, propertyName, {
+        writable: true,
+        enumerable: true,
+        configurable: true,
+        value: nextValue
+      });
     };
-  }
+    if (typeof setProperty !== "undefined") {
+      return setProperty.call(target, [propertyName, nextValue], next);
+    }
+    return next();
+  };
   handler.get = function(target, propertyName, receiver) {
     const next = () => target[propertyName];
     const value = typeof getProperty !== "undefined" ? getProperty.call(target, [propertyName, receiver], next) : next();
@@ -193,11 +209,25 @@ var XMLHttpRequestController = class {
     this.responseBuffer = new Uint8Array();
     this.request = createProxy(initialRequest, {
       setProperty: ([propertyName, nextValue], invoke) => {
-        if (propertyName === "withCredentials") {
-          define(this.request, "withCredentials", nextValue);
-          return true;
+        switch (propertyName) {
+          case "onabort":
+          case "onerror":
+          case "onload":
+          case "onloadend":
+          case "onloadstart":
+          case "onprogress":
+          case "ontimeout":
+          case "onreadystatechange": {
+            const eventName = propertyName.slice(
+              2
+            );
+            this.request.addEventListener(eventName, nextValue);
+            return invoke();
+          }
+          default: {
+            return invoke();
+          }
         }
-        return invoke();
       },
       methodCall: ([methodName, args], invoke) => {
         var _a;
@@ -261,21 +291,6 @@ var XMLHttpRequestController = class {
             });
             break;
           }
-          case "onabort":
-          case "onerror":
-          case "onload":
-          case "onloadend":
-          case "onloadstart":
-          case "onprogress":
-          case "ontimeout":
-          case "onreadystatechange": {
-            const [listener] = args;
-            this.registerEvent(
-              methodName,
-              listener
-            );
-            return invoke();
-          }
           default: {
             return invoke();
           }
@@ -328,14 +343,17 @@ var XMLHttpRequestController = class {
     Object.defineProperties(this.request, {
       response: {
         enumerable: true,
+        configurable: false,
         get: () => this.response
       },
       responseText: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseText
       },
       responseXML: {
         enumerable: true,
+        configurable: false,
         get: () => this.responseXML
       }
     });
@@ -549,9 +567,19 @@ function createXMLHttpRequestProxy({
   log
 }) {
   const XMLHttpRequestProxy = new Proxy(globalThis.XMLHttpRequest, {
-    construct(target, args) {
+    construct(target, args, newTarget) {
       log("constructed new XMLHttpRequest");
-      const originalRequest = Reflect.construct(target, args);
+      const originalRequest = Reflect.construct(target, args, newTarget);
+      const prototypeDescriptors = Object.getOwnPropertyDescriptors(
+        target.prototype
+      );
+      for (const propertyName in prototypeDescriptors) {
+        Reflect.defineProperty(
+          originalRequest,
+          propertyName,
+          prototypeDescriptors[propertyName]
+        );
+      }
       const requestController = new XMLHttpRequestController(
         originalRequest,
         log