rekwest 2.2.0 → 2.3.3

package/README.md

@@ -85,7 +85,7 @@ const file = new File(['bits'], 'file.dab');
 const readable = Readable.from('bits');
 
 const fd = new FormData({
-  aux: Date.now(),  // or [[key, value]]
+  aux: Date.now(),  // either [[key, value]], or kv sequenceable
 });
 
 fd.append('celestial', 'payload');

package/dist/formdata.js

@@ -17,6 +17,7 @@ var _mediatypes = require("./mediatypes.mjs");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const CRLF = '\r\n';
 const {
   HTTP2_HEADER_CONTENT_DISPOSITION,
   HTTP2_HEADER_CONTENT_TYPE
@@ -26,11 +27,11 @@ class FormData {
   static actuate(fd) {
     const boundary = (0, _crypto.randomBytes)(24).toString('hex');
     const contentType = `${_mediatypes.MULTIPART_FORM_DATA}; boundary=${boundary}`;
-    const prefix = `--${boundary}\r\n${HTTP2_HEADER_CONTENT_DISPOSITION}: form-data`;
+    const prefix = `--${boundary}${CRLF}${HTTP2_HEADER_CONTENT_DISPOSITION}: form-data`;
 
     const escape = str => str.replace(/\n/g, '%0A').replace(/\r/g, '%0D').replace(/"/g, '%22');
 
-    const normalize = value => value.replace(/\r?\n|\r/g, '\r\n');
+    const normalize = value => value.replace(/\r?\n|\r/g, CRLF);
 
     return {
       contentType,
@@ -40,11 +41,11 @@ class FormData {
 
         for (const [name, value] of fd) {
           if (value.constructor === String) {
-            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"\r\n\r\n${normalize(value)}\r\n`);
+            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${CRLF.repeat(2)}${normalize(value)}${CRLF}`);
           } else {
-            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${value.name ? `; filename="${escape(value.name)}"` : ''}\r\n${HTTP2_HEADER_CONTENT_TYPE}: ${value.type || _mediatypes.APPLICATION_OCTET_STREAM}\r\n\r\n`);
+            yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${value.name ? `; filename="${escape(value.name)}"` : ''}${CRLF}${HTTP2_HEADER_CONTENT_TYPE}: ${value.type || _mediatypes.APPLICATION_OCTET_STREAM}${CRLF.repeat(2)}`);
             yield* (0, _helpers.tap)(value);
-            yield encoder.encode('\r\n');
+            yield encoder.encode(CRLF);
           }
         }
 
@@ -87,11 +88,17 @@ class FormData {
   }
 
   constructor(input) {
-    if (input !== undefined && ![Array, Object].includes(input?.constructor)) {
-      throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': parameter 1 is not of type 'Array' or 'Object'.`);
-    } else {
-      if (Array.isArray(input) && !input.every(it => Array.isArray(it) && it.length === 2)) {
-        throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': The provided value cannot be converted to a sequence.`);
+    if (input === Object(input) && (input?.constructor === Object || Reflect.has(input, Symbol.iterator))) {
+      if (input.constructor !== Object) {
+        input = Array.from(input);
+      }
+
+      if (Array.isArray(input)) {
+        if (!input.every(it => Array.isArray(it))) {
+          throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': The provided value cannot be converted to a sequence.`);
+        } else if (!input.every(it => it.length === 2)) {
+          throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': Sequence initializer must only contain pair elements.`);
+        }
       }
 
       if (input.constructor === Object) {

package/dist/helpers.js

@@ -51,7 +51,7 @@ const inflate = (0, _util.promisify)(_zlib.default.inflate);
 const compress = (buf, encoding, {
   async = false
 } = {}) => {
-  encoding &&= encoding.match(/\bbr\b|\bdeflate\b|\bgzip\b/i)?.[0].toLowerCase();
+  encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const compressor = {
     br: async ? brotliCompress : _zlib.default.brotliCompressSync,
     deflate: async ? deflate : _zlib.default.deflateSync,
@@ -65,7 +65,7 @@ exports.compress = compress;
 const decompress = (buf, encoding, {
   async = false
 } = {}) => {
-  encoding &&= encoding.match(/\bbr\b|\bdeflate\b|\bgzip\b/i)?.[0].toLowerCase();
+  encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const decompressor = {
     br: async ? brotliDecompress : _zlib.default.brotliDecompressSync,
     deflate: async ? inflate : _zlib.default.inflateSync,
@@ -200,13 +200,12 @@ const premix = (res, {
       arrayBuffer: {
         enumerable: true,
         value: async function () {
-          const stash = parse;
-          parse = false;
+          parse &&= false;
           const {
             buffer,
             byteLength,
             byteOffset
-          } = await this.body().finally(() => parse = stash);
+          } = await this.body();
           return buffer.slice(byteOffset, byteOffset + byteLength);
         }
       },
@@ -258,12 +257,12 @@ const premix = (res, {
 
         if (spool.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';
+          const charset = contentType.split(';').find(it => /charset=/i.test(it))?.toLowerCase().replace('charset=', '').replace('iso-8859-1', 'latin1').trim() || 'utf-8';
 
-          if (/json/i.test(contentType)) {
+          if (/\bjson\b/i.test(contentType)) {
             spool = JSON.parse(spool.toString(charset));
-          } else if (/text|xml/i.test(contentType)) {
-            if (/latin1|utf-(8|16le)|ucs-2/.test(charset)) {
+          } else if (/\b(text|xml)\b/i.test(contentType)) {
+            if (/\b(latin1|ucs-2|utf-(8|16le))\b/.test(charset)) {
               spool = spool.toString(charset);
             } else {
               spool = new TextDecoder(charset).decode(spool);

package/package.json

@@ -8,14 +8,14 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/eslint-parser": "^7.16.3",
-    "@babel/preset-env": "^7.16.4",
-    "c8": "^7.10.0",
-    "eslint": "^8.3.0",
-    "eslint-config-ultra-refined": "^2.2.0",
-    "mocha": "^9.1.3"
+    "@babel/cli": "^7.16.8",
+    "@babel/core": "^7.16.12",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/preset-env": "^7.16.11",
+    "c8": "^7.11.0",
+    "eslint": "^8.7.0",
+    "eslint-config-ultra-refined": "^2.3.0",
+    "mocha": "^9.2.0"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -33,9 +33,13 @@
   "keywords": [
     "fetch",
     "fetch-alike",
+    "formdata",
     "http",
     "https",
+    "h2",
+    "h2c",
     "http2",
+    "multipart",
     "request"
   ],
   "license": "MIT",
@@ -55,5 +59,5 @@
     "test": "mocha --exit --recursive",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "2.2.0"
+  "version": "2.3.3"
 }

package/src/formdata.mjs

@@ -8,6 +8,7 @@ import {
   MULTIPART_FORM_DATA,
 } from './mediatypes.mjs';
 
+const CRLF = '\r\n';
 const {
   HTTP2_HEADER_CONTENT_DISPOSITION,
   HTTP2_HEADER_CONTENT_TYPE,
@@ -18,10 +19,10 @@ export class FormData {
   static actuate(fd) {
     const boundary = randomBytes(24).toString('hex');
     const contentType = `${ MULTIPART_FORM_DATA }; boundary=${ boundary }`;
-    const prefix = `--${ boundary }\r\n${ HTTP2_HEADER_CONTENT_DISPOSITION }: form-data`;
+    const prefix = `--${ boundary }${ CRLF }${ HTTP2_HEADER_CONTENT_DISPOSITION }: form-data`;
 
     const escape = (str) => str.replace(/\n/g, '%0A').replace(/\r/g, '%0D').replace(/"/g, '%22');
-    const normalize = (value) => value.replace(/\r?\n|\r/g, '\r\n');
+    const normalize = (value) => value.replace(/\r?\n|\r/g, CRLF);
 
     return {
       contentType,
@@ -32,17 +33,17 @@ export class FormData {
           if (value.constructor === String) {
             yield encoder.encode(`${ prefix }; name="${
               escape(normalize(name))
-            }"\r\n\r\n${ normalize(value) }\r\n`);
+            }"${ CRLF.repeat(2) }${ normalize(value) }${ CRLF }`);
           } else {
             yield encoder.encode(`${ prefix }; name="${
               escape(normalize(name))
-            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }\r\n${
+            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
               HTTP2_HEADER_CONTENT_TYPE
             }: ${
               value.type || APPLICATION_OCTET_STREAM
-            }\r\n\r\n`);
+            }${ CRLF.repeat(2) }`);
             yield* tap(value);
-            yield encoder.encode('\r\n');
+            yield encoder.encode(CRLF);
           }
         }
 
@@ -84,18 +85,23 @@ export class FormData {
   }
 
   constructor(input) {
-    if (input !== undefined && ![
-      Array,
-      Object,
-    ].includes(input?.constructor)) {
-      throw new TypeError(`Failed to construct '${
-        this[Symbol.toStringTag]
-      }': parameter 1 is not of type 'Array' or 'Object'.`);
-    } else {
-      if (Array.isArray(input) && !input.every((it) => Array.isArray(it) && it.length === 2)) {
-        throw new TypeError(`Failed to construct '${
-          this[Symbol.toStringTag]
-        }': The provided value cannot be converted to a sequence.`);
+    if (input === Object(input)
+      && (input?.constructor === Object || Reflect.has(input, Symbol.iterator))) {
+
+      if (input.constructor !== Object) {
+        input = Array.from(input);
+      }
+
+      if (Array.isArray(input)) {
+        if (!input.every((it) => Array.isArray(it))) {
+          throw new TypeError(`Failed to construct '${
+            this[Symbol.toStringTag]
+          }': The provided value cannot be converted to a sequence.`);
+        } else if (!input.every((it) => it.length === 2)) {
+          throw new TypeError(`Failed to construct '${
+            this[Symbol.toStringTag]
+          }': Sequence initializer must only contain pair elements.`);
+        }
       }
 
       if (input.constructor === Object) {

package/src/helpers.mjs

@@ -44,7 +44,7 @@ const deflate = promisify(zlib.deflate);
 const inflate = promisify(zlib.inflate);
 
 export const compress = (buf, encoding, { async = false } = {}) => {
-  encoding &&= encoding.match(/\bbr\b|\bdeflate\b|\bgzip\b/i)?.[0].toLowerCase();
+  encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const compressor = {
     br: async ? brotliCompress : zlib.brotliCompressSync,
     deflate: async ? deflate : zlib.deflateSync,
@@ -55,7 +55,7 @@ export const compress = (buf, encoding, { async = false } = {}) => {
 };
 
 export const decompress = (buf, encoding, { async = false } = {}) => {
-  encoding &&= encoding.match(/\bbr\b|\bdeflate\b|\bgzip\b/i)?.[0].toLowerCase();
+  encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const decompressor = {
     br: async ? brotliDecompress : zlib.brotliDecompressSync,
     deflate: async ? inflate : zlib.inflateSync,
@@ -183,10 +183,8 @@ export const premix = (res, { digest = false, parse = false } = {}) => {
       arrayBuffer: {
         enumerable: true,
         value: async function () {
-          const stash = parse;
-
-          parse = false;
-          const { buffer, byteLength, byteOffset } = await this.body().finally(() => parse = stash);
+          parse &&= false;
+          const { buffer, byteLength, byteOffset } = await this.body();
 
           return buffer.slice(byteOffset, byteOffset + byteLength);
         },
@@ -243,14 +241,14 @@ export const premix = (res, { digest = false, parse = false } = {}) => {
           const charset = contentType.split(';')
                                      .find((it) => /charset=/i.test(it))
                                      ?.toLowerCase()
-                                     ?.replace('charset=', '')
-                                     ?.replace('iso-8859-1', 'latin1')
-                                     ?.trim() || 'utf-8';
+                                     .replace('charset=', '')
+                                     .replace('iso-8859-1', 'latin1')
+                                     .trim() || 'utf-8';
 
-          if (/json/i.test(contentType)) {
+          if (/\bjson\b/i.test(contentType)) {
             spool = JSON.parse(spool.toString(charset));
-          } else if (/text|xml/i.test(contentType)) {
-            if (/latin1|utf-(8|16le)|ucs-2/.test(charset)) {
+          } else if (/\b(text|xml)\b/i.test(contentType)) {
+            if (/\b(latin1|ucs-2|utf-(8|16le))\b/.test(charset)) {
               spool = spool.toString(charset);
             } else {
               spool = new TextDecoder(charset).decode(spool);