rekwest 7.2.3 → 7.2.5

package/dist/utils.cjs

@@ -3,7 +3,7 @@
 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");
@@ -31,9 +31,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,67 +90,74 @@ 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 _nodeBuffer.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) {
     options = cloneWith(_config.default.defaults, options);
   }
-  if (options.trimTrailingSlashes) {
-    url = `${url}`.replace(/(?<!:)\/+/g, '/');
-  }
-  if (options.stripTrailingSlash) {
-    url = `${url}`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
-  }
   return Object.assign(options, {
     headers: normalizeHeaders(options.headers),
-    method: options.method.toUpperCase(),
-    url: addSearchParams(new URL(url, options.baseURL), options.params)
+    method: options.method?.toUpperCase(),
+    url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params)
   });
 };
 exports.normalize = normalize;
 const normalizeHeaders = (headers = {}) => {
   const acc = {};
-  for (const [key, val] of Object.entries(headers)) {
-    const name = key.toLowerCase();
+  for (let [key, val] of Object.entries(headers)) {
+    key = key.toLowerCase();
     acc[key] = val;
     if (key === HTTP2_HEADER_ACCEPT_ENCODING && !_config.isZstdSupported) {
-      const modified = val.replace(/\s?zstd,?/gi, '').trim();
-      if (modified) {
-        acc[key] = modified;
+      val = val.replace(/\s?zstd,?/gi, '').trim();
+      if (val) {
+        acc[key] = val;
       } else {
-        Reflect.deleteProperty(acc, name);
+        Reflect.deleteProperty(acc, key);
       }
     }
   }
   return acc;
 };
 exports.normalizeHeaders = normalizeHeaders;
-const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
+function normalizeUrl(url, {
+  trimTrailingSlashes,
+  stripTrailingSlash
+} = {}) {
+  if (trimTrailingSlashes) {
+    url.pathname = url.pathname.replace(/\/{2,}/g, '/');
+  }
+  if (stripTrailingSlash && url.pathname !== '/') {
+    url.pathname = url.pathname.replace(/\/$/, '');
+  }
+  return 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', {
@@ -162,9 +167,9 @@ const snoop = (client, req, options) => {
   });
 };
 exports.snoop = snoop;
-const stripHeaders = (headers = {}, names = []) => {
-  names = new Set(names);
-  return Object.fromEntries(Object.entries(headers).filter(([key]) => !names.has(key.toLowerCase())));
+const stripHeaders = (headers = {}, keys = []) => {
+  keys = new Set(keys);
+  return Object.fromEntries(Object.entries(headers).filter(([key]) => !keys.has(key)));
 };
 exports.stripHeaders = stripHeaders;
 async function* tap(val) {
@@ -172,8 +177,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

@@ -12,9 +12,10 @@
     "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
     "@babel/preset-env": "^7.29.0",
+    "@eslint/markdown": "^7.5.1",
     "c8": "^10.1.3",
-    "eslint": "^10.0.0",
-    "eslint-config-ultra-refined": "^4.0.1",
+    "eslint": "^10.0.1",
+    "eslint-config-ultra-refined": "^4.1.2",
     "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.3"
+  "version": "7.2.5"
 }

package/src/ackn.js

@@ -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/cookies.js

@@ -3,7 +3,13 @@ import {
   toCamelCase,
 } from './utils.js';
 
-const lifetimeCap = 3456e7; // 400 days
+export const cookieRex = /^[\w-]+=(?:"[^"]*"|[^\p{Control};]*)(?:;\s*(?:[\w-]+=(?:"[^"]*"|[^\p{Control};]*)|[\w-]+))*$/u;
+export const cookiePairRex = /(?:[^;"\s]+="[^"]*"|[^;]+)(?=;|$)/g;
+export const illegalCookieChars = /\p{Control}/u;
+export const isValidCookie = (str) => str?.constructor === String && cookieRex.test(str);
+export const maxCookieLifetimeCap = 3456e7; // 400 days
+export const maxCookieSize = 4096;
+export const splitCookie = (str) => str.match(cookiePairRex).map((str) => str.trim());
 
 export class Cookies extends URLSearchParams {
 
@@ -27,49 +33,60 @@ export class Cookies extends URLSearchParams {
   }
 
   constructor(input, { cookiesTTL } = { cookiesTTL: false }) {
-    if (Array.isArray(input) && input.every((it) => !Array.isArray(it))) {
-      input = input.map((it) => {
-        if (!cookiesTTL) {
-          return [it.split(';')[0].trim()];
-        }
-
-        const [cookie, ...attrs] = it.split(';').map((it) => it.trim());
-        const ttl = {};
-
-        for (const attr of attrs) {
-          if (/(?:expires|max-age)=/i.test(attr)) {
-            const [key, val] = attr.toLowerCase().split('=');
-            const ms = Number.isFinite(Number.parseInt(val, 10)) ? val * 1e3 : Date.parse(val) - Date.now();
+    if (isValidCookie(input)) {
+      input = splitCookie(input);
+    }
 
-            ttl[toCamelCase(key)] = Math.min(ms, lifetimeCap);
+    const ttlMap = new Map();
+
+    if (Array.isArray(input)) {
+      if (input.every((it) => isValidCookie(it))) {
+        input = input.filter((it) => !illegalCookieChars.test(it) && it.length <= maxCookieSize);
+        input = input.map(splitCookie).map(([cookie, ...attrs]) => {
+          try {
+            cookie = cookie.split('=').map((it) => decodeURIComponent(it.trim()));
+
+            return cookie;
+          } finally {
+            if (cookiesTTL) {
+              for (const attr of attrs) {
+                if (/(?:expires|max-age)=/i.test(attr)) {
+                  const [key, val] = attr.toLowerCase().split('=');
+                  let interval = val * 1e3 || Date.parse(val) - Date.now();
+
+                  if (interval < 0 || Number.isNaN(interval)) {
+                    interval = 0;
+                  }
+
+                  ttlMap.set(
+                    cookie[0],
+                    { [toCamelCase(key.trim())]: Math.min(interval, maxCookieLifetimeCap) },
+                  );
+                }
+              }
+            }
           }
-        }
-
-        return [
-          cookie.replace(/\u0022/g, ''),
-          Object.keys(ttl).length ? ttl : null,
-        ];
-      });
+        });
+      }
     }
 
-    super(Array.isArray(input) ? input.map((it) => it[0]).join('&') : input);
+    super(input);
 
-    if (Array.isArray(input) && cookiesTTL) {
-      for (const [cookie, ttl] of input.filter((it) => it[1])) {
-        const key = cookie.split('=')[0];
+    if (ttlMap.size) {
+      for (const [key, attrs] of ttlMap) {
 
         if (this.#chronometry.has(key)) {
           clearTimeout(this.#chronometry.get(key));
           this.#chronometry.delete(key);
         }
 
-        const { expires, maxAge } = ttl;
+        const { expires, maxAge } = attrs;
 
-        for (const ms of [
+        for (const interval of [
           maxAge,
           expires,
         ]) {
-          if (!Number.isInteger(ms)) {
+          if (!Number.isInteger(interval)) {
             continue;
           }
 
@@ -81,7 +98,7 @@ export class Cookies extends URLSearchParams {
               ctx.#chronometry.delete(key);
               ctx.delete(key);
             }
-          }, Math.max(ms, 0));
+          }, Math.max(interval, 0));
 
           this.constructor.#register(this, tid);
           this.#chronometry.set(key, tid);

package/src/formdata.js

@@ -7,7 +7,9 @@ import {
 } from './mediatypes.js';
 import {
   brandCheck,
-  isFileLike,
+  isBlobLike,
+  isPipeStream,
+  isReadableStream,
   tap,
 } from './utils.js';
 
@@ -19,58 +21,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 +56,6 @@ export class FormData {
     };
   }
 
-  static #ensureInstance(val) {
-    return isFileLike(val) || (Object(val) === val && Reflect.has(val, Symbol.asyncIterator));
-  }
-
   #entries = [];
 
   get [Symbol.toStringTag]() {
@@ -98,13 +69,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 +86,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 +102,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 +115,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 +123,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 +131,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 +139,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 +181,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/preflight.js

@@ -64,7 +64,7 @@ export const preflight = (options) => {
       cookie &&= Cookies.jar.get(url.origin);
     }
 
-    options.headers = {
+    headers = {
       ...cookie && { [HTTP2_HEADER_COOKIE]: cookie },
       ...headers,
     };

package/src/retries.js

@@ -27,7 +27,7 @@ export const retries = (err, options) => {
 
       if (retry.retryAfter && err.headers?.[HTTP2_HEADER_RETRY_AFTER]) {
         interval = err.headers[HTTP2_HEADER_RETRY_AFTER];
-        interval = Number.isFinite(Number.parseInt(interval, 10)) ? interval * 1e3 : new Date(interval) - Date.now();
+        interval = interval * 1e3 || Date.parse(interval) - Date.now();
         if (interval > retry.maxRetryAfter) {
           throw new RequestError(
             `Maximum '${ HTTP2_HEADER_RETRY_AFTER }' limit exceeded: ${ interval } ms`,
@@ -38,7 +38,7 @@ export const retries = (err, options) => {
         interval = new Function('interval', `return Math.ceil(${ retry.backoffStrategy });`)(interval);
       }
 
-      if (interval < 0) {
+      if (interval < 0 || Number.isNaN(interval)) {
         interval = 0;
       }
 

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,
     }));

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;
       }