rekwest 7.2.4 → 7.2.6

package/README.md

@@ -22,7 +22,7 @@ and [http2.request](https://nodejs.org/api/http2.html#clienthttp2sessionrequesth
 
 ## Prerequisites
 
-* Node.js `>= 20.0.0`
+* Node.js `>=20.0.0`
 
 ## Installation
 
@@ -48,10 +48,11 @@ const res = await rekwest(url, {
   body: { celestial: 'payload' },
   headers: {
     [HTTP2_HEADER_AUTHORIZATION]: 'Bearer [token]',
-    [HTTP2_HEADER_CONTENT_ENCODING]: 'br',  // Enables: body encoding
-    /** [HTTP2_HEADER_CONTENT_TYPE] is undue for
+    [HTTP2_HEADER_CONTENT_ENCODING]: 'br', // Enables: body encoding
+    /**
+     * [HTTP2_HEADER_CONTENT_TYPE] is undue for
      * Array/Blob/File/FormData/Object/URLSearchParams body types
-     * and will be set automatically, with an option to override it here
+     * and will be set automatically, with an option to override it here.
      */
   },
   method: HTTP2_METHOD_POST,
@@ -68,8 +69,6 @@ console.log(res.body);
 import { Readable } from 'node:stream';
 import rekwest, {
   constants,
-  Blob,
-  File,
   FormData,
 } from 'rekwest';
 
@@ -82,16 +81,21 @@ const {
 
 const blob = new Blob(['bits']);
 const file = new File(['bits'], 'file.xyz');
-const readable = Readable.from('bits');
+const rbl = Readable.from('bits');
+const rds = ReadableStream.from('bits');
 
 const fd = new FormData({
-  aux: Date.now(),  // Either [[key, value]] or kv sequenceable
+  aux: new Date(), // Either [[key, value]] or kv sequenceable
 });
 
 fd.append('celestial', 'payload');
 fd.append('blob', blob, 'blob.xyz');
 fd.append('file', file);
-fd.append('readable', readable, 'readable.xyz');
+fd.append('rbl', rbl, 'rbl.xyz');
+fd.append('rds', rds, 'rds.xyz');
+/**
+ * Streamable entries are consumed on request submittion.
+ */
 
 const url = 'https://somewhe.re/somewhat/endpoint';
 
@@ -99,7 +103,7 @@ const res = await rekwest(url, {
   body: fd,
   headers: {
     [HTTP2_HEADER_AUTHORIZATION]: 'Bearer [token]',
-    [HTTP2_HEADER_CONTENT_ENCODING]: 'zstd',  // Enables: body encoding
+    [HTTP2_HEADER_CONTENT_ENCODING]: 'zstd', // Enables: body encoding
   },
   method: HTTP2_METHOD_POST,
 });
@@ -113,70 +117,70 @@ console.log(res.body);
 
 #### `rekwest(url[, options])`
 
-* `url` **{string | URL}** The URL to send the request to
+* `url` **{string | URL}** The URL to send the request to.
 * `options` **{Object}**
   Extends [http(s).RequestOptions](https://nodejs.org/api/https.html#httpsrequesturl-options-callback) along with
   extra [http2.ClientSessionOptions](https://nodejs.org/api/http2.html#http2connectauthority-options-listener)
   & [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
-  * `allowDowngrade` **{boolean}** `Default: false` Controls whether `https:` redirects to `http:` are allowed
-  * `baseURL` **{string | URL}** The base URL to use in cases where `url` is a relative URL
+  for HTTP/2 attunes.
+  * `allowDowngrade` **{boolean}** `Default: false` Controls whether `https:` redirects to `http:` are allowed.
+  * `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
-    with the request
+    with the request.
   * `bufferBody` **{boolean}** `Default: false` Toggles the buffering of the streamable request bodies for redirects and
-    retries
+    retries.
   * `cookies` **{boolean | string | string[] | [k, v][] | Cookies | Object | URLSearchParams}** `Default: true` The
     cookies to add to the request. Manually set `cookie` header to override.
-  * `cookiesTTL` **{boolean}** `Default: false` Controls enablement of TTL for the cookies cache
+  * `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
-  * `decodersOptions` **{Object}** Configures decoders options, e.g.: `brotli`, `zlib`, `zstd`
-  * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or add a mixin
-  * `encodersOptions` **{Object}** Configures encoders options, e.g.: `brotli`, `zlib`, `zstd`
-  * `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
-  * `params` **{Object}** The search params to add to the `url`
-  * `parse` **{boolean}** `Default: true` Controls whether to parse response body or return a buffer
-  * `redirect` **{error | follow | manual}** `Default: follow` Controls the redirect flows
-  * `retry` **{Object}** Represents the retry options
-    * `attempts` **{number}** `Default: 0` The number of retry attempts
+    redirects.
+  * `decodersOptions` **{Object}** Configures decoders options, e.g.: `brotli`, `zlib`, `zstd`.
+  * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or add a mixin.
+  * `encodersOptions` **{Object}** Configures encoders options, e.g.: `brotli`, `zlib`, `zstd`.
+  * `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.
+  * `params` **{Object}** The search params to add to the `url`.
+  * `parse` **{boolean}** `Default: true` Controls whether to parse response body or return a buffer.
+  * `redirect` **{error | follow | manual}** `Default: follow` Controls the redirect flows.
+  * `retry` **{Object}** Represents the retry options.
+    * `attempts` **{number}** `Default: 0` The number of retry attempts.
     * `backoffStrategy` **{string}** `Default: interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)`
       The backoff strategy uses a log-uniform algorithm. To fix the interval, set the value to `interval * 1`.
     * `errorCodes` **{string[]}**
       `Default: ['ECONNREFUSED', 'ECONNRESET', 'EHOSTDOWN', 'EHOSTUNREACH', 'ENETDOWN', 'ENETUNREACH', 'ENOTFOUND', 'ERR_HTTP2_STREAM_ERROR']`
-      The list of error codes to retry on
-    * `interval` **{number}** `Default: 1e3` The initial retry interval
-    * `maxRetryAfter` **{number}** `Default: 3e5` The maximum `retry-after` limit in milliseconds
-    * `retryAfter` **{boolean}** `Default: true` Controls `retry-after` header receptiveness
-    * `statusCodes` **{number[]}** `Default: [429, 500, 502, 503, 504]` The list of status codes to retry on
-  * `stripTrailingSlash` **{boolean}** `Default: false` Controls whether to strip trailing slash at the end of the URL
-  * `thenable` **{boolean}** `Default: false` Controls the promise resolutions
-  * `timeout` **{number}** `Default: 3e5` The number of milliseconds a request can take before termination
-  * `trimTrailingSlashes` **{boolean}** `Default: false` Controls whether to trim trailing slashes within the URL
+      The list of error codes to retry on.
+    * `interval` **{number}** `Default: 1e3` The initial retry interval.
+    * `maxRetryAfter` **{number}** `Default: 3e5` The maximum `retry-after` limit in milliseconds.
+    * `retryAfter` **{boolean}** `Default: true` Controls `retry-after` header receptiveness.
+    * `statusCodes` **{number[]}** `Default: [429, 500, 502, 503, 504]` The list of status codes to retry on.
+  * `stripTrailingSlash` **{boolean}** `Default: false` Controls whether to strip trailing slash at the end of the URL.
+  * `thenable` **{boolean}** `Default: false` Controls the promise resolutions.
+  * `timeout` **{number}** `Default: 3e5` The number of milliseconds a request can take before termination.
+  * `trimTrailingSlashes` **{boolean}** `Default: false` Controls whether to trim trailing slashes within the URL.
 * **Returns:** Promise that resolves to
   extended [http.IncomingMessage](https://nodejs.org/api/http.html#class-httpincomingmessage)
   or [http2.ClientHttp2Stream](https://nodejs.org/api/http2.html#class-clienthttp2stream) which is respectively
-  readable and duplex streams
+  readable and duplex streams.
   * if `digest: true` & `parse: true`
-    * `body` **{string | Array | Buffer | Object}** The body based on its content type
+    * `body` **{string | Array | Buffer | Object}** The body based on its content type.
   * if `digest: false`
-    * `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 was read or not
-  * `cookies` **{undefined | Cookies}** The cookies sent and received with the response
-  * `headers` **{Object}** The headers received with the response
-  * `httpVersion` **{string}** Indicates a protocol version negotiated with the server
-  * `ok` **{boolean}** Indicates if the response was successful (statusCode: **200-299**)
-  * `redirected` **{boolean}** Indicates if the response is the result of a redirect
-  * `statusCode` **{number}** Indicates the status code of the response
-  * `trailers` **{undefined | Object}** The trailer headers received with the response
+    * `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 was read or not.
+  * `cookies` **{undefined | Cookies}** The cookies sent and received with the response.
+  * `headers` **{Object}** The headers received with the response.
+  * `httpVersion` **{string}** Indicates a protocol version negotiated with the server.
+  * `ok` **{boolean}** Indicates if the response was successful (statusCode: **200-299**).
+  * `redirected` **{boolean}** Indicates if the response is the result of a redirect.
+  * `statusCode` **{number}** Indicates the status code of the response.
+  * `trailers` **{undefined | Object}** The trailer headers received with the response.
 
 ---
 
@@ -204,7 +208,7 @@ const rk = rekwest.extend({
 const params = {
   id: '[uid]',
   signature: '[code]',
-  variant: 'A',
+  variant: '[any]',
 };
 const signal = AbortSignal.timeout(3e4);
 const url = '/somewhat/endpoint';
@@ -225,9 +229,9 @@ console.log(res.body);
 
 The method with limited functionality to use with streams and/or pipes.
 
-* No automata (redirects & retries)
-* Pass `h2: true` in options to use HTTP/2 protocol
-  * Use `ackn({ url: URL })` method in advance to check the available protocols
+* No automata (redirects & retries).
+* Pass `h2: true` in options to use HTTP/2 protocol.
+  * Use `ackn({ url: URL })` method in advance to check the available protocols.
 
 ```javascript
 import fs from 'node:fs';

package/dist/ackn.cjs

@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ackn = void 0;
 var _nodeTls = require("node:tls");
-const ackn = options => new Promise((resolve, reject) => {
-  const {
-    url
-  } = options;
+const ackn = (options = {}) => new Promise((resolve, reject) => {
+  const url = new URL(options.url);
   const socket = (0, _nodeTls.connect)({
     ...options,
     ALPNProtocols: ['h2', 'http/1.1'],
@@ -27,11 +25,11 @@ const ackn = options => new Promise((resolve, reject) => {
       createConnection() {
         return socket;
       },
-      h2: /h2c?/i.test(alpnProtocol),
+      h2: /\bh2\b/i.test(alpnProtocol),
       protocol: url.protocol
     });
   });
-  socket.on('error', reject);
-  socket.on('timeout', reject);
+  socket.once('error', reject);
+  socket.once('timeout', reject);
 });
 exports.ackn = ackn;

package/dist/formdata.cjs

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FormData = void 0;
-var _nodeBuffer = require("node:buffer");
+exports.parseFormData = exports.isFormData = exports.fdToAsyncIterable = exports.FormData = void 0;
 var _nodeCrypto = require("node:crypto");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _mediatypes = require("./mediatypes.cjs");
@@ -16,40 +15,24 @@ const {
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp.default.constants;
 class FormData {
-  static actuate(fd) {
-    const boundary = (0, _nodeCrypto.randomBytes)(24).toString('hex');
-    const contentType = `${_mediatypes.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, val] of fd) {
-          if (val.constructor === String) {
-            yield encoder.encode(`${prefix}; name="${escape(redress(name))}"${CRLF.repeat(2)}${redress(val)}${CRLF}`);
-          } else {
-            yield encoder.encode(`${prefix}; name="${escape(redress(name))}"${val.name ? `; filename="${escape(val.name)}"` : ''}${CRLF}${HTTP2_HEADER_CONTENT_TYPE}: ${val.type || _mediatypes.APPLICATION_OCTET_STREAM}${CRLF.repeat(2)}`);
-            yield* (0, _utils.tap)(val);
-            yield new Uint8Array([13, 10]);
-          }
-        }
-        yield encoder.encode(`--${boundary}--`);
+  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 alike(val) {
-    return FormData.name === val?.[Symbol.toStringTag];
+    }
   }
-  static #enfoldEntry(name, value, filename) {
+  static #formEntry(name, value, filename) {
     name = String(name).toWellFormed();
     filename &&= String(filename).toWellFormed();
-    if ((0, _utils.isFileLike)(value)) {
-      filename ??= value.name || 'blob';
-      value = new _nodeBuffer.File([value], filename, value);
-    } else if (this.#ensureInstance(value)) {
-      value.name = filename;
+    if ((0, _utils.isBlobLike)(value)) {
+      filename ??= String(value.name ?? 'blob').toWellFormed();
+      value = new File([value], filename, value);
+    } else if ((0, _utils.isPipeStream)(value) || (0, _utils.isReadableStream)(value)) {
+      value.name = filename ?? 'blob';
     } else {
       value = String(value).toWellFormed();
     }
@@ -58,9 +41,6 @@ class FormData {
       value
     };
   }
-  static #ensureInstance(val) {
-    return (0, _utils.isFileLike)(val) || Object(val) === val && Reflect.has(val, Symbol.asyncIterator);
-  }
   #entries = [];
   get [Symbol.toStringTag]() {
     return this.constructor.name;
@@ -70,10 +50,10 @@ class FormData {
       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)) {
+        }
+        if (!input.every(it => it.length === 2)) {
           throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': Sequence initializer must only contain pair elements`);
         }
-        input = Array.from(input);
       } else if (!Reflect.has(input, Symbol.iterator)) {
         input = Object.entries(input);
       }
@@ -82,35 +62,20 @@ class FormData {
       }
     }
   }
-  #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) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 2, 'append');
-    this.#entries.push(this.constructor.#enfoldEntry(...args));
+    this.constructor.#ensureArgs(args, 2, this.append.name);
+    this.#entries.push(this.constructor.#formEntry(...args));
   }
   delete(...args) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 1, 'delete');
+    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) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 1, 'forEach');
+    this.constructor.#ensureArgs(args, 1, this.forEach.name);
     const [callback, thisArg] = args;
     for (const entry of this) {
       Reflect.apply(callback, thisArg, [...entry.reverse(), this]);
@@ -118,26 +83,26 @@ class FormData {
   }
   get(...args) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 1, 'get');
+    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) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 1, 'getAll');
+    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) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 1, 'has');
+    this.constructor.#ensureArgs(args, 1, this.has.name);
     const name = String(args[0]).toWellFormed();
     return !!this.#entries.find(it => it.name === name);
   }
   set(...args) {
     (0, _utils.brandCheck)(this, FormData);
-    this.#ensureArgs(args, 2, 'set');
-    const entry = this.constructor.#enfoldEntry(...args);
+    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);
@@ -171,4 +136,37 @@ class FormData {
     return this.entries();
   }
 }
-exports.FormData = FormData;
+exports.FormData = FormData;
+const fdToAsyncIterable = fd => {
+  const boundary = (0, _nodeCrypto.randomBytes)(32).toString('hex');
+  const contentType = `${_mediatypes.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 || _mediatypes.APPLICATION_OCTET_STREAM}${CRLF.repeat(2)}`);
+          yield* (0, _utils.tap)(val);
+          yield new Uint8Array([13, 10]);
+        }
+      }
+      yield encoder.encode(`--${boundary}--${CRLF}`);
+    }
+  };
+};
+exports.fdToAsyncIterable = fdToAsyncIterable;
+const isFormData = val => FormData.name === val?.[Symbol.toStringTag];
+exports.isFormData = isFormData;
+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));
+};
+exports.parseFormData = parseFormData;

package/dist/index.cjs

@@ -5,22 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   constants: true,
-  mediatypes: true,
-  Blob: true,
-  File: true
+  mediatypes: true
 };
-Object.defineProperty(exports, "Blob", {
-  enumerable: true,
-  get: function () {
-    return _nodeBuffer.Blob;
-  }
-});
-Object.defineProperty(exports, "File", {
-  enumerable: true,
-  get: function () {
-    return _nodeBuffer.File;
-  }
-});
 Object.defineProperty(exports, "constants", {
   enumerable: true,
   get: function () {
@@ -74,7 +60,6 @@ Object.keys(_validation).forEach(function (key) {
     }
   });
 });
-var _nodeBuffer = require("node:buffer");
 var _ackn = require("./ackn.cjs");
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/mixin.cjs

@@ -40,7 +40,7 @@ const mixin = (res, {
         value: async function () {
           (0, _utils.brandCheck)(this, res?.constructor);
           const val = await this.arrayBuffer();
-          return new _nodeBuffer.Blob([val]);
+          return new Blob([val]);
         }
       },
       bytes: {

package/dist/transfer.cjs

@@ -53,11 +53,9 @@ const transfer = async options => {
       } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
       req = request(url, options);
     }
-    (0, _utils.snoop)(client, req, options);
-    req.once('aborted', reject);
-    req.once('error', reject);
-    req.once('frameError', reject);
-    req.once('goaway', reject);
+    (0, _utils.snoop)(client, req, options, {
+      reject
+    });
     req.once('response', res => (0, _postflight.postflight)(req, res, options, {
       reject,
       resolve
@@ -72,12 +70,15 @@ const transfer = async options => {
     return res;
   } catch (err) {
     if ((0, _utils.isLikelyH2cPrefaceError)(err)) {
+      const {
+        retry
+      } = options;
       options = (0, _utils.deepMerge)(options, {
         h2: true,
         retry: {
-          attempts: 1,
-          errorCodes: [err.code],
-          interval: 0
+          attempts: ++retry.attempts,
+          errorCodes: [err.code, ...retry.errorCodes],
+          interval: 1
         }
       });
     }

package/dist/transform.cjs

@@ -28,7 +28,7 @@ const transform = async options => {
   }
   if (!Buffer.isBuffer(body)) {
     switch (true) {
-      case (0, _utils.isFileLike)(body):
+      case (0, _utils.isBlobLike)(body):
         {
           headers = {
             [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
@@ -37,9 +37,9 @@ const transform = async options => {
           body = body.stream();
           break;
         }
-      case _formdata.FormData.alike(body):
+      case (0, _formdata.isFormData)(body):
         {
-          body = _formdata.FormData.actuate(body);
+          body = (0, _formdata.fdToAsyncIterable)(body);
           headers = {
             [HTTP2_HEADER_CONTENT_TYPE]: body.contentType
           };

package/dist/utils.cjs

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stripHeaders = exports.snoop = exports.sameOrigin = exports.normalizeHeaders = exports.normalize = exports.isReadableStream = exports.isPipeStream = exports.isLikelyH2cPrefaceError = exports.isFileLike = exports.dispatch = exports.deepMerge = exports.cloneWith = exports.brandCheck = exports.augment = exports.addSearchParams = void 0;
+exports.stripHeaders = exports.snoop = exports.sameOrigin = exports.normalizeHeaders = exports.normalize = exports.isReadableStream = exports.isPipeStream = exports.isLikelyH2cPrefaceError = exports.isBlobLike = exports.dispatch = exports.deepMerge = exports.cloneWith = exports.brandCheck = exports.augment = exports.addSearchParams = void 0;
 exports.tap = tap;
 exports.unwind = exports.toCamelCase = void 0;
-var _nodeBuffer = require("node:buffer");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _nodeStream = require("node:stream");
 var _config = _interopRequireWildcard(require("./config.cjs"));
@@ -31,9 +30,7 @@ const addSearchParams = (url, params = {}) => {
 };
 exports.addSearchParams = addSearchParams;
 const augment = (res, headers, options) => {
-  const {
-    h2
-  } = options;
+  const h2 = /\bh2c?\b/i.test(res.session?.alpnProtocol);
   if (h2) {
     Reflect.defineProperty(res, 'headers', {
       enumerable: true,
@@ -92,27 +89,20 @@ const dispatch = (req, {
   body
 }) => {
   if ((0, _nodeStream.isReadable)(body)) {
+    body.once('error', err => req.session && req.emit('error', err) && req.destroy() || req.destroy(err));
     body.pipe(req);
   } else {
     req.end(body);
   }
 };
 exports.dispatch = dispatch;
-const isFileLike = val => {
-  return [_nodeBuffer.Blob, _nodeBuffer.File].some(it => val instanceof it);
-};
-exports.isFileLike = isFileLike;
-const isLikelyH2cPrefaceError = err => {
-  return err.code === 'HPE_INVALID_CONSTANT';
-};
+const isBlobLike = val => val instanceof Blob;
+exports.isBlobLike = isBlobLike;
+const isLikelyH2cPrefaceError = err => err.code === 'HPE_INVALID_CONSTANT';
 exports.isLikelyH2cPrefaceError = isLikelyH2cPrefaceError;
-const isPipeStream = val => {
-  return val instanceof _nodeStream.Readable;
-};
+const isPipeStream = val => val instanceof _nodeStream.Readable;
 exports.isPipeStream = isPipeStream;
-const isReadableStream = val => {
-  return val instanceof ReadableStream;
-};
+const isReadableStream = val => val instanceof ReadableStream;
 exports.isReadableStream = isReadableStream;
 const normalize = (url, options = {}) => {
   if (!options.redirected) {
@@ -120,7 +110,7 @@ const normalize = (url, options = {}) => {
   }
   return Object.assign(options, {
     headers: normalizeHeaders(options.headers),
-    method: options.method.toUpperCase(),
+    method: options.method?.toUpperCase(),
     url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params)
   });
 };
@@ -156,9 +146,17 @@ function normalizeUrl(url, {
 }
 const sameOrigin = (a, b) => a.origin === b.origin;
 exports.sameOrigin = sameOrigin;
-const snoop = (client, req, options) => {
+const snoop = (client, req, options, {
+  reject
+} = {
+  reject: () => void 0
+}) => {
+  req.once('aborted', reject);
   req.once('close', () => client?.close());
   req.once('end', () => client?.close());
+  req.once('error', reject);
+  req.once('frameError', reject);
+  req.once('goaway', reject);
   req.once('timeout', () => req.destroy(new _errors.TimeoutError(`Timed out after ${options.timeout} ms`)));
   req.once('trailers', trailers => {
     Reflect.defineProperty(req, 'trailers', {
@@ -178,8 +176,6 @@ async function* tap(val) {
     yield* val;
   } else if (val.stream) {
     yield* val.stream();
-  } else {
-    yield await val.arrayBuffer();
   }
 }
 const toCamelCase = str => str?.toLowerCase().replace(/\p{Punctuation}.|\p{White_Space}./gu, val => val.replace(/\p{Punctuation}+|\p{White_Space}+/gu, '').toUpperCase());

package/package.json

@@ -11,10 +11,11 @@
   "devDependencies": {
     "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
-    "c8": "^10.1.3",
-    "eslint": "^10.0.0",
-    "eslint-config-ultra-refined": "^4.0.1",
+    "@babel/preset-env": "^7.29.2",
+    "@eslint/markdown": "^8.0.0",
+    "c8": "^11.0.0",
+    "eslint": "^10.1.0",
+    "eslint-config-ultra-refined": "^4.1.5",
     "mocha": "^11.7.5"
   },
   "engines": {
@@ -60,16 +61,16 @@
     "url": "git+https://github.com/bricss/rekwest.git"
   },
   "scripts": {
-    "build": "rm -rf dist && npx babel src --out-dir dist --out-file-extension .cjs",
+    "build": "rm -rf dist && npx babel src --out-dir dist --out-file-extension .cjs && sh misc.sh",
     "cert:gen": "openssl req -days 365 -keyout localhost.key -newkey ec -nodes -pkeyopt ec_paramgen_curve:prime256v1 -subj //SKIP=1/CN=localhost -out localhost.cert -x509",
     "cert:ken": "openssl x509 -in localhost.cert -noout -text",
     "lint": "eslint --concurrency=auto",
-    "prepack": "npm run build && sh misc.sh && npm run lint",
+    "prepack": "npm run build && npm run lint",
     "pretest": "rm -rf coverage && npm run cert:gen",
     "test": "mocha",
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.2.4"
+  "version": "7.2.6"
 }

package/src/ackn.js

@@ -1,7 +1,7 @@
 import { connect } from 'node:tls';
 
-export const ackn = (options) => new Promise((resolve, reject) => {
-  const { url } = options;
+export const ackn = (options = {}) => new Promise((resolve, reject) => {
+  const url = new URL(options.url);
   const socket = connect({
     ...options,
     ALPNProtocols: [
@@ -23,11 +23,11 @@ export const ackn = (options) => new Promise((resolve, reject) => {
       createConnection() {
         return socket;
       },
-      h2: /h2c?/i.test(alpnProtocol),
+      h2: /\bh2\b/i.test(alpnProtocol),
       protocol: url.protocol,
     });
   });
 
-  socket.on('error', reject);
-  socket.on('timeout', reject);
+  socket.once('error', reject);
+  socket.once('timeout', reject);
 });

package/src/formdata.js

@@ -1,4 +1,3 @@
-import { File } from 'node:buffer';
 import { randomBytes } from 'node:crypto';
 import http2 from 'node:http2';
 import {
@@ -7,7 +6,9 @@ import {
 } from './mediatypes.js';
 import {
   brandCheck,
-  isFileLike,
+  isBlobLike,
+  isPipeStream,
+  isReadableStream,
   tap,
 } from './utils.js';
 
@@ -19,58 +20,31 @@ const {
 
 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, val] of fd) {
-          if (val.constructor === String) {
-            yield encoder.encode(`${ prefix }; name="${
-              escape(redress(name))
-            }"${ CRLF.repeat(2) }${ redress(val) }${ CRLF }`);
-          } else {
-            yield encoder.encode(`${ prefix }; name="${
-              escape(redress(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 }--`);
-      },
-    };
-  }
+  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`);
+    }
 
-  static alike(val) {
-    return FormData.name === val?.[Symbol.toStringTag];
+    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 #enfoldEntry(name, value, filename) {
+  static #formEntry(name, value, filename) {
     name = String(name).toWellFormed();
     filename &&= String(filename).toWellFormed();
 
-    if (isFileLike(value)) {
-      filename ??= value.name || 'blob';
+    if (isBlobLike(value)) {
+      filename ??= String(value.name ?? 'blob').toWellFormed();
       value = new File([value], filename, value);
-    } else if (this.#ensureInstance(value)) {
-      value.name = filename;
+    } else if (isPipeStream(value) || isReadableStream(value)) {
+      value.name = filename ?? 'blob';
     } else {
       value = String(value).toWellFormed();
     }
@@ -81,10 +55,6 @@ export class FormData {
     };
   }
 
-  static #ensureInstance(val) {
-    return isFileLike(val) || (Object(val) === val && Reflect.has(val, Symbol.asyncIterator));
-  }
-
   #entries = [];
 
   get [Symbol.toStringTag]() {
@@ -98,13 +68,13 @@ export class FormData {
           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)) {
+        }
+
+        if (!input.every((it) => it.length === 2)) {
           throw new TypeError(`Failed to construct '${
             this[Symbol.toStringTag]
           }': Sequence initializer must only contain pair elements`);
         }
-
-        input = Array.from(input);
       } else if (!Reflect.has(input, Symbol.iterator)) {
         input = Object.entries(input);
       }
@@ -115,42 +85,15 @@ export class FormData {
     }
   }
 
-  #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));
+    this.constructor.#ensureArgs(args, 2, this.append.name);
+    this.#entries.push(this.constructor.#formEntry(...args));
   }
 
   delete(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'delete');
+    this.constructor.#ensureArgs(args, 1, this.delete.name);
     const name = String(args[0]).toWellFormed();
 
     this.#entries = this.#entries.filter((it) => it.name !== name);
@@ -158,7 +101,7 @@ export class FormData {
 
   forEach(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'forEach');
+    this.constructor.#ensureArgs(args, 1, this.forEach.name);
     const [callback, thisArg] = args;
 
     for (const entry of this) {
@@ -171,7 +114,7 @@ export class FormData {
 
   get(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'get');
+    this.constructor.#ensureArgs(args, 1, this.get.name);
     const name = String(args[0]).toWellFormed();
 
     return this.#entries.find((it) => it.name === name)?.value ?? null;
@@ -179,7 +122,7 @@ export class FormData {
 
   getAll(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'getAll');
+    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);
@@ -187,7 +130,7 @@ export class FormData {
 
   has(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'has');
+    this.constructor.#ensureArgs(args, 1, this.has.name);
     const name = String(args[0]).toWellFormed();
 
     return !!this.#entries.find((it) => it.name === name);
@@ -195,8 +138,8 @@ export class FormData {
 
   set(...args) {
     brandCheck(this, FormData);
-    this.#ensureArgs(args, 2, 'set');
-    const entry = this.constructor.#enfoldEntry(...args);
+    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) {
@@ -237,3 +180,50 @@ export class FormData {
   }
 
 }
+
+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

@@ -14,10 +14,6 @@ import {
 } from './utils.js';
 import { validation } from './validation.js';
 
-export {
-  Blob,
-  File,
-} from 'node:buffer';
 export { constants } from 'node:http2';
 export * from './ackn.js';
 export * from './codecs.js';

package/src/mixin.js

@@ -1,7 +1,4 @@
-import {
-  Blob,
-  isUtf8,
-} from 'node:buffer';
+import { isUtf8 } from 'node:buffer';
 import http2 from 'node:http2';
 import { buffer } from 'node:stream/consumers';
 import { MIMEType } from 'node:util';

package/src/transfer.js

@@ -53,12 +53,8 @@ export const transfer = async (options) => {
       req = request(url, options);
     }
 
-    snoop(client, req, options);
+    snoop(client, req, options, { reject });
 
-    req.once('aborted', reject);
-    req.once('error', reject);
-    req.once('frameError', reject);
-    req.once('goaway', reject);
     req.once('response', (res) => postflight(req, res, options, {
       reject, resolve,
     }));
@@ -76,12 +72,17 @@ export const transfer = async (options) => {
     return res;
   } catch (err) {
     if (isLikelyH2cPrefaceError(err)) {
+      const { retry } = options;
+
       options = deepMerge(options, {
         h2: true,
         retry: {
-          attempts: 1,
-          errorCodes: [err.code],
-          interval: 0,
+          attempts: ++retry.attempts,
+          errorCodes: [
+            err.code,
+            ...retry.errorCodes,
+          ],
+          interval: 1,
         },
       });
     }

package/src/transform.js

@@ -6,14 +6,17 @@ import {
 import { buffer } from 'node:stream/consumers';
 import { types } from 'node:util';
 import { encode } from './codecs.js';
-import { FormData } from './formdata.js';
+import {
+  fdToAsyncIterable,
+  isFormData,
+} from './formdata.js';
 import {
   APPLICATION_FORM_URLENCODED,
   APPLICATION_JSON,
   APPLICATION_OCTET_STREAM,
 } from './mediatypes.js';
 import {
-  isFileLike,
+  isBlobLike,
   isReadableStream,
 } from './utils.js';
 
@@ -32,7 +35,7 @@ export const transform = async (options) => {
 
   if (!Buffer.isBuffer(body)) {
     switch (true) {
-      case isFileLike(body): {
+      case isBlobLike(body): {
         headers = {
           [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
           [HTTP2_HEADER_CONTENT_TYPE]: body.type || APPLICATION_OCTET_STREAM,
@@ -41,8 +44,8 @@ export const transform = async (options) => {
         break;
       }
 
-      case FormData.alike(body): {
-        body = FormData.actuate(body);
+      case isFormData(body): {
+        body = fdToAsyncIterable(body);
         headers = { [HTTP2_HEADER_CONTENT_TYPE]: body.contentType };
         break;
       }

package/src/utils.js

@@ -1,7 +1,3 @@
-import {
-  Blob,
-  File,
-} from 'node:buffer';
 import http2 from 'node:http2';
 import {
   isReadable,
@@ -30,7 +26,7 @@ export const addSearchParams = (url, params = {}) => {
 };
 
 export const augment = (res, headers, options) => {
-  const { h2 } = options;
+  const h2 = /\bh2c?\b/i.test(res.session?.alpnProtocol);
 
   if (h2) {
     Reflect.defineProperty(res, 'headers', {
@@ -96,30 +92,20 @@ export const deepMerge = (target, ...rest) => {
 
 export const dispatch = (req, { body }) => {
   if (isReadable(body)) {
+    body.once('error', (err) => (req.session && req.emit('error', err) && req.destroy()) || req.destroy(err));
     body.pipe(req);
   } else {
     req.end(body);
   }
 };
 
-export const isFileLike = (val) => {
-  return [
-    Blob,
-    File,
-  ].some((it) => val instanceof it);
-};
+export const isBlobLike = (val) => val instanceof Blob;
 
-export const isLikelyH2cPrefaceError = (err) => {
-  return err.code === 'HPE_INVALID_CONSTANT';
-};
+export const isLikelyH2cPrefaceError = (err) => err.code === 'HPE_INVALID_CONSTANT';
 
-export const isPipeStream = (val) => {
-  return val instanceof Readable;
-};
+export const isPipeStream = (val) => val instanceof Readable;
 
-export const isReadableStream = (val) => {
-  return val instanceof ReadableStream;
-};
+export const isReadableStream = (val) => val instanceof ReadableStream;
 
 export const normalize = (url, options = {}) => {
   if (!options.redirected) {
@@ -128,7 +114,7 @@ export const normalize = (url, options = {}) => {
 
   return Object.assign(options, {
     headers: normalizeHeaders(options.headers),
-    method: options.method.toUpperCase(),
+    method: options.method?.toUpperCase(),
     url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params),
   });
 };
@@ -169,9 +155,13 @@ function normalizeUrl(url, { trimTrailingSlashes, stripTrailingSlash } = {}) {
 
 export const sameOrigin = (a, b) => a.origin === b.origin;
 
-export const snoop = (client, req, options) => {
+export const snoop = (client, req, options, { reject } = { reject: () => void 0 }) => {
+  req.once('aborted', reject);
   req.once('close', () => client?.close());
   req.once('end', () => client?.close());
+  req.once('error', reject);
+  req.once('frameError', reject);
+  req.once('goaway', reject);
   req.once('timeout', () => req.destroy(new TimeoutError(`Timed out after ${ options.timeout } ms`)));
   req.once('trailers', (trailers) => {
     Reflect.defineProperty(req, 'trailers', {
@@ -192,8 +182,6 @@ export async function* tap(val) {
     yield* val;
   } else if (val.stream) {
     yield* val.stream();
-  } else {
-    yield await val.arrayBuffer();
   }
 }