rekwest 4.4.0 → 4.4.2

package/README.md

@@ -187,7 +187,7 @@ const {
 } = constants;
 
 const rk = rekwest.extend({
-  baseURL: 'https://somewhe.re'
+  baseURL: 'https://somewhe.re',
 });
 
 const signal = AbortSignal.timeout(1e4);

package/dist/index.js

@@ -86,8 +86,17 @@ const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp2.default.constants;
 function rekwest(url, options) {
-  return (0, _utils.transfer)((0, _validation.validation)((0, _utils.normalize)(url, options)));
+  return (0, _utils.transfer)((0, _validation.validation)((0, _utils.normalize)(url, options)), rekwest);
 }
+Reflect.defineProperty(rekwest, 'defaults', {
+  enumerable: true,
+  get() {
+    return _defaults.default.stash;
+  },
+  set(value) {
+    _defaults.default.stash = (0, _utils.merge)(_defaults.default.stash, value);
+  }
+});
 Reflect.defineProperty(rekwest, 'extend', {
   enumerable: true,
   value(options) {
@@ -124,13 +133,4 @@ Reflect.defineProperty(rekwest, 'stream', {
     });
     return req;
   }
-});
-Reflect.defineProperty(rekwest, 'defaults', {
-  enumerable: true,
-  get() {
-    return _defaults.default.stash;
-  },
-  set(value) {
-    _defaults.default.stash = (0, _utils.merge)(_defaults.default.stash, value);
-  }
 });

package/dist/postflight.js

@@ -73,7 +73,7 @@ const postflight = (req, res, options, {
         return res.emit('error', new _errors.RequestError('URL scheme must be "http" or "https".'));
       }
       if (!(0, _utils.sameOrigin)(location, url)) {
-        Reflect.set(options, 'h2', false);
+        options.h2 = false;
         if ([_constants.requestCredentials.omit, _constants.requestCredentials.sameOrigin].includes(credentials)) {
           Object.keys(options.headers).filter(it => new RegExp(HTTP2_HEADER_AUTHORIZATION, 'i').test(it)).forEach(it => Reflect.deleteProperty(options.headers, it));
           location.password = location.username = '';
@@ -82,17 +82,17 @@ const postflight = (req, res, options, {
           }
         }
       }
-      options.url = location;
       if (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 ([HTTP_STATUS_MOVED_PERMANENTLY, HTTP_STATUS_FOUND].includes(statusCode) && options.method === HTTP2_METHOD_POST || statusCode === HTTP_STATUS_SEE_OTHER && ![HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
         Object.keys(options.headers).filter(it => /^content-/i.test(it)).forEach(it => Reflect.deleteProperty(options.headers, it));
         options.body = null;
         options.method = HTTP2_METHOD_GET;
       }
-      Reflect.set(options, 'redirected', true);
+      options.follow--;
+      options.redirected = true;
+      options.url = location;
       if (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();

package/dist/utils.js

@@ -13,10 +13,10 @@ var _promises = require("node:timers/promises");
 var _nodeUtil = require("node:util");
 var _nodeZlib = _interopRequireDefault(require("node:zlib"));
 var _ackn = require("./ackn");
+var _defaults = _interopRequireDefault(require("./defaults"));
 var _errors = require("./errors");
 var _file = require("./file");
 var _formdata = require("./formdata");
-var _index = _interopRequireDefault(require("./index"));
 var _mediatypes = require("./mediatypes");
 var _postflight = require("./postflight");
 var _preflight = require("./preflight");
@@ -149,7 +149,7 @@ const merge = (target = {}, ...rest) => {
 exports.merge = merge;
 const normalize = (url, options = {}) => {
   if (!options.redirected) {
-    options = merge(_index.default.defaults, options);
+    options = merge(_defaults.default.stash, options);
   }
   if (options.trimTrailingSlashes) {
     url = `${url}`.replace(/(?<!:)\/+/g, '/');
@@ -171,7 +171,7 @@ async function* tap(value) {
     yield await value.arrayBuffer();
   }
 }
-const transfer = async options => {
+const transfer = async (options, overact) => {
   const {
     digest,
     redirected,
@@ -245,7 +245,7 @@ const transfer = async options => {
       }
       retry.attempts--;
       retry.interval = interval;
-      return (0, _promises.setTimeout)(interval).then(() => (0, _index.default)(url, options));
+      return (0, _promises.setTimeout)(interval).then(() => overact(url, options));
     }
     if (digest && !redirected && ex.body) {
       ex.body = await ex.body();

package/package.json

@@ -13,7 +13,7 @@
     "@babel/eslint-parser": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "c8": "^7.13.0",
-    "eslint": "^8.40.0",
+    "eslint": "^8.41.0",
     "eslint-config-ultra-refined": "^2.13.0",
     "mocha": "^10.2.0"
   },
@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.4.0"
+  "version": "4.4.2"
 }

package/src/index.mjs

@@ -32,9 +32,15 @@ const {
 } = http2.constants;
 
 export default function rekwest(url, options) {
-  return transfer(validation(normalize(url, options)));
+  return transfer(validation(normalize(url, options)), rekwest);
 }
 
+Reflect.defineProperty(rekwest, 'defaults', {
+  enumerable: true,
+  get() { return defaults.stash; },
+  set(value) { defaults.stash = merge(defaults.stash, value); },
+});
+
 Reflect.defineProperty(rekwest, 'extend', {
   enumerable: true,
   value(options) {
@@ -76,9 +82,3 @@ Reflect.defineProperty(rekwest, 'stream', {
     return req;
   },
 });
-
-Reflect.defineProperty(rekwest, 'defaults', {
-  enumerable: true,
-  get() { return defaults.stash; },
-  set(value) { defaults.stash = merge(defaults.stash, value); },
-});

package/src/postflight.mjs

@@ -78,7 +78,7 @@ export const postflight = (req, res, options, { reject, resolve }) => {
       }
 
       if (!sameOrigin(location, url)) {
-        Reflect.set(options, 'h2', false);
+        options.h2 = false;
         if ([
           requestCredentials.omit,
           requestCredentials.sameOrigin,
@@ -92,14 +92,10 @@ export const postflight = (req, res, options, { reject, resolve }) => {
         }
       }
 
-      options.url = location;
-
       if (statusCode !== HTTP_STATUS_SEE_OTHER && options.body?.pipe?.constructor === Function) {
         return res.emit('error', new RequestError(`Unable to ${ redirect } redirect with streamable body.`));
       }
 
-      options.follow--;
-
       if (([
         HTTP_STATUS_MOVED_PERMANENTLY,
         HTTP_STATUS_FOUND,
@@ -113,7 +109,9 @@ export const postflight = (req, res, options, { reject, resolve }) => {
         options.method = HTTP2_METHOD_GET;
       }
 
-      Reflect.set(options, 'redirected', true);
+      options.follow--;
+      options.redirected = true;
+      options.url = location;
 
       if (statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {
         let interval = res.headers[HTTP2_HEADER_RETRY_AFTER];

package/src/utils.mjs

@@ -10,13 +10,13 @@ import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
 import { types } from 'node:util';
 import zlib from 'node:zlib';
 import { ackn } from './ackn.mjs';
+import defaults from './defaults.mjs';
 import {
   RequestError,
   TimeoutError,
 } from './errors.mjs';
 import { File } from './file.mjs';
 import { FormData } from './formdata.mjs';
-import rekwest from './index.mjs';
 import {
   APPLICATION_FORM_URLENCODED,
   APPLICATION_JSON,
@@ -173,7 +173,7 @@ export const merge = (target = {}, ...rest) => {
 
 export const normalize = (url, options = {}) => {
   if (!options.redirected) {
-    options = merge(rekwest.defaults, options);
+    options = merge(defaults.stash, options);
   }
 
   if (options.trimTrailingSlashes) {
@@ -197,7 +197,7 @@ export async function* tap(value) {
   }
 }
 
-export const transfer = async (options) => {
+export const transfer = async (options, overact) => {
   const { digest, redirected, thenable, url } = options;
 
   if (options.follow === 0) {
@@ -278,7 +278,7 @@ export const transfer = async (options) => {
       retry.attempts--;
       retry.interval = interval;
 
-      return setTimeoutPromise(interval).then(() => rekwest(url, options));
+      return setTimeoutPromise(interval).then(() => overact(url, options));
     }
 
     if (digest && !redirected && ex.body) {