rekwest 7.2.5 → 7.2.7

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
 
@@ -69,8 +69,6 @@ console.log(res.body);
 import { Readable } from 'node:stream';
 import rekwest, {
   constants,
-  Blob,
-  File,
   FormData,
 } from 'rekwest';
 

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'],

package/dist/config.cjs

@@ -13,6 +13,7 @@ const isZstdSupported = exports.isZstdSupported = !!_nodeZlib.default.constants.
 const {
   HTTP2_HEADER_ACCEPT,
   HTTP2_HEADER_ACCEPT_ENCODING,
+  HTTP2_HEADER_USER_AGENT,
   HTTP2_METHOD_GET,
   HTTP_STATUS_BAD_GATEWAY,
   HTTP_STATUS_GATEWAY_TIMEOUT,
@@ -44,7 +45,8 @@ const defaults = {
   h2: false,
   headers: {
     [HTTP2_HEADER_ACCEPT]: `${_mediatypes.APPLICATION_JSON}, ${_mediatypes.TEXT_PLAIN}, ${_mediatypes.WILDCARD}`,
-    [HTTP2_HEADER_ACCEPT_ENCODING]: `br,${isZstdSupported ? ' zstd, ' : ' '}gzip, deflate, deflate-raw`
+    [HTTP2_HEADER_ACCEPT_ENCODING]: `br,${isZstdSupported ? ' zstd, ' : ' '}gzip, deflate, deflate-raw`,
+    [HTTP2_HEADER_USER_AGENT]: `node/${process.versions.node} ${process.platform}/${process.arch}`
   },
   method: HTTP2_METHOD_GET,
   parse: true,

package/dist/cookies.cjs

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.splitCookie = exports.maxCookieSize = exports.maxCookieLifetimeCap = exports.isValidCookie = exports.illegalCookieChars = exports.cookieRex = exports.cookiePairRex = exports.Cookies = void 0;
 var _utils = require("./utils.cjs");
-const cookieRex = exports.cookieRex = /^[\w-]+=(?:"[^"]*"|[^\p{Control};]*)(?:;\s*(?:[\w-]+=(?:"[^"]*"|[^\p{Control};]*)|[\w-]+))*$/u;
-const cookiePairRex = exports.cookiePairRex = /(?:[^;"\s]+="[^"]*"|[^;]+)(?=;|$)/g;
+const cookieRex = exports.cookieRex = /^[^=]+=(?:"[^"]*"|[^\p{Control};]*)(?:;\s*(?:[^=]+=(?:"[^"]*"|[^\p{Control};]*)|[^=]+))*$/u;
+const cookiePairRex = exports.cookiePairRex = /[^;\s]+=(?:"[^"]*"|[^;\s]*)/g;
 const illegalCookieChars = exports.illegalCookieChars = /\p{Control}/u;
 const isValidCookie = str => str?.constructor === String && cookieRex.test(str);
 exports.isValidCookie = isValidCookie;
 const maxCookieLifetimeCap = exports.maxCookieLifetimeCap = 3456e7; // 400 days
 const maxCookieSize = exports.maxCookieSize = 4096;
-const splitCookie = str => str.match(cookiePairRex).map(str => str.trim());
+const splitCookie = str => str.match(cookiePairRex);
 exports.splitCookie = splitCookie;
 class Cookies extends URLSearchParams {
   static #finalizers = new Set();
@@ -42,25 +42,28 @@ class Cookies extends URLSearchParams {
       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], {
-                    [(0, _utils.toCamelCase)(key.trim())]: Math.min(interval, maxCookieLifetimeCap)
-                  });
+          cookie = cookie.split(/=(?<v>.*)/s, 2).map(it => {
+            try {
+              return decodeURIComponent(it);
+            } catch {
+              return it;
+            }
+          });
+          if (cookiesTTL) {
+            for (const attr of attrs) {
+              if (/(?:expires|max-age)=/i.test(attr)) {
+                const [key, val] = attr.split(/=(?<v>.*)/s, 2);
+                let interval = val * 1e3 || Date.parse(val) - Date.now();
+                if (interval < 0 || Number.isNaN(interval)) {
+                  interval = 0;
                 }
+                ttlMap.set(cookie[0], {
+                  [(0, _utils.toCamelCase)(key)]: Math.min(interval, maxCookieLifetimeCap)
+                });
               }
             }
           }
+          return cookie;
         });
       }
     }
@@ -96,7 +99,7 @@ class Cookies extends URLSearchParams {
   }
   toString() {
     (0, _utils.brandCheck)(this, Cookies);
-    return super.toString().split('&').join('; ').trim();
+    return super.toString().split('&').join('; ');
   }
 }
 exports.Cookies = Cookies;

package/dist/formdata.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseFormData = exports.isFormData = exports.fdToAsyncIterable = exports.FormData = void 0;
-var _nodeBuffer = require("node:buffer");
 var _nodeCrypto = require("node:crypto");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _mediatypes = require("./mediatypes.cjs");
@@ -31,7 +30,7 @@ class FormData {
     filename &&= String(filename).toWellFormed();
     if ((0, _utils.isBlobLike)(value)) {
       filename ??= String(value.name ?? 'blob').toWellFormed();
-      value = new _nodeBuffer.File([value], filename, value);
+      value = new File([value], filename, value);
     } else if ((0, _utils.isPipeStream)(value) || (0, _utils.isReadableStream)(value)) {
       value.name = filename ?? 'blob';
     } else {

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

@@ -70,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/utils.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 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"));
@@ -97,7 +96,7 @@ const dispatch = (req, {
   }
 };
 exports.dispatch = dispatch;
-const isBlobLike = val => val instanceof _nodeBuffer.Blob;
+const isBlobLike = val => val instanceof Blob;
 exports.isBlobLike = isBlobLike;
 const isLikelyH2cPrefaceError = err => err.code === 'HPE_INVALID_CONSTANT';
 exports.isLikelyH2cPrefaceError = isLikelyH2cPrefaceError;

package/package.json

@@ -11,11 +11,11 @@
   "devDependencies": {
     "@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.1",
-    "eslint-config-ultra-refined": "^4.1.2",
+    "@babel/preset-env": "^7.29.2",
+    "@eslint/markdown": "^8.0.1",
+    "c8": "^11.0.0",
+    "eslint": "^10.2.0",
+    "eslint-config-ultra-refined": "^4.1.6",
     "mocha": "^11.7.5"
   },
   "engines": {
@@ -72,5 +72,5 @@
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.2.5"
+  "version": "7.2.7"
 }

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: [

package/src/config.js

@@ -15,6 +15,7 @@ export const isZstdSupported = !!zlib.constants.ZSTD_CLEVEL_DEFAULT;
 const {
   HTTP2_HEADER_ACCEPT,
   HTTP2_HEADER_ACCEPT_ENCODING,
+  HTTP2_HEADER_USER_AGENT,
   HTTP2_METHOD_GET,
   HTTP_STATUS_BAD_GATEWAY,
   HTTP_STATUS_GATEWAY_TIMEOUT,
@@ -49,6 +50,7 @@ const defaults = {
   headers: {
     [HTTP2_HEADER_ACCEPT]: `${ APPLICATION_JSON }, ${ TEXT_PLAIN }, ${ WILDCARD }`,
     [HTTP2_HEADER_ACCEPT_ENCODING]: `br,${ isZstdSupported ? ' zstd, ' : ' ' }gzip, deflate, deflate-raw`,
+    [HTTP2_HEADER_USER_AGENT]: `node/${ process.versions.node } ${ process.platform }/${ process.arch }`,
   },
   method: HTTP2_METHOD_GET,
   parse: true,

package/src/cookies.js

@@ -3,13 +3,13 @@ import {
   toCamelCase,
 } from './utils.js';
 
-export const cookieRex = /^[\w-]+=(?:"[^"]*"|[^\p{Control};]*)(?:;\s*(?:[\w-]+=(?:"[^"]*"|[^\p{Control};]*)|[\w-]+))*$/u;
-export const cookiePairRex = /(?:[^;"\s]+="[^"]*"|[^;]+)(?=;|$)/g;
+export const cookieRex = /^[^=]+=(?:"[^"]*"|[^\p{Control};]*)(?:;\s*(?:[^=]+=(?:"[^"]*"|[^\p{Control};]*)|[^=]+))*$/u;
+export const cookiePairRex = /[^;\s]+=(?:"[^"]*"|[^;\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 const splitCookie = (str) => str.match(cookiePairRex);
 
 export class Cookies extends URLSearchParams {
 
@@ -43,29 +43,33 @@ export class Cookies extends URLSearchParams {
       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) },
-                  );
+          cookie = cookie.split(/=(?<v>.*)/s, 2).map((it) => {
+            try {
+              return decodeURIComponent(it);
+            } catch {
+              return it;
+            }
+          });
+
+          if (cookiesTTL) {
+            for (const attr of attrs) {
+              if (/(?:expires|max-age)=/i.test(attr)) {
+                const [key, val] = attr.split(/=(?<v>.*)/s, 2);
+                let interval = val * 1e3 || Date.parse(val) - Date.now();
+
+                if (interval < 0 || Number.isNaN(interval)) {
+                  interval = 0;
                 }
+
+                ttlMap.set(
+                  cookie[0],
+                  { [toCamelCase(key)]: Math.min(interval, maxCookieLifetimeCap) },
+                );
               }
             }
           }
+
+          return cookie;
         });
       }
     }
@@ -111,7 +115,7 @@ export class Cookies extends URLSearchParams {
   toString() {
     brandCheck(this, Cookies);
 
-    return super.toString().split('&').join('; ').trim();
+    return super.toString().split('&').join('; ');
   }
 
 }

package/src/formdata.js

@@ -1,4 +1,3 @@
-import { File } from 'node:buffer';
 import { randomBytes } from 'node:crypto';
 import http2 from 'node:http2';
 import {

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

@@ -72,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/utils.js

@@ -1,4 +1,3 @@
-import { Blob } from 'node:buffer';
 import http2 from 'node:http2';
 import {
   isReadable,