rekwest 5.2.8 → 5.3.1

package/README.md

@@ -161,6 +161,7 @@ console.log(res.body);
     * `arrayBuffer` **{AsyncFunction}** Reads the response and returns **ArrayBuffer**
     * `blob` **{AsyncFunction}** Reads the response and returns **Blob**
     * `body` **{AsyncFunction}** Reads the response and returns **Buffer** if `parse: false`
+    * `bytes` **{AsyncFunction}** Reads the response and returns **Uint8Array**
     * `json` **{AsyncFunction}** Reads the response and returns **Object**
     * `text` **{AsyncFunction}** Reads the response and returns **String**
   * `bodyUsed` **{boolean}** Indicates whether the response were read or not

package/dist/mixin.js

@@ -39,6 +39,13 @@ const mixin = (res, {
           return new _nodeBuffer.Blob([val]);
         }
       },
+      bytes: {
+        enumerable: true,
+        value: async function () {
+          (0, _utils.brandCheck)(this, res?.constructor);
+          return new Uint8Array(await this.arrayBuffer());
+        }
+      },
       json: {
         enumerable: true,
         value: async function () {

package/package.json

@@ -8,15 +8,15 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.9",
-    "@babel/core": "^7.25.9",
+    "@babel/cli": "^7.26.4",
+    "@babel/core": "^7.26.0",
     "@babel/eslint-parser": "^7.25.9",
-    "@babel/preset-env": "^7.25.9",
-    "@stylistic/eslint-plugin-js": "^2.9.0",
-    "c8": "^10.1.2",
-    "eslint": "^9.13.0",
-    "eslint-config-ultra-refined": "^3.2.7",
-    "mocha": "^10.7.3"
+    "@babel/preset-env": "^7.26.0",
+    "@stylistic/eslint-plugin-js": "^2.12.1",
+    "c8": "^10.1.3",
+    "eslint": "^9.17.0",
+    "eslint-config-ultra-refined": "^3.3.1",
+    "mocha": "^11.0.1"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -70,5 +70,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "5.2.8"
+  "version": "5.3.1"
 }

package/src/formdata.mjs

@@ -1,244 +1,246 @@
-import { File } from 'node:buffer';
-import { randomBytes } from 'node:crypto';
-import http2 from 'node:http2';
-import { toUSVString } from 'node:util';
-import {
-  APPLICATION_OCTET_STREAM,
-  MULTIPART_FORM_DATA,
-} from './mediatypes.mjs';
-import {
-  brandCheck,
-  isFileLike,
-  tap,
-} from './utils.mjs';
-
-const CRLF = '\r\n';
-const {
-  HTTP2_HEADER_CONTENT_DISPOSITION,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export class FormData {
-
-  static actuate(fd) {
-    const boundary = randomBytes(24).toString('hex');
-    const contentType = `${ MULTIPART_FORM_DATA }; boundary=${ boundary }`;
-    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 redress = (str) => str.replace(/\r?\n|\r/g, CRLF);
-
-    return {
-      contentType,
-      async* [Symbol.asyncIterator]() {
-        const encoder = new TextEncoder();
-
-        for (const [name, value] of fd) {
-          if (value.constructor === String) {
-            yield encoder.encode(`${ prefix }; name="${
-              escape(redress(name))
-            }"${ CRLF.repeat(2) }${ redress(value) }${ CRLF }`);
-          } else {
-            yield encoder.encode(`${ prefix }; name="${
-              escape(redress(name))
-            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
-              HTTP2_HEADER_CONTENT_TYPE
-            }: ${
-              value.type || APPLICATION_OCTET_STREAM
-            }${ CRLF.repeat(2) }`);
-            yield* tap(value);
-            yield new Uint8Array([
-              13,
-              10,
-            ]);
-          }
-        }
-
-        yield encoder.encode(`--${ boundary }--`);
-      },
-    };
-  }
-
-  static alike(instance) {
-    return FormData.name === instance?.[Symbol.toStringTag];
-  }
-
-  static #enfoldEntry(name, value, filename) {
-    name = toUSVString(name);
-    filename &&= toUSVString(filename);
-
-    if (isFileLike(value)) {
-      filename ??= value.name || 'blob';
-      value = new File([value], filename, value);
-    } else if (this.#ensureInstance(value)) {
-      value.name = filename;
-    } else {
-      value = toUSVString(value);
-    }
-
-    return {
-      name,
-      value,
-    };
-  }
-
-  static #ensureInstance(value) {
-    return isFileLike(value) || (value === Object(value) && Reflect.has(value, Symbol.asyncIterator));
-  }
-
-  #entries = [];
-
-  get [Symbol.toStringTag]() {
-    return this.constructor.name;
-  }
-
-  constructor(input) {
-    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) {
-        input = Object.entries(input);
-      }
-
-      for (const [key, value] of input) { this.append(key, value); }
-    }
-  }
-
-  #ensureArgs(args, expected, method) {
-    if (args.length < expected) {
-      throw new TypeError(`Failed to execute '${ method }' on '${
-        this[Symbol.toStringTag]
-      }': ${ expected } arguments required, but only ${ args.length } present.`);
-    }
-
-    if ([
-      'append',
-      'set',
-    ].includes(method)) {
-      if (args.length === 3 && !this.constructor.#ensureInstance(args[1])) {
-        throw new TypeError(`Failed to execute '${ method }' on '${
-          this[Symbol.toStringTag]
-        }': parameter ${ expected } is not of type 'Blob'.`);
-      }
-    }
-
-    if (method === 'forEach') {
-      if (args[0]?.constructor !== Function) {
-        throw new TypeError(`Failed to execute '${ method }' on '${
-          this[Symbol.toStringTag]
-        }': parameter ${ expected } is not of type 'Function'.`);
-      }
-    }
-  }
-
-  append(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 2, 'append');
-    this.#entries.push(this.constructor.#enfoldEntry(...args));
-  }
-
-  delete(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'delete');
-    const name = toUSVString(args[0]);
-
-    this.#entries = this.#entries.filter((it) => it.name !== name);
-  }
-
-  forEach(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'forEach');
-    const [callback, thisArg] = args;
-
-    for (const entry of this) {
-      Reflect.apply(callback, thisArg, [
-        ...entry.reverse(),
-        this,
-      ]);
-    }
-  }
-
-  get(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'get');
-    const name = toUSVString(args[0]);
-
-    return (this.#entries.find((it) => it.name === name) ?? {}).value ?? null;
-  }
-
-  getAll(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'getAll');
-    const name = toUSVString(args[0]);
-
-    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
-  }
-
-  has(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'has');
-    const name = toUSVString(args[0]);
-
-    return !!this.#entries.find((it) => it.name === name);
-  }
-
-  set(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 2, 'set');
-    const entry = this.constructor.#enfoldEntry(...args);
-    const idx = this.#entries.findIndex((it) => it.name === entry.name);
-
-    if (idx !== -1) {
-      this.#entries.splice(idx, 1, entry);
-    } else {
-      this.#entries.push(entry);
-    }
-  }
-
-  * entries() {
-    brandCheck(this, FormData);
-    for (const { name, value } of this.#entries) {
-      yield [
-        name,
-        value,
-      ];
-    }
-  }
-
-  * keys() {
-    brandCheck(this, FormData);
-    for (const [name] of this) {
-      yield name;
-    }
-  }
-
-  * values() {
-    brandCheck(this, FormData);
-    for (const [, value] of this) {
-      yield value;
-    }
-  }
-
-  [Symbol.iterator]() {
-    brandCheck(this, FormData);
-
-    return this.entries();
-  }
-
-}
+import { File } from 'node:buffer';
+import { randomBytes } from 'node:crypto';
+import http2 from 'node:http2';
+import { toUSVString } from 'node:util';
+import {
+  APPLICATION_OCTET_STREAM,
+  MULTIPART_FORM_DATA,
+} from './mediatypes.mjs';
+import {
+  brandCheck,
+  isFileLike,
+  tap,
+} from './utils.mjs';
+
+const CRLF = '\r\n';
+const {
+  HTTP2_HEADER_CONTENT_DISPOSITION,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export class FormData {
+
+  static actuate(fd) {
+    const boundary = randomBytes(24).toString('hex');
+    const contentType = `${ MULTIPART_FORM_DATA }; boundary=${ boundary }`;
+    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 redress = (str) => str.replace(/\r?\n|\r/g, CRLF);
+
+    return {
+      contentType,
+      async* [Symbol.asyncIterator]() {
+        const encoder = new TextEncoder();
+
+        for (const [name, value] of fd) {
+          if (value.constructor === String) {
+            yield encoder.encode(`${ prefix }; name="${
+              escape(redress(name))
+            }"${ CRLF.repeat(2) }${ redress(value) }${ CRLF }`);
+          } else {
+            yield encoder.encode(`${ prefix }; name="${
+              escape(redress(name))
+            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
+              HTTP2_HEADER_CONTENT_TYPE
+            }: ${
+              value.type || APPLICATION_OCTET_STREAM
+            }${ CRLF.repeat(2) }`);
+            yield* tap(value);
+            yield new Uint8Array([
+              13,
+              10,
+            ]);
+          }
+        }
+
+        yield encoder.encode(`--${ boundary }--`);
+      },
+    };
+  }
+
+  static alike(instance) {
+    return FormData.name === instance?.[Symbol.toStringTag];
+  }
+
+  static #enfoldEntry(name, value, filename) {
+    name = toUSVString(name);
+    filename &&= toUSVString(filename);
+
+    if (isFileLike(value)) {
+      filename ??= value.name || 'blob';
+      value = new File([value], filename, value);
+    } else if (this.#ensureInstance(value)) {
+      value.name = filename;
+    } else {
+      value = toUSVString(value);
+    }
+
+    return {
+      name,
+      value,
+    };
+  }
+
+  static #ensureInstance(value) {
+    return isFileLike(value) || (value === Object(value) && Reflect.has(value, Symbol.asyncIterator));
+  }
+
+  #entries = [];
+
+  get [Symbol.toStringTag]() {
+    return this.constructor.name;
+  }
+
+  constructor(input) {
+    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) {
+        input = Object.entries(input);
+      }
+
+      for (const [key, value] of input) {
+        this.append(key, value);
+      }
+    }
+  }
+
+  #ensureArgs(args, expected, method) {
+    if (args.length < expected) {
+      throw new TypeError(`Failed to execute '${ method }' on '${
+        this[Symbol.toStringTag]
+      }': ${ expected } arguments required, but only ${ args.length } present.`);
+    }
+
+    if ([
+      'append',
+      'set',
+    ].includes(method)) {
+      if (args.length === 3 && !this.constructor.#ensureInstance(args[1])) {
+        throw new TypeError(`Failed to execute '${ method }' on '${
+          this[Symbol.toStringTag]
+        }': parameter ${ expected } is not of type 'Blob'.`);
+      }
+    }
+
+    if (method === 'forEach') {
+      if (args[0]?.constructor !== Function) {
+        throw new TypeError(`Failed to execute '${ method }' on '${
+          this[Symbol.toStringTag]
+        }': parameter ${ expected } is not of type 'Function'.`);
+      }
+    }
+  }
+
+  append(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 2, 'append');
+    this.#entries.push(this.constructor.#enfoldEntry(...args));
+  }
+
+  delete(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'delete');
+    const name = toUSVString(args[0]);
+
+    this.#entries = this.#entries.filter((it) => it.name !== name);
+  }
+
+  forEach(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'forEach');
+    const [callback, thisArg] = args;
+
+    for (const entry of this) {
+      Reflect.apply(callback, thisArg, [
+        ...entry.reverse(),
+        this,
+      ]);
+    }
+  }
+
+  get(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'get');
+    const name = toUSVString(args[0]);
+
+    return (this.#entries.find((it) => it.name === name) ?? {}).value ?? null;
+  }
+
+  getAll(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'getAll');
+    const name = toUSVString(args[0]);
+
+    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
+  }
+
+  has(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'has');
+    const name = toUSVString(args[0]);
+
+    return !!this.#entries.find((it) => it.name === name);
+  }
+
+  set(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 2, 'set');
+    const entry = this.constructor.#enfoldEntry(...args);
+    const idx = this.#entries.findIndex((it) => it.name === entry.name);
+
+    if (idx !== -1) {
+      this.#entries.splice(idx, 1, entry);
+    } else {
+      this.#entries.push(entry);
+    }
+  }
+
+  * entries() {
+    brandCheck(this, FormData);
+    for (const { name, value } of this.#entries) {
+      yield [
+        name,
+        value,
+      ];
+    }
+  }
+
+  * keys() {
+    brandCheck(this, FormData);
+    for (const [name] of this) {
+      yield name;
+    }
+  }
+
+  * values() {
+    brandCheck(this, FormData);
+    for (const [, value] of this) {
+      yield value;
+    }
+  }
+
+  [Symbol.iterator]() {
+    brandCheck(this, FormData);
+
+    return this.entries();
+  }
+
+}

package/src/mixin.mjs

@@ -32,6 +32,14 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
           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 () {