rekwest 3.3.4 → 4.0.0

package/dist/index.js

@@ -8,81 +8,58 @@ var _exportNames = {
 exports.constants = void 0;
 exports.default = rekwest;
 exports.mediatypes = void 0;
-
 var _nodeHttp = _interopRequireDefault(require("node:http"));
-
 var _nodeHttp2 = _interopRequireWildcard(require("node:http2"));
-
 exports.constants = _nodeHttp2.constants;
-
 var _nodeHttps = _interopRequireDefault(require("node:https"));
-
 var _promises = require("node:timers/promises");
-
-var _ackn = require("./ackn.js");
-
+var _ackn = require("./ackn");
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ackn[key]) return;
   exports[key] = _ackn[key];
 });
-
-var _cookies = require("./cookies.js");
-
+var _cookies = require("./cookies");
 Object.keys(_cookies).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _cookies[key]) return;
   exports[key] = _cookies[key];
 });
-
-var _errors = require("./errors.js");
-
+var _errors = require("./errors");
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _errors[key]) return;
   exports[key] = _errors[key];
 });
-
-var _mediatypes = _interopRequireWildcard(require("./mediatypes.js"));
-
+var _mediatypes = _interopRequireWildcard(require("./mediatypes"));
 exports.mediatypes = _mediatypes;
-
-var _utils = require("./utils.js");
-
+var _utils = require("./utils");
 Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _utils[key]) return;
   exports[key] = _utils[key];
 });
-
-var _file = require("./file.js");
-
+var _file = require("./file");
 Object.keys(_file).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _file[key]) return;
   exports[key] = _file[key];
 });
-
-var _formdata = require("./formdata.js");
-
+var _formdata = require("./formdata");
 Object.keys(_formdata).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _formdata[key]) return;
   exports[key] = _formdata[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_LENGTH,
   HTTP2_HEADER_CONTENT_TYPE,
@@ -98,20 +75,15 @@ const {
   HTTP_STATUS_TOO_MANY_REQUESTS
 } = _nodeHttp2.default.constants;
 const maxRetryAfter = Symbol('maxRetryAfter');
-
 const maxRetryAfterError = (interval, options) => new _errors.RequestError(`Maximum '${HTTP2_HEADER_RETRY_AFTER}' limit exceeded: ${interval} ms.`, options);
-
 let defaults = {
   follow: 20,
-
   get maxRetryAfter() {
     return this[maxRetryAfter] ?? this.timeout;
   },
-
   set maxRetryAfter(value) {
     this[maxRetryAfter] = value;
   },
-
   method: HTTP2_METHOD_GET,
   retry: {
     attempts: 0,
@@ -122,34 +94,26 @@ let defaults = {
   },
   timeout: 3e5
 };
-
-async function rekwest(url, options = {}) {
-  ({
-    url
-  } = (0, _utils.revise)({
-    options,
+async function rekwest(...args) {
+  let options = (0, _utils.sanitize)(...args);
+  const {
     url
-  }));
-
+  } = options;
   if (!options.redirected) {
     options = (0, _utils.merge)(rekwest.defaults, 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 (options.follow === 0) {
     throw new _errors.RequestError(`Maximum redirect reached at: ${url.href}`);
   }
-
   if (url.protocol === 'https:') {
     options = await (0, _ackn.ackn)(options);
   } else if (Reflect.has(options, 'alpnProtocol')) {
     ['alpnProtocol', 'createConnection', 'h2', 'protocol'].forEach(it => Reflect.deleteProperty(options, it));
   }
-
-  options = (0, _utils.preflight)(options);
+  options = await (0, _utils.transform)((0, _utils.preflight)(options));
   const {
     cookies,
     digest,
@@ -162,36 +126,27 @@ async function rekwest(url, options = {}) {
   const {
     request
   } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
-  let {
-    body
-  } = options;
   const promise = new Promise((resolve, reject) => {
     let client, req;
-    body &&= (0, _utils.transform)(body, options);
-
     if (h2) {
       client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
       req = request(url, options);
     }
-
     (0, _utils.affix)(client, req, options);
     req.once('error', reject);
     req.once('frameError', reject);
     req.once('goaway', reject);
     req.once('response', res => {
       let headers;
-
       if (h2) {
         headers = res;
         res = req;
       } else {
         res.once('error', reject);
       }
-
       (0, _utils.admix)(res, headers, options);
-
       if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
         if (_cookies.Cookies.jar.has(url.origin)) {
           new _cookies.Cookies(res.headers[HTTP2_HEADER_SET_COOKIE]).forEach(function (val, key) {
@@ -201,85 +156,64 @@ async function rekwest(url, options = {}) {
           _cookies.Cookies.jar.set(url.origin, new _cookies.Cookies(res.headers[HTTP2_HEADER_SET_COOKIE]));
         }
       }
-
       Reflect.defineProperty(res, 'cookies', {
         enumerable: true,
         value: cookies !== false && _cookies.Cookies.jar.has(url.origin) ? _cookies.Cookies.jar.get(url.origin) : void 0
       });
-
       if (follow && /^3\d{2}$/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
         if (redirect === _utils.redirects.error) {
           return res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
         }
-
         if (redirect === _utils.redirects.follow) {
           options.url = new URL(res.headers[HTTP2_HEADER_LOCATION], url).href;
-
-          if (res.statusCode !== HTTP_STATUS_SEE_OTHER && body === Object(body) && body.pipe?.constructor === Function) {
+          if (res.statusCode !== HTTP_STATUS_SEE_OTHER && options?.body?.pipe?.constructor === Function) {
             return res.emit('error', new _errors.RequestError(`Unable to ${redirect} redirect with streamable body.`));
           }
-
           options.follow--;
-
           if (res.statusCode === HTTP_STATUS_SEE_OTHER) {
             Reflect.deleteProperty(options.headers, HTTP2_HEADER_CONTENT_LENGTH);
             options.method = HTTP2_METHOD_GET;
             options.body = null;
           }
-
           Reflect.set(options, 'redirected', true);
-
           if (res.statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {
             let interval = res.headers[HTTP2_HEADER_RETRY_AFTER];
             interval = Number(interval) * 1000 || new Date(interval) - Date.now();
-
             if (interval > options.maxRetryAfter) {
               return res.emit('error', maxRetryAfterError(interval, {
                 cause: (0, _utils.mixin)(res, options)
               }));
             }
-
             return (0, _promises.setTimeout)(interval).then(() => rekwest(options.url, options).then(resolve, reject));
           }
-
           return rekwest(options.url, options).then(resolve, reject);
         }
       }
-
       if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
         return reject((0, _utils.mixin)(res, options));
       }
-
       resolve((0, _utils.mixin)(res, options));
     });
-    (0, _utils.dispatch)(req, { ...options,
-      body
-    });
+    (0, _utils.dispatch)(options, req);
   });
-
   try {
     const res = await promise;
-
     if (digest && !redirected) {
       res.body = await res.body();
     }
-
     return res;
   } catch (ex) {
     const {
       maxRetryAfter,
       retry
     } = options;
-
     if (retry?.attempts && retry?.statusCodes.includes(ex.statusCode)) {
       let {
         interval
       } = retry;
-
       if (retry.retryAfter && ex.headers[HTTP2_HEADER_RETRY_AFTER]) {
         interval = ex.headers[HTTP2_HEADER_RETRY_AFTER];
         interval = Number(interval) * 1000 || new Date(interval) - Date.now();
-
         if (interval > maxRetryAfter) {
           throw maxRetryAfterError(interval, {
             cause: ex
@@ -288,16 +222,13 @@ async function rekwest(url, options = {}) {
       } else {
         interval = new Function('interval', `return Math.ceil(${retry.backoffStrategy});`)(interval);
       }
-
       retry.attempts--;
       retry.interval = interval;
       return (0, _promises.setTimeout)(interval).then(() => rekwest(url, options));
     }
-
     if (digest && !redirected && ex.body) {
       ex.body = await ex.body();
     }
-
     if (!thenable) {
       throw ex;
     } else {
@@ -305,63 +236,49 @@ async function rekwest(url, options = {}) {
     }
   }
 }
-
 Reflect.defineProperty(rekwest, 'stream', {
   enumerable: true,
-
-  value(url, options = {}) {
-    ({
-      url
-    } = (0, _utils.revise)({
-      options,
-      url
-    }));
-    options = (0, _utils.preflight)({ ...(0, _utils.merge)(rekwest.defaults, {
+  value(...args) {
+    const options = (0, _utils.preflight)({
+      ...(0, _utils.merge)(rekwest.defaults, {
         headers: {
           [HTTP2_HEADER_CONTENT_TYPE]: _mediatypes.APPLICATION_OCTET_STREAM
         }
-      }, options),
+      }, (0, _utils.sanitize)(...args)),
       redirect: _utils.redirects.manual
     });
     const {
-      h2
+      h2,
+      url
     } = options;
     const {
       request
     } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
     let client, req;
-
     if (h2) {
       client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
       req = request(url, options);
     }
-
     (0, _utils.affix)(client, req, options);
     req.once('response', res => {
       let headers;
-
       if (h2) {
         headers = res;
         res = req;
       }
-
       (0, _utils.admix)(res, headers, options);
     });
     return req;
   }
-
 });
 Reflect.defineProperty(rekwest, 'defaults', {
   enumerable: true,
-
   get() {
     return defaults;
   },
-
   set(value) {
     defaults = (0, _utils.merge)(defaults, value);
   }
-
 });