rekwest 7.2.1 → 7.2.3

package/README.md

@@ -7,7 +7,7 @@ and [http2.request](https://nodejs.org/api/http2.html#clienthttp2sessionrequesth
 ## Abstract
 
 * Fetch-alike 🥏
-* Cool-beans 🫐 config options (with defaults)
+* Cool-beans 🫐 config options (with defaults) 📋
 * Automatic HTTP/2 support (ALPN negotiation) 💼
 * Automatic or opt-in body parse (with non-UTF-8 charset decoding) 🉑
 * Automatic and simplistic `Cookies` treatment (with **TTL** support) 🍪
@@ -17,7 +17,7 @@ and [http2.request](https://nodejs.org/api/http2.html#clienthttp2sessionrequesth
 * Support redirects & retries with fine-grained tune-ups 🪛
 * Support plenty request body types (include blobs & streams) 📦
 * Support both CJS and ESM module systems 🧩
-* Fully promise-able and pipe-able 🔗
+* Fully promise-able ⏳ and pipe-able 🌀
 * Zero dependencies 🗽
 
 ## Prerequisites
@@ -207,7 +207,7 @@ const params = {
   signature: '[code]',
   variant: 'A',
 };
-const signal = AbortSignal.timeout(1e4);
+const signal = AbortSignal.timeout(3e4);
 const url = '/somewhat/endpoint';
 
 const res = await rk(url, {

package/dist/cookies.cjs

@@ -30,7 +30,7 @@ class Cookies extends URLSearchParams {
     if (Array.isArray(input) && input.every(it => !Array.isArray(it))) {
       input = input.map(it => {
         if (!cookiesTTL) {
-          return [it.split(';').at(0).trim()];
+          return [it.split(';')[0].trim()];
         }
         const [cookie, ...attrs] = it.split(';').map(it => it.trim());
         const ttl = {};
@@ -44,10 +44,10 @@ class Cookies extends URLSearchParams {
         return [cookie.replace(/\u0022/g, ''), Object.keys(ttl).length ? ttl : null];
       });
     }
-    super(Array.isArray(input) ? input.map(it => it.at(0)).join('&') : input);
+    super(Array.isArray(input) ? input.map(it => it[0]).join('&') : input);
     if (Array.isArray(input) && cookiesTTL) {
-      for (const [cookie, ttl] of input.filter(it => it.at(1))) {
-        const key = cookie.split('=').at(0);
+      for (const [cookie, ttl] of input.filter(it => it[1])) {
+        const key = cookie.split('=')[0];
         if (this.#chronometry.has(key)) {
           clearTimeout(this.#chronometry.get(key));
           this.#chronometry.delete(key);

package/dist/formdata.cjs

@@ -7,7 +7,6 @@ exports.FormData = void 0;
 var _nodeBuffer = require("node:buffer");
 var _nodeCrypto = require("node:crypto");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
-var _nodeUtil = require("node:util");
 var _mediatypes = require("./mediatypes.cjs");
 var _utils = require("./utils.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -44,15 +43,15 @@ class FormData {
     return FormData.name === val?.[Symbol.toStringTag];
   }
   static #enfoldEntry(name, value, filename) {
-    name = (0, _nodeUtil.toUSVString)(name);
-    filename &&= (0, _nodeUtil.toUSVString)(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;
     } else {
-      value = (0, _nodeUtil.toUSVString)(value);
+      value = String(value).toWellFormed();
     }
     return {
       name,
@@ -106,7 +105,7 @@ class FormData {
   delete(...args) {
     (0, _utils.brandCheck)(this, FormData);
     this.#ensureArgs(args, 1, 'delete');
-    const name = (0, _nodeUtil.toUSVString)(args[0]);
+    const name = String(args[0]).toWellFormed();
     this.#entries = this.#entries.filter(it => it.name !== name);
   }
   forEach(...args) {
@@ -120,19 +119,19 @@ class FormData {
   get(...args) {
     (0, _utils.brandCheck)(this, FormData);
     this.#ensureArgs(args, 1, 'get');
-    const name = (0, _nodeUtil.toUSVString)(args[0]);
-    return (this.#entries.find(it => it.name === name) ?? {}).value ?? null;
+    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');
-    const name = (0, _nodeUtil.toUSVString)(args[0]);
+    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');
-    const name = (0, _nodeUtil.toUSVString)(args[0]);
+    const name = String(args[0]).toWellFormed();
     return !!this.#entries.find(it => it.name === name);
   }
   set(...args) {

package/dist/transfer.cjs

@@ -71,6 +71,16 @@ const transfer = async options => {
     }
     return res;
   } catch (err) {
+    if ((0, _utils.isLikelyH2cPrefaceError)(err)) {
+      options = (0, _utils.deepMerge)(options, {
+        h2: true,
+        retry: {
+          attempts: 1,
+          errorCodes: [err.code],
+          interval: 0
+        }
+      });
+    }
     const result = (0, _retries.retries)(err, options);
     if (result) {
       return result;

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.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.isFileLike = 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");
@@ -102,6 +102,10 @@ 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';
+};
+exports.isLikelyH2cPrefaceError = isLikelyH2cPrefaceError;
 const isPipeStream = val => {
   return val instanceof _nodeStream.Readable;
 };

package/package.json

@@ -71,5 +71,5 @@
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.2.1"
+  "version": "7.2.3"
 }

package/src/cookies.js

@@ -30,7 +30,7 @@ export class Cookies extends URLSearchParams {
     if (Array.isArray(input) && input.every((it) => !Array.isArray(it))) {
       input = input.map((it) => {
         if (!cookiesTTL) {
-          return [it.split(';').at(0).trim()];
+          return [it.split(';')[0].trim()];
         }
 
         const [cookie, ...attrs] = it.split(';').map((it) => it.trim());
@@ -52,11 +52,11 @@ export class Cookies extends URLSearchParams {
       });
     }
 
-    super(Array.isArray(input) ? input.map((it) => it.at(0)).join('&') : input);
+    super(Array.isArray(input) ? input.map((it) => it[0]).join('&') : input);
 
     if (Array.isArray(input) && cookiesTTL) {
-      for (const [cookie, ttl] of input.filter((it) => it.at(1))) {
-        const key = cookie.split('=').at(0);
+      for (const [cookie, ttl] of input.filter((it) => it[1])) {
+        const key = cookie.split('=')[0];
 
         if (this.#chronometry.has(key)) {
           clearTimeout(this.#chronometry.get(key));

package/src/formdata.js

@@ -1,7 +1,6 @@
 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,
@@ -64,8 +63,8 @@ export class FormData {
   }
 
   static #enfoldEntry(name, value, filename) {
-    name = toUSVString(name);
-    filename &&= toUSVString(filename);
+    name = String(name).toWellFormed();
+    filename &&= String(filename).toWellFormed();
 
     if (isFileLike(value)) {
       filename ??= value.name || 'blob';
@@ -73,7 +72,7 @@ export class FormData {
     } else if (this.#ensureInstance(value)) {
       value.name = filename;
     } else {
-      value = toUSVString(value);
+      value = String(value).toWellFormed();
     }
 
     return {
@@ -152,7 +151,7 @@ export class FormData {
   delete(...args) {
     brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'delete');
-    const name = toUSVString(args[0]);
+    const name = String(args[0]).toWellFormed();
 
     this.#entries = this.#entries.filter((it) => it.name !== name);
   }
@@ -173,15 +172,15 @@ export class FormData {
   get(...args) {
     brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'get');
-    const name = toUSVString(args[0]);
+    const name = String(args[0]).toWellFormed();
 
-    return (this.#entries.find((it) => it.name === name) ?? {}).value ?? null;
+    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]);
+    const name = String(args[0]).toWellFormed();
 
     return this.#entries.filter((it) => it.name === name).map((it) => it.value);
   }
@@ -189,7 +188,7 @@ export class FormData {
   has(...args) {
     brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'has');
-    const name = toUSVString(args[0]);
+    const name = String(args[0]).toWellFormed();
 
     return !!this.#entries.find((it) => it.name === name);
   }

package/src/transfer.js

@@ -8,7 +8,9 @@ import { preflight } from './preflight.js';
 import { retries } from './retries.js';
 import { transform } from './transform.js';
 import {
+  deepMerge,
   dispatch,
+  isLikelyH2cPrefaceError,
   snoop,
 } from './utils.js';
 
@@ -73,6 +75,17 @@ export const transfer = async (options) => {
 
     return res;
   } catch (err) {
+    if (isLikelyH2cPrefaceError(err)) {
+      options = deepMerge(options, {
+        h2: true,
+        retry: {
+          attempts: 1,
+          errorCodes: [err.code],
+          interval: 0,
+        },
+      });
+    }
+
     const result = retries(err, options);
 
     if (result) {

package/src/utils.js

@@ -109,6 +109,10 @@ export const isFileLike = (val) => {
   ].some((it) => val instanceof it);
 };
 
+export const isLikelyH2cPrefaceError = (err) => {
+  return err.code === 'HPE_INVALID_CONSTANT';
+};
+
 export const isPipeStream = (val) => {
   return val instanceof Readable;
 };