rekwest 7.2.6 → 8.0.0

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 `>=22.0.0`
 
 ## Installation
 

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]: navigator.userAgent
   },
   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/utils.cjs

@@ -75,6 +75,10 @@ const deepMerge = (target, ...rest) => {
     for (const key of Object.getOwnPropertyNames(source)) {
       const sv = source[key];
       const tv = target[key];
+      if (sv instanceof Function) {
+        target[key] = source[key];
+        continue;
+      }
       if (Object(sv) === sv && Object(tv) === tv) {
         target[key] = deepMerge(tv, sv);
         continue;

package/package.json

@@ -11,15 +11,15 @@
   "devDependencies": {
     "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.2",
-    "@eslint/markdown": "^8.0.0",
+    "@babel/preset-env": "^7.29.5",
+    "@eslint/markdown": "^8.0.1",
     "c8": "^11.0.0",
-    "eslint": "^10.1.0",
-    "eslint-config-ultra-refined": "^4.1.5",
+    "eslint": "^10.3.0",
+    "eslint-config-ultra-refined": "^4.1.7",
     "mocha": "^11.7.5"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   },
   "exports": {
     "import": "./src/index.js",
@@ -72,5 +72,5 @@
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.2.6"
+  "version": "8.0.0"
 }

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]: navigator.userAgent,
   },
   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/utils.js

@@ -78,6 +78,11 @@ export const deepMerge = (target, ...rest) => {
       const sv = source[key];
       const tv = target[key];
 
+      if (sv instanceof Function) {
+        target[key] = source[key];
+        continue;
+      }
+
       if (Object(sv) === sv && Object(tv) === tv) {
         target[key] = deepMerge(tv, sv);
         continue;