rekwest 7.2.3 → 7.2.5

package/src/utils.js

@@ -1,7 +1,4 @@
-import {
-  Blob,
-  File,
-} from 'node:buffer';
+import { Blob } from 'node:buffer';
 import http2 from 'node:http2';
 import {
   isReadable,
@@ -30,7 +27,7 @@ export const addSearchParams = (url, params = {}) => {
 };
 
 export const augment = (res, headers, options) => {
-  const { h2 } = options;
+  const h2 = /\bh2c?\b/i.test(res.session?.alpnProtocol);
 
   if (h2) {
     Reflect.defineProperty(res, 'headers', {
@@ -96,66 +93,48 @@ export const deepMerge = (target, ...rest) => {
 
 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 isFileLike = (val) => {
-  return [
-    Blob,
-    File,
-  ].some((it) => val instanceof it);
-};
+export const isBlobLike = (val) => val instanceof Blob;
 
-export const isLikelyH2cPrefaceError = (err) => {
-  return err.code === 'HPE_INVALID_CONSTANT';
-};
+export const isLikelyH2cPrefaceError = (err) => err.code === 'HPE_INVALID_CONSTANT';
 
-export const isPipeStream = (val) => {
-  return val instanceof Readable;
-};
+export const isPipeStream = (val) => val instanceof Readable;
 
-export const isReadableStream = (val) => {
-  return val instanceof ReadableStream;
-};
+export const isReadableStream = (val) => val instanceof ReadableStream;
 
 export const normalize = (url, options = {}) => {
   if (!options.redirected) {
     options = cloneWith(config.defaults, options);
   }
 
-  if (options.trimTrailingSlashes) {
-    url = `${ url }`.replace(/(?<!:)\/+/g, '/');
-  }
-
-  if (options.stripTrailingSlash) {
-    url = `${ url }`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
-  }
-
   return Object.assign(options, {
     headers: normalizeHeaders(options.headers),
-    method: options.method.toUpperCase(),
-    url: addSearchParams(new URL(url, options.baseURL), options.params),
+    method: options.method?.toUpperCase(),
+    url: addSearchParams(normalizeUrl(new URL(url, options.baseURL), options), options.params),
   });
 };
 
 export const normalizeHeaders = (headers = {}) => {
   const acc = {};
 
-  for (const [key, val] of Object.entries(headers)) {
-    const name = key.toLowerCase();
+  for (let [key, val] of Object.entries(headers)) {
+    key = key.toLowerCase();
 
     acc[key] = val;
 
     if (key === HTTP2_HEADER_ACCEPT_ENCODING && !isZstdSupported) {
-      const modified = val.replace(/\s?zstd,?/gi, '').trim();
+      val = val.replace(/\s?zstd,?/gi, '').trim();
 
-      if (modified) {
-        acc[key] = modified;
+      if (val) {
+        acc[key] = val;
       } else {
-        Reflect.deleteProperty(acc, name);
+        Reflect.deleteProperty(acc, key);
       }
     }
   }
@@ -163,11 +142,27 @@ export const normalizeHeaders = (headers = {}) => {
   return acc;
 };
 
-export const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
+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 snoop = (client, req, options) => {
+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', {
@@ -177,14 +172,10 @@ export const snoop = (client, req, options) => {
   });
 };
 
-export const stripHeaders = (headers = {}, names = []) => {
-  names = new Set(names);
+export const stripHeaders = (headers = {}, keys = []) => {
+  keys = new Set(keys);
 
-  return Object.fromEntries(
-    Object.entries(headers).filter(
-      ([key]) => !names.has(key.toLowerCase()),
-    ),
-  );
+  return Object.fromEntries(Object.entries(headers).filter(([key]) => !keys.has(key)));
 };
 
 export async function* tap(val) {
@@ -192,8 +183,6 @@ export async function* tap(val) {
     yield* val;
   } else if (val.stream) {
     yield* val.stream();
-  } else {
-    yield await val.arrayBuffer();
   }
 }