rekwest 8.0.0 → 8.1.0

package/src/formdata.js

@@ -1,229 +1,229 @@
-import { randomBytes } from 'node:crypto';
-import http2 from 'node:http2';
-import {
-  APPLICATION_OCTET_STREAM,
-  MULTIPART_FORM_DATA,
-} from './mediatypes.js';
-import {
-  brandCheck,
-  isBlobLike,
-  isPipeStream,
-  isReadableStream,
-  tap,
-} from './utils.js';
-
-const CRLF = '\r\n';
-const {
-  HTTP2_HEADER_CONTENT_DISPOSITION,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export class FormData {
-
-  static #ensureArgs(args, expect, method) {
-    if (args.length < expect) {
-      throw new TypeError(`Failed to execute '${ method }' on '${
-        this[Symbol.toStringTag]
-      }': ${ expect } arguments required, but only ${ args.length } present`);
-    }
-
-    if (method === 'forEach') {
-      if (args[0]?.constructor !== Function) {
-        throw new TypeError(`Failed to execute '${ method }' on '${
-          this[Symbol.toStringTag]
-        }': parameter ${ expect } is not of type 'Function'`);
-      }
-    }
-  }
-
-  static #formEntry(name, value, filename) {
-    name = String(name).toWellFormed();
-    filename &&= String(filename).toWellFormed();
-
-    if (isBlobLike(value)) {
-      filename ??= String(value.name ?? 'blob').toWellFormed();
-      value = new File([value], filename, value);
-    } else if (isPipeStream(value) || isReadableStream(value)) {
-      value.name = filename ?? 'blob';
-    } else {
-      value = String(value).toWellFormed();
-    }
-
-    return {
-      name,
-      value,
-    };
-  }
-
-  #entries = [];
-
-  get [Symbol.toStringTag]() {
-    return this.constructor.name;
-  }
-
-  constructor(input) {
-    if (Object(input) === 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`);
-        }
-
-        if (!input.every((it) => it.length === 2)) {
-          throw new TypeError(`Failed to construct '${
-            this[Symbol.toStringTag]
-          }': Sequence initializer must only contain pair elements`);
-        }
-      } else if (!Reflect.has(input, Symbol.iterator)) {
-        input = Object.entries(input);
-      }
-
-      for (const [key, val] of input) {
-        this.append(key, val);
-      }
-    }
-  }
-
-  append(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 2, this.append.name);
-    this.#entries.push(this.constructor.#formEntry(...args));
-  }
-
-  delete(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 1, this.delete.name);
-    const name = String(args[0]).toWellFormed();
-
-    this.#entries = this.#entries.filter((it) => it.name !== name);
-  }
-
-  forEach(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 1, this.forEach.name);
-    const [callback, thisArg] = args;
-
-    for (const entry of this) {
-      Reflect.apply(callback, thisArg, [
-        ...entry.reverse(),
-        this,
-      ]);
-    }
-  }
-
-  get(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 1, this.get.name);
-    const name = String(args[0]).toWellFormed();
-
-    return this.#entries.find((it) => it.name === name)?.value ?? null;
-  }
-
-  getAll(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 1, this.getAll.name);
-    const name = String(args[0]).toWellFormed();
-
-    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
-  }
-
-  has(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 1, this.has.name);
-    const name = String(args[0]).toWellFormed();
-
-    return !!this.#entries.find((it) => it.name === name);
-  }
-
-  set(...args) {
-    brandCheck(this, FormData);
-    this.constructor.#ensureArgs(args, 2, this.set.name);
-    const entry = this.constructor.#formEntry(...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 [, val] of this) {
-      yield val;
-    }
-  }
-
-  [Symbol.iterator]() {
-    brandCheck(this, FormData);
-
-    return this.entries();
-  }
-
-}
-
-export const fdToAsyncIterable = (fd) => {
-  const boundary = randomBytes(32).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 normalize = (str) => str.replace(/\r?\n|\r/g, CRLF);
-
-  return {
-    contentType,
-    async* [Symbol.asyncIterator]() {
-      const encoder = new TextEncoder();
-
-      for (const [name, val] of fd) {
-        if (val.constructor === String) {
-          yield encoder.encode(`${ prefix }; name="${
-            escape(normalize(name))
-          }"${ CRLF.repeat(2) }${ normalize(val) }${ CRLF }`);
-        } else {
-          yield encoder.encode(`${ prefix }; name="${
-            escape(normalize(name))
-          }"${ val.name ? `; filename="${ escape(val.name) }"` : '' }${ CRLF }${
-            HTTP2_HEADER_CONTENT_TYPE
-          }: ${
-            val.type || APPLICATION_OCTET_STREAM
-          }${ CRLF.repeat(2) }`);
-          yield* tap(val);
-          yield new Uint8Array([
-            13,
-            10,
-          ]);
-        }
-      }
-
-      yield encoder.encode(`--${ boundary }--${ CRLF }`);
-    },
-  };
-};
-
-export const isFormData = (val) => FormData.name === val?.[Symbol.toStringTag];
-
-export const parseFormData = (str) => {
-  const rex = /^-+[^\r\n]+\r?\ncontent-disposition:\s*form-data;\s*name="(?<name>[^"]+)"(?:;\s*filename="(?<filename>[^"]+)")?(?:\r?\n[^\r\n:]+:[^\r\n]*)*\r?\n\r?\n(?<content>.*?)(?=\r?\n-+[^\r\n]+)/gims;
-
-  return [...str.matchAll(rex)].map(({ groups }) => structuredClone(groups));
-};
+import { randomBytes } from 'node:crypto';
+import http2 from 'node:http2';
+import {
+  APPLICATION_OCTET_STREAM,
+  MULTIPART_FORM_DATA,
+} from './mediatypes.js';
+import {
+  brandCheck,
+  isBlobLike,
+  isPipeStream,
+  isReadableStream,
+  tap,
+} from './utils.js';
+
+const CRLF = '\r\n';
+const {
+  HTTP2_HEADER_CONTENT_DISPOSITION,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export class FormData {
+
+  static #ensureArgs(args, expect, method) {
+    if (args.length < expect) {
+      throw new TypeError(`Failed to execute '${ method }' on '${
+        this[Symbol.toStringTag]
+      }': ${ expect } arguments required, but only ${ args.length } present`);
+    }
+
+    if (method === 'forEach') {
+      if (args[0]?.constructor !== Function) {
+        throw new TypeError(`Failed to execute '${ method }' on '${
+          this[Symbol.toStringTag]
+        }': parameter ${ expect } is not of type 'Function'`);
+      }
+    }
+  }
+
+  static #formEntry(name, value, filename) {
+    name = String(name).toWellFormed();
+    filename &&= String(filename).toWellFormed();
+
+    if (isBlobLike(value)) {
+      filename ??= String(value.name ?? 'blob').toWellFormed();
+      value = new File([value], filename, value);
+    } else if (isPipeStream(value) || isReadableStream(value)) {
+      value.name = filename ?? 'blob';
+    } else {
+      value = String(value).toWellFormed();
+    }
+
+    return {
+      name,
+      value,
+    };
+  }
+
+  #entries = [];
+
+  get [Symbol.toStringTag]() {
+    return this.constructor.name;
+  }
+
+  constructor(input) {
+    if (Object(input) === 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`);
+        }
+
+        if (!input.every((it) => it.length === 2)) {
+          throw new TypeError(`Failed to construct '${
+            this[Symbol.toStringTag]
+          }': Sequence initializer must only contain pair elements`);
+        }
+      } else if (!Reflect.has(input, Symbol.iterator)) {
+        input = Object.entries(input);
+      }
+
+      for (const [key, val] of input) {
+        this.append(key, val);
+      }
+    }
+  }
+
+  append(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 2, this.append.name);
+    this.#entries.push(this.constructor.#formEntry(...args));
+  }
+
+  delete(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 1, this.delete.name);
+    const name = String(args[0]).toWellFormed();
+
+    this.#entries = this.#entries.filter((it) => it.name !== name);
+  }
+
+  forEach(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 1, this.forEach.name);
+    const [callback, thisArg] = args;
+
+    for (const entry of this) {
+      Reflect.apply(callback, thisArg, [
+        ...entry.reverse(),
+        this,
+      ]);
+    }
+  }
+
+  get(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 1, this.get.name);
+    const name = String(args[0]).toWellFormed();
+
+    return this.#entries.find((it) => it.name === name)?.value ?? null;
+  }
+
+  getAll(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 1, this.getAll.name);
+    const name = String(args[0]).toWellFormed();
+
+    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
+  }
+
+  has(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 1, this.has.name);
+    const name = String(args[0]).toWellFormed();
+
+    return !!this.#entries.find((it) => it.name === name);
+  }
+
+  set(...args) {
+    brandCheck(this, FormData);
+    this.constructor.#ensureArgs(args, 2, this.set.name);
+    const entry = this.constructor.#formEntry(...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 [, val] of this) {
+      yield val;
+    }
+  }
+
+  [Symbol.iterator]() {
+    brandCheck(this, FormData);
+
+    return this.entries();
+  }
+
+}
+
+export const fdToAsyncIterable = (fd) => {
+  const boundary = randomBytes(32).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 normalize = (str) => str.replace(/\r?\n|\r/g, CRLF);
+
+  return {
+    contentType,
+    async* [Symbol.asyncIterator]() {
+      const encoder = new TextEncoder();
+
+      for (const [name, val] of fd) {
+        if (val.constructor === String) {
+          yield encoder.encode(`${ prefix }; name="${
+            escape(normalize(name))
+          }"${ CRLF.repeat(2) }${ normalize(val) }${ CRLF }`);
+        } else {
+          yield encoder.encode(`${ prefix }; name="${
+            escape(normalize(name))
+          }"${ val.name ? `; filename="${ escape(val.name) }"` : '' }${ CRLF }${
+            HTTP2_HEADER_CONTENT_TYPE
+          }: ${
+            val.type || APPLICATION_OCTET_STREAM
+          }${ CRLF.repeat(2) }`);
+          yield* tap(val);
+          yield new Uint8Array([
+            13,
+            10,
+          ]);
+        }
+      }
+
+      yield encoder.encode(`--${ boundary }--${ CRLF }`);
+    },
+  };
+};
+
+export const isFormData = (val) => FormData.name === val?.[Symbol.toStringTag];
+
+export const parseFormData = (str) => {
+  const rex = /^-+[^\r\n]+\r?\ncontent-disposition:\s*form-data;\s*name="(?<name>[^"]+)"(?:;\s*filename="(?<filename>[^"]+)")?(?:\r?\n[^\r\n:]+:[^\r\n]*)*\r?\n\r?\n(?<content>.*?)(?=\r?\n-+[^\r\n]+)/gims;
+
+  return [...str.matchAll(rex)].map(({ groups }) => structuredClone(groups));
+};

package/src/index.js

@@ -1,83 +1,83 @@
-import http from 'node:http';
-import http2 from 'node:http2';
-import https from 'node:https';
-import config from './config.js';
-import { requestRedirect } from './constants.js';
-import { APPLICATION_OCTET_STREAM } from './mediatypes.js';
-import { preflight } from './preflight.js';
-import { transfer } from './transfer.js';
-import {
-  augment,
-  cloneWith,
-  normalize,
-  snoop,
-} from './utils.js';
-import { validation } from './validation.js';
-
-export { constants } from 'node:http2';
-export * from './ackn.js';
-export * from './codecs.js';
-export * from './constants.js';
-export * from './cookies.js';
-export * from './errors.js';
-export * from './formdata.js';
-export * as mediatypes from './mediatypes.js';
-export * from './mixin.js';
-export * from './utils.js';
-export * from './validation.js';
-
-const {
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export default function rekwest(url, options) {
-  return transfer(validation(normalize(url, options)));
-}
-
-Reflect.defineProperty(rekwest, 'defaults', {
-  enumerable: true,
-  get() { return config.defaults; },
-  set(val) { config.defaults = cloneWith(config.defaults, val); },
-});
-
-Reflect.defineProperty(rekwest, 'extend', {
-  enumerable: true,
-  value(options) {
-    return (url, opts) => rekwest(url, cloneWith(options, opts));
-  },
-});
-
-Reflect.defineProperty(rekwest, 'stream', {
-  enumerable: true,
-  value(url, options) {
-    options = preflight(validation(normalize(url, cloneWith({}, options, {
-      headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
-      redirect: requestRedirect.manual,
-    }))));
-    let client, req;
-
-    if (options.h2) {
-      client = http2.connect(options.url.origin, options);
-      req = client.request(options.headers, options);
-    } else {
-      const { request } = options.url.protocol === 'http:' ? http : https;
-
-      req = request(options.url, options);
-    }
-
-    snoop(client, req, options);
-
-    req.once('response', (res) => {
-      let headers;
-
-      if (options.h2) {
-        headers = res;
-        res = req;
-      }
-
-      augment(res, headers, options);
-    });
-
-    return req;
-  },
-});
+import http from 'node:http';
+import http2 from 'node:http2';
+import https from 'node:https';
+import config from './config.js';
+import { requestRedirect } from './constants.js';
+import { APPLICATION_OCTET_STREAM } from './mediatypes.js';
+import { preflight } from './preflight.js';
+import { transfer } from './transfer.js';
+import {
+  augment,
+  cloneWith,
+  normalize,
+  snoop,
+} from './utils.js';
+import { validation } from './validation.js';
+
+export { constants } from 'node:http2';
+export * from './ackn.js';
+export * from './codecs.js';
+export * from './constants.js';
+export * from './cookies.js';
+export * from './errors.js';
+export * from './formdata.js';
+export * as mediatypes from './mediatypes.js';
+export * from './mixin.js';
+export * from './utils.js';
+export * from './validation.js';
+
+const {
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export default function rekwest(url, options) {
+  return transfer(validation(normalize(url, options)));
+}
+
+Reflect.defineProperty(rekwest, 'defaults', {
+  enumerable: true,
+  get() { return config.defaults; },
+  set(val) { config.defaults = cloneWith(config.defaults, val); },
+});
+
+Reflect.defineProperty(rekwest, 'extend', {
+  enumerable: true,
+  value(options) {
+    return (url, opts) => rekwest(url, cloneWith(options, opts));
+  },
+});
+
+Reflect.defineProperty(rekwest, 'stream', {
+  enumerable: true,
+  value(url, options) {
+    options = preflight(validation(normalize(url, cloneWith({}, options, {
+      headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
+      redirect: requestRedirect.manual,
+    }))));
+    let client, req;
+
+    if (options.h2) {
+      client = http2.connect(options.url.origin, options);
+      req = client.request(options.headers, options);
+    } else {
+      const { request } = options.url.protocol === 'http:' ? http : https;
+
+      req = request(options.url, options);
+    }
+
+    snoop(client, req, options);
+
+    req.once('response', (res) => {
+      let headers;
+
+      if (options.h2) {
+        headers = res;
+        res = req;
+      }
+
+      augment(res, headers, options);
+    });
+
+    return req;
+  },
+});

package/src/mediatypes.js

@@ -1,6 +1,6 @@
-export const APPLICATION_FORM_URLENCODED = 'application/x-www-form-urlencoded';
-export const APPLICATION_JSON = 'application/json';
-export const APPLICATION_OCTET_STREAM = 'application/octet-stream';
-export const MULTIPART_FORM_DATA = 'multipart/form-data';
-export const TEXT_PLAIN = 'text/plain';
-export const WILDCARD = '*/*';
+export const APPLICATION_FORM_URLENCODED = 'application/x-www-form-urlencoded';
+export const APPLICATION_JSON = 'application/json';
+export const APPLICATION_OCTET_STREAM = 'application/octet-stream';
+export const MULTIPART_FORM_DATA = 'multipart/form-data';
+export const TEXT_PLAIN = 'text/plain';
+export const WILDCARD = '*/*';