rekwest 4.2.1 → 4.2.3

package/dist/defaults.js

@@ -15,6 +15,7 @@ const stash = {
   credentials: _constants.requestCredentials.sameOrigin,
   digest: true,
   follow: 20,
+  h2: false,
   get maxRetryAfter() {
     return this[_utils.maxRetryAfter] ?? this.timeout;
   },
@@ -33,7 +34,8 @@ const stash = {
     statusCodes: [HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_SERVICE_UNAVAILABLE]
   },
   thenable: false,
-  timeout: 3e5
+  timeout: 3e5,
+  trimTrailingSlashes: false
 };
 var _default = {
   stash

package/dist/postflight.js

@@ -71,11 +71,14 @@ const postflight = (req, res, options, {
       if (!/^https?:/i.test(location.protocol)) {
         return res.emit('error', new _errors.RequestError('URL scheme must be "http" or "https".'));
       }
-      if (!(0, _utils.sameOrigin)(location, url) && [_constants.requestCredentials.omit, _constants.requestCredentials.sameOrigin].includes(credentials)) {
-        Reflect.deleteProperty(options.headers, HTTP2_HEADER_AUTHORIZATION);
-        location.password = location.username = '';
-        if (credentials === _constants.requestCredentials.omit) {
-          options.cookies = false;
+      if (!(0, _utils.sameOrigin)(location, url)) {
+        Reflect.set(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;
+          }
         }
       }
       options.url = location;
@@ -88,7 +91,6 @@ const postflight = (req, res, options, {
         options.body = null;
         options.method = HTTP2_METHOD_GET;
       }
-      Reflect.set(options, 'h2', false);
       Reflect.set(options, 'redirected', true);
       if (statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {
         let interval = res.headers[HTTP2_HEADER_RETRY_AFTER];

package/package.json

@@ -13,7 +13,7 @@
     "@babel/eslint-parser": "^7.19.1",
     "@babel/preset-env": "^7.20.2",
     "c8": "^7.12.0",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-ultra-refined": "^2.10.0",
     "mocha": "^10.1.0"
   },
@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.2.1"
+  "version": "4.2.3"
 }

package/src/defaults.mjs

@@ -1,44 +1,46 @@
-import http2 from 'node:http2';
-import {
-  requestCredentials,
-  requestRedirect,
-} from './constants.mjs';
-import { maxRetryAfter } from './utils.mjs';
-
-const {
-  HTTP2_METHOD_GET,
-  HTTP_STATUS_SERVICE_UNAVAILABLE,
-  HTTP_STATUS_TOO_MANY_REQUESTS,
-} = http2.constants;
-
-const stash = {
-  credentials: requestCredentials.sameOrigin,
-  digest: true,
-  follow: 20,
-  get maxRetryAfter() {
-    return this[maxRetryAfter] ?? this.timeout;
-  },
-  set maxRetryAfter(value) {
-    this[maxRetryAfter] = value;
-  },
-  method: HTTP2_METHOD_GET,
-  parse: true,
-  redirect: requestRedirect.follow,
-  redirected: false,
-  retry: {
-    attempts: 0,
-    backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
-    interval: 1e3,
-    retryAfter: true,
-    statusCodes: [
-      HTTP_STATUS_TOO_MANY_REQUESTS,
-      HTTP_STATUS_SERVICE_UNAVAILABLE,
-    ],
-  },
-  thenable: false,
-  timeout: 3e5,
-};
-
-export default {
-  stash,
-};
+import http2 from 'node:http2';
+import {
+  requestCredentials,
+  requestRedirect,
+} from './constants.mjs';
+import { maxRetryAfter } from './utils.mjs';
+
+const {
+  HTTP2_METHOD_GET,
+  HTTP_STATUS_SERVICE_UNAVAILABLE,
+  HTTP_STATUS_TOO_MANY_REQUESTS,
+} = http2.constants;
+
+const stash = {
+  credentials: requestCredentials.sameOrigin,
+  digest: true,
+  follow: 20,
+  h2: false,
+  get maxRetryAfter() {
+    return this[maxRetryAfter] ?? this.timeout;
+  },
+  set maxRetryAfter(value) {
+    this[maxRetryAfter] = value;
+  },
+  method: HTTP2_METHOD_GET,
+  parse: true,
+  redirect: requestRedirect.follow,
+  redirected: false,
+  retry: {
+    attempts: 0,
+    backoffStrategy: 'interval * Math.log(Math.random() * (Math.E * Math.E - Math.E) + Math.E)',
+    interval: 1e3,
+    retryAfter: true,
+    statusCodes: [
+      HTTP_STATUS_TOO_MANY_REQUESTS,
+      HTTP_STATUS_SERVICE_UNAVAILABLE,
+    ],
+  },
+  thenable: false,
+  timeout: 3e5,
+  trimTrailingSlashes: false,
+};
+
+export default {
+  stash,
+};

package/src/postflight.mjs

@@ -77,14 +77,18 @@ export const postflight = (req, res, options, { reject, resolve }) => {
         return res.emit('error', new RequestError('URL scheme must be "http" or "https".'));
       }
 
-      if (!sameOrigin(location, url) && [
-        requestCredentials.omit,
-        requestCredentials.sameOrigin,
-      ].includes(credentials)) {
-        Reflect.deleteProperty(options.headers, HTTP2_HEADER_AUTHORIZATION);
-        location.password = location.username = '';
-        if (credentials === requestCredentials.omit) {
-          options.cookies = false;
+      if (!sameOrigin(location, url)) {
+        Reflect.set(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;
+          }
         }
       }
 
@@ -109,7 +113,6 @@ export const postflight = (req, res, options, { reject, resolve }) => {
         options.method = HTTP2_METHOD_GET;
       }
 
-      Reflect.set(options, 'h2', false);
       Reflect.set(options, 'redirected', true);
 
       if (statusCode === HTTP_STATUS_MOVED_PERMANENTLY && res.headers[HTTP2_HEADER_RETRY_AFTER]) {