rekwest 4.2.3 → 4.4.0

package/README.md

@@ -121,6 +121,7 @@ console.log(res.body);
   & [http2.ClientSessionRequestOptions](https://nodejs.org/api/http2.html#http2_clienthttp2session_request_headers_options)
   and [tls.ConnectionOptions](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback)
   for HTTP/2 attunes
+  * `baseURL` **{string | URL}** The base URL to use in cases where `url` is a relative URL
   * `body` **{string | Array | ArrayBuffer | ArrayBufferView | AsyncIterator | Blob | Buffer | DataView | File |
     FormData | Iterator | Object | Readable | SharedArrayBuffer | URLSearchParams}** The body to send with the request
   * `cookies` **{boolean | Array<[k, v]> | Cookies | Object | URLSearchParams}** `Default: true` The cookies to add to
@@ -174,6 +175,35 @@ The object to fulfill with default [options](#rekwesturl-options)
 
 ---
 
+#### `rekwest.extend(options)`
+
+The method to extend default [options](#rekwesturl-options) per instance
+
+```javascript
+import rekwest, { constants } from 'rekwest';
+
+const {
+  HTTP_STATUS_OK,
+} = constants;
+
+const rk = rekwest.extend({
+  baseURL: 'https://somewhe.re'
+});
+
+const signal = AbortSignal.timeout(1e4);
+const url = '/somewhat/endpoint';
+
+const res = await rk(url, {
+  signal,
+});
+
+console.assert(res.statusCode === HTTP_STATUS_OK);
+console.info(res.headers);
+console.log(res.body);
+```
+
+---
+
 #### `rekwest.stream(url[, options])`
 
 The method with limited functionality to use with streams and/or pipes

package/dist/formdata.js

@@ -20,16 +20,16 @@ class FormData {
     const contentType = `${_mediatypes.MULTIPART_FORM_DATA}; boundary=${boundary}`;
     const prefix = `--${boundary}${CRLF}${HTTP2_HEADER_CONTENT_DISPOSITION}: form-data`;
     const escape = str => str.replace(/\n/g, '%0A').replace(/\r/g, '%0D').replace(/"/g, '%22');
-    const normalize = value => value.replace(/\r?\n|\r/g, CRLF);
+    const redress = value => value.replace(/\r?\n|\r/g, CRLF);
     return {
       contentType,
       async *[Symbol.asyncIterator]() {
         const encoder = new TextEncoder();
         for (const [name, value] of fd) {
           if (value.constructor === String) {
-            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${CRLF.repeat(2)}${normalize(value)}${CRLF}`);
+            yield encoder.encode(`${prefix}; name="${escape(redress(name))}"${CRLF.repeat(2)}${redress(value)}${CRLF}`);
           } else {
-            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${value.name ? `; filename="${escape(value.name)}"` : ''}${CRLF}${HTTP2_HEADER_CONTENT_TYPE}: ${value.type || _mediatypes.APPLICATION_OCTET_STREAM}${CRLF.repeat(2)}`);
+            yield encoder.encode(`${prefix}; name="${escape(redress(name))}"${value.name ? `; filename="${escape(value.name)}"` : ''}${CRLF}${HTTP2_HEADER_CONTENT_TYPE}: ${value.type || _mediatypes.APPLICATION_OCTET_STREAM}${CRLF.repeat(2)}`);
             yield* (0, _utils.tap)(value);
             yield new Uint8Array([13, 10]);
           }

package/dist/index.js

@@ -30,6 +30,13 @@ Object.keys(_utils).forEach(function (key) {
   if (key in exports && exports[key] === _utils[key]) return;
   exports[key] = _utils[key];
 });
+var _validation = require("./validation");
+Object.keys(_validation).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _validation[key]) return;
+  exports[key] = _validation[key];
+});
 var _ackn = require("./ackn");
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -65,48 +72,51 @@ Object.keys(_formdata).forEach(function (key) {
   if (key in exports && exports[key] === _formdata[key]) return;
   exports[key] = _formdata[key];
 });
+var _mixin = require("./mixin");
+Object.keys(_mixin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _mixin[key]) return;
+  exports[key] = _mixin[key];
+});
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp2.default.constants;
-function rekwest(...args) {
-  let options = (0, _utils.sanitize)(...args);
-  if (!options.redirected) {
-    options = (0, _utils.merge)(rekwest.defaults, options);
-  }
-  return (0, _utils.transfer)((0, _utils.validation)(options));
+function rekwest(url, options) {
+  return (0, _utils.transfer)((0, _validation.validation)((0, _utils.normalize)(url, options)));
 }
+Reflect.defineProperty(rekwest, 'extend', {
+  enumerable: true,
+  value(options) {
+    return (url, opts) => rekwest(url, (0, _utils.merge)(options, opts));
+  }
+});
 Reflect.defineProperty(rekwest, 'stream', {
   enumerable: true,
-  value(...args) {
-    const options = (0, _preflight.preflight)({
-      ...(0, _utils.validation)((0, _utils.merge)(rekwest.defaults, {
-        headers: {
-          [HTTP2_HEADER_CONTENT_TYPE]: _mediatypes.APPLICATION_OCTET_STREAM
-        }
-      }, (0, _utils.sanitize)(...args))),
+  value(url, options) {
+    options = (0, _preflight.preflight)((0, _validation.validation)((0, _utils.normalize)(url, (0, _utils.merge)(options, {
+      headers: {
+        [HTTP2_HEADER_CONTENT_TYPE]: _mediatypes.APPLICATION_OCTET_STREAM
+      },
       redirect: _constants.requestRedirect.manual
-    });
-    const {
-      h2,
-      url
-    } = options;
+    }))));
     let client, req;
-    if (h2) {
-      client = _nodeHttp2.default.connect(url.origin, options);
+    if (options.h2) {
+      client = _nodeHttp2.default.connect(options.url.origin, options);
       req = client.request(options.headers, options);
     } else {
       const {
         request
-      } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
-      req = request(url, options);
+      } = options.url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
+      req = request(options.url, options);
     }
     (0, _utils.affix)(client, req, options);
     req.once('response', res => {
       let headers;
-      if (h2) {
+      if (options.h2) {
         headers = res;
         res = req;
       }

package/dist/mixin.js

@@ -0,0 +1,99 @@
+"use strict";
+
+exports.__esModule = true;
+exports.mixin = void 0;
+var _nodeBuffer = require("node:buffer");
+var _nodeHttp = _interopRequireDefault(require("node:http2"));
+var _utils = require("./utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const {
+  HTTP2_HEADER_CONTENT_ENCODING,
+  HTTP2_HEADER_CONTENT_TYPE
+} = _nodeHttp.default.constants;
+const mixin = (res, {
+  digest = false,
+  parse = false
+} = {}) => {
+  if (!digest) {
+    Object.defineProperties(res, {
+      arrayBuffer: {
+        enumerable: true,
+        value: async function () {
+          (0, _utils.brandCheck)(this, res?.constructor);
+          parse &&= false;
+          const {
+            buffer,
+            byteLength,
+            byteOffset
+          } = await this.body();
+          return buffer.slice(byteOffset, byteOffset + byteLength);
+        }
+      },
+      blob: {
+        enumerable: true,
+        value: async function () {
+          (0, _utils.brandCheck)(this, res?.constructor);
+          const val = await this.arrayBuffer();
+          return new _nodeBuffer.Blob([val]);
+        }
+      },
+      json: {
+        enumerable: true,
+        value: async function () {
+          (0, _utils.brandCheck)(this, res?.constructor);
+          const val = await this.text();
+          return JSON.parse(val);
+        }
+      },
+      text: {
+        enumerable: true,
+        value: async function () {
+          (0, _utils.brandCheck)(this, res?.constructor);
+          const blob = await this.blob();
+          return blob.text();
+        }
+      }
+    });
+  }
+  return Object.defineProperties(res, {
+    body: {
+      enumerable: true,
+      value: async function () {
+        (0, _utils.brandCheck)(this, res?.constructor);
+        if (this.bodyUsed) {
+          throw new TypeError('Response stream already read');
+        }
+        let body = [];
+        for await (const chunk of (0, _utils.decompress)(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
+          body.push(chunk);
+        }
+        body = Buffer.concat(body);
+        if (!body.length && parse) {
+          return null;
+        }
+        if (body.length && parse) {
+          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
+          const charset = contentType.split(';').find(it => /charset=/i.test(it))?.toLowerCase().replace('charset=', '').replace('iso-8859-1', 'latin1').trim() || 'utf-8';
+          if (/\bjson\b/i.test(contentType)) {
+            body = JSON.parse(body.toString(charset));
+          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
+            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
+              body = body.toString(charset);
+            } else {
+              body = new TextDecoder(charset).decode(body);
+            }
+          }
+        }
+        return body;
+      },
+      writable: true
+    },
+    bodyUsed: {
+      enumerable: true,
+      get() {
+        return this.readableEnded;
+      }
+    }
+  });
+};
+exports.mixin = mixin;

package/dist/postflight.js

@@ -8,6 +8,7 @@ var _constants = require("./constants");
 var _cookies = require("./cookies");
 var _errors = require("./errors");
 var _index = _interopRequireDefault(require("./index"));
+var _mixin = require("./mixin");
 var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
@@ -97,7 +98,7 @@ const postflight = (req, res, options, {
         interval = Number(interval) * 1000 || new Date(interval) - Date.now();
         if (interval > options.maxRetryAfter) {
           return res.emit('error', (0, _utils.maxRetryAfterError)(interval, {
-            cause: (0, _utils.mixin)(res, options)
+            cause: (0, _mixin.mixin)(res, options)
           }));
         }
         return (0, _promises.setTimeout)(interval).then(() => (0, _index.default)(options.url, options).then(resolve, reject));
@@ -106,8 +107,8 @@ const postflight = (req, res, options, {
     }
   }
   if (statusCode >= HTTP_STATUS_BAD_REQUEST) {
-    return reject((0, _utils.mixin)(res, options));
+    return reject((0, _mixin.mixin)(res, options));
   }
-  resolve((0, _utils.mixin)(res, options));
+  resolve((0, _mixin.mixin)(res, options));
 };
 exports.postflight = postflight;

package/dist/utils.js

@@ -1,10 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
-exports.sanitize = exports.sameOrigin = exports.mixin = exports.merge = exports.maxRetryAfterError = exports.maxRetryAfter = exports.dispatch = exports.decompress = exports.compress = exports.brandCheck = exports.affix = exports.admix = void 0;
+exports.sameOrigin = exports.normalize = exports.merge = exports.maxRetryAfterError = exports.maxRetryAfter = exports.dispatch = exports.decompress = exports.compress = exports.brandCheck = exports.affix = exports.admix = void 0;
 exports.tap = tap;
-exports.validation = exports.unwind = exports.transform = exports.transfer = void 0;
-var _nodeBuffer = require("node:buffer");
+exports.unwind = exports.transform = exports.transfer = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http"));
 var _nodeHttp2 = _interopRequireDefault(require("node:http2"));
 var _nodeHttps = _interopRequireDefault(require("node:https"));
@@ -14,7 +13,6 @@ var _promises = require("node:timers/promises");
 var _nodeUtil = require("node:util");
 var _nodeZlib = _interopRequireDefault(require("node:zlib"));
 var _ackn = require("./ackn");
-var _constants = require("./constants");
 var _errors = require("./errors");
 var _file = require("./file");
 var _formdata = require("./formdata");
@@ -28,9 +26,7 @@ const {
   HTTP2_HEADER_CONTENT_LENGTH,
   HTTP2_HEADER_CONTENT_TYPE,
   HTTP2_HEADER_RETRY_AFTER,
-  HTTP2_HEADER_STATUS,
-  HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD
+  HTTP2_HEADER_STATUS
 } = _nodeHttp2.default.constants;
 const admix = (res, headers, options) => {
   const {
@@ -151,103 +147,19 @@ const merge = (target = {}, ...rest) => {
   return target;
 };
 exports.merge = merge;
-const mixin = (res, {
-  digest = false,
-  parse = false
-} = {}) => {
-  if (!digest) {
-    Object.defineProperties(res, {
-      arrayBuffer: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          parse &&= false;
-          const {
-            buffer,
-            byteLength,
-            byteOffset
-          } = await this.body();
-          return buffer.slice(byteOffset, byteOffset + byteLength);
-        }
-      },
-      blob: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.arrayBuffer();
-          return new _nodeBuffer.Blob([val]);
-        }
-      },
-      json: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.text();
-          return JSON.parse(val);
-        }
-      },
-      text: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const blob = await this.blob();
-          return blob.text();
-        }
-      }
-    });
+const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = merge(_index.default.defaults, options);
   }
-  return Object.defineProperties(res, {
-    body: {
-      enumerable: true,
-      value: async function () {
-        brandCheck(this, res?.constructor);
-        if (this.bodyUsed) {
-          throw new TypeError('Response stream already read');
-        }
-        let body = [];
-        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
-          body.push(chunk);
-        }
-        body = Buffer.concat(body);
-        if (!body.length && parse) {
-          return null;
-        }
-        if (body.length && parse) {
-          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          const charset = contentType.split(';').find(it => /charset=/i.test(it))?.toLowerCase().replace('charset=', '').replace('iso-8859-1', 'latin1').trim() || 'utf-8';
-          if (/\bjson\b/i.test(contentType)) {
-            body = JSON.parse(body.toString(charset));
-          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
-            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
-              body = body.toString(charset);
-            } else {
-              body = new TextDecoder(charset).decode(body);
-            }
-          }
-        }
-        return body;
-      },
-      writable: true
-    },
-    bodyUsed: {
-      enumerable: true,
-      get() {
-        return this.readableEnded;
-      }
-    }
-  });
-};
-exports.mixin = mixin;
-const sanitize = (url, options = {}) => {
   if (options.trimTrailingSlashes) {
     url = `${url}`.replace(/(?<!:)\/+/g, '/');
   }
-  url = new URL(url);
+  url = new URL(url, options.baseURL);
   return Object.assign(options, {
     url
   });
 };
-exports.sanitize = sanitize;
+exports.normalize = normalize;
 const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
 exports.sameOrigin = sameOrigin;
 async function* tap(value) {
@@ -262,7 +174,6 @@ async function* tap(value) {
 const transfer = async options => {
   const {
     digest,
-    h2,
     redirected,
     thenable,
     url
@@ -271,7 +182,7 @@ const transfer = async options => {
     throw new _errors.RequestError(`Maximum redirect reached at: ${url.href}`);
   }
   if (url.protocol === 'https:') {
-    options = !h2 ? await (0, _ackn.ackn)(options) : {
+    options = !options.h2 ? await (0, _ackn.ackn)(options) : {
       ...options,
       createConnection: null,
       protocol: url.protocol
@@ -407,17 +318,4 @@ const transform = async options => {
 };
 exports.transform = transform;
 const unwind = encodings => encodings.split(',').map(it => it.trim());
-exports.unwind = unwind;
-const validation = (options = {}) => {
-  if (options.body && [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
-    throw new TypeError(`Request with ${HTTP2_METHOD_GET}/${HTTP2_METHOD_HEAD} method cannot have body.`);
-  }
-  if (!Object.values(_constants.requestCredentials).includes(options.credentials)) {
-    throw new TypeError(`Failed to read the 'credentials' property from 'options': The provided value '${options.credentials}' is not a valid enum value.`);
-  }
-  if (!Reflect.has(_constants.requestRedirect, options.redirect)) {
-    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${options.redirect}' is not a valid enum value.`);
-  }
-  return options;
-};
-exports.validation = validation;
+exports.unwind = unwind;

package/dist/validation.js

@@ -0,0 +1,24 @@
+"use strict";
+
+exports.__esModule = true;
+exports.validation = void 0;
+var _nodeHttp = _interopRequireDefault(require("node:http2"));
+var _constants = require("./constants");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const {
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD
+} = _nodeHttp.default.constants;
+const validation = (options = {}) => {
+  if (options.body && [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
+    throw new TypeError(`Request with ${HTTP2_METHOD_GET}/${HTTP2_METHOD_HEAD} method cannot have body.`);
+  }
+  if (!Object.values(_constants.requestCredentials).includes(options.credentials)) {
+    throw new TypeError(`Failed to read the 'credentials' property from 'options': The provided value '${options.credentials}' is not a valid enum value.`);
+  }
+  if (!Reflect.has(_constants.requestRedirect, options.redirect)) {
+    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${options.redirect}' is not a valid enum value.`);
+  }
+  return options;
+};
+exports.validation = validation;

package/package.json

@@ -8,14 +8,14 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.5",
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/preset-env": "^7.20.2",
-    "c8": "^7.12.0",
-    "eslint": "^8.29.0",
-    "eslint-config-ultra-refined": "^2.10.0",
-    "mocha": "^10.1.0"
+    "@babel/cli": "^7.21.5",
+    "@babel/core": "^7.21.8",
+    "@babel/eslint-parser": "^7.21.8",
+    "@babel/preset-env": "^7.21.5",
+    "c8": "^7.13.0",
+    "eslint": "^8.40.0",
+    "eslint-config-ultra-refined": "^2.13.0",
+    "mocha": "^10.2.0"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.2.3"
+  "version": "4.4.0"
 }

package/src/formdata.mjs

@@ -25,7 +25,7 @@ export class FormData {
     const prefix = `--${ boundary }${ CRLF }${ HTTP2_HEADER_CONTENT_DISPOSITION }: form-data`;
 
     const escape = (str) => str.replace(/\n/g, '%0A').replace(/\r/g, '%0D').replace(/"/g, '%22');
-    const normalize = (value) => value.replace(/\r?\n|\r/g, CRLF);
+    const redress = (value) => value.replace(/\r?\n|\r/g, CRLF);
 
     return {
       contentType,
@@ -35,11 +35,11 @@ export class FormData {
         for (const [name, value] of fd) {
           if (value.constructor === String) {
             yield encoder.encode(`${ prefix }; name="${
-              escape(normalize(name))
-            }"${ CRLF.repeat(2) }${ normalize(value) }${ CRLF }`);
+              escape(redress(name))
+            }"${ CRLF.repeat(2) }${ redress(value) }${ CRLF }`);
           } else {
             yield encoder.encode(`${ prefix }; name="${
-              escape(normalize(name))
+              escape(redress(name))
             }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
               HTTP2_HEADER_CONTENT_TYPE
             }: ${

package/src/index.mjs

@@ -9,10 +9,10 @@ import {
   admix,
   affix,
   merge,
-  sanitize,
+  normalize,
   transfer,
-  validation,
 } from './utils.mjs';
+import { validation } from './validation.mjs';
 
 export { constants } from 'node:http2';
 
@@ -23,42 +23,41 @@ export * from './errors.mjs';
 export * from './file.mjs';
 export * from './formdata.mjs';
 export * as mediatypes from './mediatypes.mjs';
+export * from './mixin.mjs';
 export * from './utils.mjs';
+export * from './validation.mjs';
 
 const {
   HTTP2_HEADER_CONTENT_TYPE,
 } = http2.constants;
 
-export default function rekwest(...args) {
-  let options = sanitize(...args);
-
-  if (!options.redirected) {
-    options = merge(rekwest.defaults, options);
-  }
-
-  return transfer(validation(options));
+export default function rekwest(url, options) {
+  return transfer(validation(normalize(url, options)));
 }
 
+Reflect.defineProperty(rekwest, 'extend', {
+  enumerable: true,
+  value(options) {
+    return (url, opts) => rekwest(url, merge(options, opts));
+  },
+});
+
 Reflect.defineProperty(rekwest, 'stream', {
   enumerable: true,
-  value(...args) {
-    const options = preflight({
-      ...validation(merge(rekwest.defaults, {
-        headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
-      }, sanitize(...args))),
+  value(url, options) {
+    options = preflight(validation(normalize(url, merge(options, {
+      headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
       redirect: requestRedirect.manual,
-    });
-
-    const { h2, url } = options;
+    }))));
     let client, req;
 
-    if (h2) {
-      client = http2.connect(url.origin, options);
+    if (options.h2) {
+      client = http2.connect(options.url.origin, options);
       req = client.request(options.headers, options);
     } else {
-      const { request } = (url.protocol === 'http:' ? http : https);
+      const { request } = options.url.protocol === 'http:' ? http : https;
 
-      req = request(url, options);
+      req = request(options.url, options);
     }
 
     affix(client, req, options);
@@ -66,7 +65,7 @@ Reflect.defineProperty(rekwest, 'stream', {
     req.once('response', (res) => {
       let headers;
 
-      if (h2) {
+      if (options.h2) {
         headers = res;
         res = req;
       }

package/src/mixin.mjs

@@ -0,0 +1,109 @@
+import { Blob } from 'node:buffer';
+import http2 from 'node:http2';
+import {
+  brandCheck,
+  decompress,
+} from './utils.mjs';
+
+const {
+  HTTP2_HEADER_CONTENT_ENCODING,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export const mixin = (res, { digest = false, parse = false } = {}) => {
+  if (!digest) {
+    Object.defineProperties(res, {
+      arrayBuffer: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          parse &&= false;
+          const { buffer, byteLength, byteOffset } = await this.body();
+
+          return buffer.slice(byteOffset, byteOffset + byteLength);
+        },
+      },
+      blob: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.arrayBuffer();
+
+          return new Blob([val]);
+        },
+      },
+      json: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.text();
+
+          return JSON.parse(val);
+        },
+      },
+      text: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const blob = await this.blob();
+
+          return blob.text();
+        },
+      },
+    });
+  }
+
+  return Object.defineProperties(res, {
+    body: {
+      enumerable: true,
+      value: async function () {
+        brandCheck(this, res?.constructor);
+
+        if (this.bodyUsed) {
+          throw new TypeError('Response stream already read');
+        }
+
+        let body = [];
+
+        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
+          body.push(chunk);
+        }
+
+        body = Buffer.concat(body);
+
+        if (!body.length && parse) {
+          return null;
+        }
+
+        if (body.length && parse) {
+          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
+          const charset = contentType.split(';')
+                                     .find((it) => /charset=/i.test(it))
+                                     ?.toLowerCase()
+                                     .replace('charset=', '')
+                                     .replace('iso-8859-1', 'latin1')
+                                     .trim() || 'utf-8';
+
+          if (/\bjson\b/i.test(contentType)) {
+            body = JSON.parse(body.toString(charset));
+          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
+            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
+              body = body.toString(charset);
+            } else {
+              body = new TextDecoder(charset).decode(body);
+            }
+          }
+        }
+
+        return body;
+      },
+      writable: true,
+    },
+    bodyUsed: {
+      enumerable: true,
+      get() {
+        return this.readableEnded;
+      },
+    },
+  });
+};

package/src/postflight.mjs

@@ -8,10 +8,10 @@ import {
 import { Cookies } from './cookies.mjs';
 import { RequestError } from './errors.mjs';
 import rekwest from './index.mjs';
+import { mixin } from './mixin.mjs';
 import {
   admix,
   maxRetryAfterError,
-  mixin,
   sameOrigin,
 } from './utils.mjs';
 

package/src/utils.mjs

@@ -1,4 +1,3 @@
-import { Blob } from 'node:buffer';
 import http from 'node:http';
 import http2 from 'node:http2';
 import https from 'node:https';
@@ -11,10 +10,6 @@ import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
 import { types } from 'node:util';
 import zlib from 'node:zlib';
 import { ackn } from './ackn.mjs';
-import {
-  requestCredentials,
-  requestRedirect,
-} from './constants.mjs';
 import {
   RequestError,
   TimeoutError,
@@ -36,8 +31,6 @@ const {
   HTTP2_HEADER_CONTENT_TYPE,
   HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_STATUS,
-  HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD,
 } = http2.constants;
 
 export const admix = (res, headers, options) => {
@@ -178,110 +171,16 @@ export const merge = (target = {}, ...rest) => {
   return target;
 };
 
-export const mixin = (res, { digest = false, parse = false } = {}) => {
-  if (!digest) {
-    Object.defineProperties(res, {
-      arrayBuffer: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          parse &&= false;
-          const { buffer, byteLength, byteOffset } = await this.body();
-
-          return buffer.slice(byteOffset, byteOffset + byteLength);
-        },
-      },
-      blob: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.arrayBuffer();
-
-          return new Blob([val]);
-        },
-      },
-      json: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.text();
-
-          return JSON.parse(val);
-        },
-      },
-      text: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const blob = await this.blob();
-
-          return blob.text();
-        },
-      },
-    });
+export const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = merge(rekwest.defaults, options);
   }
 
-  return Object.defineProperties(res, {
-    body: {
-      enumerable: true,
-      value: async function () {
-        brandCheck(this, res?.constructor);
-
-        if (this.bodyUsed) {
-          throw new TypeError('Response stream already read');
-        }
-
-        let body = [];
-
-        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
-          body.push(chunk);
-        }
-
-        body = Buffer.concat(body);
-
-        if (!body.length && parse) {
-          return null;
-        }
-
-        if (body.length && parse) {
-          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          const charset = contentType.split(';')
-                                     .find((it) => /charset=/i.test(it))
-                                     ?.toLowerCase()
-                                     .replace('charset=', '')
-                                     .replace('iso-8859-1', 'latin1')
-                                     .trim() || 'utf-8';
-
-          if (/\bjson\b/i.test(contentType)) {
-            body = JSON.parse(body.toString(charset));
-          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
-            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
-              body = body.toString(charset);
-            } else {
-              body = new TextDecoder(charset).decode(body);
-            }
-          }
-        }
-
-        return body;
-      },
-      writable: true,
-    },
-    bodyUsed: {
-      enumerable: true,
-      get() {
-        return this.readableEnded;
-      },
-    },
-  });
-};
-
-export const sanitize = (url, options = {}) => {
   if (options.trimTrailingSlashes) {
     url = `${ url }`.replace(/(?<!:)\/+/g, '/');
   }
 
-  url = new URL(url);
+  url = new URL(url, options.baseURL);
 
   return Object.assign(options, { url });
 };
@@ -299,14 +198,14 @@ export async function* tap(value) {
 }
 
 export const transfer = async (options) => {
-  const { digest, h2, redirected, thenable, url } = options;
+  const { digest, redirected, thenable, url } = options;
 
   if (options.follow === 0) {
     throw new RequestError(`Maximum redirect reached at: ${ url.href }`);
   }
 
   if (url.protocol === 'https:') {
-    options = !h2 ? await ackn(options) : {
+    options = !options.h2 ? await ackn(options) : {
       ...options,
       createConnection: null,
       protocol: url.protocol,
@@ -334,7 +233,7 @@ export const transfer = async (options) => {
       client = http2.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
-      const { request } = (url.protocol === 'http:' ? http : https);
+      const { request } = url.protocol === 'http:' ? http : https;
 
       req = request(url, options);
     }
@@ -452,26 +351,3 @@ export const transform = async (options) => {
 };
 
 export const unwind = (encodings) => encodings.split(',').map((it) => it.trim());
-
-export const validation = (options = {}) => {
-  if (options.body && [
-    HTTP2_METHOD_GET,
-    HTTP2_METHOD_HEAD,
-  ].includes(options.method)) {
-    throw new TypeError(`Request with ${ HTTP2_METHOD_GET }/${ HTTP2_METHOD_HEAD } method cannot have body.`);
-  }
-
-  if (!Object.values(requestCredentials).includes(options.credentials)) {
-    throw new TypeError(`Failed to read the 'credentials' property from 'options': The provided value '${
-      options.credentials
-    }' is not a valid enum value.`);
-  }
-
-  if (!Reflect.has(requestRedirect, options.redirect)) {
-    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${
-      options.redirect
-    }' is not a valid enum value.`);
-  }
-
-  return options;
-};

package/src/validation.mjs

@@ -0,0 +1,33 @@
+import http2 from 'node:http2';
+import {
+  requestCredentials,
+  requestRedirect,
+} from './constants.mjs';
+
+const {
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD,
+} = http2.constants;
+
+export const validation = (options = {}) => {
+  if (options.body && [
+    HTTP2_METHOD_GET,
+    HTTP2_METHOD_HEAD,
+  ].includes(options.method)) {
+    throw new TypeError(`Request with ${ HTTP2_METHOD_GET }/${ HTTP2_METHOD_HEAD } method cannot have body.`);
+  }
+
+  if (!Object.values(requestCredentials).includes(options.credentials)) {
+    throw new TypeError(`Failed to read the 'credentials' property from 'options': The provided value '${
+      options.credentials
+    }' is not a valid enum value.`);
+  }
+
+  if (!Reflect.has(requestRedirect, options.redirect)) {
+    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${
+      options.redirect
+    }' is not a valid enum value.`);
+  }
+
+  return options;
+};