rekwest 6.2.1 → 7.0.1

package/README.md

@@ -10,11 +10,12 @@ and [http2.request](https://nodejs.org/api/http2.html#clienthttp2sessionrequesth
 * Cool-beans 🫐 config options (with defaults)
 * Automatic HTTP/2 support (ALPN negotiation) 💼
 * Automatic or opt-in body parse (with non-UTF-8 charset decoding) 🉑
-* Automatic and simplistic `Cookies` treatment (with built-in **jar** & **ttl**) 🍪
-* Automatic decompression (with opt-in body compression) 🗜️
+* Automatic and simplistic `Cookies` treatment (with **TTL** support) 🍪
+* Automatic body decoding (and opt-in request body encoding) 🗜️
+* Better error management 🚥
 * Built-in streamable `FormData` interface 🔌
 * Support redirects & retries with fine-grained tune-ups 🪛
-* Support all legit request body types (include blobs & streams) 📦
+* Support plenty request body types (include blobs & streams) 📦
 * Support both CJS and ESM module systems 🧩
 * Fully promise-able and pipe-able 🔗
 * Zero dependencies 🗽
@@ -47,7 +48,7 @@ const res = await rekwest(url, {
   body: { celestial: 'payload' },
   headers: {
     [HTTP2_HEADER_AUTHORIZATION]: 'Bearer [token]',
-    [HTTP2_HEADER_CONTENT_ENCODING]: 'br',  // enables: body compression
+    [HTTP2_HEADER_CONTENT_ENCODING]: 'br',  // enables: body encoding
     /** [HTTP2_HEADER_CONTENT_TYPE]
      * is undue for
      * Array/Blob/File/FormData/Object/URLSearchParams body types
@@ -99,7 +100,7 @@ const res = await rekwest(url, {
   body: fd,
   headers: {
     [HTTP2_HEADER_AUTHORIZATION]: 'Bearer [token]',
-    [HTTP2_HEADER_CONTENT_ENCODING]: 'zstd',  // enables: body compression
+    [HTTP2_HEADER_CONTENT_ENCODING]: 'zstd',  // enables: body encoding
   },
   method: HTTP2_METHOD_POST,
 });
@@ -120,21 +121,21 @@ console.log(res.body);
   & [http2.ClientSessionRequestOptions](https://nodejs.org/api/http2.html#clienthttp2sessionrequestheaders-options)
   and [tls.ConnectionOptions](https://nodejs.org/api/tls.html#tlsconnectoptions-callback)
   for HTTP/2 attunes
-  * `compression` **{Object}** Configures compression options, e.g.: `brotliOptions`, `zstdOptions`,
-    `zlibOptions`
   * `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 | ReadableStream | SharedArrayBuffer | URLSearchParams}** The body to send
     with the request
+  * `bufferBody` **{boolean}** `Default: false` Toggles the buffering of the streamable request bodies for redirects and
+    retries
   * `cookies` **{boolean | Array<[k, v]> | Array<string\> | Cookies | Object | URLSearchParams}** `Default: true` The
     cookies to add to
     the request
   * `cookiesTTL` **{boolean}** `Default: false` Controls enablement of TTL for the cookies cache
   * `credentials` **{include | omit | same-origin}** `Default: same-origin` Controls credentials in case of cross-origin
     redirects
-  * `decompression` **{Object}** Configures decompression options, e.g.: `brotliOptions`, `zstdOptions`,
-    `zlibOptions`
+  * `decodersOptions` **{Object}** Configures decoders options, e.g.: `brotli`, `zstd`, `zlib`
   * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or add a mixin
+  * `encodersOptions` **{Object}** Configures encoders options, e.g.: `brotli`, `zstd`, `zlib`
   * `follow` **{number}** `Default: 20` The number of redirects to follow
   * `h2` **{boolean}** `Default: false` Forces the use of HTTP/2 protocol
   * `headers` **{Object}** The headers to add to the request
@@ -146,7 +147,7 @@ console.log(res.body);
     * `backoffStrategy` **{string}** `Default: interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)`
       The backoff strategy algorithm that increases logarithmically. To fixate set value to `interval * 1`
     * `errorCodes` **{string[]}**
-      `Default: ['EAI_AGAIN', 'ECONNREFUSED', 'ECONNRESET', 'EHOSTDOWN', 'EHOSTUNREACH', 'ENETDOWN', 'ENETUNREACH', 'ENOTFOUND', 'EPIPE', 'ERR_HTTP2_STREAM_ERROR']`
+      `Default: ['ECONNREFUSED', 'ECONNRESET', 'EHOSTDOWN', 'EHOSTUNREACH', 'ENETDOWN', 'ENETUNREACH', 'ENOTFOUND', 'ERR_HTTP2_STREAM_ERROR']`
       The list of error codes to retry on
     * `interval` **{number}** `Default: 1e3` The initial retry interval
     * `retryAfter` **{boolean}** `Default: true` Controls `retry-after` header receptiveness

package/dist/codecs.cjs

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.encodeCodecs = exports.encode = exports.decodeCodecs = exports.decode = void 0;
+var _nodeStream = require("node:stream");
+var _nodeZlib = _interopRequireDefault(require("node:zlib"));
+var _config = require("./config.cjs");
+var _utils = require("./utils.cjs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const decodeCodecs = exports.decodeCodecs = {
+  br: opts => _nodeZlib.default.createBrotliDecompress(opts?.brotli),
+  deflate: opts => _nodeZlib.default.createInflate(opts?.zlib),
+  'deflate-raw': opts => _nodeZlib.default.createInflateRaw(opts?.zlib),
+  gzip: opts => _nodeZlib.default.createGunzip(opts?.zlib),
+  zstd: opts => _config.isZstdSupported && _nodeZlib.default.createZstdDecompress(opts?.zstd)
+};
+const decode = (readable, encodings = '', {
+  decodersOptions
+} = {}) => {
+  const decoders = [];
+  encodings = (0, _utils.unwind)(encodings).reverse();
+  for (const encoding of encodings) {
+    const decoder = decodeCodecs[encoding]?.(decodersOptions);
+    if (!decoder) {
+      return readable;
+    }
+    decoders.push(decoder);
+  }
+  return (0, _nodeStream.pipeline)(readable, ...decoders, () => void 0);
+};
+exports.decode = decode;
+const encodeCodecs = exports.encodeCodecs = {
+  br: opts => _nodeZlib.default.createBrotliCompress(opts?.brotli),
+  deflate: opts => _nodeZlib.default.createDeflate(opts?.zlib),
+  'deflate-raw': opts => _nodeZlib.default.createDeflateRaw(opts?.zlib),
+  gzip: opts => _nodeZlib.default.createGzip(opts?.zlib),
+  zstd: opts => _config.isZstdSupported && _nodeZlib.default.createZstdCompress(opts?.zstd)
+};
+const encode = (readable, encodings = '', {
+  encodersOptions
+} = {}) => {
+  const encoders = [];
+  encodings = (0, _utils.unwind)(encodings);
+  for (const encoding of encodings) {
+    const encoder = encodeCodecs[encoding]?.(encodersOptions);
+    if (!encoder) {
+      return readable;
+    }
+    encoders.push(encoder);
+  }
+  return (0, _nodeStream.pipeline)(readable, ...encoders, () => void 0);
+};
+exports.encode = encode;

package/dist/{config.js → config.cjs}

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.isZstdSupported = exports.default = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _nodeZlib = _interopRequireDefault(require("node:zlib"));
-var _constants = require("./constants");
-var _mediatypes = require("./mediatypes");
-var _utils = require("./utils");
+var _constants = require("./constants.cjs");
+var _mediatypes = require("./mediatypes.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const isZstdSupported = exports.isZstdSupported = !!_nodeZlib.default.constants.ZSTD_CLEVEL_DEFAULT;
 const {
   HTTP2_HEADER_ACCEPT,
   HTTP2_HEADER_ACCEPT_ENCODING,
@@ -20,36 +20,32 @@ const {
   HTTP_STATUS_SERVICE_UNAVAILABLE,
   HTTP_STATUS_TOO_MANY_REQUESTS
 } = _nodeHttp.default.constants;
-const isZstdSupported = exports.isZstdSupported = !!_nodeZlib.default.constants.ZSTD_CLEVEL_DEFAULT;
+const timeout = 3e5;
 const defaults = {
-  compression: {
-    brotliOptions: {
+  bufferBody: false,
+  cookiesTTL: false,
+  credentials: _constants.requestCredentials.sameOrigin,
+  decodersOptions: {},
+  digest: true,
+  encodersOptions: {
+    brotli: {
       params: {
         [_nodeZlib.default.constants.BROTLI_PARAM_QUALITY]: 4
       }
     },
-    zstdOptions: {
+    zstd: {
       params: {
         [_nodeZlib.default.constants.ZSTD_c_compressionLevel]: 6
       }
     }
   },
-  cookiesTTL: false,
-  credentials: _constants.requestCredentials.sameOrigin,
-  decompression: {},
-  digest: true,
   follow: 20,
   h2: false,
   headers: {
     [HTTP2_HEADER_ACCEPT]: `${_mediatypes.APPLICATION_JSON}, ${_mediatypes.TEXT_PLAIN}, ${_mediatypes.WILDCARD}`,
     [HTTP2_HEADER_ACCEPT_ENCODING]: `br,${isZstdSupported ? ' zstd, ' : ' '}gzip, deflate, deflate-raw`
   },
-  get maxRetryAfter() {
-    return this[_utils.maxRetryAfter] ?? this.timeout;
-  },
-  set maxRetryAfter(value) {
-    this[_utils.maxRetryAfter] = value;
-  },
+  maxRetryAfter: timeout,
   method: HTTP2_METHOD_GET,
   parse: true,
   redirect: _constants.requestRedirect.follow,
@@ -57,14 +53,14 @@ const defaults = {
   retry: {
     attempts: 0,
     backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
-    errorCodes: ['EAI_AGAIN', 'ECONNREFUSED', 'ECONNRESET', 'EHOSTDOWN', 'EHOSTUNREACH', 'ENETDOWN', 'ENETUNREACH', 'ENOTFOUND', 'EPIPE', 'ERR_HTTP2_STREAM_ERROR'],
+    errorCodes: ['ECONNREFUSED', 'ECONNRESET', 'EHOSTDOWN', 'EHOSTUNREACH', 'ENETDOWN', 'ENETUNREACH', 'ENOTFOUND', 'ERR_HTTP2_STREAM_ERROR'],
     interval: 1e3,
     retryAfter: true,
     statusCodes: [HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_BAD_GATEWAY, HTTP_STATUS_SERVICE_UNAVAILABLE, HTTP_STATUS_GATEWAY_TIMEOUT]
   },
   stripTrailingSlash: false,
   thenable: false,
-  timeout: 3e5,
+  timeout,
   trimTrailingSlashes: false
 };
 var _default = exports.default = {

package/dist/{cookies.js → cookies.cjs}

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Cookies = void 0;
-var _utils = require("./utils");
+var _utils = require("./utils.cjs");
 const lifetimeCap = 3456e7; // pragma: 400 days
 
 class Cookies extends URLSearchParams {
@@ -35,7 +35,7 @@ class Cookies extends URLSearchParams {
         const [cookie, ...attrs] = it.split(';').map(it => it.trim());
         const ttl = {};
         for (const val of attrs) {
-          if (/(?:Expires|Max-Age)=/i.test(val)) {
+          if (/(?:expires|max-age)=/i.test(val)) {
             const [key, value] = val.toLowerCase().split('=');
             const ms = Number.isFinite(Number(value)) ? value * 1e3 : Date.parse(value) - Date.now();
             ttl[(0, _utils.toCamelCase)(key)] = Math.min(ms, lifetimeCap);

package/dist/{formdata.js → formdata.cjs}

@@ -8,8 +8,8 @@ var _nodeBuffer = require("node:buffer");
 var _nodeCrypto = require("node:crypto");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _nodeUtil = require("node:util");
-var _mediatypes = require("./mediatypes");
-var _utils = require("./utils");
+var _mediatypes = require("./mediatypes.cjs");
+var _utils = require("./utils.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const CRLF = '\r\n';
 const {
@@ -40,8 +40,8 @@ class FormData {
       }
     };
   }
-  static alike(instance) {
-    return FormData.name === instance?.[Symbol.toStringTag];
+  static alike(value) {
+    return FormData.name === value?.[Symbol.toStringTag];
   }
   static #enfoldEntry(name, value, filename) {
     name = (0, _nodeUtil.toUSVString)(name);
@@ -60,25 +60,22 @@ class FormData {
     };
   }
   static #ensureInstance(value) {
-    return (0, _utils.isFileLike)(value) || value === Object(value) && Reflect.has(value, Symbol.asyncIterator);
+    return (0, _utils.isFileLike)(value) || Object(value) === value && Reflect.has(value, Symbol.asyncIterator);
   }
   #entries = [];
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
   constructor(input) {
-    if (input === Object(input) && (input?.constructor === Object || Reflect.has(input, Symbol.iterator))) {
-      if (input.constructor !== Object) {
-        input = Array.from(input);
-      }
+    if (Object(input) === input) {
       if (Array.isArray(input)) {
         if (!input.every(it => Array.isArray(it))) {
           throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': The provided value cannot be converted to a sequence.`);
         } else if (!input.every(it => it.length === 2)) {
           throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': Sequence initializer must only contain pair elements.`);
         }
-      }
-      if (input.constructor === Object) {
+        input = Array.from(input);
+      } else if (!Reflect.has(input, Symbol.iterator)) {
         input = Object.entries(input);
       }
       for (const [key, value] of input) {

package/dist/{index.js → index.cjs}

@@ -32,8 +32,8 @@ exports.mediatypes = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http"));
 var _nodeHttp2 = _interopRequireWildcard(require("node:http2"));
 var _nodeHttps = _interopRequireDefault(require("node:https"));
-var _config = _interopRequireDefault(require("./config"));
-var _constants = require("./constants");
+var _config = _interopRequireDefault(require("./config.cjs"));
+var _constants = require("./constants.cjs");
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -45,12 +45,12 @@ Object.keys(_constants).forEach(function (key) {
     }
   });
 });
-var _mediatypes2 = _interopRequireWildcard(require("./mediatypes"));
+var _mediatypes2 = _interopRequireWildcard(require("./mediatypes.cjs"));
 var _mediatypes = _mediatypes2;
 exports.mediatypes = _mediatypes2;
-var _preflight = require("./preflight");
-var _transfer = require("./transfer");
-var _utils = require("./utils");
+var _preflight = require("./preflight.cjs");
+var _transfer = require("./transfer.cjs");
+var _utils = require("./utils.cjs");
 Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -62,7 +62,7 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
-var _validation = require("./validation");
+var _validation = require("./validation.cjs");
 Object.keys(_validation).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -75,7 +75,7 @@ Object.keys(_validation).forEach(function (key) {
   });
 });
 var _nodeBuffer = require("node:buffer");
-var _ackn = require("./ackn");
+var _ackn = require("./ackn.cjs");
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -87,7 +87,19 @@ Object.keys(_ackn).forEach(function (key) {
     }
   });
 });
-var _cookies = require("./cookies");
+var _codecs = require("./codecs.cjs");
+Object.keys(_codecs).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _codecs[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _codecs[key];
+    }
+  });
+});
+var _cookies = require("./cookies.cjs");
 Object.keys(_cookies).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -99,7 +111,7 @@ Object.keys(_cookies).forEach(function (key) {
     }
   });
 });
-var _errors = require("./errors");
+var _errors = require("./errors.cjs");
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -111,7 +123,7 @@ Object.keys(_errors).forEach(function (key) {
     }
   });
 });
-var _formdata = require("./formdata");
+var _formdata = require("./formdata.cjs");
 Object.keys(_formdata).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -123,7 +135,7 @@ Object.keys(_formdata).forEach(function (key) {
     }
   });
 });
-var _mixin = require("./mixin");
+var _mixin = require("./mixin.cjs");
 Object.keys(_mixin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -141,7 +153,7 @@ const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp2.default.constants;
 function rekwest(url, options) {
-  return (0, _transfer.transfer)((0, _validation.validation)((0, _utils.normalize)(url, options)), rekwest);
+  return (0, _transfer.transfer)((0, _validation.validation)((0, _utils.normalize)(url, options)));
 }
 Reflect.defineProperty(rekwest, 'defaults', {
   enumerable: true,
@@ -177,14 +189,14 @@ Reflect.defineProperty(rekwest, 'stream', {
       } = options.url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
       req = request(options.url, options);
     }
-    (0, _utils.affix)(client, req, options);
+    (0, _utils.snoop)(client, req, options);
     req.once('response', res => {
       let headers;
       if (options.h2) {
         headers = res;
         res = req;
       }
-      (0, _utils.admix)(res, headers, options);
+      (0, _utils.augment)(res, headers, options);
     });
     return req;
   }

package/dist/{mixin.js → mixin.cjs}

@@ -6,14 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.mixin = void 0;
 var _nodeBuffer = require("node:buffer");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
-var _utils = require("./utils");
+var _consumers = require("node:stream/consumers");
+var _nodeUtil = require("node:util");
+var _codecs = require("./codecs.cjs");
+var _utils = require("./utils.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
   HTTP2_HEADER_CONTENT_ENCODING,
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp.default.constants;
 const mixin = (res, {
-  decompression,
+  decodersOptions,
   digest = false,
   parse = false
 } = {}) => {
@@ -71,28 +74,30 @@ const mixin = (res, {
       value: async function () {
         (0, _utils.brandCheck)(this, res?.constructor);
         if (this.bodyUsed) {
-          throw new TypeError('Response stream already read');
+          throw new TypeError('Response stream already read.');
         }
-        let body = [];
-        for await (const chunk of (0, _utils.decompress)(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], {
-          decompression
-        })) {
-          body.push(chunk);
-        }
-        body = Buffer.concat(body);
+        let body = await (0, _consumers.buffer)((0, _codecs.decode)(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], {
+          decodersOptions
+        }));
         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);
+          let isTextual, mimeType;
+          try {
+            mimeType = contentType ? new _nodeUtil.MIMEType(contentType) : null;
+          } finally {
+            isTextual = mimeType && (mimeType.type === 'text' || mimeType.subtype.match(/\bcsv\b|\bjson\b|\bxml\b|\byaml\b/) || mimeType.essence.match(/\becmascript\b|\bjavascript\b|\bx-www-form-urlencoded\b/));
+          }
+          if (isTextual) {
+            if (/\bjson\b/i.test(contentType)) {
+              body = JSON.parse(body.toString());
             } else {
-              body = new TextDecoder(charset).decode(body);
+              const charset = mimeType.params.get('charset')?.toLowerCase() ?? 'utf-8';
+              body = new TextDecoder(charset, {
+                fatal: true
+              }).decode(body);
             }
           }
         }

package/dist/postflight.cjs

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.postflight = void 0;
+var _nodeHttp = _interopRequireDefault(require("node:http2"));
+var _cookies = require("./cookies.cjs");
+var _mixin = require("./mixin.cjs");
+var _redirects = require("./redirects.cjs");
+var _utils = require("./utils.cjs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const {
+  HTTP2_HEADER_SET_COOKIE,
+  HTTP_STATUS_BAD_REQUEST
+} = _nodeHttp.default.constants;
+const postflight = (req, res, options, {
+  reject,
+  resolve
+}) => {
+  const {
+    cookies,
+    h2,
+    url
+  } = options;
+  let headers;
+  if (h2) {
+    headers = res;
+    res = req;
+  } else {
+    res.once('error', reject);
+  }
+  (0, _utils.augment)(res, headers, options);
+  if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
+    if (_cookies.Cookies.jar.has(url.origin)) {
+      const cookie = new _cookies.Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options);
+      _cookies.Cookies.jar.get(url.origin).forEach((val, key) => {
+        if (!cookie.has(key)) {
+          cookie.set(key, val);
+        }
+      });
+      _cookies.Cookies.jar.set(url.origin, cookie);
+    } else {
+      _cookies.Cookies.jar.set(url.origin, new _cookies.Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options));
+    }
+  }
+  Reflect.defineProperty(res, 'cookies', {
+    enumerable: true,
+    value: cookies !== false && _cookies.Cookies.jar.has(url.origin) ? _cookies.Cookies.jar.get(url.origin) : void 0
+  });
+  const willRedirect = (0, _redirects.redirects)(res, options);
+  if (Object(willRedirect) === willRedirect) {
+    return willRedirect.then(resolve, reject);
+  }
+  if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
+    return reject((0, _mixin.mixin)(res, options));
+  }
+  resolve((0, _mixin.mixin)(res, options));
+};
+exports.postflight = postflight;

package/dist/{preflight.js → preflight.cjs}

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.preflight = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
-var _config = require("./config");
-var _constants = require("./constants");
-var _cookies = require("./cookies");
+var _constants = require("./constants.cjs");
+var _cookies = require("./cookies.cjs");
+var _utils = require("./utils.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
-  HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_AUTHORITY,
   HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_COOKIE,
@@ -21,7 +20,7 @@ const {
   HTTP2_METHOD_HEAD
 } = _nodeHttp.default.constants;
 const preflight = options => {
-  const {
+  let {
     cookies,
     credentials,
     h2,
@@ -31,10 +30,17 @@ const preflight = options => {
   } = options;
   if (h2) {
     options.endStream = [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(method);
+  } else {
+    headers = (0, _utils.stripHeaders)(headers, [HTTP2_HEADER_AUTHORITY, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_SCHEME]);
+  }
+  if (credentials === _constants.requestCredentials.omit) {
+    headers = (0, _utils.stripHeaders)(headers, [HTTP2_HEADER_AUTHORIZATION, HTTP2_HEADER_COOKIE]);
+    options.cookies = false;
+    url.password = url.username = '';
   }
   if (cookies !== false && credentials !== _constants.requestCredentials.omit) {
     let cookie = _cookies.Cookies.jar.has(url.origin);
-    if (cookies === Object(cookies) && [_constants.requestCredentials.include, _constants.requestCredentials.sameOrigin].includes(credentials)) {
+    if (Object(cookies) === cookies && [_constants.requestCredentials.include, _constants.requestCredentials.sameOrigin].includes(credentials)) {
       if (cookie) {
         cookie = new _cookies.Cookies(cookies, options);
         _cookies.Cookies.jar.get(url.origin).forEach((val, key) => {
@@ -57,24 +63,8 @@ const preflight = options => {
       ...headers
     };
   }
-  if (credentials === _constants.requestCredentials.omit) {
-    options.cookies = false;
-    for (const it of Object.keys(options.headers ?? {}).filter(val => new RegExp(`^(${HTTP2_HEADER_AUTHORIZATION}|${HTTP2_HEADER_COOKIE})$`, 'i').test(val))) {
-      Reflect.deleteProperty(options.headers, it);
-    }
-    url.password = url.username = '';
-  }
   options.headers = {
-    ...Object.entries(options.headers ?? {}).reduce((acc, [key, val]) => {
-      acc[key.toLowerCase()] = val;
-      if (acc[HTTP2_HEADER_ACCEPT_ENCODING]?.match(/\bzstd\b/i) && !_config.isZstdSupported) {
-        acc[HTTP2_HEADER_ACCEPT_ENCODING] = val.replace(/\s?zstd,?/gi, '').trim();
-        if (!acc[HTTP2_HEADER_ACCEPT_ENCODING]) {
-          Reflect.deleteProperty(acc, HTTP2_HEADER_ACCEPT_ENCODING);
-        }
-      }
-      return acc;
-    }, {}),
+    ...headers,
     ...(h2 && {
       [HTTP2_HEADER_AUTHORITY]: url.host,
       [HTTP2_HEADER_METHOD]: method,

package/dist/redirects.cjs

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.redirects = void 0;
+var _nodeHttp = _interopRequireDefault(require("node:http2"));
+var _nodeStream = require("node:stream");
+var _constants = require("./constants.cjs");
+var _errors = require("./errors.cjs");
+var _index = _interopRequireDefault(require("./index.cjs"));
+var _utils = require("./utils.cjs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const {
+  HTTP2_HEADER_LOCATION,
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD,
+  HTTP2_METHOD_POST,
+  HTTP_STATUS_FOUND,
+  HTTP_STATUS_MOVED_PERMANENTLY,
+  HTTP_STATUS_PERMANENT_REDIRECT,
+  HTTP_STATUS_SEE_OTHER,
+  HTTP_STATUS_TEMPORARY_REDIRECT
+} = _nodeHttp.default.constants;
+const redirects = (res, options) => {
+  const {
+    credentials,
+    follow,
+    redirect,
+    url
+  } = options;
+  if (follow && /3\d{2}/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
+    if (!_constants.requestRedirectCodes.includes(res.statusCode)) {
+      return res.emit('error', new RangeError(`Invalid status code: ${res.statusCode}`));
+    }
+    if (redirect === _constants.requestRedirect.error) {
+      return res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
+    }
+    if (redirect === _constants.requestRedirect.follow) {
+      const location = new URL(res.headers[HTTP2_HEADER_LOCATION], url);
+      if (!/^https?:/i.test(location.protocol)) {
+        return res.emit('error', new _errors.RequestError('URL scheme must be "http" or "https".'));
+      }
+      if (!(0, _utils.sameOrigin)(location, url)) {
+        if (credentials !== _constants.requestCredentials.include) {
+          options.credentials = _constants.requestCredentials.omit;
+        }
+        options.h2 = false;
+      }
+      if ([HTTP_STATUS_PERMANENT_REDIRECT, HTTP_STATUS_TEMPORARY_REDIRECT].includes(res.statusCode) && (0, _utils.isPipeStream)(options.body) && !(0, _nodeStream.isReadable)(options.body)) {
+        return res.emit('error', new _errors.RequestError(`Unable to ${redirect} redirect with streamable body.`));
+      }
+      if ([HTTP_STATUS_MOVED_PERMANENTLY, HTTP_STATUS_FOUND].includes(res.statusCode) && options.method === HTTP2_METHOD_POST || res.statusCode === HTTP_STATUS_SEE_OTHER && ![HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
+        options.body = null;
+        options.method = HTTP2_METHOD_GET;
+      }
+      options.follow--;
+      options.redirected = true;
+      return (0, _index.default)(location, options);
+    }
+  }
+};
+exports.redirects = redirects;