rekwest 4.0.0 → 4.2.0

package/dist/utils.js

@@ -1,37 +1,37 @@
 "use strict";
 
 exports.__esModule = true;
-exports.sanitize = exports.redirects = exports.preflight = exports.mixin = exports.merge = exports.dispatch = exports.decompress = exports.compress = exports.collate = exports.affix = exports.admix = void 0;
+exports.sanitize = exports.sameOrigin = exports.mixin = exports.merge = exports.maxRetryAfterError = exports.maxRetryAfter = exports.dispatch = exports.decompress = exports.compress = exports.brandCheck = exports.affix = exports.admix = void 0;
 exports.tap = tap;
-exports.transform = void 0;
+exports.validation = exports.unwind = exports.transform = exports.transfer = void 0;
 var _nodeBuffer = require("node:buffer");
-var _nodeHttp = _interopRequireDefault(require("node:http2"));
+var _nodeHttp = _interopRequireDefault(require("node:http"));
+var _nodeHttp2 = _interopRequireDefault(require("node:http2"));
+var _nodeHttps = _interopRequireDefault(require("node:https"));
 var _nodeStream = require("node:stream");
 var _consumers = require("node:stream/consumers");
+var _promises = require("node:timers/promises");
 var _nodeUtil = require("node:util");
 var _nodeZlib = _interopRequireDefault(require("node:zlib"));
-var _cookies = require("./cookies");
+var _ackn = require("./ackn");
+var _constants = require("./constants");
 var _errors = require("./errors");
 var _file = require("./file");
 var _formdata = require("./formdata");
+var _index = _interopRequireDefault(require("./index"));
 var _mediatypes = require("./mediatypes");
+var _postflight = require("./postflight");
+var _preflight = require("./preflight");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
-  HTTP2_HEADER_ACCEPT,
-  HTTP2_HEADER_ACCEPT_ENCODING,
-  HTTP2_HEADER_AUTHORITY,
   HTTP2_HEADER_CONTENT_ENCODING,
   HTTP2_HEADER_CONTENT_LENGTH,
   HTTP2_HEADER_CONTENT_TYPE,
-  HTTP2_HEADER_COOKIE,
-  HTTP2_HEADER_METHOD,
-  HTTP2_HEADER_PATH,
-  HTTP2_HEADER_SCHEME,
+  HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_STATUS,
   HTTP2_METHOD_GET,
   HTTP2_METHOD_HEAD
-} = _nodeHttp.default.constants;
-const unwind = encodings => encodings.split(',').map(it => it.trim());
+} = _nodeHttp2.default.constants;
 const admix = (res, headers, options) => {
   const {
     h2
@@ -71,12 +71,12 @@ const affix = (client, req, options) => {
   });
 };
 exports.affix = affix;
-const collate = (entity, primordial) => {
-  if (entity?.constructor !== primordial) {
+const brandCheck = (value, ctor) => {
+  if (!(value instanceof ctor)) {
     throw new TypeError('Illegal invocation');
   }
 };
-exports.collate = collate;
+exports.brandCheck = brandCheck;
 const compress = (readable, encodings = '') => {
   const encoders = [];
   encodings = unwind(encodings);
@@ -125,6 +125,10 @@ const dispatch = ({
   }
 };
 exports.dispatch = dispatch;
+const maxRetryAfter = Symbol('maxRetryAfter');
+exports.maxRetryAfter = maxRetryAfter;
+const maxRetryAfterError = (interval, options) => new _errors.RequestError(`Maximum '${HTTP2_HEADER_RETRY_AFTER}' limit exceeded: ${interval} ms.`, options);
+exports.maxRetryAfterError = maxRetryAfterError;
 const merge = (target = {}, ...rest) => {
   target = JSON.parse(JSON.stringify(target));
   if (!rest.length) {
@@ -156,7 +160,7 @@ const mixin = (res, {
       arrayBuffer: {
         enumerable: true,
         value: async function () {
-          collate(this, res?.constructor);
+          brandCheck(this, res?.constructor);
           parse &&= false;
           const {
             buffer,
@@ -169,7 +173,7 @@ const mixin = (res, {
       blob: {
         enumerable: true,
         value: async function () {
-          collate(this, res?.constructor);
+          brandCheck(this, res?.constructor);
           const val = await this.arrayBuffer();
           return new _nodeBuffer.Blob([val]);
         }
@@ -177,7 +181,7 @@ const mixin = (res, {
       json: {
         enumerable: true,
         value: async function () {
-          collate(this, res?.constructor);
+          brandCheck(this, res?.constructor);
           const val = await this.text();
           return JSON.parse(val);
         }
@@ -185,7 +189,7 @@ const mixin = (res, {
       text: {
         enumerable: true,
         value: async function () {
-          collate(this, res?.constructor);
+          brandCheck(this, res?.constructor);
           const blob = await this.blob();
           return blob.text();
         }
@@ -196,7 +200,7 @@ const mixin = (res, {
     body: {
       enumerable: true,
       value: async function () {
-        collate(this, res?.constructor);
+        brandCheck(this, res?.constructor);
         if (this.bodyUsed) {
           throw new TypeError('Response stream already read');
         }
@@ -214,7 +218,7 @@ const mixin = (res, {
           if (/\bjson\b/i.test(contentType)) {
             body = JSON.parse(body.toString(charset));
           } else if (/\b(?:text|xml)\b/i.test(contentType)) {
-            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/.test(charset)) {
+            if (/\b(?:latin1|ucs-2|utf-(?:8|16le))\b/i.test(charset)) {
               body = body.toString(charset);
             } else {
               body = new TextDecoder(charset).decode(body);
@@ -234,72 +238,9 @@ const mixin = (res, {
   });
 };
 exports.mixin = mixin;
-const preflight = options => {
-  const {
-    cookies,
-    h2 = false,
-    headers,
-    method = HTTP2_METHOD_GET,
-    redirected,
-    url
-  } = options;
-  if (h2) {
-    options.endStream = [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(method);
-  }
-  if (cookies !== false) {
-    let cookie = _cookies.Cookies.jar.get(url.origin);
-    if (cookies === Object(cookies) && !redirected) {
-      if (cookie) {
-        new _cookies.Cookies(cookies).forEach(function (val, key) {
-          this.set(key, val);
-        }, cookie);
-      } else {
-        cookie = new _cookies.Cookies(cookies);
-        _cookies.Cookies.jar.set(url.origin, cookie);
-      }
-    }
-    options.headers = {
-      ...(cookie && {
-        [HTTP2_HEADER_COOKIE]: cookie
-      }),
-      ...headers
-    };
-  }
-  options.digest ??= true;
-  options.follow ??= 20;
-  options.h2 ??= h2;
-  options.headers = {
-    [HTTP2_HEADER_ACCEPT]: `${_mediatypes.APPLICATION_JSON}, ${_mediatypes.TEXT_PLAIN}, ${_mediatypes.WILDCARD}`,
-    [HTTP2_HEADER_ACCEPT_ENCODING]: 'br, deflate, deflate-raw, gzip, identity',
-    ...Object.entries(options.headers ?? {}).reduce((acc, [key, val]) => (acc[key.toLowerCase()] = val, acc), {}),
-    ...(h2 && {
-      [HTTP2_HEADER_AUTHORITY]: url.host,
-      [HTTP2_HEADER_METHOD]: method,
-      [HTTP2_HEADER_PATH]: `${url.pathname}${url.search}`,
-      [HTTP2_HEADER_SCHEME]: url.protocol.replace(/\p{Punctuation}/gu, '')
-    })
-  };
-  options.method ??= method;
-  options.parse ??= true;
-  options.redirect ??= redirects.follow;
-  if (!Object.values(redirects).includes(options.redirect)) {
-    options.createConnection?.().destroy();
-    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${options.redirect}' is not a valid enum value.`);
-  }
-  options.redirected ??= false;
-  options.thenable ??= false;
-  return options;
-};
-exports.preflight = preflight;
-const redirects = {
-  error: 'error',
-  follow: 'follow',
-  manual: 'manual'
-};
-exports.redirects = redirects;
 const sanitize = (url, options = {}) => {
   if (options.trimTrailingSlashes) {
-    url = `${url}`.replace(/(?<!:)\/+/gi, '/');
+    url = `${url}`.replace(/(?<!:)\/+/g, '/');
   }
   url = new URL(url);
   return Object.assign(options, {
@@ -307,6 +248,8 @@ const sanitize = (url, options = {}) => {
   });
 };
 exports.sanitize = sanitize;
+const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
+exports.sameOrigin = sameOrigin;
 async function* tap(value) {
   if (Reflect.has(value, Symbol.asyncIterator)) {
     yield* value;
@@ -316,6 +259,92 @@ async function* tap(value) {
     yield await value.arrayBuffer();
   }
 }
+const transfer = async options => {
+  const {
+    url
+  } = options;
+  if (options.follow === 0) {
+    throw new _errors.RequestError(`Maximum redirect reached at: ${url.href}`);
+  }
+  if (url.protocol === 'https:') {
+    options = await (0, _ackn.ackn)(options);
+  } else if (Reflect.has(options, 'alpnProtocol')) {
+    ['alpnProtocol', 'createConnection', 'h2', 'protocol'].forEach(it => Reflect.deleteProperty(options, it));
+  }
+  try {
+    options = await transform((0, _preflight.preflight)(options));
+  } catch (ex) {
+    options.createConnection?.().destroy();
+    throw ex;
+  }
+  const {
+    digest,
+    h2,
+    redirected,
+    thenable
+  } = options;
+  const {
+    request
+  } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
+  const promise = new Promise((resolve, reject) => {
+    let client, req;
+    if (h2) {
+      client = _nodeHttp2.default.connect(url.origin, options);
+      req = client.request(options.headers, options);
+    } else {
+      req = request(url, options);
+    }
+    affix(client, req, options);
+    req.once('error', reject);
+    req.once('frameError', reject);
+    req.once('goaway', reject);
+    req.once('response', res => (0, _postflight.postflight)(req, res, options, {
+      reject,
+      resolve
+    }));
+    dispatch(options, req);
+  });
+  try {
+    const res = await promise;
+    if (digest && !redirected) {
+      res.body = await res.body();
+    }
+    return res;
+  } catch (ex) {
+    const {
+      maxRetryAfter,
+      retry
+    } = options;
+    if (retry?.attempts && retry?.statusCodes.includes(ex.statusCode)) {
+      let {
+        interval
+      } = retry;
+      if (retry.retryAfter && ex.headers[HTTP2_HEADER_RETRY_AFTER]) {
+        interval = ex.headers[HTTP2_HEADER_RETRY_AFTER];
+        interval = Number(interval) * 1000 || new Date(interval) - Date.now();
+        if (interval > maxRetryAfter) {
+          throw maxRetryAfterError(interval, {
+            cause: ex
+          });
+        }
+      } else {
+        interval = new Function('interval', `return Math.ceil(${retry.backoffStrategy});`)(interval);
+      }
+      retry.attempts--;
+      retry.interval = interval;
+      return (0, _promises.setTimeout)(interval).then(() => (0, _index.default)(url, options));
+    }
+    if (digest && !redirected && ex.body) {
+      ex.body = await ex.body();
+    }
+    if (!thenable) {
+      throw ex;
+    } else {
+      return ex;
+    }
+  }
+};
+exports.transfer = transfer;
 const transform = async options => {
   let {
     body,
@@ -355,17 +384,16 @@ const transform = async options => {
     }
   }
   const encodings = options.headers[HTTP2_HEADER_CONTENT_ENCODING];
-  if (encodings) {
-    if (Reflect.has(body, Symbol.asyncIterator)) {
-      body = compress(_nodeStream.Readable.from(body), encodings);
-    } else {
-      body = await (0, _consumers.buffer)(compress(_nodeStream.Readable.from(body), encodings));
-    }
-  } else if (body === Object(body) && (Reflect.has(body, Symbol.asyncIterator) || !Array.isArray(body) && Reflect.has(body, Symbol.iterator))) {
-    body = _nodeStream.Readable.from(body);
+  if (body === Object(body) && (Reflect.has(body, Symbol.asyncIterator) || !Array.isArray(body) && Reflect.has(body, Symbol.iterator))) {
+    body = encodings ? compress(_nodeStream.Readable.from(body), encodings) : _nodeStream.Readable.from(body);
+  } else if (encodings) {
+    body = await (0, _consumers.buffer)(compress(_nodeStream.Readable.from(body), encodings));
   }
   Object.assign(options.headers, {
     ...headers,
+    ...(!body[Symbol.asyncIterator] && {
+      [HTTP2_HEADER_CONTENT_LENGTH]: Buffer.byteLength(body)
+    }),
     ...(options.headers[HTTP2_HEADER_CONTENT_TYPE] && {
       [HTTP2_HEADER_CONTENT_TYPE]: options.headers[HTTP2_HEADER_CONTENT_TYPE]
     })
@@ -375,4 +403,19 @@ const transform = async options => {
     body
   };
 };
-exports.transform = transform;
+exports.transform = transform;
+const unwind = encodings => encodings.split(',').map(it => it.trim());
+exports.unwind = unwind;
+const validation = (options = {}) => {
+  if (options.body && [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
+    throw new TypeError(`Request with ${HTTP2_METHOD_GET}/${HTTP2_METHOD_HEAD} method cannot have body.`);
+  }
+  if (!Object.values(_constants.requestCredentials).includes(options.credentials)) {
+    throw new TypeError(`Failed to read the 'credentials' property from 'options': The provided value '${options.credentials}' is not a valid enum value.`);
+  }
+  if (!Reflect.has(_constants.requestRedirect, options.redirect)) {
+    throw new TypeError(`Failed to read the 'redirect' property from 'options': The provided value '${options.redirect}' is not a valid enum value.`);
+  }
+  return options;
+};
+exports.validation = validation;

package/package.json

@@ -9,11 +9,11 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/preset-env": "^7.20.2",
     "c8": "^7.12.0",
-    "eslint": "^8.27.0",
+    "eslint": "^8.28.0",
     "eslint-config-ultra-refined": "^2.10.0",
     "mocha": "^10.1.0"
   },
@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.0.0"
+  "version": "4.2.0"
 }

package/src/ackn.mjs

@@ -23,7 +23,7 @@ export const ackn = (options) => new Promise((resolve, reject) => {
       createConnection() {
         return socket;
       },
-      h2: /h2c?/.test(alpnProtocol),
+      h2: /h2c?/i.test(alpnProtocol),
       protocol: url.protocol,
     });
   });

package/src/constants.mjs

@@ -0,0 +1,29 @@
+import http2 from 'node:http2';
+
+const {
+  HTTP_STATUS_FOUND,
+  HTTP_STATUS_MOVED_PERMANENTLY,
+  HTTP_STATUS_PERMANENT_REDIRECT,
+  HTTP_STATUS_SEE_OTHER,
+  HTTP_STATUS_TEMPORARY_REDIRECT,
+} = http2.constants;
+
+export const requestCredentials = {
+  include: 'include',
+  omit: 'omit',
+  sameOrigin: 'same-origin',
+};
+
+export const requestRedirect = {
+  error: 'error',
+  follow: 'follow',
+  manual: 'manual',
+};
+
+export const requestRedirectCodes = [
+  HTTP_STATUS_MOVED_PERMANENTLY,
+  HTTP_STATUS_FOUND,
+  HTTP_STATUS_SEE_OTHER,
+  HTTP_STATUS_TEMPORARY_REDIRECT,
+  HTTP_STATUS_PERMANENT_REDIRECT,
+];

package/src/cookies.mjs

@@ -1,4 +1,4 @@
-import { collate } from './utils.mjs';
+import { brandCheck } from './utils.mjs';
 
 export class Cookies extends URLSearchParams {
 
@@ -20,7 +20,7 @@ export class Cookies extends URLSearchParams {
   }
 
   toString() {
-    collate(this, Cookies);
+    brandCheck(this, Cookies);
 
     return super.toString().split('&').join('; ').trim();
   }

package/src/defaults.mjs

@@ -0,0 +1,44 @@
+import http2 from 'node:http2';
+import {
+  requestCredentials,
+  requestRedirect,
+} from './constants.mjs';
+import { maxRetryAfter } from './utils.mjs';
+
+const {
+  HTTP2_METHOD_GET,
+  HTTP_STATUS_SERVICE_UNAVAILABLE,
+  HTTP_STATUS_TOO_MANY_REQUESTS,
+} = http2.constants;
+
+const stash = {
+  credentials: requestCredentials.sameOrigin,
+  digest: true,
+  follow: 20,
+  get maxRetryAfter() {
+    return this[maxRetryAfter] ?? this.timeout;
+  },
+  set maxRetryAfter(value) {
+    this[maxRetryAfter] = value;
+  },
+  method: HTTP2_METHOD_GET,
+  parse: true,
+  redirect: requestRedirect.follow,
+  redirected: false,
+  retry: {
+    attempts: 0,
+    backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
+    interval: 1e3,
+    retryAfter: true,
+    statusCodes: [
+      HTTP_STATUS_TOO_MANY_REQUESTS,
+      HTTP_STATUS_SERVICE_UNAVAILABLE,
+    ],
+  },
+  thenable: false,
+  timeout: 3e5,
+};
+
+export default {
+  stash,
+};

package/src/formdata.mjs

@@ -7,7 +7,7 @@ import {
   MULTIPART_FORM_DATA,
 } from './mediatypes.mjs';
 import {
-  collate,
+  brandCheck,
   tap,
 } from './utils.mjs';
 
@@ -46,7 +46,10 @@ export class FormData {
               value.type || APPLICATION_OCTET_STREAM
             }${ CRLF.repeat(2) }`);
             yield* tap(value);
-            yield encoder.encode(CRLF);
+            yield new Uint8Array([
+              13,
+              10,
+            ]);
           }
         }
 
@@ -144,13 +147,13 @@ export class FormData {
   }
 
   append(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 2, 'append');
     this.#entries.push(this.constructor.#enfoldEntry(...args));
   }
 
   delete(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'delete');
     const name = toUSVString(args[0]);
 
@@ -158,7 +161,7 @@ export class FormData {
   }
 
   forEach(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'forEach');
     const [callback, thisArg] = args;
 
@@ -171,7 +174,7 @@ export class FormData {
   }
 
   get(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'get');
     const name = toUSVString(args[0]);
 
@@ -179,7 +182,7 @@ export class FormData {
   }
 
   getAll(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'getAll');
     const name = toUSVString(args[0]);
 
@@ -187,7 +190,7 @@ export class FormData {
   }
 
   has(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 1, 'has');
     const name = toUSVString(args[0]);
 
@@ -195,7 +198,7 @@ export class FormData {
   }
 
   set(...args) {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     this.#ensureArgs(args, 2, 'set');
     const entry = this.constructor.#enfoldEntry(...args);
     const idx = this.#entries.findIndex((it) => it.name === entry.name);
@@ -208,7 +211,7 @@ export class FormData {
   }
 
   * entries() {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     for (const { name, value } of this.#entries) {
       yield [
         name,
@@ -218,21 +221,21 @@ export class FormData {
   }
 
   * keys() {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     for (const [name] of this) {
       yield name;
     }
   }
 
   * values() {
-    collate(this, FormData);
+    brandCheck(this, FormData);
     for (const [, value] of this) {
       yield value;
     }
   }
 
   [Symbol.iterator]() {
-    collate(this, FormData);
+    brandCheck(this, FormData);
 
     return this.entries();
   }