rekwest 4.5.2 → 4.5.4

package/dist/ackn.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.ackn = void 0;
 var _nodeTls = require("node:tls");
 const ackn = options => new Promise((resolve, reject) => {

package/dist/constants.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.requestRedirectCodes = exports.requestRedirect = exports.requestCredentials = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/cookies.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.Cookies = void 0;
 var _utils = require("./utils");
 class Cookies extends URLSearchParams {

package/dist/defaults.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.default = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _constants = require("./constants");

package/dist/errors.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.TimeoutError = exports.RequestError = void 0;
 class RequestError extends Error {
   get [Symbol.toStringTag]() {

package/dist/file.js

@@ -1,9 +1,16 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Blob", {
+  enumerable: true,
+  get: function () {
+    return _nodeBuffer.Blob;
+  }
+});
 exports.File = void 0;
 var _nodeBuffer = require("node:buffer");
-exports.Blob = _nodeBuffer.Blob;
 var _nodeUtil = require("node:util");
 class File extends _nodeBuffer.Blob {
   static alike(instance) {

package/dist/formdata.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.FormData = void 0;
 var _nodeCrypto = require("node:crypto");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));

package/dist/index.js

@@ -1,23 +1,34 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 var _exportNames = {
   constants: true,
   mediatypes: true
 };
-exports.constants = void 0;
+Object.defineProperty(exports, "constants", {
+  enumerable: true,
+  get: function () {
+    return _nodeHttp2.constants;
+  }
+});
 exports.default = rekwest;
 exports.mediatypes = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http"));
 var _nodeHttp2 = _interopRequireWildcard(require("node:http2"));
-exports.constants = _nodeHttp2.constants;
 var _nodeHttps = _interopRequireDefault(require("node:https"));
 var _constants = require("./constants");
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _constants[key]) return;
-  exports[key] = _constants[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _constants[key];
+    }
+  });
 });
 var _defaults = _interopRequireDefault(require("./defaults"));
 var _mediatypes = _interopRequireWildcard(require("./mediatypes"));
@@ -29,56 +40,96 @@ Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _utils[key]) return;
-  exports[key] = _utils[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _utils[key];
+    }
+  });
 });
 var _validation = require("./validation");
 Object.keys(_validation).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _validation[key]) return;
-  exports[key] = _validation[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _validation[key];
+    }
+  });
 });
 var _ackn = require("./ackn");
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ackn[key]) return;
-  exports[key] = _ackn[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ackn[key];
+    }
+  });
 });
 var _cookies = require("./cookies");
 Object.keys(_cookies).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _cookies[key]) return;
-  exports[key] = _cookies[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _cookies[key];
+    }
+  });
 });
 var _errors = require("./errors");
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _errors[key]) return;
-  exports[key] = _errors[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _errors[key];
+    }
+  });
 });
 var _file = require("./file");
 Object.keys(_file).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _file[key]) return;
-  exports[key] = _file[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _file[key];
+    }
+  });
 });
 var _formdata = require("./formdata");
 Object.keys(_formdata).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _formdata[key]) return;
-  exports[key] = _formdata[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _formdata[key];
+    }
+  });
 });
 var _mixin = require("./mixin");
 Object.keys(_mixin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _mixin[key]) return;
-  exports[key] = _mixin[key];
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _mixin[key];
+    }
+  });
 });
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/mediatypes.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.WILDCARD = exports.TEXT_PLAIN = exports.MULTIPART_FORM_DATA = exports.APPLICATION_OCTET_STREAM = exports.APPLICATION_JSON = exports.APPLICATION_FORM_URLENCODED = void 0;
 const APPLICATION_FORM_URLENCODED = 'application/x-www-form-urlencoded';
 exports.APPLICATION_FORM_URLENCODED = APPLICATION_FORM_URLENCODED;

package/dist/mixin.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.mixin = void 0;
 var _nodeBuffer = require("node:buffer");
 var _nodeHttp = _interopRequireDefault(require("node:http2"));

package/dist/postflight.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.postflight = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _promises = require("node:timers/promises");
@@ -12,7 +14,6 @@ var _mixin = require("./mixin");
 var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
-  HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_LOCATION,
   HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_SET_COOKIE,
@@ -77,14 +78,10 @@ const postflight = (req, res, options, {
         return res.emit('error', new _errors.RequestError('URL scheme must be "http" or "https".'));
       }
       if (!(0, _utils.sameOrigin)(location, url)) {
-        options.h2 = false;
-        if ([_constants.requestCredentials.omit, _constants.requestCredentials.sameOrigin].includes(credentials)) {
-          Object.keys(options.headers).filter(it => new RegExp(HTTP2_HEADER_AUTHORIZATION, 'i').test(it)).forEach(it => Reflect.deleteProperty(options.headers, it));
-          location.password = location.username = '';
-          if (credentials === _constants.requestCredentials.omit) {
-            options.cookies = false;
-          }
+        if (credentials !== _constants.requestCredentials.include) {
+          options.credentials = _constants.requestCredentials.omit;
         }
+        options.h2 = false;
       }
       if (statusCode !== HTTP_STATUS_SEE_OTHER && options.body?.pipe?.constructor === Function) {
         return res.emit('error', new _errors.RequestError(`Unable to ${redirect} redirect with streamable body.`));

package/dist/preflight.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.preflight = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _constants = require("./constants");
@@ -11,6 +13,7 @@ const {
   HTTP2_HEADER_ACCEPT,
   HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_AUTHORITY,
+  HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_COOKIE,
   HTTP2_HEADER_METHOD,
   HTTP2_HEADER_PATH,
@@ -30,7 +33,7 @@ const preflight = options => {
   if (h2) {
     options.endStream = [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(method);
   }
-  if (cookies !== false) {
+  if (cookies !== false && credentials !== _constants.requestCredentials.omit) {
     let cookie = _cookies.Cookies.jar.has(url.origin);
     if (cookies === Object(cookies) && [_constants.requestCredentials.include, _constants.requestCredentials.sameOrigin].includes(credentials)) {
       if (cookie) {
@@ -45,6 +48,8 @@ const preflight = options => {
         cookie = new _cookies.Cookies(cookies, options);
         _cookies.Cookies.jar.set(url.origin, cookie);
       }
+    } else {
+      cookie &&= _cookies.Cookies.jar.get(url.origin);
     }
     options.headers = {
       ...(cookie && {
@@ -53,6 +58,11 @@ const preflight = options => {
       ...headers
     };
   }
+  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));
+    url.password = url.username = '';
+  }
   options.headers = {
     [HTTP2_HEADER_ACCEPT]: `${_mediatypes.APPLICATION_JSON}, ${_mediatypes.TEXT_PLAIN}, ${_mediatypes.WILDCARD}`,
     [HTTP2_HEADER_ACCEPT_ENCODING]: 'br, deflate, deflate-raw, gzip, identity',

package/dist/transfer.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.transfer = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http"));
 var _nodeHttp2 = _interopRequireDefault(require("node:http2"));

package/dist/transform.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.transform = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _nodeStream = require("node:stream");

package/dist/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.sameOrigin = exports.normalize = exports.merge = exports.maxRetryAfterError = exports.maxRetryAfter = exports.dispatch = exports.decompress = exports.compress = exports.brandCheck = exports.affix = exports.admix = void 0;
 exports.tap = tap;
 exports.unwind = exports.toCamelCase = void 0;

package/dist/validation.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.validation = void 0;
 var _nodeHttp = _interopRequireDefault(require("node:http2"));
 var _constants = require("./constants");

package/package.json

@@ -69,5 +69,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.5.2"
+  "version": "4.5.4"
 }

package/src/postflight.mjs

@@ -16,7 +16,6 @@ import {
 } from './utils.mjs';
 
 const {
-  HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_LOCATION,
   HTTP2_HEADER_RETRY_AFTER,
   HTTP2_HEADER_SET_COOKIE,
@@ -83,18 +82,11 @@ export const postflight = (req, res, options, { reject, resolve }) => {
       }
 
       if (!sameOrigin(location, url)) {
-        options.h2 = false;
-        if ([
-          requestCredentials.omit,
-          requestCredentials.sameOrigin,
-        ].includes(credentials)) {
-          Object.keys(options.headers).filter((it) => new RegExp(HTTP2_HEADER_AUTHORIZATION, 'i').test(it))
-                .forEach((it) => Reflect.deleteProperty(options.headers, it));
-          location.password = location.username = '';
-          if (credentials === requestCredentials.omit) {
-            options.cookies = false;
-          }
+        if (credentials !== requestCredentials.include) {
+          options.credentials = requestCredentials.omit;
         }
+
+        options.h2 = false;
       }
 
       if (statusCode !== HTTP_STATUS_SEE_OTHER && options.body?.pipe?.constructor === Function) {

package/src/preflight.mjs

@@ -11,6 +11,7 @@ const {
   HTTP2_HEADER_ACCEPT,
   HTTP2_HEADER_ACCEPT_ENCODING,
   HTTP2_HEADER_AUTHORITY,
+  HTTP2_HEADER_AUTHORIZATION,
   HTTP2_HEADER_COOKIE,
   HTTP2_HEADER_METHOD,
   HTTP2_HEADER_PATH,
@@ -29,7 +30,7 @@ export const preflight = (options) => {
     ].includes(method);
   }
 
-  if (cookies !== false) {
+  if (cookies !== false && credentials !== requestCredentials.omit) {
     let cookie = Cookies.jar.has(url.origin);
 
     if (cookies === Object(cookies) && [
@@ -49,6 +50,8 @@ export const preflight = (options) => {
         cookie = new Cookies(cookies, options);
         Cookies.jar.set(url.origin, cookie);
       }
+    } else {
+      cookie &&= Cookies.jar.get(url.origin);
     }
 
     options.headers = {
@@ -57,6 +60,14 @@ 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))
+          .forEach((it) => Reflect.deleteProperty(options.headers, it));
+    url.password = url.username = '';
+  }
+
   options.headers = {
     [HTTP2_HEADER_ACCEPT]: `${ APPLICATION_JSON }, ${ TEXT_PLAIN }, ${ WILDCARD }`,
     [HTTP2_HEADER_ACCEPT_ENCODING]: 'br, deflate, deflate-raw, gzip, identity',