rekwest 5.0.2 → 5.0.3

package/package.json

@@ -1,74 +1,74 @@
-{
-  "author": {
-    "name": "Yehor Sergeenko",
-    "email": "yehor.sergeenko@gmail.com",
-    "url": "https://github.com/bricss"
-  },
-  "bugs": {
-    "url": "https://github.com/bricss/rekwest/issues"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.23.0",
-    "@babel/core": "^7.23.2",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.23.2",
-    "@stylistic/eslint-plugin-js": "^1.0.0",
-    "c8": "^8.0.1",
-    "eslint": "^8.53.0",
-    "eslint-config-ultra-refined": "^2.19.0",
-    "mocha": "^10.2.0"
-  },
-  "description": "The robust request library that humanity deserves 🌐",
-  "engines": {
-    "node": ">=18.13.0"
-  },
-  "exports": {
-    "import": "./src/index.mjs",
-    "require": "./dist/index.js"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "homepage": "https://github.com/bricss/rekwest#readme",
-  "keywords": [
-    "alpn",
-    "backoff",
-    "brotli",
-    "cookie",
-    "deflate",
-    "fetch",
-    "formdata",
-    "gzip",
-    "http",
-    "https",
-    "h2",
-    "h2c",
-    "http2",
-    "multipart",
-    "request",
-    "redirect",
-    "retry",
-    "retry-after",
-    "stream",
-    "upload"
-  ],
-  "license": "MIT",
-  "name": "rekwest",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bricss/rekwest.git"
-  },
-  "scripts": {
-    "build": "rm -rf dist && npx babel src -d dist",
-    "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 . --ext .cjs,.js,.mjs",
-    "prepack": "npm run build && sh pony.sh",
-    "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"
-  },
-  "version": "5.0.2"
-}
+{
+  "author": {
+    "name": "Yehor Sergeenko",
+    "email": "yehor.sergeenko@gmail.com",
+    "url": "https://github.com/bricss"
+  },
+  "bugs": {
+    "url": "https://github.com/bricss/rekwest/issues"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.3",
+    "@babel/eslint-parser": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@stylistic/eslint-plugin-js": "^1.1.0",
+    "c8": "^8.0.1",
+    "eslint": "^8.53.0",
+    "eslint-config-ultra-refined": "^2.19.1",
+    "mocha": "^10.2.0"
+  },
+  "description": "The robust request library that humanity deserves 🌐",
+  "engines": {
+    "node": ">=18.13.0"
+  },
+  "exports": {
+    "import": "./src/index.mjs",
+    "require": "./dist/index.js"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "homepage": "https://github.com/bricss/rekwest#readme",
+  "keywords": [
+    "alpn",
+    "backoff",
+    "brotli",
+    "cookie",
+    "deflate",
+    "fetch",
+    "formdata",
+    "gzip",
+    "http",
+    "https",
+    "h2",
+    "h2c",
+    "http2",
+    "multipart",
+    "request",
+    "redirect",
+    "retry",
+    "retry-after",
+    "stream",
+    "upload"
+  ],
+  "license": "MIT",
+  "name": "rekwest",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bricss/rekwest.git"
+  },
+  "scripts": {
+    "build": "rm -rf dist && npx babel src -d dist",
+    "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 . --ext .cjs,.js,.mjs",
+    "prepack": "npm run build && sh pony.sh",
+    "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"
+  },
+  "version": "5.0.3"
+}

package/src/cookies.mjs

@@ -1,92 +1,97 @@
-import {
-  brandCheck,
-  toCamelCase,
-} from './utils.mjs';
-
-export class Cookies extends URLSearchParams {
-
-  static #finalizers = new Set();
-  static jar = new Map();
-
-  static #register(target, value) {
-    const finalizer = new FinalizationRegistry((heldValue) => {
-      clearTimeout(heldValue);
-      this.#finalizers.delete(finalizer);
-    });
-
-    finalizer.register(target, value);
-    this.#finalizers.add(finalizer);
-  }
-
-  #chronometry = new Map();
-
-  get [Symbol.toStringTag]() {
-    return this.constructor.name;
-  }
-
-  constructor(input, { cookiesTTL } = { cookiesTTL: false }) {
-    if (Array.isArray(input) && input.every((it) => !Array.isArray(it))) {
-      input = input.map((it) => {
-        if (!cookiesTTL) {
-          return [it.split(';').at(0).trim()];
-        }
-
-        const [cookie, ...attrs] = it.split(';').map((it) => it.trim());
-        const ttl = attrs.reduce((acc, val) => {
-          if (/(?:Expires|Max-Age)=/i.test(val)) {
-            const [key, value] = val.toLowerCase().split('=');
-
-            acc[toCamelCase(key)] = !Number.isNaN(Number(value)) ? value * 1e3 : Date.parse(value) - Date.now();
-          }
-
-          return acc;
-        }, {});
-
-        return [
-          cookie.replace(/\u0022/g, ''),
-          Object.keys(ttl).length ? ttl : null,
-        ];
-      });
-    }
-
-    super(Array.isArray(input) ? input.map((it) => it.at(0)).join('&') : input);
-
-    if (Array.isArray(input) && cookiesTTL) {
-      input.filter((it) => it.at(1)).forEach(([cookie, ttl]) => {
-        cookie = cookie.split('=').at(0);
-        if (this.#chronometry.has(cookie)) {
-          clearTimeout(this.#chronometry.get(cookie));
-          this.#chronometry.delete(cookie);
-        }
-
-        const { expires, maxAge } = ttl;
-
-        [
-          maxAge,
-          expires,
-        ].filter((it) => Number.isInteger(it)).some((ms) => {
-          const ref = new WeakRef(this);
-          const tid = setTimeout(() => {
-            const ctx = ref.deref();
-
-            if (ctx) {
-              ctx.#chronometry.delete(cookie);
-              ctx.delete(cookie);
-            }
-          }, Math.max(ms, 0));
-
-          this.constructor.#register(this, tid);
-
-          return this.#chronometry.set(cookie, tid);
-        });
-      });
-    }
-  }
-
-  toString() {
-    brandCheck(this, Cookies);
-
-    return super.toString().split('&').join('; ').trim();
-  }
-
-}
+import {
+  brandCheck,
+  toCamelCase,
+} from './utils.mjs';
+
+export class Cookies extends URLSearchParams {
+
+  static #finalizers = new Set();
+  static jar = new Map();
+
+  static #register(target, value) {
+    const finalizer = new FinalizationRegistry((heldValue) => {
+      clearTimeout(heldValue);
+      this.#finalizers.delete(finalizer);
+    });
+
+    finalizer.register(target, value);
+    this.#finalizers.add(finalizer);
+  }
+
+  #chronometry = new Map();
+
+  get [Symbol.toStringTag]() {
+    return this.constructor.name;
+  }
+
+  constructor(input, { cookiesTTL } = { cookiesTTL: false }) {
+    if (Array.isArray(input) && input.every((it) => !Array.isArray(it))) {
+      input = input.map((it) => {
+        if (!cookiesTTL) {
+          return [it.split(';').at(0).trim()];
+        }
+
+        const [cookie, ...attrs] = it.split(';').map((it) => it.trim());
+        const ttl = {};
+
+        for (const val of attrs) {
+          if (/(?:Expires|Max-Age)=/i.test(val)) {
+            const [key, value] = val.toLowerCase().split('=');
+
+            ttl[toCamelCase(key)] = !Number.isNaN(Number(value)) ? value * 1e3 : Date.parse(value) - Date.now();
+          }
+        }
+
+        return [
+          cookie.replace(/\u0022/g, ''),
+          Object.keys(ttl).length ? ttl : null,
+        ];
+      });
+    }
+
+    super(Array.isArray(input) ? input.map((it) => it.at(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);
+
+        if (this.#chronometry.has(key)) {
+          clearTimeout(this.#chronometry.get(key));
+          this.#chronometry.delete(key);
+        }
+
+        const { expires, maxAge } = ttl;
+
+        for (const ms of [
+          maxAge,
+          expires,
+        ]) {
+          if (!Number.isInteger(ms)) {
+            continue;
+          }
+
+          const ref = new WeakRef(this);
+          const tid = setTimeout(() => {
+            const ctx = ref.deref();
+
+            if (ctx) {
+              ctx.#chronometry.delete(key);
+              ctx.delete(key);
+            }
+          }, Math.max(ms, 0));
+
+          this.constructor.#register(this, tid);
+          this.#chronometry.set(key, tid);
+          break;
+        }
+      }
+    }
+  }
+
+  toString() {
+    brandCheck(this, Cookies);
+
+    return super.toString().split('&').join('; ').trim();
+  }
+
+}

package/src/formdata.mjs

@@ -116,7 +116,7 @@ export class FormData {
         input = Object.entries(input);
       }
 
-      input.forEach(([key, value]) => this.append(key, value));
+      for (const [key, value] of input) { this.append(key, value); }
     }
   }
 

package/src/postflight.mjs

@@ -1,134 +1,136 @@
-import http2 from 'node:http2';
-import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
-import {
-  requestCredentials,
-  requestRedirect,
-  requestRedirectCodes,
-} from './constants.mjs';
-import { Cookies } from './cookies.mjs';
-import { RequestError } from './errors.mjs';
-import rekwest from './index.mjs';
-import { mixin } from './mixin.mjs';
-import {
-  admix,
-  maxRetryAfterError,
-  sameOrigin,
-} from './utils.mjs';
-
-const {
-  HTTP2_HEADER_LOCATION,
-  HTTP2_HEADER_RETRY_AFTER,
-  HTTP2_HEADER_SET_COOKIE,
-  HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD,
-  HTTP2_METHOD_POST,
-  HTTP_STATUS_BAD_REQUEST,
-  HTTP_STATUS_FOUND,
-  HTTP_STATUS_MOVED_PERMANENTLY,
-  HTTP_STATUS_SEE_OTHER,
-} = http2.constants;
-
-export const postflight = (req, res, options, { reject, resolve }) => {
-  const { cookies, credentials, follow, h2, redirect, url } = options;
-  let headers;
-
-  if (h2) {
-    headers = res;
-    res = req;
-  } else {
-    res.once('error', reject);
-  }
-
-  admix(res, headers, options);
-
-  if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
-    if (Cookies.jar.has(url.origin)) {
-      const cookie = new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options);
-
-      Cookies.jar.get(url.origin).forEach((val, key) => {
-        if (!cookie.has(key)) {
-          cookie.set(key, val);
-        }
-      });
-      Cookies.jar.set(url.origin, cookie);
-    } else {
-      Cookies.jar.set(url.origin, new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options));
-    }
-  }
-
-  Reflect.defineProperty(res, 'cookies', {
-    enumerable: true,
-    value: cookies !== false && Cookies.jar.has(url.origin)
-           ? Cookies.jar.get(url.origin)
-           : void 0,
-  });
-
-  const { statusCode } = res;
-
-  if (follow && /3\d{2}/.test(statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
-    if (!requestRedirectCodes.includes(statusCode)) {
-      return res.emit('error', new RangeError(`Invalid status code: ${ statusCode }`));
-    }
-
-    if (redirect === requestRedirect.error) {
-      return res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
-    }
-
-    if (redirect === requestRedirect.follow) {
-      const location = new URL(res.headers[HTTP2_HEADER_LOCATION], url);
-
-      if (!/^https?:/i.test(location.protocol)) {
-        return res.emit('error', new RequestError('URL scheme must be "http" or "https".'));
-      }
-
-      if (!sameOrigin(location, url)) {
-        if (credentials !== requestCredentials.include) {
-          options.credentials = requestCredentials.omit;
-        }
-
-        options.h2 = false;
-      }
-
-      if (statusCode !== HTTP_STATUS_SEE_OTHER && options.body?.pipe?.constructor === Function) {
-        return res.emit('error', new RequestError(`Unable to ${ redirect } redirect with streamable body.`));
-      }
-
-      if (([
-        HTTP_STATUS_MOVED_PERMANENTLY,
-        HTTP_STATUS_FOUND,
-      ].includes(statusCode) && options.method === HTTP2_METHOD_POST) || (statusCode === HTTP_STATUS_SEE_OTHER && ![
-        HTTP2_METHOD_GET,
-        HTTP2_METHOD_HEAD,
-      ].includes(options.method))) {
-        Object.keys(options.headers).filter((it) => /^content-/i.test(it))
-              .forEach((it) => Reflect.deleteProperty(options.headers, it));
-        options.body = null;
-        options.method = HTTP2_METHOD_GET;
-      }
-
-      options.follow--;
-      options.redirected = true;
-      options.url = location;
-
-      if (statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {
-        let interval = res.headers[HTTP2_HEADER_RETRY_AFTER];
-
-        interval = Number(interval) * 1000 || new Date(interval) - Date.now();
-
-        if (interval > options.maxRetryAfter) {
-          return res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
-        }
-
-        return setTimeoutPromise(interval).then(() => rekwest(options.url, options).then(resolve, reject));
-      }
-
-      return rekwest(options.url, options).then(resolve, reject);
-    }
-  }
-
-  if (statusCode >= HTTP_STATUS_BAD_REQUEST) {
-    return reject(mixin(res, options));
-  }
-
-  resolve(mixin(res, options));
-};
+import http2 from 'node:http2';
+import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
+import {
+  requestCredentials,
+  requestRedirect,
+  requestRedirectCodes,
+} from './constants.mjs';
+import { Cookies } from './cookies.mjs';
+import { RequestError } from './errors.mjs';
+import rekwest from './index.mjs';
+import { mixin } from './mixin.mjs';
+import {
+  admix,
+  maxRetryAfterError,
+  sameOrigin,
+} from './utils.mjs';
+
+const {
+  HTTP2_HEADER_LOCATION,
+  HTTP2_HEADER_RETRY_AFTER,
+  HTTP2_HEADER_SET_COOKIE,
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD,
+  HTTP2_METHOD_POST,
+  HTTP_STATUS_BAD_REQUEST,
+  HTTP_STATUS_FOUND,
+  HTTP_STATUS_MOVED_PERMANENTLY,
+  HTTP_STATUS_SEE_OTHER,
+} = http2.constants;
+
+export const postflight = (req, res, options, { reject, resolve }) => {
+  const { cookies, credentials, follow, h2, redirect, url } = options;
+  let headers;
+
+  if (h2) {
+    headers = res;
+    res = req;
+  } else {
+    res.once('error', reject);
+  }
+
+  admix(res, headers, options);
+
+  if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
+    if (Cookies.jar.has(url.origin)) {
+      const cookie = new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options);
+
+      Cookies.jar.get(url.origin).forEach((val, key) => {
+        if (!cookie.has(key)) {
+          cookie.set(key, val);
+        }
+      });
+      Cookies.jar.set(url.origin, cookie);
+    } else {
+      Cookies.jar.set(url.origin, new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options));
+    }
+  }
+
+  Reflect.defineProperty(res, 'cookies', {
+    enumerable: true,
+    value: cookies !== false && Cookies.jar.has(url.origin)
+           ? Cookies.jar.get(url.origin)
+           : void 0,
+  });
+
+  const { statusCode } = res;
+
+  if (follow && /3\d{2}/.test(statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
+    if (!requestRedirectCodes.includes(statusCode)) {
+      return res.emit('error', new RangeError(`Invalid status code: ${ statusCode }`));
+    }
+
+    if (redirect === requestRedirect.error) {
+      return res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
+    }
+
+    if (redirect === requestRedirect.follow) {
+      const location = new URL(res.headers[HTTP2_HEADER_LOCATION], url);
+
+      if (!/^https?:/i.test(location.protocol)) {
+        return res.emit('error', new RequestError('URL scheme must be "http" or "https".'));
+      }
+
+      if (!sameOrigin(location, url)) {
+        if (credentials !== requestCredentials.include) {
+          options.credentials = requestCredentials.omit;
+        }
+
+        options.h2 = false;
+      }
+
+      if (statusCode !== HTTP_STATUS_SEE_OTHER && options.body?.pipe?.constructor === Function) {
+        return res.emit('error', new RequestError(`Unable to ${ redirect } redirect with streamable body.`));
+      }
+
+      if (([
+        HTTP_STATUS_MOVED_PERMANENTLY,
+        HTTP_STATUS_FOUND,
+      ].includes(statusCode) && options.method === HTTP2_METHOD_POST) || (statusCode === HTTP_STATUS_SEE_OTHER && ![
+        HTTP2_METHOD_GET,
+        HTTP2_METHOD_HEAD,
+      ].includes(options.method))) {
+        for (const it of Object.keys(options.headers).filter((val) => /^content-/i.test(val))) {
+          Reflect.deleteProperty(options.headers, it);
+        }
+
+        options.body = null;
+        options.method = HTTP2_METHOD_GET;
+      }
+
+      options.follow--;
+      options.redirected = true;
+      options.url = location;
+
+      if (statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {
+        let interval = res.headers[HTTP2_HEADER_RETRY_AFTER];
+
+        interval = Number(interval) * 1000 || new Date(interval) - Date.now();
+
+        if (interval > options.maxRetryAfter) {
+          return res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
+        }
+
+        return setTimeoutPromise(interval).then(() => rekwest(options.url, options).then(resolve, reject));
+      }
+
+      return rekwest(options.url, options).then(resolve, reject);
+    }
+  }
+
+  if (statusCode >= HTTP_STATUS_BAD_REQUEST) {
+    return reject(mixin(res, options));
+  }
+
+  resolve(mixin(res, options));
+};