rekwest 3.0.0 → 3.1.1

package/README.md

@@ -121,11 +121,11 @@ 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 just add a mixin
+  * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or simply add a mixin
   * `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

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

@@ -81,7 +81,6 @@ const {
   HTTP2_HEADER_LOCATION,
   HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_SET_COOKIE,
-  HTTP2_HEADER_STATUS,
   HTTP2_METHOD_GET,
   HTTP2_METHOD_HEAD,
   HTTP_STATUS_BAD_REQUEST,
@@ -257,26 +256,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

@@ -60,5 +60,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "3.0.0"
+  "version": "3.1.1"
 }

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

@@ -32,7 +32,6 @@ const {
   HTTP2_HEADER_LOCATION,
   HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_SET_COOKIE,
-  HTTP2_HEADER_STATUS,
   HTTP2_METHOD_GET,
   HTTP2_METHOD_HEAD,
   HTTP_STATUS_BAD_REQUEST,
@@ -206,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));
     }