rekwest 3.0.1 → 3.2.0

package/README.md

@@ -7,7 +7,7 @@ and [http2.request](https://nodejs.org/api/http2.html#http2_clienthttp2session_r
 ## Abstract
 
 * Fetch-alike
-* Cool-beans config options (with defaults)
+* 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)
@@ -121,8 +121,8 @@ 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
-  * `body` **{string | Array | AsyncIterator | Blob | Buffer | File | FromData | Iterator | Object | Readable |
-    Uint8Array | URLSearchParams}** The body to send with the request
+  * `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
     the request
   * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or simply add a mixin

package/dist/helpers.js

@@ -126,10 +126,6 @@ const dispatch = (req, {
   body,
   headers
 }) => {
-  if (_util.types.isUint8Array(body)) {
-    return req.end(body);
-  }
-
   if (body === Object(body) && !Buffer.isBuffer(body)) {
     if (body.pipe?.constructor !== Function && (Reflect.has(body, Symbol.asyncIterator) || Reflect.has(body, Symbol.iterator))) {
       body = _stream.Readable.from(body);
@@ -350,6 +346,12 @@ async function* tap(value) {
 const transform = (body, options) => {
   let headers = {};
 
+  if (_util.types.isAnyArrayBuffer(body) && !Buffer.isBuffer(body)) {
+    body = Buffer.from(body);
+  } else if (_util.types.isArrayBufferView(body) && !Buffer.isBuffer(body)) {
+    body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+  }
+
   if (_file.File.alike(body)) {
     headers = {
       [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
@@ -374,7 +376,7 @@ const transform = (body, options) => {
       body = JSON.stringify(body);
     }
 
-    if (_util.types.isUint8Array(body) || Buffer.isBuffer(body) || body !== Object(body)) {
+    if (Buffer.isBuffer(body) || body !== Object(body)) {
       if (options.headers[HTTP2_HEADER_CONTENT_ENCODING]) {
         body = compress(body, options.headers[HTTP2_HEADER_CONTENT_ENCODING]);
       }

package/dist/index.js

@@ -9,7 +9,7 @@ exports.default = rekwest;
 
 var _http = _interopRequireDefault(require("http"));
 
-var _http2 = _interopRequireDefault(require("http2"));
+var _http2 = _interopRequireWildcard(require("http2"));
 
 exports.constants = _http2.constants;
 
@@ -73,6 +73,10 @@ Object.keys(_formdata).forEach(function (key) {
   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 {
@@ -199,14 +203,14 @@ async function rekwest(url, options = {}) {
 
       if (follow && /^3\d{2}$/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
         if (redirect === _helpers.redirects.error) {
-          res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
+          return res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
         }
 
         if (redirect === _helpers.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) {
-            res.emit('error', new _errors.RequestError(`Unable to ${redirect} redirect with body as readable stream.`));
+            return res.emit('error', new _errors.RequestError(`Unable to ${redirect} redirect with streamable body.`));
           }
 
           options.follow--;
@@ -224,7 +228,7 @@ async function rekwest(url, options = {}) {
             interval = Number(interval) * 1000 || new Date(interval) - Date.now();
 
             if (interval > options.maxRetryAfter) {
-              res.emit('error', maxRetryAfterError(interval, {
+              return res.emit('error', maxRetryAfterError(interval, {
                 cause: (0, _helpers.mixin)(res, options)
               }));
             }
@@ -256,26 +260,31 @@ async function rekwest(url, options = {}) {
 
     return res;
   } catch (ex) {
-    if (options.retry?.attempts && options.retry?.statusCodes.includes(ex.statusCode)) {
+    const {
+      maxRetryAfter,
+      retry
+    } = options;
+
+    if (retry?.attempts && retry?.statusCodes.includes(ex.statusCode)) {
       let {
         interval
-      } = options.retry;
+      } = retry;
 
-      if (options.retry.retryAfter && ex.headers[HTTP2_HEADER_RETRY_AFTER]) {
+      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 > options.maxRetryAfter) {
+        if (interval > maxRetryAfter) {
           throw maxRetryAfterError(interval, {
             cause: ex
           });
         }
       } else {
-        interval = new Function('interval', `return Math.ceil(${options.retry.backoffStrategy});`)(interval);
+        interval = new Function('interval', `return Math.ceil(${retry.backoffStrategy});`)(interval);
       }
 
-      options.retry.attempts--;
-      options.retry.interval = interval;
+      retry.attempts--;
+      retry.interval = interval;
       return (0, _promises.setTimeout)(interval).then(() => rekwest(url, options));
     }
 

package/package.json

@@ -9,13 +9,13 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.17.9",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
-    "c8": "^7.11.0",
-    "eslint": "^8.10.0",
-    "eslint-config-ultra-refined": "^2.4.1",
-    "mocha": "^9.2.1"
+    "c8": "^7.11.2",
+    "eslint": "^8.14.0",
+    "eslint-config-ultra-refined": "^2.5.0",
+    "mocha": "^9.2.2"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -31,6 +31,7 @@
   ],
   "homepage": "https://github.com/bricss/rekwest#readme",
   "keywords": [
+    "backoff",
     "fetch",
     "fetch-alike",
     "formdata",
@@ -40,7 +41,8 @@
     "h2c",
     "http2",
     "multipart",
-    "request"
+    "request",
+    "retry"
   ],
   "license": "MIT",
   "main": "./dist/index.js",
@@ -60,5 +62,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "3.0.1"
+  "version": "3.2.0"
 }

package/src/helpers.mjs

@@ -109,10 +109,6 @@ export const decompress = (buf, encoding, { async = false } = {}) => {
 };
 
 export const dispatch = (req, { body, headers }) => {
-  if (types.isUint8Array(body)) {
-    return req.end(body);
-  }
-
   if (body === Object(body) && !Buffer.isBuffer(body)) {
     if (body.pipe?.constructor !== Function
       && (Reflect.has(body, Symbol.asyncIterator) || Reflect.has(body, Symbol.iterator))) {
@@ -333,6 +329,12 @@ export async function* tap(value) {
 export const transform = (body, options) => {
   let headers = {};
 
+  if (types.isAnyArrayBuffer(body) && !Buffer.isBuffer(body)) {
+    body = Buffer.from(body);
+  } else if (types.isArrayBufferView(body) && !Buffer.isBuffer(body)) {
+    body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+  }
+
   if (File.alike(body)) {
     headers = {
       [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
@@ -352,7 +354,7 @@ export const transform = (body, options) => {
       body = JSON.stringify(body);
     }
 
-    if (types.isUint8Array(body) || Buffer.isBuffer(body) || body !== Object(body)) {
+    if (Buffer.isBuffer(body) || body !== Object(body)) {
       if (options.headers[HTTP2_HEADER_CONTENT_ENCODING]) {
         body = compress(body, options.headers[HTTP2_HEADER_CONTENT_ENCODING]);
       }

package/src/index.mjs

@@ -149,7 +149,7 @@ export default async function rekwest(url, options = {}) {
 
       if (follow && /^3\d{2}$/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
         if (redirect === redirects.error) {
-          res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
+          return res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
         }
 
         if (redirect === redirects.follow) {
@@ -157,7 +157,7 @@ export default async function rekwest(url, options = {}) {
 
           if (res.statusCode !== HTTP_STATUS_SEE_OTHER
             && body === Object(body) && body.pipe?.constructor === Function) {
-            res.emit('error', new RequestError(`Unable to ${ redirect } redirect with body as readable stream.`));
+            return res.emit('error', new RequestError(`Unable to ${ redirect } redirect with streamable body.`));
           }
 
           options.follow--;
@@ -176,7 +176,7 @@ export default async function rekwest(url, options = {}) {
             interval = Number(interval) * 1000 || new Date(interval) - Date.now();
 
             if (interval > options.maxRetryAfter) {
-              res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
+              return res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
             }
 
             return setTimeoutPromise(interval).then(() => rekwest(options.url, options).then(resolve, reject));
@@ -205,21 +205,23 @@ export default async function rekwest(url, options = {}) {
 
     return res;
   } catch (ex) {
-    if (options.retry?.attempts && options.retry?.statusCodes.includes(ex.statusCode)) {
-      let { interval } = options.retry;
+    const { maxRetryAfter, retry } = options;
 
-      if (options.retry.retryAfter && ex.headers[HTTP2_HEADER_RETRY_AFTER]) {
+    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 > options.maxRetryAfter) {
+        if (interval > maxRetryAfter) {
           throw maxRetryAfterError(interval, { cause: ex });
         }
       } else {
-        interval = new Function('interval', `return Math.ceil(${ options.retry.backoffStrategy });`)(interval);
+        interval = new Function('interval', `return Math.ceil(${ retry.backoffStrategy });`)(interval);
       }
 
-      options.retry.attempts--;
-      options.retry.interval = interval;
+      retry.attempts--;
+      retry.interval = interval;
 
       return setTimeoutPromise(interval).then(() => rekwest(url, options));
     }