rekwest 6.1.0 → 6.2.0

package/README.md

@@ -120,7 +120,8 @@ console.log(res.body);
   & [http2.ClientSessionRequestOptions](https://nodejs.org/api/http2.html#clienthttp2sessionrequestheaders-options)
   and [tls.ConnectionOptions](https://nodejs.org/api/tls.html#tlsconnectoptions-callback)
   for HTTP/2 attunes
-  * `compression` **{Object}** Configures compression options
+  * `compression` **{Object}** Configures compression options, e.g.: `brotliOptions`, `zstdOptions`,
+    `zlibOptions`
   * `baseURL` **{string | URL}** The base URL to use in cases where `url` is a relative URL
   * `body` **{string | Array | ArrayBuffer | ArrayBufferView | AsyncIterator | Blob | Buffer | DataView | File |
     FormData | Iterator | Object | Readable | ReadableStream | SharedArrayBuffer | URLSearchParams}** The body to send
@@ -131,6 +132,8 @@ console.log(res.body);
   * `cookiesTTL` **{boolean}** `Default: false` Controls enablement of TTL for the cookies cache
   * `credentials` **{include | omit | same-origin}** `Default: same-origin` Controls credentials in case of cross-origin
     redirects
+  * `decompression` **{Object}** Configures decompression options, e.g.: `brotliOptions`, `zstdOptions`,
+    `zlibOptions`
   * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or add a mixin
   * `follow` **{number}** `Default: 20` The number of redirects to follow
   * `h2` **{boolean}** `Default: false` Forces the use of HTTP/2 protocol

package/dist/config.js

@@ -30,13 +30,13 @@ const defaults = {
     },
     zstdOptions: {
       params: {
-        [_nodeZlib.default.constants.ZSTD_c_compressionLevel]: 6,
-        [_nodeZlib.default.constants.ZSTD_d_windowLogMax]: 0
+        [_nodeZlib.default.constants.ZSTD_c_compressionLevel]: 6
       }
     }
   },
   cookiesTTL: false,
   credentials: _constants.requestCredentials.sameOrigin,
+  decompression: {},
   digest: true,
   follow: 20,
   h2: false,

package/dist/mixin.js

@@ -13,7 +13,7 @@ const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp.default.constants;
 const mixin = (res, {
-  compression,
+  decompression,
   digest = false,
   parse = false
 } = {}) => {
@@ -75,7 +75,7 @@ const mixin = (res, {
         }
         let body = [];
         for await (const chunk of (0, _utils.decompress)(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], {
-          compression
+          decompression
         })) {
           body.push(chunk);
         }

package/dist/utils.js

@@ -96,21 +96,21 @@ const copyWithMerge = (target, ...rest) => {
 };
 exports.copyWithMerge = copyWithMerge;
 const decompress = (readable, encodings = '', {
-  compression
+  decompression
 } = {}) => {
   const decoders = [];
   encodings = unwind(encodings);
   for (const encoding of encodings) {
     if (/\bbr\b/i.test(encoding)) {
-      decoders.push(_nodeZlib.default.createBrotliDecompress(compression?.brotliOptions));
+      decoders.push(_nodeZlib.default.createBrotliDecompress(decompression?.brotliOptions));
     } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
-      decoders.push(_nodeZlib.default.createInflate(compression?.zlibOptions));
+      decoders.push(_nodeZlib.default.createInflate(decompression?.zlibOptions));
     } else if (/\bdeflate-raw\b/i.test(encoding)) {
-      decoders.push(_nodeZlib.default.createInflateRaw(compression?.zlibOptions));
+      decoders.push(_nodeZlib.default.createInflateRaw(decompression?.zlibOptions));
     } else if (/\bgzip\b/i.test(encoding)) {
-      decoders.push(_nodeZlib.default.createGunzip(compression?.zlibOptions));
+      decoders.push(_nodeZlib.default.createGunzip(decompression?.zlibOptions));
     } else if (_config.isZstdSupported && /\bzstd\b/i.test(encoding)) {
-      decoders.push(_nodeZlib.default.createZstdDecompress(compression?.zstdOptions));
+      decoders.push(_nodeZlib.default.createZstdDecompress(decompression?.zstdOptions));
     } else {
       return readable;
     }

package/package.json

@@ -71,5 +71,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "6.1.0"
+  "version": "6.2.0"
 }

package/src/config.mjs

@@ -34,12 +34,12 @@ const defaults = {
     zstdOptions: {
       params: {
         [zlib.constants.ZSTD_c_compressionLevel]: 6,
-        [zlib.constants.ZSTD_d_windowLogMax]: 0,
       },
     },
   },
   cookiesTTL: false,
   credentials: requestCredentials.sameOrigin,
+  decompression: {},
   digest: true,
   follow: 20,
   h2: false,

package/src/mixin.mjs

@@ -1,117 +1,117 @@
-import { Blob } from 'node:buffer';
-import http2 from 'node:http2';
-import {
-  brandCheck,
-  decompress,
-} from './utils.mjs';
-
-const {
-  HTTP2_HEADER_CONTENT_ENCODING,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export const mixin = (res, { compression, digest = false, parse = false } = {}) => {
-  if (!digest) {
-    Object.defineProperties(res, {
-      arrayBuffer: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          parse &&= false;
-          const { buffer, byteLength, byteOffset } = await this.body();
-
-          return buffer.slice(byteOffset, byteOffset + byteLength);
-        },
-      },
-      blob: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.arrayBuffer();
-
-          return new Blob([val]);
-        },
-      },
-      bytes: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-
-          return new Uint8Array(await this.arrayBuffer());
-        },
-      },
-      json: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.text();
-
-          return JSON.parse(val);
-        },
-      },
-      text: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const blob = await this.blob();
-
-          return blob.text();
-        },
-      },
-    });
-  }
-
-  return Object.defineProperties(res, {
-    body: {
-      enumerable: true,
-      value: async function () {
-        brandCheck(this, res?.constructor);
-
-        if (this.bodyUsed) {
-          throw new TypeError('Response stream already read');
-        }
-
-        let body = [];
-
-        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], { compression })) {
-          body.push(chunk);
-        }
-
-        body = Buffer.concat(body);
-
-        if (!body.length && parse) {
-          return null;
-        }
-
-        if (body.length && parse) {
-          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          const charset = contentType.split(';')
-                                     .find((it) => /charset=/i.test(it))
-                                     ?.toLowerCase()
-                                     .replace('charset=', '')
-                                     .replace('iso-8859-1', 'latin1')
-                                     .trim() || 'utf-8';
-
-          if (/\bjson\b/i.test(contentType)) {
-            body = JSON.parse(body.toString(charset));
-          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
-            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
-              body = body.toString(charset);
-            } else {
-              body = new TextDecoder(charset).decode(body);
-            }
-          }
-        }
-
-        return body;
-      },
-      writable: true,
-    },
-    bodyUsed: {
-      enumerable: true,
-      get() {
-        return this.readableEnded;
-      },
-    },
-  });
-};
+import { Blob } from 'node:buffer';
+import http2 from 'node:http2';
+import {
+  brandCheck,
+  decompress,
+} from './utils.mjs';
+
+const {
+  HTTP2_HEADER_CONTENT_ENCODING,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export const mixin = (res, { decompression, digest = false, parse = false } = {}) => {
+  if (!digest) {
+    Object.defineProperties(res, {
+      arrayBuffer: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          parse &&= false;
+          const { buffer, byteLength, byteOffset } = await this.body();
+
+          return buffer.slice(byteOffset, byteOffset + byteLength);
+        },
+      },
+      blob: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.arrayBuffer();
+
+          return new Blob([val]);
+        },
+      },
+      bytes: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+
+          return new Uint8Array(await this.arrayBuffer());
+        },
+      },
+      json: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.text();
+
+          return JSON.parse(val);
+        },
+      },
+      text: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const blob = await this.blob();
+
+          return blob.text();
+        },
+      },
+    });
+  }
+
+  return Object.defineProperties(res, {
+    body: {
+      enumerable: true,
+      value: async function () {
+        brandCheck(this, res?.constructor);
+
+        if (this.bodyUsed) {
+          throw new TypeError('Response stream already read');
+        }
+
+        let body = [];
+
+        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], { decompression })) {
+          body.push(chunk);
+        }
+
+        body = Buffer.concat(body);
+
+        if (!body.length && parse) {
+          return null;
+        }
+
+        if (body.length && parse) {
+          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
+          const charset = contentType.split(';')
+                                     .find((it) => /charset=/i.test(it))
+                                     ?.toLowerCase()
+                                     .replace('charset=', '')
+                                     .replace('iso-8859-1', 'latin1')
+                                     .trim() || 'utf-8';
+
+          if (/\bjson\b/i.test(contentType)) {
+            body = JSON.parse(body.toString(charset));
+          } else if (/\b(?:text|xml)\b/i.test(contentType)) {
+            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
+              body = body.toString(charset);
+            } else {
+              body = new TextDecoder(charset).decode(body);
+            }
+          }
+        }
+
+        return body;
+      },
+      writable: true,
+    },
+    bodyUsed: {
+      enumerable: true,
+      get() {
+        return this.readableEnded;
+      },
+    },
+  });
+};

package/src/utils.mjs

@@ -98,22 +98,22 @@ export const copyWithMerge = (target, ...rest) => {
   return merge(target, ...rest);
 };
 
-export const decompress = (readable, encodings = '', { compression } = {}) => {
+export const decompress = (readable, encodings = '', { decompression } = {}) => {
   const decoders = [];
 
   encodings = unwind(encodings);
 
   for (const encoding of encodings) {
     if (/\bbr\b/i.test(encoding)) {
-      decoders.push(zlib.createBrotliDecompress(compression?.brotliOptions));
+      decoders.push(zlib.createBrotliDecompress(decompression?.brotliOptions));
     } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
-      decoders.push(zlib.createInflate(compression?.zlibOptions));
+      decoders.push(zlib.createInflate(decompression?.zlibOptions));
     } else if (/\bdeflate-raw\b/i.test(encoding)) {
-      decoders.push(zlib.createInflateRaw(compression?.zlibOptions));
+      decoders.push(zlib.createInflateRaw(decompression?.zlibOptions));
     } else if (/\bgzip\b/i.test(encoding)) {
-      decoders.push(zlib.createGunzip(compression?.zlibOptions));
+      decoders.push(zlib.createGunzip(decompression?.zlibOptions));
     } else if (isZstdSupported && /\bzstd\b/i.test(encoding)) {
-      decoders.push(zlib.createZstdDecompress(compression?.zstdOptions));
+      decoders.push(zlib.createZstdDecompress(decompression?.zstdOptions));
     } else {
       return readable;
     }