rekwest 7.0.0 → 7.0.1

package/dist/preflight.cjs

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.preflight = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
-var _config = require("./config.cjs");
 var _constants = require("./constants.cjs");
 var _cookies = require("./cookies.cjs");
+var _utils = require("./utils.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
-  HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_AUTHORITY,
   HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_COOKIE,
@@ -21,7 +20,7 @@ const {
   HTTP2_METHOD_HEAD
 } = _nodeHttp.default.constants;
 const preflight = options => {
-  const {
+  let {
     cookies,
     credentials,
     h2,
@@ -31,6 +30,13 @@ const preflight = options => {
   } = options;
   if (h2) {
     options.endStream = [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(method);
+  } else {
+    headers = (0, _utils.stripHeaders)(headers, [HTTP2_HEADER_AUTHORITY, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_SCHEME]);
+  }
+  if (credentials === _constants.requestCredentials.omit) {
+    headers = (0, _utils.stripHeaders)(headers, [HTTP2_HEADER_AUTHORIZATION, HTTP2_HEADER_COOKIE]);
+    options.cookies = false;
+    url.password = url.username = '';
   }
   if (cookies !== false && credentials !== _constants.requestCredentials.omit) {
     let cookie = _cookies.Cookies.jar.has(url.origin);
@@ -57,26 +63,8 @@ const preflight = options => {
       ...headers
     };
   }
-  if (credentials === _constants.requestCredentials.omit) {
-    [HTTP2_HEADER_AUTHORIZATION, HTTP2_HEADER_COOKIE].forEach(key => Reflect.deleteProperty(options.headers, key));
-    options.cookies = false;
-    url.password = url.username = '';
-  }
-  if (!h2) {
-    [HTTP2_HEADER_AUTHORITY, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_SCHEME].forEach(key => Reflect.deleteProperty(options.headers, key));
-  }
   options.headers = {
-    ...Object.entries(options.headers ?? {}).reduce((acc, [key, val]) => {
-      acc[key.toLowerCase()] = val;
-      const rex = /\s?zstd,?/gi;
-      if (acc[HTTP2_HEADER_ACCEPT_ENCODING]?.match(rex) && !_config.isZstdSupported) {
-        acc[HTTP2_HEADER_ACCEPT_ENCODING] = val.replace(rex, '').trim();
-        if (!acc[HTTP2_HEADER_ACCEPT_ENCODING]) {
-          Reflect.deleteProperty(acc, HTTP2_HEADER_ACCEPT_ENCODING);
-        }
-      }
-      return acc;
-    }, {}),
+    ...headers,
     ...(h2 && {
       [HTTP2_HEADER_AUTHORITY]: url.host,
       [HTTP2_HEADER_METHOD]: method,

package/dist/utils.cjs

@@ -3,16 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.snoop = exports.sameOrigin = exports.normalize = exports.merge = exports.isReadableStream = exports.isPipeStream = exports.isFileLike = exports.dispatch = exports.copyWithMerge = exports.brandCheck = exports.augment = void 0;
+exports.stripHeaders = exports.snoop = exports.sameOrigin = exports.normalizeHeaders = exports.normalize = exports.merge = exports.isReadableStream = exports.isPipeStream = exports.isFileLike = exports.dispatch = exports.copyWithMerge = exports.brandCheck = exports.augment = void 0;
 exports.tap = tap;
 exports.unwind = exports.toCamelCase = void 0;
 var _nodeBuffer = require("node:buffer");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _nodeStream = require("node:stream");
-var _config = _interopRequireDefault(require("./config.cjs"));
+var _config = _interopRequireWildcard(require("./config.cjs"));
 var _errors = require("./errors.cjs");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
+  HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_STATUS
 } = _nodeHttp.default.constants;
 const augment = (res, headers, options) => {
@@ -105,12 +107,30 @@ const normalize = (url, options = {}) => {
   if (options.stripTrailingSlash) {
     url = `${url}`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
   }
-  url = new URL(url, options.baseURL);
   return Object.assign(options, {
-    url
+    headers: normalizeHeaders(options.headers),
+    method: options.method.toUpperCase(),
+    url: new URL(url, options.baseURL)
   });
 };
 exports.normalize = normalize;
+const normalizeHeaders = headers => {
+  const collector = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    const name = key.toLowerCase();
+    collector[key] = value;
+    if (key === HTTP2_HEADER_ACCEPT_ENCODING && !_config.isZstdSupported) {
+      const stripped = value.replace(/\s?zstd,?/gi, '').trim();
+      if (stripped) {
+        collector[key] = stripped;
+      } else {
+        Reflect.deleteProperty(collector, name);
+      }
+    }
+  }
+  return collector;
+};
+exports.normalizeHeaders = normalizeHeaders;
 const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
 exports.sameOrigin = sameOrigin;
 const snoop = (client, req, options) => {
@@ -125,6 +145,11 @@ const snoop = (client, req, options) => {
   });
 };
 exports.snoop = snoop;
+const stripHeaders = (headers = {}, names = []) => {
+  names = new Set(names);
+  return Object.fromEntries(Object.entries(headers).filter(([key]) => !names.has(key.toLowerCase())));
+};
+exports.stripHeaders = stripHeaders;
 async function* tap(value) {
   if (Reflect.has(value, Symbol.asyncIterator)) {
     yield* value;

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": {
-    "name": "Yehor Sergeenko",
     "email": "yehor.sergeenko@gmail.com",
+    "name": "Yehor Sergeenko",
     "url": "https://github.com/bricss"
   },
   "bugs": {
@@ -72,5 +72,5 @@
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.0.0"
+  "version": "7.0.1"
 }

package/src/preflight.js

@@ -1,10 +1,9 @@
 import http2 from 'node:http2';
-import { isZstdSupported } from './config.js';
 import { requestCredentials } from './constants.js';
 import { Cookies } from './cookies.js';
+import { stripHeaders } from './utils.js';
 
 const {
-  HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_AUTHORITY,
   HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_COOKIE,
@@ -16,13 +15,29 @@ const {
 } = http2.constants;
 
 export const preflight = (options) => {
-  const { cookies, credentials, h2, headers, method, url } = 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) {
+    headers = stripHeaders(headers, [
+      HTTP2_HEADER_AUTHORIZATION,
+      HTTP2_HEADER_COOKIE,
+    ]);
+    options.cookies = false;
+    url.password = url.username = '';
   }
 
   if (cookies !== false && credentials !== requestCredentials.omit) {
@@ -55,39 +70,8 @@ export const preflight = (options) => {
     };
   }
 
-  if (credentials === requestCredentials.omit) {
-    [
-      HTTP2_HEADER_AUTHORIZATION,
-      HTTP2_HEADER_COOKIE,
-    ].forEach((key) => Reflect.deleteProperty(options.headers, key));
-    options.cookies = false;
-    url.password = url.username = '';
-  }
-
-  if (!h2) {
-    [
-      HTTP2_HEADER_AUTHORITY,
-      HTTP2_HEADER_METHOD,
-      HTTP2_HEADER_PATH,
-      HTTP2_HEADER_SCHEME,
-    ].forEach((key) => Reflect.deleteProperty(options.headers, key));
-  }
-
   options.headers = {
-    ...Object.entries(options.headers ?? {})
-             .reduce((acc, [key, val]) => {
-               acc[key.toLowerCase()] = val;
-               const rex = /\s?zstd,?/gi;
-
-               if (acc[HTTP2_HEADER_ACCEPT_ENCODING]?.match(rex) && !isZstdSupported) {
-                 acc[HTTP2_HEADER_ACCEPT_ENCODING] = val.replace(rex, '').trim();
-                 if (!acc[HTTP2_HEADER_ACCEPT_ENCODING]) {
-                   Reflect.deleteProperty(acc, HTTP2_HEADER_ACCEPT_ENCODING);
-                 }
-               }
-
-               return acc;
-             }, {}),
+    ...headers,
     ...h2 && {
       [HTTP2_HEADER_AUTHORITY]: url.host,
       [HTTP2_HEADER_METHOD]: method,

package/src/utils.js

@@ -7,10 +7,11 @@ import {
   isReadable,
   Readable,
 } from 'node:stream';
-import config from './config.js';
+import config, { isZstdSupported } from './config.js';
 import { TimeoutError } from './errors.js';
 
 const {
+  HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_STATUS,
 } = http2.constants;
 
@@ -115,9 +116,33 @@ export const normalize = (url, options = {}) => {
     url = `${ url }`.replace(/\/$|\/(?=#)|\/(?=\?)/g, '');
   }
 
-  url = new URL(url, options.baseURL);
+  return Object.assign(options, {
+    headers: normalizeHeaders(options.headers),
+    method: options.method.toUpperCase(),
+    url: new URL(url, options.baseURL),
+  });
+};
+
+export const normalizeHeaders = (headers) => {
+  const collector = {};
+
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    const name = key.toLowerCase();
 
-  return Object.assign(options, { url });
+    collector[key] = value;
+
+    if (key === HTTP2_HEADER_ACCEPT_ENCODING && !isZstdSupported) {
+      const stripped = value.replace(/\s?zstd,?/gi, '').trim();
+
+      if (stripped) {
+        collector[key] = stripped;
+      } else {
+        Reflect.deleteProperty(collector, name);
+      }
+    }
+  }
+
+  return collector;
 };
 
 export const sameOrigin = (a, b) => a.protocol === b.protocol && a.hostname === b.hostname && a.port === b.port;
@@ -134,6 +159,16 @@ export const snoop = (client, req, options) => {
   });
 };
 
+export const stripHeaders = (headers = {}, names = []) => {
+  names = new Set(names);
+
+  return Object.fromEntries(
+    Object.entries(headers).filter(
+      ([key]) => !names.has(key.toLowerCase()),
+    ),
+  );
+};
+
 export async function* tap(value) {
   if (Reflect.has(value, Symbol.asyncIterator)) {
     yield* value;