rekwest 7.2.7 → 8.1.0

package/src/utils.js

@@ -1,193 +1,198 @@
-import http2 from 'node:http2';
-import {
-  isReadable,
-  Readable,
-} from 'node:stream';
-import config, { isZstdSupported } from './config.js';
-import { TimeoutError } from './errors.js';
-
-const {
-  HTTP2_HEADER_ACCEPT_ENCODING,
-  HTTP2_HEADER_STATUS,
-} = http2.constants;
-
-export const addSearchParams = (url, params = {}) => {
-  for (const [key, val] of Object.entries(params)) {
-    if (Array.isArray(val)) {
-      for (const v of val) {
-        url.searchParams.append(key, v);
-      }
-    } else {
-      url.searchParams.set(key, val);
-    }
-  }
-
-  return url;
-};
-
-export const augment = (res, headers, options) => {
-  const h2 = /\bh2c?\b/i.test(res.session?.alpnProtocol);
-
-  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 brandCheck = (val, ctor) => {
-  if (!(val instanceof ctor)) {
-    throw new TypeError('Illegal invocation');
-  }
-};
-
-export const cloneWith = (target, ...rest) => {
-  target = structuredClone(target);
-  if (!rest.length) {
-    return target;
-  }
-
-  return deepMerge(target, ...rest);
-};
-
-export const deepMerge = (target, ...rest) => {
-  rest = rest.filter((it) => Object(it) === it);
-  for (const source of rest) {
-    for (const key of Object.getOwnPropertyNames(source)) {
-      const sv = source[key];
-      const tv = target[key];
-
-      if (Object(sv) === sv && Object(tv) === tv) {
-        target[key] = deepMerge(tv, sv);
-        continue;
-      }
-
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-};
-
-export const dispatch = (req, { body }) => {
-  if (isReadable(body)) {
-    body.once('error', (err) => (req.session && req.emit('error', err) && req.destroy()) || req.destroy(err));
-    body.pipe(req);
-  } else {
-    req.end(body);
-  }
-};
-
-export const isBlobLike = (val) => val instanceof Blob;
-
-export const isLikelyH2cPrefaceError = (err) => err.code === 'HPE_INVALID_CONSTANT';
-
-export const isPipeStream = (val) => val instanceof Readable;
-
-export const isReadableStream = (val) => val instanceof ReadableStream;
-
-export const normalize = (url, options = {}) => {
-  if (!options.redirected) {
-    options = cloneWith(config.defaults, options);
-  }
-
-  return Object.assign(options, {
-    headers: normalizeHeaders(options.headers),
-    method: options.method?.toUpperCase(),
-    url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params),
-  });
-};
-
-export const normalizeHeaders = (headers = {}) => {
-  const acc = {};
-
-  for (let [key, val] of Object.entries(headers)) {
-    key = key.toLowerCase();
-
-    acc[key] = val;
-
-    if (key === HTTP2_HEADER_ACCEPT_ENCODING && !isZstdSupported) {
-      val = val.replace(/\s?zstd,?/gi, '').trim();
-
-      if (val) {
-        acc[key] = val;
-      } else {
-        Reflect.deleteProperty(acc, key);
-      }
-    }
-  }
-
-  return acc;
-};
-
-function normalizeUrl(url, { trimTrailingSlashes, stripTrailingSlash } = {}) {
-  if (trimTrailingSlashes) {
-    url.pathname = url.pathname.replace(/\/{2,}/g, '/');
-  }
-
-  if (stripTrailingSlash && url.pathname !== '/') {
-    url.pathname = url.pathname.replace(/\/$/, '');
-  }
-
-  return url;
-}
-
-export const sameOrigin = (a, b) => a.origin === b.origin;
-
-export const snoop = (client, req, options, { reject } = { reject: () => void 0 }) => {
-  req.once('aborted', reject);
-  req.once('close', () => client?.close());
-  req.once('end', () => client?.close());
-  req.once('error', reject);
-  req.once('frameError', reject);
-  req.once('goaway', reject);
-  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 stripHeaders = (headers = {}, keys = []) => {
-  keys = new Set(keys);
-
-  return Object.fromEntries(Object.entries(headers).filter(([key]) => !keys.has(key)));
-};
-
-export async function* tap(val) {
-  if (Reflect.has(val, Symbol.asyncIterator)) {
-    yield* val;
-  } else if (val.stream) {
-    yield* val.stream();
-  }
-}
-
-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.toLowerCase().trim());
+import http2 from 'node:http2';
+import {
+  isReadable,
+  Readable,
+} from 'node:stream';
+import config, { isZstdSupported } from './config.js';
+import { TimeoutError } from './errors.js';
+
+const {
+  HTTP2_HEADER_ACCEPT_ENCODING,
+  HTTP2_HEADER_STATUS,
+} = http2.constants;
+
+export const addSearchParams = (url, params = {}) => {
+  for (const [key, val] of Object.entries(params)) {
+    if (Array.isArray(val)) {
+      for (const v of val) {
+        url.searchParams.append(key, v);
+      }
+    } else {
+      url.searchParams.set(key, val);
+    }
+  }
+
+  return url;
+};
+
+export const augment = (res, headers, options) => {
+  const h2 = /\bh2c?\b/i.test(res.session?.alpnProtocol);
+
+  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 brandCheck = (val, ctor) => {
+  if (!(val instanceof ctor)) {
+    throw new TypeError('Illegal invocation');
+  }
+};
+
+export const cloneWith = (target, ...rest) => {
+  target = structuredClone(target);
+  if (!rest.length) {
+    return target;
+  }
+
+  return deepMerge(target, ...rest);
+};
+
+export const deepMerge = (target, ...rest) => {
+  rest = rest.filter((it) => Object(it) === it);
+  for (const source of rest) {
+    for (const key of Object.getOwnPropertyNames(source)) {
+      const sv = source[key];
+      const tv = target[key];
+
+      if (sv instanceof Function) {
+        target[key] = source[key];
+        continue;
+      }
+
+      if (Object(sv) === sv && Object(tv) === tv) {
+        target[key] = deepMerge(tv, sv);
+        continue;
+      }
+
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+};
+
+export const dispatch = (req, { body }) => {
+  if (isReadable(body)) {
+    body.once('error', (err) => (req.session && req.emit('error', err) && req.destroy()) || req.destroy(err));
+    body.pipe(req);
+  } else {
+    req.end(body);
+  }
+};
+
+export const isBlobLike = (val) => val instanceof Blob;
+
+export const isLikelyH2cPrefaceError = (err) => err.code === 'HPE_INVALID_CONSTANT';
+
+export const isPipeStream = (val) => val instanceof Readable;
+
+export const isReadableStream = (val) => val instanceof ReadableStream;
+
+export const normalize = (url, options = {}) => {
+  if (!options.redirected) {
+    options = cloneWith(config.defaults, options);
+  }
+
+  return Object.assign(options, {
+    headers: normalizeHeaders(options.headers),
+    method: options.method?.toUpperCase(),
+    url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params),
+  });
+};
+
+export const normalizeHeaders = (headers = {}) => {
+  const acc = {};
+
+  for (let [key, val] of Object.entries(headers)) {
+    key = key.toLowerCase();
+
+    acc[key] = val;
+
+    if (key === HTTP2_HEADER_ACCEPT_ENCODING && !isZstdSupported) {
+      val = val.replace(/\s?zstd,?/gi, '').trim();
+
+      if (val) {
+        acc[key] = val;
+      } else {
+        Reflect.deleteProperty(acc, key);
+      }
+    }
+  }
+
+  return acc;
+};
+
+function normalizeUrl(url, { trimTrailingSlashes, stripTrailingSlash } = {}) {
+  if (trimTrailingSlashes) {
+    url.pathname = url.pathname.replace(/\/{2,}/g, '/');
+  }
+
+  if (stripTrailingSlash && url.pathname !== '/') {
+    url.pathname = url.pathname.replace(/\/$/, '');
+  }
+
+  return url;
+}
+
+export const sameOrigin = (a, b) => a.origin === b.origin;
+
+export const snoop = (client, req, options, { reject } = { reject: () => void 0 }) => {
+  req.once('aborted', reject);
+  req.once('close', () => client?.close());
+  req.once('end', () => client?.close());
+  req.once('error', reject);
+  req.once('frameError', reject);
+  req.once('goaway', reject);
+  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 stripHeaders = (headers = {}, keys = []) => {
+  keys = new Set(keys);
+
+  return Object.fromEntries(Object.entries(headers).filter(([key]) => !keys.has(key)));
+};
+
+export async function* tap(val) {
+  if (Reflect.has(val, Symbol.asyncIterator)) {
+    yield* val;
+  } else if (val.stream) {
+    yield* val.stream();
+  }
+}
+
+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.toLowerCase().trim());

package/src/validation.js

@@ -1,33 +1,33 @@
-import http2 from 'node:http2';
-import {
-  requestCredentials,
-  requestRedirect,
-} from './constants.js';
-
-const {
-  HTTP2_METHOD_GET,
-  HTTP2_METHOD_HEAD,
-} = http2.constants;
-
-export 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(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(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;
-};
+import http2 from 'node:http2';
+import {
+  requestCredentials,
+  requestRedirect,
+} from './constants.js';
+
+const {
+  HTTP2_METHOD_GET,
+  HTTP2_METHOD_HEAD,
+} = http2.constants;
+
+export 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(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(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;
+};