rekwest 4.4.4 → 4.5.0

package/src/cookies.mjs

@@ -1,22 +1,68 @@
-import { brandCheck } from './utils.mjs';
+import {
+  brandCheck,
+  toCamelCase,
+} from './utils.mjs';
 
 export class Cookies extends URLSearchParams {
 
   static jar = new Map();
 
+  #chronometry = new Map();
+
   get [Symbol.toStringTag]() {
     return this.constructor.name;
   }
 
-  constructor(input) {
+  constructor(input, { cookiesTTL } = { cookiesTTL: false }) {
     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.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(input);
+    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 tid = setTimeout(() => {
+            this.#chronometry.delete(cookie);
+            this.delete(cookie);
+          }, Math.max(ms, 0));
+
+          return this.#chronometry.set(cookie, tid);
+        });
+      });
+    }
   }
 
   toString() {

package/src/defaults.mjs

@@ -12,6 +12,7 @@ const {
 } = http2.constants;
 
 const stash = {
+  cookiesTTL: false,
   credentials: requestCredentials.sameOrigin,
   digest: true,
   follow: 20,
@@ -36,6 +37,7 @@ const stash = {
       HTTP_STATUS_SERVICE_UNAVAILABLE,
     ],
   },
+  stripTrailingSlash: false,
   thenable: false,
   timeout: 3e5,
   trimTrailingSlashes: false,

package/src/formdata.mjs

@@ -1,241 +1,243 @@
-import { randomBytes } from 'node:crypto';
-import http2 from 'node:http2';
-import { toUSVString } from 'node:util';
-import { File } from './file.mjs';
-import {
-  APPLICATION_OCTET_STREAM,
-  MULTIPART_FORM_DATA,
-} from './mediatypes.mjs';
-import {
-  brandCheck,
-  tap,
-} from './utils.mjs';
-
-const CRLF = '\r\n';
-const {
-  HTTP2_HEADER_CONTENT_DISPOSITION,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export class FormData {
-
-  static actuate(fd) {
-    const boundary = randomBytes(24).toString('hex');
-    const contentType = `${ 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 redress = (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(redress(name))
-            }"${ CRLF.repeat(2) }${ redress(value) }${ CRLF }`);
-          } else {
-            yield encoder.encode(`${ prefix }; name="${
-              escape(redress(name))
-            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
-              HTTP2_HEADER_CONTENT_TYPE
-            }: ${
-              value.type || APPLICATION_OCTET_STREAM
-            }${ CRLF.repeat(2) }`);
-            yield* tap(value);
-            yield new Uint8Array([
-              13,
-              10,
-            ]);
-          }
-        }
-
-        yield encoder.encode(`--${ boundary }--`);
-      },
-    };
-  }
-
-  static alike(instance) {
-    return instance?.constructor.name === FormData.name;
-  }
-
-  static #enfoldEntry(name, value, filename) {
-    name = toUSVString(name);
-    filename &&= toUSVString(filename);
-
-    if (File.alike(value)) {
-      filename ??= value.name || 'blob';
-      value = new File([value], filename, value);
-    } else if (this.#ensureInstance(value)) {
-      value.name = filename;
-    } else {
-      value = toUSVString(value);
-    }
-
-    return {
-      name,
-      value,
-    };
-  }
-
-  static #ensureInstance(value) {
-    return 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.`);
-        } else if (!input.every((it) => it.length === 2)) {
-          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'.`);
-      }
-    }
-
-    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) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 2, 'append');
-    this.#entries.push(this.constructor.#enfoldEntry(...args));
-  }
-
-  delete(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'delete');
-    const name = toUSVString(args[0]);
-
-    this.#entries = this.#entries.filter((it) => it.name !== name);
-  }
-
-  forEach(...args) {
-    brandCheck(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) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'get');
-    const name = toUSVString(args[0]);
-
-    return (this.#entries.find((it) => it.name === name) ?? {}).value ?? null;
-  }
-
-  getAll(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'getAll');
-    const name = toUSVString(args[0]);
-
-    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
-  }
-
-  has(...args) {
-    brandCheck(this, FormData);
-    this.#ensureArgs(args, 1, 'has');
-    const name = toUSVString(args[0]);
-
-    return !!this.#entries.find((it) => it.name === name);
-  }
-
-  set(...args) {
-    brandCheck(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() {
-    brandCheck(this, FormData);
-    for (const { name, value } of this.#entries) {
-      yield [
-        name,
-        value,
-      ];
-    }
-  }
-
-  * keys() {
-    brandCheck(this, FormData);
-    for (const [name] of this) {
-      yield name;
-    }
-  }
-
-  * values() {
-    brandCheck(this, FormData);
-    for (const [, value] of this) {
-      yield value;
-    }
-  }
-
-  [Symbol.iterator]() {
-    return this.entries();
-  }
-
-}
+import { randomBytes } from 'node:crypto';
+import http2 from 'node:http2';
+import { toUSVString } from 'node:util';
+import { File } from './file.mjs';
+import {
+  APPLICATION_OCTET_STREAM,
+  MULTIPART_FORM_DATA,
+} from './mediatypes.mjs';
+import {
+  brandCheck,
+  tap,
+} from './utils.mjs';
+
+const CRLF = '\r\n';
+const {
+  HTTP2_HEADER_CONTENT_DISPOSITION,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export class FormData {
+
+  static actuate(fd) {
+    const boundary = randomBytes(24).toString('hex');
+    const contentType = `${ 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 redress = (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(redress(name))
+            }"${ CRLF.repeat(2) }${ redress(value) }${ CRLF }`);
+          } else {
+            yield encoder.encode(`${ prefix }; name="${
+              escape(redress(name))
+            }"${ value.name ? `; filename="${ escape(value.name) }"` : '' }${ CRLF }${
+              HTTP2_HEADER_CONTENT_TYPE
+            }: ${
+              value.type || APPLICATION_OCTET_STREAM
+            }${ CRLF.repeat(2) }`);
+            yield* tap(value);
+            yield new Uint8Array([
+              13,
+              10,
+            ]);
+          }
+        }
+
+        yield encoder.encode(`--${ boundary }--`);
+      },
+    };
+  }
+
+  static alike(instance) {
+    return instance?.constructor.name === FormData.name;
+  }
+
+  static #enfoldEntry(name, value, filename) {
+    name = toUSVString(name);
+    filename &&= toUSVString(filename);
+
+    if (File.alike(value)) {
+      filename ??= value.name || 'blob';
+      value = new File([value], filename, value);
+    } else if (this.#ensureInstance(value)) {
+      value.name = filename;
+    } else {
+      value = toUSVString(value);
+    }
+
+    return {
+      name,
+      value,
+    };
+  }
+
+  static #ensureInstance(value) {
+    return 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.`);
+        } else if (!input.every((it) => it.length === 2)) {
+          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'.`);
+      }
+    }
+
+    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) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 2, 'append');
+    this.#entries.push(this.constructor.#enfoldEntry(...args));
+  }
+
+  delete(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'delete');
+    const name = toUSVString(args[0]);
+
+    this.#entries = this.#entries.filter((it) => it.name !== name);
+  }
+
+  forEach(...args) {
+    brandCheck(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) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'get');
+    const name = toUSVString(args[0]);
+
+    return (this.#entries.find((it) => it.name === name) ?? {}).value ?? null;
+  }
+
+  getAll(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'getAll');
+    const name = toUSVString(args[0]);
+
+    return this.#entries.filter((it) => it.name === name).map((it) => it.value);
+  }
+
+  has(...args) {
+    brandCheck(this, FormData);
+    this.#ensureArgs(args, 1, 'has');
+    const name = toUSVString(args[0]);
+
+    return !!this.#entries.find((it) => it.name === name);
+  }
+
+  set(...args) {
+    brandCheck(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() {
+    brandCheck(this, FormData);
+    for (const { name, value } of this.#entries) {
+      yield [
+        name,
+        value,
+      ];
+    }
+  }
+
+  * keys() {
+    brandCheck(this, FormData);
+    for (const [name] of this) {
+      yield name;
+    }
+  }
+
+  * values() {
+    brandCheck(this, FormData);
+    for (const [, value] of this) {
+      yield value;
+    }
+  }
+
+  [Symbol.iterator]() {
+    brandCheck(this, FormData);
+
+    return this.entries();
+  }
+
+}

package/src/index.mjs

@@ -5,12 +5,12 @@ import { requestRedirect } from './constants.mjs';
 import defaults from './defaults.mjs';
 import { APPLICATION_OCTET_STREAM } from './mediatypes.mjs';
 import { preflight } from './preflight.mjs';
+import { transfer } from './transfer.mjs';
 import {
   admix,
   affix,
   merge,
   normalize,
-  transfer,
 } from './utils.mjs';
 import { validation } from './validation.mjs';
 

package/src/postflight.mjs

@@ -44,11 +44,16 @@ export const postflight = (req, res, options, { reject, resolve }) => {
 
   if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
     if (Cookies.jar.has(url.origin)) {
-      new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE]).forEach(function (val, key) {
-        this.set(key, val);
-      }, Cookies.jar.get(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]));
+      Cookies.jar.set(url.origin, new Cookies(res.headers[HTTP2_HEADER_SET_COOKIE], options));
     }
   }
 

package/src/preflight.mjs

@@ -30,18 +30,23 @@ export const preflight = (options) => {
   }
 
   if (cookies !== false) {
-    let cookie = Cookies.jar.get(url.origin);
+    let cookie = Cookies.jar.has(url.origin);
 
     if (cookies === Object(cookies) && [
       requestCredentials.include,
       requestCredentials.sameOrigin,
     ].includes(credentials)) {
       if (cookie) {
-        new Cookies(cookies).forEach(function (val, key) {
-          this.set(key, val);
-        }, cookie);
+        cookie = new Cookies(cookies, options);
+
+        Cookies.jar.get(url.origin).forEach((val, key) => {
+          if (!cookie.has(key)) {
+            cookie.set(key, val);
+          }
+        });
+        Cookies.jar.set(url.origin, cookie);
       } else {
-        cookie = new Cookies(cookies);
+        cookie = new Cookies(cookies, options);
         Cookies.jar.set(url.origin, cookie);
       }
     }