rekwest 4.3.0 → 4.4.1

package/README.md

@@ -175,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/index.js

@@ -85,42 +85,38 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp2.default.constants;
-function rekwest(...args) {
-  let options = (0, _utils.normalize)(...args);
-  if (!options.redirected) {
-    options = (0, _utils.merge)(rekwest.defaults, options);
-  }
-  return (0, _utils.transfer)((0, _validation.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, _validation.validation)((0, _utils.merge)(rekwest.defaults, {
-        headers: {
-          [HTTP2_HEADER_CONTENT_TYPE]: _mediatypes.APPLICATION_OCTET_STREAM
-        }
-      }, (0, _utils.normalize)(...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/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

@@ -148,6 +148,9 @@ const merge = (target = {}, ...rest) => {
 };
 exports.merge = merge;
 const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = merge(_index.default.defaults, options);
+  }
   if (options.trimTrailingSlashes) {
     url = `${url}`.replace(/(?<!:)\/+/g, '/');
   }
@@ -171,7 +174,6 @@ async function* tap(value) {
 const transfer = async options => {
   const {
     digest,
-    h2,
     redirected,
     thenable,
     url
@@ -180,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

package/package.json

@@ -8,13 +8,13 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/preset-env": "^7.20.2",
-    "c8": "^7.12.0",
-    "eslint": "^8.33.0",
-    "eslint-config-ultra-refined": "^2.10.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 🌐",
@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.3.0"
+  "version": "4.4.1"
 }

package/src/index.mjs

@@ -31,36 +31,33 @@ const {
   HTTP2_HEADER_CONTENT_TYPE,
 } = http2.constants;
 
-export default function rekwest(...args) {
-  let options = normalize(...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 },
-      }, normalize(...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);
@@ -68,7 +65,7 @@ Reflect.defineProperty(rekwest, 'stream', {
     req.once('response', (res) => {
       let headers;
 
-      if (h2) {
+      if (options.h2) {
         headers = res;
         res = req;
       }

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

@@ -172,6 +172,10 @@ export const merge = (target = {}, ...rest) => {
 };
 
 export const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = merge(rekwest.defaults, options);
+  }
+
   if (options.trimTrailingSlashes) {
     url = `${ url }`.replace(/(?<!:)\/+/g, '/');
   }
@@ -194,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,
@@ -229,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);
     }