rekwest 7.2.7 → 8.1.0

package/package.json

@@ -1,76 +1,81 @@
-{
-  "author": {
-    "email": "yehor.sergeenko@gmail.com",
-    "name": "Yehor Sergeenko",
-    "url": "https://github.com/bricss"
-  },
-  "bugs": {
-    "url": "https://github.com/bricss/rekwest/issues"
-  },
-  "description": "The robust request library that humanity deserves 🌐",
-  "devDependencies": {
-    "@babel/cli": "^7.28.6",
-    "@babel/core": "^7.29.0",
-    "@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": {
-    "node": ">=20.0.0"
-  },
-  "exports": {
-    "import": "./src/index.js",
-    "require": "./dist/index.cjs"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "homepage": "https://github.com/bricss/rekwest#readme",
-  "keywords": [
-    "alpn",
-    "backoff",
-    "brotli",
-    "cookies",
-    "deflate",
-    "deflate-raw",
-    "fetch",
-    "formdata",
-    "gzip",
-    "http",
-    "https",
-    "h2",
-    "h2c",
-    "http2",
-    "multipart",
-    "request",
-    "redirect",
-    "retry",
-    "retry-after",
-    "stream",
-    "upload",
-    "zstd"
-  ],
-  "license": "MIT",
-  "name": "rekwest",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bricss/rekwest.git"
-  },
-  "scripts": {
-    "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 && 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.7"
-}
+{
+  "author": {
+    "email": "yehor.sergeenko@gmail.com",
+    "name": "Yehor Sergeenko",
+    "url": "https://github.com/bricss"
+  },
+  "bugs": {
+    "url": "https://github.com/bricss/rekwest/issues"
+  },
+  "description": "The robust request library that humanity deserves 🌐",
+  "devDependencies": {
+    "@babel/cli": "^7.29.7",
+    "@babel/core": "^7.29.7",
+    "@babel/preset-env": "^7.29.7",
+    "@eslint/markdown": "^8.0.2",
+    "c8": "^11.0.0",
+    "eslint": "^10.4.1",
+    "eslint-config-ultra-refined": "^4.1.8",
+    "mocha": "^11.7.6"
+  },
+  "engines": {
+    "node": ">=22.0.0"
+  },
+  "exports": {
+    "import": "./src/index.js",
+    "require": "./dist/index.cjs"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "homepage": "https://github.com/bricss/rekwest#readme",
+  "keywords": [
+    "alpn",
+    "backoff",
+    "brotli",
+    "cookies",
+    "deflate",
+    "deflate-raw",
+    "fetch",
+    "formdata",
+    "gzip",
+    "http",
+    "https",
+    "h2",
+    "h2c",
+    "http2",
+    "multipart",
+    "request",
+    "redirect",
+    "retry",
+    "retry-after",
+    "stream",
+    "upload",
+    "zstd"
+  ],
+  "license": "MIT",
+  "name": "rekwest",
+  "overrides": {
+    "c8": {
+      "yargs": "^18.0.0"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bricss/rekwest.git"
+  },
+  "scripts": {
+    "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 && 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": "8.1.0"
+}

package/src/ackn.js

@@ -1,33 +1,46 @@
-import { connect } from 'node:tls';
-
-export const ackn = (options = {}) => new Promise((resolve, reject) => {
-  const url = new URL(options.url);
-  const socket = connect({
-    ...options,
-    ALPNProtocols: [
-      'h2',
-      'http/1.1',
-    ],
-    host: url.hostname,
-    port: parseInt(url.port, 10) || 443,
-    servername: url.hostname,
-  }, () => {
-    socket.off('error', reject);
-    socket.off('timeout', reject);
-
-    const { alpnProtocol } = socket;
-
-    resolve({
-      ...options,
-      alpnProtocol,
-      createConnection() {
-        return socket;
-      },
-      h2: /\bh2\b/i.test(alpnProtocol),
-      protocol: url.protocol,
-    });
-  });
-
-  socket.once('error', reject);
-  socket.once('timeout', reject);
-});
+import { connect } from 'node:tls';
+import { RequestError } from './errors.js';
+
+export const ackn = (options = {}) => new Promise((resolve, reject) => {
+  const url = new URL(options.url);
+  const socket = connect({
+    ...options,
+    ALPNProtocols: [
+      'h2',
+      'http/1.1',
+    ],
+    host: url.hostname,
+    port: parseInt(url.port, 10) || 443,
+    servername: url.hostname,
+  }, () => {
+    const cert = socket.getPeerCertificate();
+
+    if (options.certPins?.length) {
+      const fp = cert.fingerprint256;
+
+      if (!options.certPins.includes(fp) && !socket.isSessionReused()) {
+        socket.destroy();
+
+        return reject(new RequestError(`Certificate pins mismatch for ${ url.hostname }`));
+      }
+    }
+
+    socket.off('error', reject);
+    socket.off('timeout', reject);
+
+    const { alpnProtocol } = socket;
+
+    resolve({
+      ...options,
+      alpnProtocol,
+      createConnection() {
+        return socket;
+      },
+      h2: /\bh2\b/i.test(alpnProtocol),
+      protocol: url.protocol,
+    });
+  });
+
+  socket.once('error', reject);
+  socket.once('timeout', reject);
+});

package/src/config.js

@@ -1,90 +1,91 @@
-import http2 from 'node:http2';
-import zlib from 'node:zlib';
-import {
-  requestCredentials,
-  requestRedirect,
-} from './constants.js';
-import {
-  APPLICATION_JSON,
-  TEXT_PLAIN,
-  WILDCARD,
-} from './mediatypes.js';
-
-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,
-  HTTP_STATUS_INTERNAL_SERVER_ERROR,
-  HTTP_STATUS_SERVICE_UNAVAILABLE,
-  HTTP_STATUS_TOO_MANY_REQUESTS,
-} = http2.constants;
-
-const timeout = 3e5;
-
-const defaults = {
-  allowDowngrade: false,
-  bufferBody: false,
-  cookiesTTL: false,
-  credentials: requestCredentials.sameOrigin,
-  decodersOptions: {},
-  digest: true,
-  encodersOptions: {
-    brotli: {
-      params: {
-        [zlib.constants.BROTLI_PARAM_QUALITY]: 4,
-      },
-    },
-    zstd: {
-      params: {
-        [zlib.constants.ZSTD_c_compressionLevel]: 6,
-      },
-    },
-  },
-  follow: 20,
-  h2: false,
-  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,
-  redirect: requestRedirect.follow,
-  retry: {
-    attempts: 0,
-    backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
-    errorCodes: [
-      'ECONNREFUSED',
-      'ECONNRESET',
-      'EHOSTDOWN',
-      'EHOSTUNREACH',
-      'ENETDOWN',
-      'ENETUNREACH',
-      'ENOTFOUND',
-      'ERR_HTTP2_STREAM_ERROR',
-    ],
-    interval: 1e3,
-    maxRetryAfter: timeout,
-    retryAfter: true,
-    statusCodes: [
-      HTTP_STATUS_TOO_MANY_REQUESTS,
-      HTTP_STATUS_INTERNAL_SERVER_ERROR,
-      HTTP_STATUS_BAD_GATEWAY,
-      HTTP_STATUS_SERVICE_UNAVAILABLE,
-      HTTP_STATUS_GATEWAY_TIMEOUT,
-    ],
-  },
-  stripTrailingSlash: false,
-  thenable: false,
-  timeout,
-  trimTrailingSlashes: false,
-};
-
-export default {
-  defaults,
-};
+import http2 from 'node:http2';
+import zlib from 'node:zlib';
+import {
+  requestCredentials,
+  requestRedirect,
+} from './constants.js';
+import {
+  APPLICATION_JSON,
+  TEXT_PLAIN,
+  WILDCARD,
+} from './mediatypes.js';
+
+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,
+  HTTP_STATUS_INTERNAL_SERVER_ERROR,
+  HTTP_STATUS_SERVICE_UNAVAILABLE,
+  HTTP_STATUS_TOO_MANY_REQUESTS,
+} = http2.constants;
+
+const timeout = 3e5;
+
+const defaults = {
+  allowDowngrade: false,
+  bufferBody: false,
+  certPins: [],
+  cookiesTTL: false,
+  credentials: requestCredentials.sameOrigin,
+  decodersOptions: {},
+  digest: true,
+  encodersOptions: {
+    brotli: {
+      params: {
+        [zlib.constants.BROTLI_PARAM_QUALITY]: 4,
+      },
+    },
+    zstd: {
+      params: {
+        [zlib.constants.ZSTD_c_compressionLevel]: 6,
+      },
+    },
+  },
+  follow: 20,
+  h2: false,
+  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,
+  redirect: requestRedirect.follow,
+  retry: {
+    attempts: 0,
+    backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
+    errorCodes: [
+      'ECONNREFUSED',
+      'ECONNRESET',
+      'EHOSTDOWN',
+      'EHOSTUNREACH',
+      'ENETDOWN',
+      'ENETUNREACH',
+      'ENOTFOUND',
+      'ERR_HTTP2_STREAM_ERROR',
+    ],
+    interval: 1e3,
+    maxRetryAfter: timeout,
+    retryAfter: true,
+    statusCodes: [
+      HTTP_STATUS_TOO_MANY_REQUESTS,
+      HTTP_STATUS_INTERNAL_SERVER_ERROR,
+      HTTP_STATUS_BAD_GATEWAY,
+      HTTP_STATUS_SERVICE_UNAVAILABLE,
+      HTTP_STATUS_GATEWAY_TIMEOUT,
+    ],
+  },
+  stripTrailingSlash: false,
+  thenable: false,
+  timeout,
+  trimTrailingSlashes: false,
+};
+
+export default {
+  defaults,
+};

package/src/constants.js

@@ -1,11 +1,11 @@
-export const requestCredentials = {
-  include: 'include',
-  omit: 'omit',
-  sameOrigin: 'same-origin',
-};
-
-export const requestRedirect = {
-  error: 'error',
-  follow: 'follow',
-  manual: 'manual',
-};
+export const requestCredentials = {
+  include: 'include',
+  omit: 'omit',
+  sameOrigin: 'same-origin',
+};
+
+export const requestRedirect = {
+  error: 'error',
+  follow: 'follow',
+  manual: 'manual',
+};