rekwest 4.5.4 → 4.5.6

package/dist/preflight.js

@@ -60,7 +60,7 @@ const preflight = options => {
   }
   if (credentials === _constants.requestCredentials.omit) {
     options.cookies = false;
-    Object.keys(options.headers ?? {}).filter(it => new RegExp(`^${HTTP2_HEADER_AUTHORIZATION}`, 'i').test(it)).forEach(it => Reflect.deleteProperty(options.headers, it));
+    Object.keys(options.headers ?? {}).filter(it => new RegExp(`^(${HTTP2_HEADER_AUTHORIZATION}|${HTTP2_HEADER_COOKIE})$`, 'i').test(it)).forEach(it => Reflect.deleteProperty(options.headers, it));
     url.password = url.username = '';
   }
   options.headers = {

package/dist/transform.js

@@ -31,7 +31,7 @@ const transform = async options => {
       [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
       [HTTP2_HEADER_CONTENT_TYPE]: body.type || _mediatypes.APPLICATION_OCTET_STREAM
     };
-    body = body.stream();
+    body = (0, _utils.tap)(body);
   } else if (_formdata.FormData.alike(body)) {
     body = _formdata.FormData.actuate(body);
     headers = {

package/package.json

@@ -8,13 +8,13 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.22.1",
-    "@babel/eslint-parser": "^7.21.8",
-    "@babel/preset-env": "^7.22.4",
-    "c8": "^7.14.0",
-    "eslint": "^8.42.0",
-    "eslint-config-ultra-refined": "^2.15.0",
+    "@babel/cli": "^7.22.9",
+    "@babel/core": "^7.22.9",
+    "@babel/eslint-parser": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "c8": "^8.0.0",
+    "eslint": "^8.45.0",
+    "eslint-config-ultra-refined": "^2.16.0",
     "mocha": "^10.2.0"
   },
   "description": "The robust request library that humanity deserves 🌐",
@@ -69,5 +69,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.5.4"
+  "version": "4.5.6"
 }

package/src/mixin.mjs

@@ -1,109 +1,109 @@
-import { Blob } from 'node:buffer';
-import http2 from 'node:http2';
-import {
-  brandCheck,
-  decompress,
-} from './utils.mjs';
-
-const {
-  HTTP2_HEADER_CONTENT_ENCODING,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export const mixin = (res, { digest = false, parse = false } = {}) => {
-  if (!digest) {
-    Object.defineProperties(res, {
-      arrayBuffer: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          parse &&= false;
-          const { buffer, byteLength, byteOffset } = await this.body();
-
-          return buffer.slice(byteOffset, byteOffset + byteLength);
-        },
-      },
-      blob: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.arrayBuffer();
-
-          return new Blob([val]);
-        },
-      },
-      json: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const val = await this.text();
-
-          return JSON.parse(val);
-        },
-      },
-      text: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-          const blob = await this.blob();
-
-          return blob.text();
-        },
-      },
-    });
-  }
-
-  return Object.defineProperties(res, {
-    body: {
-      enumerable: true,
-      value: async function () {
-        brandCheck(this, res?.constructor);
-
-        if (this.bodyUsed) {
-          throw new TypeError('Response stream already read');
-        }
-
-        let body = [];
-
-        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
-          body.push(chunk);
-        }
-
-        body = Buffer.concat(body);
-
-        if (!body.length && parse) {
-          return null;
-        }
-
-        if (body.length && parse) {
-          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          const charset = contentType.split(';')
-                                     .find((it) => /charset=/i.test(it))
-                                     ?.toLowerCase()
-                                     .replace('charset=', '')
-                                     .replace('iso-8859-1', 'latin1')
-                                     .trim() || 'utf-8';
-
-          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/i.test(charset)) {
-              body = body.toString(charset);
-            } else {
-              body = new TextDecoder(charset).decode(body);
-            }
-          }
-        }
-
-        return body;
-      },
-      writable: true,
-    },
-    bodyUsed: {
-      enumerable: true,
-      get() {
-        return this.readableEnded;
-      },
-    },
-  });
-};
+import { Blob } from 'node:buffer';
+import http2 from 'node:http2';
+import {
+  brandCheck,
+  decompress,
+} from './utils.mjs';
+
+const {
+  HTTP2_HEADER_CONTENT_ENCODING,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export const mixin = (res, { digest = false, parse = false } = {}) => {
+  if (!digest) {
+    Object.defineProperties(res, {
+      arrayBuffer: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          parse &&= false;
+          const { buffer, byteLength, byteOffset } = await this.body();
+
+          return buffer.slice(byteOffset, byteOffset + byteLength);
+        },
+      },
+      blob: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.arrayBuffer();
+
+          return new Blob([val]);
+        },
+      },
+      json: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const val = await this.text();
+
+          return JSON.parse(val);
+        },
+      },
+      text: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+          const blob = await this.blob();
+
+          return blob.text();
+        },
+      },
+    });
+  }
+
+  return Object.defineProperties(res, {
+    body: {
+      enumerable: true,
+      value: async function () {
+        brandCheck(this, res?.constructor);
+
+        if (this.bodyUsed) {
+          throw new TypeError('Response stream already read');
+        }
+
+        let body = [];
+
+        for await (const chunk of decompress(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING])) {
+          body.push(chunk);
+        }
+
+        body = Buffer.concat(body);
+
+        if (!body.length && parse) {
+          return null;
+        }
+
+        if (body.length && parse) {
+          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
+          const charset = contentType.split(';')
+                                     .find((it) => /charset=/i.test(it))
+                                     ?.toLowerCase()
+                                     .replace('charset=', '')
+                                     .replace('iso-8859-1', 'latin1')
+                                     .trim() || 'utf-8';
+
+          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/i.test(charset)) {
+              body = body.toString(charset);
+            } else {
+              body = new TextDecoder(charset).decode(body);
+            }
+          }
+        }
+
+        return body;
+      },
+      writable: true,
+    },
+    bodyUsed: {
+      enumerable: true,
+      get() {
+        return this.readableEnded;
+      },
+    },
+  });
+};

package/src/preflight.mjs

@@ -63,7 +63,9 @@ export const preflight = (options) => {
   if (credentials === requestCredentials.omit) {
     options.cookies = false;
     Object.keys(options.headers ?? {})
-          .filter((it) => new RegExp(`^${ HTTP2_HEADER_AUTHORIZATION }`, 'i').test(it))
+          .filter((it) => new RegExp(`^(${
+            HTTP2_HEADER_AUTHORIZATION }|${ HTTP2_HEADER_COOKIE
+          })$`, 'i').test(it))
           .forEach((it) => Reflect.deleteProperty(options.headers, it));
     url.password = url.username = '';
   }

package/src/transform.mjs

@@ -9,7 +9,10 @@ import {
   APPLICATION_JSON,
   APPLICATION_OCTET_STREAM,
 } from './mediatypes.mjs';
-import { compress } from './utils.mjs';
+import {
+  compress,
+  tap,
+} from './utils.mjs';
 
 const {
   HTTP2_HEADER_CONTENT_ENCODING,
@@ -29,7 +32,7 @@ export const transform = async (options) => {
       [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
       [HTTP2_HEADER_CONTENT_TYPE]: body.type || APPLICATION_OCTET_STREAM,
     };
-    body = body.stream();
+    body = tap(body);
   } else if (FormData.alike(body)) {
     body = FormData.actuate(body);
     headers = { [HTTP2_HEADER_CONTENT_TYPE]: body.contentType };

package/src/utils.mjs

@@ -1,188 +1,188 @@
-import http2 from 'node:http2';
-import { pipeline } from 'node:stream';
-import zlib from 'node:zlib';
-import defaults from './defaults.mjs';
-import {
-  RequestError,
-  TimeoutError,
-} from './errors.mjs';
-
-const {
-  HTTP2_HEADER_RETRY_AFTER,
-  HTTP2_HEADER_STATUS,
-} = http2.constants;
-
-export const admix = (res, headers, options) => {
-  const { h2 } = options;
-
-  if (h2) {
-    Reflect.defineProperty(res, 'headers', {
-      enumerable: true,
-      value: headers,
-    });
-
-    Reflect.defineProperty(res, 'httpVersion', {
-      enumerable: true,
-      value: `${ h2 + 1 }.0`,
-    });
-
-    Reflect.defineProperty(res, 'statusCode', {
-      enumerable: true,
-      value: headers[HTTP2_HEADER_STATUS],
-    });
-  }
-
-  Reflect.defineProperty(res, 'ok', {
-    enumerable: true,
-    value: /^2\d{2}$/.test(res.statusCode),
-  });
-
-  Reflect.defineProperty(res, 'redirected', {
-    enumerable: true,
-    value: !!options.redirected,
-  });
-};
-
-export const affix = (client, req, options) => {
-  req.once('end', () => client?.close());
-  req.once('timeout', () => req.destroy(new TimeoutError(`Timed out after ${ options.timeout } ms.`)));
-  req.once('trailers', (trailers) => {
-    Reflect.defineProperty(req, 'trailers', {
-      enumerable: true,
-      value: trailers,
-    });
-  });
-};
-
-export const brandCheck = (value, ctor) => {
-  if (!(value instanceof ctor)) {
-    throw new TypeError('Illegal invocation');
-  }
-};
-
-export const compress = (readable, encodings = '') => {
-  const encoders = [];
-
-  encodings = unwind(encodings);
-
-  for (const encoding of encodings) {
-    if (/\bbr\b/i.test(encoding)) {
-      encoders.push(zlib.createBrotliCompress());
-    } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
-      encoders.push(zlib.createDeflate());
-    } else if (/\bdeflate-raw\b/i.test(encoding)) {
-      encoders.push(zlib.createDeflateRaw());
-    } else if (/\bgzip\b/i.test(encoding)) {
-      encoders.push(zlib.createGzip());
-    } else {
-      return readable;
-    }
-  }
-
-  return pipeline(readable, ...encoders, () => void 0);
-};
-
-export const decompress = (readable, encodings = '') => {
-  const decoders = [];
-
-  encodings = unwind(encodings);
-
-  for (const encoding of encodings) {
-    if (/\bbr\b/i.test(encoding)) {
-      decoders.push(zlib.createBrotliDecompress());
-    } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
-      decoders.push(zlib.createInflate());
-    } else if (/\bdeflate-raw\b/i.test(encoding)) {
-      decoders.push(zlib.createInflateRaw());
-    } else if (/\bgzip\b/i.test(encoding)) {
-      decoders.push(zlib.createGunzip());
-    } else {
-      return readable;
-    }
-  }
-
-  return pipeline(readable, ...decoders, () => void 0);
-};
-
-export const dispatch = ({ body }, req) => {
-  if (body?.pipe?.constructor === Function) {
-    body.pipe(req);
-  } else {
-    req.end(body);
-  }
-};
-
-export const maxRetryAfter = Symbol('maxRetryAfter');
-
-export const maxRetryAfterError = (
-  interval,
-  options,
-) => new RequestError(`Maximum '${ HTTP2_HEADER_RETRY_AFTER }' limit exceeded: ${ interval } ms.`, options);
-
-export const merge = (target = {}, ...rest) => {
-  target = JSON.parse(JSON.stringify(target));
-  if (!rest.length) {
-    return target;
-  }
-
-  rest.filter((it) => it === Object(it)).forEach((it) => {
-    Object.entries(it).reduce((acc, [key, val]) => {
-      if ([
-        acc[key]?.constructor,
-        val?.constructor,
-      ].every((it) => [
-        Array,
-        Object,
-      ].includes(it))) {
-        if (acc[key]?.constructor === val.constructor) {
-          acc[key] = merge(acc[key], val);
-        } else {
-          acc[key] = val;
-        }
-      } else {
-        acc[key] = val;
-      }
-
-      return acc;
-    }, target);
-  });
-
-  return target;
-};
-
-export const normalize = (url, options = {}) => {
-  if (!options.redirected) {
-    options = merge(defaults.stash, options);
-  }
-
-  if (options.trimTrailingSlashes) {
-    url = `${ url }`.replace(/(?<!:)\/+/g, '/');
-  }
-
-  if (options.stripTrailingSlash) {
-    url = `${ url }`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
-  }
-
-  url = new URL(url, options.baseURL);
-
-  return Object.assign(options, { url });
-};
-
-export const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
-
-export async function* tap(value) {
-  if (Reflect.has(value, Symbol.asyncIterator)) {
-    yield* value;
-  } else if (value.stream) {
-    yield* value.stream();
-  } else {
-    yield await value.arrayBuffer();
-  }
-}
-
-export const toCamelCase = (str) => str?.toLowerCase().replace(
-  /\p{Punctuation}.|\p{White_Space}./gu,
-  (val) => val.replace(/\p{Punctuation}+|\p{White_Space}+/gu, '').toUpperCase(),
-);
-
-export const unwind = (encodings) => encodings.split(',').map((it) => it.trim());
+import http2 from 'node:http2';
+import { pipeline } from 'node:stream';
+import zlib from 'node:zlib';
+import defaults from './defaults.mjs';
+import {
+  RequestError,
+  TimeoutError,
+} from './errors.mjs';
+
+const {
+  HTTP2_HEADER_RETRY_AFTER,
+  HTTP2_HEADER_STATUS,
+} = http2.constants;
+
+export const admix = (res, headers, options) => {
+  const { h2 } = options;
+
+  if (h2) {
+    Reflect.defineProperty(res, 'headers', {
+      enumerable: true,
+      value: headers,
+    });
+
+    Reflect.defineProperty(res, 'httpVersion', {
+      enumerable: true,
+      value: `${ h2 + 1 }.0`,
+    });
+
+    Reflect.defineProperty(res, 'statusCode', {
+      enumerable: true,
+      value: headers[HTTP2_HEADER_STATUS],
+    });
+  }
+
+  Reflect.defineProperty(res, 'ok', {
+    enumerable: true,
+    value: /^2\d{2}$/.test(res.statusCode),
+  });
+
+  Reflect.defineProperty(res, 'redirected', {
+    enumerable: true,
+    value: !!options.redirected,
+  });
+};
+
+export const affix = (client, req, options) => {
+  req.once('end', () => client?.close());
+  req.once('timeout', () => req.destroy(new TimeoutError(`Timed out after ${ options.timeout } ms.`)));
+  req.once('trailers', (trailers) => {
+    Reflect.defineProperty(req, 'trailers', {
+      enumerable: true,
+      value: trailers,
+    });
+  });
+};
+
+export const brandCheck = (value, ctor) => {
+  if (!(value instanceof ctor)) {
+    throw new TypeError('Illegal invocation');
+  }
+};
+
+export const compress = (readable, encodings = '') => {
+  const encoders = [];
+
+  encodings = unwind(encodings);
+
+  for (const encoding of encodings) {
+    if (/\bbr\b/i.test(encoding)) {
+      encoders.push(zlib.createBrotliCompress());
+    } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
+      encoders.push(zlib.createDeflate());
+    } else if (/\bdeflate-raw\b/i.test(encoding)) {
+      encoders.push(zlib.createDeflateRaw());
+    } else if (/\bgzip\b/i.test(encoding)) {
+      encoders.push(zlib.createGzip());
+    } else {
+      return readable;
+    }
+  }
+
+  return pipeline(readable, ...encoders, () => void 0);
+};
+
+export const decompress = (readable, encodings = '') => {
+  const decoders = [];
+
+  encodings = unwind(encodings);
+
+  for (const encoding of encodings) {
+    if (/\bbr\b/i.test(encoding)) {
+      decoders.push(zlib.createBrotliDecompress());
+    } else if (/\bdeflate(?!-(?:\w+)?)\b/i.test(encoding)) {
+      decoders.push(zlib.createInflate());
+    } else if (/\bdeflate-raw\b/i.test(encoding)) {
+      decoders.push(zlib.createInflateRaw());
+    } else if (/\bgzip\b/i.test(encoding)) {
+      decoders.push(zlib.createGunzip());
+    } else {
+      return readable;
+    }
+  }
+
+  return pipeline(readable, ...decoders, () => void 0);
+};
+
+export const dispatch = ({ body }, req) => {
+  if (body?.pipe?.constructor === Function) {
+    body.pipe(req);
+  } else {
+    req.end(body);
+  }
+};
+
+export const maxRetryAfter = Symbol('maxRetryAfter');
+
+export const maxRetryAfterError = (
+  interval,
+  options,
+) => new RequestError(`Maximum '${ HTTP2_HEADER_RETRY_AFTER }' limit exceeded: ${ interval } ms.`, options);
+
+export const merge = (target = {}, ...rest) => {
+  target = JSON.parse(JSON.stringify(target));
+  if (!rest.length) {
+    return target;
+  }
+
+  rest.filter((it) => it === Object(it)).forEach((it) => {
+    Object.entries(it).reduce((acc, [key, val]) => {
+      if ([
+        acc[key]?.constructor,
+        val?.constructor,
+      ].every((it) => [
+        Array,
+        Object,
+      ].includes(it))) {
+        if (acc[key]?.constructor === val.constructor) {
+          acc[key] = merge(acc[key], val);
+        } else {
+          acc[key] = val;
+        }
+      } else {
+        acc[key] = val;
+      }
+
+      return acc;
+    }, target);
+  });
+
+  return target;
+};
+
+export const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = merge(defaults.stash, options);
+  }
+
+  if (options.trimTrailingSlashes) {
+    url = `${ url }`.replace(/(?<!:)\/+/g, '/');
+  }
+
+  if (options.stripTrailingSlash) {
+    url = `${ url }`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
+  }
+
+  url = new URL(url, options.baseURL);
+
+  return Object.assign(options, { url });
+};
+
+export const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
+
+export async function* tap(value) {
+  if (Reflect.has(value, Symbol.asyncIterator)) {
+    yield* value;
+  } else if (value.stream) {
+    yield* value.stream();
+  } else {
+    yield await value.arrayBuffer();
+  }
+}
+
+export const toCamelCase = (str) => str?.toLowerCase().replace(
+  /\p{Punctuation}.|\p{White_Space}./gu,
+  (val) => val.replace(/\p{Punctuation}+|\p{White_Space}+/gu, '').toUpperCase(),
+);
+
+export const unwind = (encodings) => encodings.split(',').map((it) => it.trim());