@mswjs/interceptors 0.22.1 → 0.22.3

package/ClientRequest/package.json

@@ -1,6 +1,6 @@
 {
-  "main": "../lib/node/interceptors/ClientRequest.js",
-  "module": "../lib/node/interceptors/ClientRequest.mjs",
+  "main": "../lib/node/interceptors/ClientRequest/index.js",
+  "module": "../lib/node/interceptors/ClientRequest/index.mjs",
   "browser": null,
   "types": "../lib/node/interceptors/ClientRequest/index.d.ts"
 }

package/lib/node/RemoteHttpInterceptor.js

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

package/lib/node/RemoteHttpInterceptor.mjs

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

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-PRX3F52M.js → chunk-XLZJAPVS.js}

@@ -404,7 +404,6 @@ var debug3 = _chunkWWHITCCIjs.__require.call(void 0, "debug")("utils getUrlByReq
 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 _http.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/interceptors/ClientRequest/index.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPRX3F52Mjs = require('../../chunk-PRX3F52M.js');
+var _chunkXLZJAPVSjs = require('../../chunk-XLZJAPVS.js');
 require('../../chunk-ZJOF5MEZ.js');
 require('../../chunk-WWHITCCI.js');
 
 
-exports.ClientRequestInterceptor = _chunkPRX3F52Mjs.ClientRequestInterceptor;
+exports.ClientRequestInterceptor = _chunkXLZJAPVSjs.ClientRequestInterceptor;

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

@@ -1,6 +1,6 @@
 import {
   ClientRequestInterceptor
-} from "../../chunk-SWJ33XIS.mjs";
+} from "../../chunk-FGPCRIW6.mjs";
 import "../../chunk-STA6QBYM.mjs";
 import "../../chunk-37CATPNG.mjs";
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",

package/src/utils/getUrlByRequestOptions.test.ts

@@ -4,138 +4,132 @@ import { RequestOptions, Agent as HttpsAgent } from 'https'
 import { getUrlByRequestOptions } from './getUrlByRequestOptions'
 
 it('returns a URL based on the basic RequestOptions', () => {
-  const options: RequestOptions = {
-    protocol: 'https:',
-    host: '127.0.0.1',
-    path: '/resource',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'https://127.0.0.1/resource')
+  expect(
+    getUrlByRequestOptions({
+      protocol: 'https:',
+      host: '127.0.0.1',
+      path: '/resource',
+    }).href
+  ).toBe('https://127.0.0.1/resource')
 })
 
 it('inherits protocol and port from http.Agent, if set', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    path: '/',
-    agent: new HttpAgent(),
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('protocol', 'http:')
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'http://127.0.0.1/')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      path: '/',
+      agent: new HttpAgent(),
+    }).href
+  ).toBe('http://127.0.0.1/')
 })
 
 it('inherits protocol and port from https.Agent, if set', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    path: '/',
-    agent: new HttpsAgent({
-      port: 3080,
-    }),
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('protocol', 'https:')
-  expect(url).toHaveProperty('port', '3080')
-  expect(url).toHaveProperty('href', 'https://127.0.0.1:3080/')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      path: '/',
+      agent: new HttpsAgent({
+        port: 3080,
+      }),
+    }).href
+  ).toBe('https://127.0.0.1:3080/')
 })
 
 it('resolves protocol to "http" given no explicit protocol and no certificate', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    path: '/',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('protocol', 'http:')
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'http://127.0.0.1/')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      path: '/',
+    }).href
+  ).toBe('http://127.0.0.1/')
 })
 
 it('resolves protocol to "https" given no explicit protocol, but certificate', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    path: '/secure',
-    cert: '<!-- SSL certificate -->',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('protocol', 'https:')
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'https://127.0.0.1/secure')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      path: '/secure',
+      cert: '<!-- SSL certificate -->',
+    }).href
+  ).toBe('https://127.0.0.1/secure')
 })
 
 it('resolves protocol to "https" given no explicit protocol, but port is 443', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    port: 443,
-    path: '/resource',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'https://127.0.0.1/resource')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      port: 443,
+      path: '/resource',
+    }).href
+  ).toBe('https://127.0.0.1/resource')
 })
 
 it('resolves protocol to "https" given no explicit protocol, but agent port is 443', () => {
-  const options: RequestOptions = {
-    host: '127.0.0.1',
-    agent: new HttpsAgent({
-      port: 443,
-    }),
-    path: '/resource',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('port', '')
-  expect(url).toHaveProperty('href', 'https://127.0.0.1/resource')
+  expect(
+    getUrlByRequestOptions({
+      host: '127.0.0.1',
+      agent: new HttpsAgent({
+        port: 443,
+      }),
+      path: '/resource',
+    }).href
+  ).toBe('https://127.0.0.1/resource')
 })
 
-it('inherits "port" if given', () => {
-  const options = {
-    protocol: 'http:',
-    host: '127.0.0.1',
-    port: 4002,
-    path: '/',
-  }
-  const url = getUrlByRequestOptions(options)
-
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('port', '4002')
-  expect(url).toHaveProperty('protocol', 'http:')
-  expect(url).toHaveProperty('href', 'http://127.0.0.1:4002/')
+it('respects explicitly provided port', () => {
+  expect(
+    getUrlByRequestOptions({
+      protocol: 'http:',
+      host: '127.0.0.1',
+      port: 4002,
+      path: '/',
+    }).href
+  ).toBe('http://127.0.0.1:4002/')
 })
 
 it('inherits "username" and "password"', () => {
-  const options: RequestOptions = {
+  const url = getUrlByRequestOptions({
     protocol: 'https:',
     host: '127.0.0.1',
     path: '/user',
     auth: 'admin:abc-123',
-  }
-  const url = getUrlByRequestOptions(options)
+  })
 
   expect(url).toBeInstanceOf(URL)
   expect(url).toHaveProperty('username', 'admin')
   expect(url).toHaveProperty('password', 'abc-123')
-  expect(url).toHaveProperty('protocol', 'https:')
   expect(url).toHaveProperty('href', 'https://admin:abc-123@127.0.0.1/user')
 })
 
 it('resolves hostname to localhost if none provided', () => {
-  const url = getUrlByRequestOptions({})
+  expect(getUrlByRequestOptions({}).hostname).toBe('localhost')
+})
 
-  expect(url).toBeInstanceOf(URL)
-  expect(url).toHaveProperty('protocol', 'http:')
-  expect(url).toHaveProperty('href', 'http://localhost/')
+it('supports "hostname" instead of "host" and "port"', () => {
+  const options: RequestOptions = {
+    protocol: 'https:',
+    hostname: '127.0.0.1:1234',
+    path: '/resource',
+  }
+
+  expect(getUrlByRequestOptions(options).href).toBe(
+    'https://127.0.0.1:1234/resource'
+  )
+})
+
+it('handles IPv6 hostnames', () => {
+  expect(
+    getUrlByRequestOptions({
+      host: '::1',
+      path: '/resource',
+    }).href
+  ).toBe('http://[::1]/resource')
+
+  expect(
+    getUrlByRequestOptions({
+      host: '::1',
+      port: 3001,
+      path: '/resource',
+    }).href
+  ).toBe('http://[::1]:3001/resource')
 })

package/src/utils/getUrlByRequestOptions.ts

@@ -15,7 +15,6 @@ export type ResolvedRequestOptions = RequestOptions & RequestSelf
 export const DEFAULT_PATH = '/'
 const DEFAULT_PROTOCOL = 'http:'
 const DEFAULT_HOST = 'localhost'
-const DEFAULT_PORT = 80
 const SSL_PORT = 443
 
 function getAgent(
@@ -45,20 +44,45 @@ function getProtocolByRequestOptions(options: ResolvedRequestOptions): string {
 function getPortByRequestOptions(
   options: ResolvedRequestOptions
 ): number | undefined {
+  // Use the explicitly provided port.
+  if (options.port) {
+    return Number(options.port)
+  }
+
+  // Extract the port from the hostname.
+  if (options.hostname != null) {
+    const [, extractedPort] = options.hostname.match(/:(\d+)$/) || []
+
+    if (extractedPort != null) {
+      return Number(extractedPort)
+    }
+  }
+
+  // Otherwise, try to resolve port from the agent.
   const agent = getAgent(options)
-  const agentPort =
-    (agent as HttpsAgent)?.options.port ||
-    (agent as RequestOptions)?.defaultPort
-  const optionsPort = options.port
-
-  if (optionsPort || agentPort) {
-    const explicitPort = optionsPort || agentPort || DEFAULT_PORT
-    return Number(explicitPort)
+
+  if ((agent as HttpsAgent)?.options.port) {
+    return Number((agent as HttpsAgent).options.port)
   }
+
+  if ((agent as RequestOptions)?.defaultPort) {
+    return Number((agent as RequestOptions).defaultPort)
+  }
+
+  // Lastly, return undefined indicating that the port
+  // must inferred from the protocol. Do not infer it here.
+  return undefined
 }
 
 function getHostByRequestOptions(options: ResolvedRequestOptions): string {
-  return options.hostname || options.host || DEFAULT_HOST
+  const { hostname, host } = options
+
+  // If the hostname is specified, resolve the host from the "host:port" string.
+  if (hostname != null) {
+    return hostname.replace(/:\d+$/, '')
+  }
+
+  return host || DEFAULT_HOST
 }
 
 function getAuthByRequestOptions(options: ResolvedRequestOptions) {
@@ -77,45 +101,65 @@ function isRawIPv6Address(host: string): boolean {
   return host.includes(':') && !host.startsWith('[') && !host.endsWith(']')
 }
 
+function getHostname(host: string, port?: number): string {
+  const portString = typeof port !== 'undefined' ? `:${port}` : ''
+
+  /**
+   * @note As of Node >= 17, hosts (including "localhost") can resolve to IPv6
+   * addresses, so construct valid URL by surrounding the IPv6 host with brackets.
+   */
+  if (isRawIPv6Address(host)) {
+    return `[${host}]${portString}`
+  }
+
+  if (typeof port === 'undefined') {
+    return host
+  }
+
+  return `${host}${portString}`
+}
+
 /**
  * Creates a `URL` instance from a given `RequestOptions` object.
  */
 export function getUrlByRequestOptions(options: ResolvedRequestOptions): URL {
   debug('request options', options)
 
-  const protocol = getProtocolByRequestOptions(options)
-  const host = getHostByRequestOptions(options)
-  const port = getPortByRequestOptions(options)
-  const path = options.path || DEFAULT_PATH
-  const auth = getAuthByRequestOptions(options)
+  if (options.uri) {
+    debug(
+      'constructing url from explicitly provided "options.uri": %s',
+      options.uri
+    )
+    return new URL(options.uri.href)
+  }
 
+  debug('figuring out url from request options...')
+
+  const protocol = getProtocolByRequestOptions(options)
   debug('protocol', protocol)
+
+  const host = getHostByRequestOptions(options)
   debug('host', host)
-  debug('port', port)
-  debug('path', path)
 
-  /**
-   * @note As of Node >= 17, hosts (including "localhost") can resolve to IPv6
-   * addresses, so construct valid URL by surrounding the IPv6 host with brackets.
-   */
-  const baseUrl = `${protocol}//${isRawIPv6Address(host) ? `[${host}]` : host}`
-  debug('base URL:', baseUrl)
+  const port = getPortByRequestOptions(options)
+  debug('port', port)
 
-  const url = options.uri ? new URL(options.uri.href) : new URL(path, baseUrl)
+  const hostname = getHostname(host, port)
+  debug('hostname', hostname)
 
-  if (port) {
-    debug('detected explicit port', port)
-    url.port = port.toString()
-  }
+  const path = options.path || DEFAULT_PATH
+  debug('path', path)
 
-  if (auth) {
-    debug('resolved auth', auth)
+  const credentials = getAuthByRequestOptions(options)
+  debug('credentials', credentials)
 
-    url.username = auth.username
-    url.password = auth.password
-  }
+  const authString = credentials
+    ? `${credentials.username}:${credentials.password}@`
+    : ''
+  debug('auth string:', authString)
 
-  debug('created URL:', url)
+  const url = new URL(`${protocol}//${authString}${hostname}${path}`)
+  debug('created url:', url)
 
   return url
 }