rekwest 8.0.0 → 8.1.0

package/src/mixin.js

@@ -1,118 +1,118 @@
-import { isUtf8 } from 'node:buffer';
-import http2 from 'node:http2';
-import { buffer } from 'node:stream/consumers';
-import { MIMEType } from 'node:util';
-import { decode } from './codecs.js';
-import { brandCheck } from './utils.js';
-
-const {
-  HTTP2_HEADER_CONTENT_ENCODING,
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export const mixin = (res, { decodersOptions, 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]);
-        },
-      },
-      bytes: {
-        enumerable: true,
-        value: async function () {
-          brandCheck(this, res?.constructor);
-
-          return new Uint8Array(await this.arrayBuffer());
-        },
-      },
-      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 = await buffer(decode(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], { decodersOptions }));
-
-        if (!body.length && parse) {
-          return null;
-        }
-
-        if (body.length && parse) {
-          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          let isTextual, mimeType;
-
-          try {
-            mimeType = contentType ? new MIMEType(contentType) : null;
-          } finally {
-            isTextual = mimeType && (
-              mimeType.type === 'text'
-              || mimeType.subtype.match(/\bcsv\b|\bjson\b|\bxml\b|\byaml\b/)
-              || mimeType.essence.match(/\becmascript\b|\bjavascript\b|\bx-www-form-urlencoded\b/)
-            );
-          }
-
-          if (isTextual) {
-            if (/\bjson\b/.test(mimeType)) {
-              body = JSON.parse(body.toString());
-            } else if (isUtf8(body)) {
-              body = body.toString();
-            } else {
-              const charset = mimeType.params.get('charset')?.toLowerCase() ?? 'utf-8';
-
-              body = new TextDecoder(charset, { fatal: true }).decode(body);
-            }
-          }
-        }
-
-        return body;
-      },
-      writable: true,
-    },
-    bodyUsed: {
-      enumerable: true,
-      get() {
-        return this.readableEnded;
-      },
-    },
-  });
-};
+import { isUtf8 } from 'node:buffer';
+import http2 from 'node:http2';
+import { buffer } from 'node:stream/consumers';
+import { MIMEType } from 'node:util';
+import { decode } from './codecs.js';
+import { brandCheck } from './utils.js';
+
+const {
+  HTTP2_HEADER_CONTENT_ENCODING,
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export const mixin = (res, { decodersOptions, 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]);
+        },
+      },
+      bytes: {
+        enumerable: true,
+        value: async function () {
+          brandCheck(this, res?.constructor);
+
+          return new Uint8Array(await this.arrayBuffer());
+        },
+      },
+      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 = await buffer(decode(this, this.headers[HTTP2_HEADER_CONTENT_ENCODING], { decodersOptions }));
+
+        if (!body.length && parse) {
+          return null;
+        }
+
+        if (body.length && parse) {
+          const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
+          let isTextual, mimeType;
+
+          try {
+            mimeType = contentType ? new MIMEType(contentType) : null;
+          } finally {
+            isTextual = mimeType && (
+              mimeType.type === 'text'
+              || mimeType.subtype.match(/\bcsv\b|\bjson\b|\bxml\b|\byaml\b/)
+              || mimeType.essence.match(/\becmascript\b|\bjavascript\b|\bx-www-form-urlencoded\b/)
+            );
+          }
+
+          if (isTextual) {
+            if (/\bjson\b/.test(mimeType)) {
+              body = JSON.parse(body.toString());
+            } else if (isUtf8(body)) {
+              body = body.toString();
+            } else {
+              const charset = mimeType.params.get('charset')?.toLowerCase() ?? 'utf-8';
+
+              body = new TextDecoder(charset, { fatal: true }).decode(body);
+            }
+          }
+        }
+
+        return body;
+      },
+      writable: true,
+    },
+    bodyUsed: {
+      enumerable: true,
+      get() {
+        return this.readableEnded;
+      },
+    },
+  });
+};

package/src/postflight.js

@@ -1,64 +1,64 @@
-import http2 from 'node:http2';
-import { Cookies } from './cookies.js';
-import { mixin } from './mixin.js';
-import { redirects } from './redirects.js';
-import { augment } from './utils.js';
-
-const {
-  HTTP2_HEADER_SET_COOKIE,
-  HTTP_STATUS_BAD_REQUEST,
-} = http2.constants;
-
-export const postflight = (req, res, options, { reject, resolve }) => {
-  const { cookies, h2, url } = options;
-  let headers;
-
-  if (h2) {
-    headers = res;
-    res = req;
-  } else {
-    res.once('error', reject);
-  }
-
-  augment(res, headers, options);
-
-  if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
-    if (Cookies.jar.has(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], options));
-    }
-  }
-
-  Reflect.defineProperty(res, 'cookies', {
-    enumerable: true,
-    value: cookies !== false && Cookies.jar.has(url.origin) ? Cookies.jar.get(url.origin) : void 0,
-  });
-
-  let result;
-
-  try {
-    result = redirects(res, options);
-  } catch (err) {
-    res.emit('error', err);
-
-    return reject(mixin(res, options));
-  }
-
-  if (Object(result) === result) {
-    return result.then(resolve, reject);
-  }
-
-  if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
-    return reject(mixin(res, options));
-  }
-
-  resolve(mixin(res, options));
-};
+import http2 from 'node:http2';
+import { Cookies } from './cookies.js';
+import { mixin } from './mixin.js';
+import { redirects } from './redirects.js';
+import { augment } from './utils.js';
+
+const {
+  HTTP2_HEADER_SET_COOKIE,
+  HTTP_STATUS_BAD_REQUEST,
+} = http2.constants;
+
+export const postflight = (req, res, options, { reject, resolve }) => {
+  const { cookies, h2, url } = options;
+  let headers;
+
+  if (h2) {
+    headers = res;
+    res = req;
+  } else {
+    res.once('error', reject);
+  }
+
+  augment(res, headers, options);
+
+  if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
+    if (Cookies.jar.has(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], options));
+    }
+  }
+
+  Reflect.defineProperty(res, 'cookies', {
+    enumerable: true,
+    value: cookies !== false && Cookies.jar.has(url.origin) ? Cookies.jar.get(url.origin) : void 0,
+  });
+
+  let result;
+
+  try {
+    result = redirects(res, options);
+  } catch (err) {
+    res.emit('error', err);
+
+    return reject(mixin(res, options));
+  }
+
+  if (Object(result) === result) {
+    return result.then(resolve, reject);
+  }
+
+  if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
+    return reject(mixin(res, options));
+  }
+
+  resolve(mixin(res, options));
+};

package/src/preflight.js

@@ -1,84 +1,84 @@
-import http2 from 'node:http2';
-import { requestCredentials } from './constants.js';
-import { Cookies } from './cookies.js';
-import { stripHeaders } from './utils.js';
-
-const {
-  HTTP2_HEADER_AUTHORITY,
-  HTTP2_HEADER_AUTHORIZATION,
-  HTTP2_HEADER_COOKIE,
-  HTTP2_HEADER_METHOD,
-  HTTP2_HEADER_PATH,
-  HTTP2_HEADER_SCHEME,
-  HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD,
-} = http2.constants;
-
-export const preflight = (options) => {
-  let { cookies, credentials, h2, headers, method, url } = options;
-
-  if (h2) {
-    options.endStream = [
-      HTTP2_METHOD_GET,
-      HTTP2_METHOD_HEAD,
-    ].includes(method);
-  } else {
-    headers = stripHeaders(headers, [
-      HTTP2_HEADER_AUTHORITY,
-      HTTP2_HEADER_METHOD,
-      HTTP2_HEADER_PATH,
-      HTTP2_HEADER_SCHEME,
-    ]);
-  }
-
-  if (credentials === requestCredentials.omit) {
-    cookies = false;
-    headers = stripHeaders(headers, [
-      HTTP2_HEADER_AUTHORIZATION,
-      HTTP2_HEADER_COOKIE,
-    ]);
-    url.password = url.username = '';
-  }
-
-  if (cookies !== false && credentials !== requestCredentials.omit) {
-    let cookie = Cookies.jar.has(url.origin);
-
-    if (Object(cookies) === cookies && [
-      requestCredentials.include,
-      requestCredentials.sameOrigin,
-    ].includes(credentials)) {
-      if (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, options);
-        Cookies.jar.set(url.origin, cookie);
-      }
-    } else {
-      cookie &&= Cookies.jar.get(url.origin);
-    }
-
-    headers = {
-      ...cookie && { [HTTP2_HEADER_COOKIE]: cookie },
-      ...headers,
-    };
-  }
-
-  options.headers = {
-    ...headers,
-    ...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, ''),
-    },
-  };
-
-  return options;
-};
+import http2 from 'node:http2';
+import { requestCredentials } from './constants.js';
+import { Cookies } from './cookies.js';
+import { stripHeaders } from './utils.js';
+
+const {
+  HTTP2_HEADER_AUTHORITY,
+  HTTP2_HEADER_AUTHORIZATION,
+  HTTP2_HEADER_COOKIE,
+  HTTP2_HEADER_METHOD,
+  HTTP2_HEADER_PATH,
+  HTTP2_HEADER_SCHEME,
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD,
+} = http2.constants;
+
+export const preflight = (options) => {
+  let { cookies, credentials, h2, headers, method, url } = options;
+
+  if (h2) {
+    options.endStream = [
+      HTTP2_METHOD_GET,
+      HTTP2_METHOD_HEAD,
+    ].includes(method);
+  } else {
+    headers = stripHeaders(headers, [
+      HTTP2_HEADER_AUTHORITY,
+      HTTP2_HEADER_METHOD,
+      HTTP2_HEADER_PATH,
+      HTTP2_HEADER_SCHEME,
+    ]);
+  }
+
+  if (credentials === requestCredentials.omit) {
+    cookies = false;
+    headers = stripHeaders(headers, [
+      HTTP2_HEADER_AUTHORIZATION,
+      HTTP2_HEADER_COOKIE,
+    ]);
+    url.password = url.username = '';
+  }
+
+  if (cookies !== false && credentials !== requestCredentials.omit) {
+    let cookie = Cookies.jar.has(url.origin);
+
+    if (Object(cookies) === cookies && [
+      requestCredentials.include,
+      requestCredentials.sameOrigin,
+    ].includes(credentials)) {
+      if (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, options);
+        Cookies.jar.set(url.origin, cookie);
+      }
+    } else {
+      cookie &&= Cookies.jar.get(url.origin);
+    }
+
+    headers = {
+      ...cookie && { [HTTP2_HEADER_COOKIE]: cookie },
+      ...headers,
+    };
+  }
+
+  options.headers = {
+    ...headers,
+    ...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, ''),
+    },
+  };
+
+  return options;
+};