rekwest 3.3.4 → 4.0.0

package/README.md

@@ -21,7 +21,7 @@ and [http2.request](https://nodejs.org/api/http2.html#http2_clienthttp2session_r
 
 ## Prerequisites
 
-* Node.js `>= 16.5.x`
+* Node.js `>= 16.7.x`
 
 ## Installation
 
@@ -122,7 +122,8 @@ console.log(res.body);
   and [tls.ConnectionOptions](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback)
   for HTTP/2 attunes
   * `body` **{string | Array | ArrayBuffer | ArrayBufferView | AsyncIterator | Blob | Buffer | DataView | File |
-    FormData | Iterator | Object | Readable | SharedArrayBuffer | URLSearchParams}** The body to send with the request
+    FormData | Iterator | Object | Readable | ReadableStream | SharedArrayBuffer | URLSearchParams}** The body to send
+    with the request
   * `cookies` **{boolean | Array<[k, v]> | Cookies | Object | URLSearchParams}** `Default: true` The cookies to add to
     the request
   * `digest` **{boolean}** `Default: true` Controls whether to read the response stream or simply add a mixin
@@ -179,7 +180,7 @@ The method with limited functionality to use with streams and/or pipes
 * No automata
 * No redirects
 * Pass `h2: true` in options to use HTTP/2 protocol
-  * Or use `ackn({ url: URL })` method in advance to probe the available protocols
+  * Use `ackn({ url: URL })` method beforehand to check the available protocols
 
 ---
 

package/dist/ackn.js

@@ -2,14 +2,13 @@
 
 exports.__esModule = true;
 exports.ackn = void 0;
-
 var _nodeTls = require("node:tls");
-
 const ackn = options => new Promise((resolve, reject) => {
   const {
     url
   } = options;
-  const socket = (0, _nodeTls.connect)({ ...options,
+  const socket = (0, _nodeTls.connect)({
+    ...options,
     ALPNProtocols: ['h2', 'http/1.1'],
     host: url.hostname,
     port: parseInt(url.port) || 443,
@@ -20,13 +19,12 @@ const ackn = options => new Promise((resolve, reject) => {
     const {
       alpnProtocol
     } = socket;
-    resolve({ ...options,
+    resolve({
+      ...options,
       alpnProtocol,
-
       createConnection() {
         return socket;
       },
-
       h2: /h2c?/.test(alpnProtocol),
       protocol: url.protocol
     });
@@ -34,5 +32,4 @@ const ackn = options => new Promise((resolve, reject) => {
   socket.on('error', reject);
   socket.on('timeout', reject);
 });
-
 exports.ackn = ackn;

package/dist/cookies.js

@@ -2,29 +2,21 @@
 
 exports.__esModule = true;
 exports.Cookies = void 0;
-
-var _utils = require("./utils.js");
-
+var _utils = require("./utils");
 class Cookies extends URLSearchParams {
   static jar = new Map();
-
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
-
   constructor(input) {
     if (Array.isArray(input) && input.every(it => !Array.isArray(it))) {
-      input = input.join(';').split(';').filter(it => !/\b(Domain|Expires|HttpOnly|Max-Age|Path|SameParty|SameSite|Secure)\b/i.test(it)).map(it => it.trim()).join('&');
+      input = input.join(';').split(';').filter(it => !/\b(?:Domain|Expires|HttpOnly|Max-Age|Path|SameParty|SameSite|Secure)\b/i.test(it)).map(it => it.trim()).join('&');
     }
-
     super(input);
   }
-
   toString() {
     (0, _utils.collate)(this, Cookies);
     return super.toString().split('&').join('; ').trim();
   }
-
 }
-
 exports.Cookies = Cookies;

package/dist/errors.js

@@ -2,25 +2,18 @@
 
 exports.__esModule = true;
 exports.TimeoutError = exports.RequestError = void 0;
-
 class RequestError extends Error {
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
-
   get name() {
     return this[Symbol.toStringTag];
   }
-
   constructor(...args) {
     super(...args);
     Error.captureStackTrace(this, this.constructor);
   }
-
 }
-
 exports.RequestError = RequestError;
-
 class TimeoutError extends RequestError {}
-
 exports.TimeoutError = TimeoutError;

package/dist/file.js

@@ -2,41 +2,36 @@
 
 exports.__esModule = true;
 exports.File = void 0;
-
 var _nodeBuffer = require("node:buffer");
-
 exports.Blob = _nodeBuffer.Blob;
-
+var _nodeUtil = require("node:util");
 class File extends _nodeBuffer.Blob {
   static alike(instance) {
     return [_nodeBuffer.Blob.name, File.name].includes(instance?.constructor.name);
   }
-
   #lastModified;
   #name;
-
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
-
   get lastModified() {
     return this.#lastModified;
   }
-
   get name() {
     return this.#name;
   }
-
-  constructor(bits, name = 'blob', options = {}) {
+  constructor(...args) {
+    const len = args.length;
+    if (len < 2) {
+      throw new TypeError(`Failed to construct '${File.name}': 2 arguments required, but only ${len} present.`);
+    }
+    const [bits, name, options = {}] = args;
     const {
-      name: filename,
       lastModified = Date.now()
     } = options;
     super(bits, options);
-    this.#lastModified = lastModified;
-    this.#name = filename || name;
+    this.#lastModified = +lastModified ? lastModified : 0;
+    this.#name = (0, _nodeUtil.toUSVString)(name);
   }
-
 }
-
 exports.File = File;

package/dist/formdata.js

@@ -2,43 +2,29 @@
 
 exports.__esModule = true;
 exports.FormData = void 0;
-
 var _nodeCrypto = require("node:crypto");
-
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
-
 var _nodeUtil = require("node:util");
-
-var _file = require("./file.js");
-
-var _mediatypes = require("./mediatypes.js");
-
-var _utils = require("./utils.js");
-
+var _file = require("./file");
+var _mediatypes = require("./mediatypes");
+var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const CRLF = '\r\n';
 const {
   HTTP2_HEADER_CONTENT_DISPOSITION,
   HTTP2_HEADER_CONTENT_TYPE
 } = _nodeHttp.default.constants;
-
 class FormData {
   static actuate(fd) {
     const boundary = (0, _nodeCrypto.randomBytes)(24).toString('hex');
     const contentType = `${_mediatypes.MULTIPART_FORM_DATA}; boundary=${boundary}`;
     const prefix = `--${boundary}${CRLF}${HTTP2_HEADER_CONTENT_DISPOSITION}: form-data`;
-
     const escape = str => str.replace(/\n/g, '%0A').replace(/\r/g, '%0D').replace(/"/g, '%22');
-
     const normalize = value => value.replace(/\r?\n|\r/g, CRLF);
-
     return {
       contentType,
-
       async *[Symbol.asyncIterator]() {
         const encoder = new TextEncoder();
-
         for (const [name, value] of fd) {
           if (value.constructor === String) {
             yield encoder.encode(`${prefix}; name="${escape(normalize(name))}"${CRLF.repeat(2)}${normalize(value)}${CRLF}`);
@@ -48,51 +34,41 @@ class FormData {
             yield encoder.encode(CRLF);
           }
         }
-
         yield encoder.encode(`--${boundary}--`);
       }
-
     };
   }
-
   static alike(instance) {
     return instance?.constructor.name === FormData.name;
   }
-
   static #enfoldEntry(name, value, filename) {
     name = (0, _nodeUtil.toUSVString)(name);
     filename &&= (0, _nodeUtil.toUSVString)(filename);
-
     if (_file.File.alike(value)) {
+      filename ??= value.name || 'blob';
       value = new _file.File([value], filename, value);
     } else if (this.#ensureInstance(value)) {
-      value.name = filename || value.name;
+      value.name = filename;
     } else {
       value = (0, _nodeUtil.toUSVString)(value);
     }
-
     return {
       name,
       value
     };
   }
-
   static #ensureInstance(value) {
     return _file.File.alike(value) || value === Object(value) && Reflect.has(value, Symbol.asyncIterator);
   }
-
   #entries = [];
-
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
-
   constructor(input) {
     if (input === Object(input) && (input?.constructor === Object || Reflect.has(input, Symbol.iterator))) {
       if (input.constructor !== Object) {
         input = Array.from(input);
       }
-
       if (Array.isArray(input)) {
         if (!input.every(it => Array.isArray(it))) {
           throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': The provided value cannot be converted to a sequence.`);
@@ -100,93 +76,77 @@ class FormData {
           throw new TypeError(`Failed to construct '${this[Symbol.toStringTag]}': Sequence initializer must only contain pair elements.`);
         }
       }
-
       if (input.constructor === Object) {
         input = Object.entries(input);
       }
-
       input.forEach(([key, value]) => this.append(key, value));
     }
   }
-
   #ensureArgs(args, expected, method) {
     if (args.length < expected) {
       throw new TypeError(`Failed to execute '${method}' on '${this[Symbol.toStringTag]}': ${expected} arguments required, but only ${args.length} present.`);
     }
-
     if (['append', 'set'].includes(method)) {
       if (args.length === 3 && !this.constructor.#ensureInstance(args[1])) {
-        throw new TypeError(`Failed to execute '${method}' on '${this[Symbol.toStringTag]}': parameter ${expected} is not of type 'Blob', 'File' or async iterable.`);
+        throw new TypeError(`Failed to execute '${method}' on '${this[Symbol.toStringTag]}': parameter ${expected} is not of type 'Blob'.`);
       }
     }
-
     if (method === 'forEach') {
       if (args[0]?.constructor !== Function) {
         throw new TypeError(`Failed to execute '${method}' on '${this[Symbol.toStringTag]}': parameter ${expected} is not of type 'Function'.`);
       }
     }
   }
-
   append(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 2, 'append');
     this.#entries.push(this.constructor.#enfoldEntry(...args));
   }
-
   delete(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 1, 'delete');
     const name = (0, _nodeUtil.toUSVString)(args[0]);
     this.#entries = this.#entries.filter(it => it.name !== name);
   }
-
   forEach(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 1, 'forEach');
     const [callback, thisArg] = args;
-
     for (const entry of this) {
       Reflect.apply(callback, thisArg, [...entry.reverse(), this]);
     }
   }
-
   get(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 1, 'get');
     const name = (0, _nodeUtil.toUSVString)(args[0]);
     return (this.#entries.find(it => it.name === name) ?? {}).value ?? null;
   }
-
   getAll(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 1, 'getAll');
     const name = (0, _nodeUtil.toUSVString)(args[0]);
     return this.#entries.filter(it => it.name === name).map(it => it.value);
   }
-
   has(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 1, 'has');
     const name = (0, _nodeUtil.toUSVString)(args[0]);
     return !!this.#entries.find(it => it.name === name);
   }
-
   set(...args) {
     (0, _utils.collate)(this, FormData);
     this.#ensureArgs(args, 2, 'set');
     const entry = this.constructor.#enfoldEntry(...args);
     const idx = this.#entries.findIndex(it => it.name === entry.name);
-
     if (idx !== -1) {
       this.#entries.splice(idx, 1, entry);
     } else {
       this.#entries.push(entry);
     }
   }
-
   *entries() {
     (0, _utils.collate)(this, FormData);
-
     for (const {
       name,
       value
@@ -194,28 +154,21 @@ class FormData {
       yield [name, value];
     }
   }
-
   *keys() {
     (0, _utils.collate)(this, FormData);
-
     for (const [name] of this) {
       yield name;
     }
   }
-
   *values() {
     (0, _utils.collate)(this, FormData);
-
     for (const [, value] of this) {
       yield value;
     }
   }
-
   [Symbol.iterator]() {
     (0, _utils.collate)(this, FormData);
     return this.entries();
   }
-
 }
-
 exports.FormData = FormData;