rekwest 7.0.1 → 7.0.3

package/dist/constants.cjs

@@ -3,16 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requestRedirectCodes = exports.requestRedirect = exports.requestCredentials = void 0;
-var _nodeHttp = _interopRequireDefault(require("node:http2"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const {
-  HTTP_STATUS_FOUND,
-  HTTP_STATUS_MOVED_PERMANENTLY,
-  HTTP_STATUS_PERMANENT_REDIRECT,
-  HTTP_STATUS_SEE_OTHER,
-  HTTP_STATUS_TEMPORARY_REDIRECT
-} = _nodeHttp.default.constants;
+exports.requestRedirect = exports.requestCredentials = void 0;
 const requestCredentials = exports.requestCredentials = {
   include: 'include',
   omit: 'omit',
@@ -22,5 +13,4 @@ const requestRedirect = exports.requestRedirect = {
   error: 'error',
   follow: 'follow',
   manual: 'manual'
-};
-const requestRedirectCodes = exports.requestRedirectCodes = [HTTP_STATUS_MOVED_PERMANENTLY, HTTP_STATUS_FOUND, HTTP_STATUS_SEE_OTHER, HTTP_STATUS_TEMPORARY_REDIRECT, HTTP_STATUS_PERMANENT_REDIRECT];
+};

package/dist/mixin.cjs

@@ -91,8 +91,10 @@ const mixin = (res, {
             isTextual = mimeType && (mimeType.type === 'text' || mimeType.subtype.match(/\bcsv\b|\bjson\b|\bxml\b|\byaml\b/) || mimeType.essence.match(/\becmascript\b|\bjavascript\b|\bx-www-form-urlencoded\b/));
           }
           if (isTextual) {
-            if (/\bjson\b/i.test(contentType)) {
+            if (/\bjson\b/.test(mimeType)) {
               body = JSON.parse(body.toString());
+            } else if ((0, _nodeBuffer.isUtf8)(body)) {
+              body = body.toString();
             } else {
               const charset = mimeType.params.get('charset')?.toLowerCase() ?? 'utf-8';
               body = new TextDecoder(charset, {

package/dist/postflight.cjs

@@ -48,9 +48,12 @@ const postflight = (req, res, options, {
     enumerable: true,
     value: cookies !== false && _cookies.Cookies.jar.has(url.origin) ? _cookies.Cookies.jar.get(url.origin) : void 0
   });
-  const willRedirect = (0, _redirects.redirects)(res, options);
-  if (Object(willRedirect) === willRedirect) {
-    return willRedirect.then(resolve, reject);
+  const result = (0, _redirects.redirects)(res, options);
+  if (Object(result) === result) {
+    return result.then(resolve, reject);
+  }
+  if (result) {
+    return reject((0, _mixin.mixin)(res, options));
   }
   if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
     return reject((0, _mixin.mixin)(res, options));

package/dist/preflight.cjs

@@ -34,8 +34,8 @@ const preflight = options => {
     headers = (0, _utils.stripHeaders)(headers, [HTTP2_HEADER_AUTHORITY, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_SCHEME]);
   }
   if (credentials === _constants.requestCredentials.omit) {
+    cookies = false;
     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) {

package/dist/redirects.cjs

@@ -30,9 +30,6 @@ const redirects = (res, options) => {
     url
   } = options;
   if (follow && /3\d{2}/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
-    if (!_constants.requestRedirectCodes.includes(res.statusCode)) {
-      return res.emit('error', new RangeError(`Invalid status code: ${res.statusCode}`));
-    }
     if (redirect === _constants.requestRedirect.error) {
       return res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
     }

package/dist/transfer.cjs

@@ -71,9 +71,9 @@ const transfer = async options => {
     }
     return res;
   } catch (ex) {
-    const willRetry = (0, _retries.retries)(ex, options);
-    if (willRetry) {
-      return willRetry;
+    const result = (0, _retries.retries)(ex, options);
+    if (result) {
+      return result;
     }
     if (digest && !redirected && ex.body) {
       ex.body = await ex.body();

package/package.json

@@ -34,7 +34,7 @@
     "alpn",
     "backoff",
     "brotli",
-    "cookie",
+    "cookies",
     "deflate",
     "deflate-raw",
     "fetch",
@@ -72,5 +72,5 @@
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
   "type": "module",
-  "version": "7.0.1"
+  "version": "7.0.3"
 }

package/src/constants.js

@@ -1,13 +1,3 @@
-import http2 from 'node:http2';
-
-const {
-  HTTP_STATUS_FOUND,
-  HTTP_STATUS_MOVED_PERMANENTLY,
-  HTTP_STATUS_PERMANENT_REDIRECT,
-  HTTP_STATUS_SEE_OTHER,
-  HTTP_STATUS_TEMPORARY_REDIRECT,
-} = http2.constants;
-
 export const requestCredentials = {
   include: 'include',
   omit: 'omit',
@@ -19,11 +9,3 @@ export const requestRedirect = {
   follow: 'follow',
   manual: 'manual',
 };
-
-export const requestRedirectCodes = [
-  HTTP_STATUS_MOVED_PERMANENTLY,
-  HTTP_STATUS_FOUND,
-  HTTP_STATUS_SEE_OTHER,
-  HTTP_STATUS_TEMPORARY_REDIRECT,
-  HTTP_STATUS_PERMANENT_REDIRECT,
-];

package/src/mixin.js

@@ -1,4 +1,7 @@
-import { Blob } from 'node:buffer';
+import {
+  Blob,
+  isUtf8,
+} from 'node:buffer';
 import http2 from 'node:http2';
 import { buffer } from 'node:stream/consumers';
 import { MIMEType } from 'node:util';
@@ -92,8 +95,10 @@ export const mixin = (res, { decodersOptions, digest = false, parse = false } =
           }
 
           if (isTextual) {
-            if (/\bjson\b/i.test(contentType)) {
+            if (/\bjson\b/.test(mimeType)) {
               body = JSON.parse(body.toString());
+            } else if (isUtf8(body)) {
+              body = body.toString();
             } else {
               const charset = mimeType.params.get('charset')?.toLowerCase() ?? 'utf-8';
 

package/src/postflight.js

@@ -42,10 +42,14 @@ export const postflight = (req, res, options, { reject, resolve }) => {
     value: cookies !== false && Cookies.jar.has(url.origin) ? Cookies.jar.get(url.origin) : void 0,
   });
 
-  const willRedirect = redirects(res, options);
+  const result = redirects(res, options);
 
-  if (Object(willRedirect) === willRedirect) {
-    return willRedirect.then(resolve, reject);
+  if (Object(result) === result) {
+    return result.then(resolve, reject);
+  }
+
+  if (result) {
+    return reject(mixin(res, options));
   }
 
   if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {

package/src/preflight.js

@@ -32,11 +32,11 @@ export const preflight = (options) => {
   }
 
   if (credentials === requestCredentials.omit) {
+    cookies = false;
     headers = stripHeaders(headers, [
       HTTP2_HEADER_AUTHORIZATION,
       HTTP2_HEADER_COOKIE,
     ]);
-    options.cookies = false;
     url.password = url.username = '';
   }
 

package/src/redirects.js

@@ -3,7 +3,6 @@ import { isReadable } from 'node:stream';
 import {
   requestCredentials,
   requestRedirect,
-  requestRedirectCodes,
 } from './constants.js';
 import { RequestError } from './errors.js';
 import rekwest from './index.js';
@@ -28,10 +27,6 @@ export const redirects = (res, options) => {
   const { credentials, follow, redirect, url } = options;
 
   if (follow && /3\d{2}/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
-    if (!requestRedirectCodes.includes(res.statusCode)) {
-      return res.emit('error', new RangeError(`Invalid status code: ${ res.statusCode }`));
-    }
-
     if (redirect === requestRedirect.error) {
       return res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
     }

package/src/transfer.js

@@ -73,10 +73,10 @@ export const transfer = async (options) => {
 
     return res;
   } catch (ex) {
-    const willRetry = retries(ex, options);
+    const result = retries(ex, options);
 
-    if (willRetry) {
-      return willRetry;
+    if (result) {
+      return result;
     }
 
     if (digest && !redirected && ex.body) {