rekwest 2.3.2 → 2.3.6

package/dist/formdata.js

@@ -9,11 +9,11 @@ var _http = _interopRequireDefault(require("http2"));
 
 var _util = require("util");
 
-var _file = require("./file.mjs");
+var _file = require("./file.js");
 
-var _helpers = require("./helpers.mjs");
+var _helpers = require("./helpers.js");
 
-var _mediatypes = require("./mediatypes.mjs");
+var _mediatypes = require("./mediatypes.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/dist/helpers.js

@@ -7,9 +7,7 @@ exports.transform = void 0;
 
 var _buffer = require("buffer");
 
-var _http = require("http");
-
-var _http2 = _interopRequireDefault(require("http2"));
+var _http = _interopRequireDefault(require("http2"));
 
 var _stream = require("stream");
 
@@ -17,13 +15,13 @@ var _util = require("util");
 
 var _zlib = _interopRequireDefault(require("zlib"));
 
-var _cookies = require("./cookies.mjs");
+var _cookies = require("./cookies.js");
 
-var _file = require("./file.mjs");
+var _file = require("./file.js");
 
-var _formdata = require("./formdata.mjs");
+var _formdata = require("./formdata.js");
 
-var _mediatypes = require("./mediatypes.mjs");
+var _mediatypes = require("./mediatypes.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -40,7 +38,7 @@ const {
   HTTP2_HEADER_SCHEME,
   HTTP2_METHOD_GET,
   HTTP2_METHOD_HEAD
-} = _http2.default.constants;
+} = _http.default.constants;
 const brotliCompress = (0, _util.promisify)(_zlib.default.brotliCompress);
 const brotliDecompress = (0, _util.promisify)(_zlib.default.brotliDecompress);
 const gzip = (0, _util.promisify)(_zlib.default.gzip);
@@ -139,9 +137,7 @@ const preflight = options => {
     redirected
   } = options;
 
-  if (!h2) {
-    options.agent ??= url.protocol === 'http:' ? _http.globalAgent : void 0;
-  } else {
+  if (h2) {
     options.endStream = [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(method);
   }
 
@@ -199,36 +195,31 @@ const premix = (res, {
     Object.defineProperties(res, {
       arrayBuffer: {
         enumerable: true,
-        value: async function () {
-          const stash = parse;
-          parse = false;
-          const {
+        value: function () {
+          parse &&= false;
+          return this.body().then(({
             buffer,
             byteLength,
             byteOffset
-          } = await this.body().finally(() => parse = stash);
-          return buffer.slice(byteOffset, byteOffset + byteLength);
+          }) => buffer.slice(byteOffset, byteOffset + byteLength));
         }
       },
       blob: {
         enumerable: true,
-        value: async function () {
-          const val = await this.arrayBuffer();
-          return new _buffer.Blob([val]);
+        value: function () {
+          return this.arrayBuffer().then(res => new _buffer.Blob([res]));
         }
       },
       json: {
         enumerable: true,
-        value: async function () {
-          const val = await this.text();
-          return JSON.parse(val);
+        value: function () {
+          return this.text().then(res => JSON.parse(res));
         }
       },
       text: {
         enumerable: true,
-        value: async function () {
-          const val = await this.blob().then(blob => blob.text());
-          return val.toString();
+        value: function () {
+          return this.blob().then(blob => blob.text());
         }
       }
     });
@@ -258,7 +249,7 @@ const premix = (res, {
 
         if (spool.length && parse) {
           const contentType = this.headers[HTTP2_HEADER_CONTENT_TYPE] ?? '';
-          const charset = contentType.split(';').find(it => /charset=/i.test(it))?.toLowerCase()?.replace('charset=', '')?.replace('iso-8859-1', 'latin1')?.trim() || 'utf-8';
+          const charset = contentType.split(';').find(it => /charset=/i.test(it))?.toLowerCase().replace('charset=', '').replace('iso-8859-1', 'latin1').trim() || 'utf-8';
 
           if (/\bjson\b/i.test(contentType)) {
             spool = JSON.parse(spool.toString(charset));

package/dist/index.js

@@ -7,13 +7,15 @@ var _exportNames = {
 exports.constants = void 0;
 exports.default = rekwest;
 
-var _http = _interopRequireDefault(require("http2"));
+var _http = _interopRequireDefault(require("http"));
 
-exports.constants = _http.constants;
+var _http2 = _interopRequireDefault(require("http2"));
 
-var _https = require("https");
+exports.constants = _http2.constants;
 
-var _ackn = require("./ackn.mjs");
+var _https = _interopRequireDefault(require("https"));
+
+var _ackn = require("./ackn.js");
 
 Object.keys(_ackn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -22,7 +24,7 @@ Object.keys(_ackn).forEach(function (key) {
   exports[key] = _ackn[key];
 });
 
-var _cookies = require("./cookies.mjs");
+var _cookies = require("./cookies.js");
 
 Object.keys(_cookies).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -31,7 +33,7 @@ Object.keys(_cookies).forEach(function (key) {
   exports[key] = _cookies[key];
 });
 
-var _errors = require("./errors.mjs");
+var _errors = require("./errors.js");
 
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -40,7 +42,7 @@ Object.keys(_errors).forEach(function (key) {
   exports[key] = _errors[key];
 });
 
-var _helpers = require("./helpers.mjs");
+var _helpers = require("./helpers.js");
 
 Object.keys(_helpers).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -49,9 +51,9 @@ Object.keys(_helpers).forEach(function (key) {
   exports[key] = _helpers[key];
 });
 
-var _mediatypes = require("./mediatypes.mjs");
+var _mediatypes = require("./mediatypes.js");
 
-var _file = require("./file.mjs");
+var _file = require("./file.js");
 
 Object.keys(_file).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -60,7 +62,7 @@ Object.keys(_file).forEach(function (key) {
   exports[key] = _file[key];
 });
 
-var _formdata = require("./formdata.mjs");
+var _formdata = require("./formdata.js");
 
 Object.keys(_formdata).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -81,7 +83,7 @@ const {
   HTTP2_METHOD_HEAD,
   HTTP_STATUS_BAD_REQUEST,
   HTTP_STATUS_SEE_OTHER
-} = _http.default.constants;
+} = _http2.default.constants;
 
 async function rekwest(url, options = {}) {
   url = options.url = new URL(url);
@@ -115,8 +117,14 @@ async function rekwest(url, options = {}) {
     h2,
     redirect,
     redirected,
-    thenable
+    thenable,
+    url: {
+      protocol
+    }
   } = options;
+  const {
+    request
+  } = protocol === 'http:' ? _http.default : _https.default;
   let {
     body
   } = options;
@@ -125,10 +133,10 @@ async function rekwest(url, options = {}) {
     body &&= (0, _helpers.transform)(body, options);
 
     if (h2) {
-      client = _http.default.connect(url.origin, options);
+      client = _http2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
-      req = (0, _https.request)(url, options);
+      req = request(url, options);
     }
 
     req.on('response', res => {
@@ -258,7 +266,7 @@ Reflect.defineProperty(rekwest, 'stream', {
     });
 
     if (options.h2) {
-      const client = _http.default.connect(url.origin, options);
+      const client = _http2.default.connect(url.origin, options);
 
       const req = client.request(options.headers, options);
       req.on('end', () => {
@@ -267,7 +275,15 @@ Reflect.defineProperty(rekwest, 'stream', {
       return req;
     }
 
-    return (0, _https.request)(options.url, options);
+    const {
+      url: {
+        protocol
+      }
+    } = options;
+    const {
+      request
+    } = protocol === 'http:' ? _http.default : _https.default;
+    return request(options.url, options);
   }
 });
 Reflect.defineProperty(rekwest, 'defaults', {

package/package.json

@@ -9,13 +9,13 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.16.7",
+    "@babel/core": "^7.16.12",
     "@babel/eslint-parser": "^7.16.5",
-    "@babel/preset-env": "^7.16.8",
+    "@babel/preset-env": "^7.16.11",
     "c8": "^7.11.0",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-config-ultra-refined": "^2.3.0",
-    "mocha": "^9.1.3"
+    "mocha": "^9.2.0"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -54,10 +54,10 @@
     "cert:gen": "openssl req -days 365 -keyout localhost.key -newkey ec -nodes -pkeyopt ec_paramgen_curve:prime256v1 -subj //SKIP=1/CN=localhost -out localhost.cert -x509",
     "cert:ken": "openssl x509 -in localhost.cert -noout -text",
     "lint": "eslint . --ext .cjs,.js,.mjs",
-    "prepack": "npm run build",
+    "prepack": "npm run build && sh pony.sh",
     "pretest": "rm -rf coverage && npm run cert:gen",
     "test": "mocha --exit --recursive",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "2.3.2"
+  "version": "2.3.6"
 }

package/src/helpers.mjs

@@ -1,5 +1,4 @@
 import { Blob } from 'buffer';
-import { globalAgent } from 'http';
 import http2 from 'http2';
 import {
   PassThrough,
@@ -123,9 +122,7 @@ export const preflight = (options) => {
   const url = options.url = new URL(options.url);
   const { cookies, h2 = false, method = HTTP2_METHOD_GET, headers, redirected } = options;
 
-  if (!h2) {
-    options.agent ??= url.protocol === 'http:' ? globalAgent : void 0;
-  } else {
+  if (h2) {
     options.endStream = [
       HTTP2_METHOD_GET,
       HTTP2_METHOD_HEAD,
@@ -182,37 +179,31 @@ export const premix = (res, { digest = false, parse = false } = {}) => {
     Object.defineProperties(res, {
       arrayBuffer: {
         enumerable: true,
-        value: async function () {
-          const stash = parse;
-
-          parse = false;
-          const { buffer, byteLength, byteOffset } = await this.body().finally(() => parse = stash);
+        value: function () {
+          parse &&= false;
 
-          return buffer.slice(byteOffset, byteOffset + byteLength);
+          return this.body().then(({ buffer, byteLength, byteOffset }) => buffer.slice(
+            byteOffset,
+            byteOffset + byteLength,
+          ));
         },
       },
       blob: {
         enumerable: true,
-        value: async function () {
-          const val = await this.arrayBuffer();
-
-          return new Blob([val]);
+        value: function () {
+          return this.arrayBuffer().then((res) => new Blob([res]));
         },
       },
       json: {
         enumerable: true,
-        value: async function () {
-          const val = await this.text();
-
-          return JSON.parse(val);
+        value: function () {
+          return this.text().then((res) => JSON.parse(res));
         },
       },
       text: {
         enumerable: true,
-        value: async function () {
-          const val = await this.blob().then((blob) => blob.text());
-
-          return val.toString();
+        value: function () {
+          return this.blob().then((blob) => blob.text());
         },
       },
     });
@@ -243,9 +234,9 @@ export const premix = (res, { digest = false, parse = false } = {}) => {
           const charset = contentType.split(';')
                                      .find((it) => /charset=/i.test(it))
                                      ?.toLowerCase()
-                                     ?.replace('charset=', '')
-                                     ?.replace('iso-8859-1', 'latin1')
-                                     ?.trim() || 'utf-8';
+                                     .replace('charset=', '')
+                                     .replace('iso-8859-1', 'latin1')
+                                     .trim() || 'utf-8';
 
           if (/\bjson\b/i.test(contentType)) {
             spool = JSON.parse(spool.toString(charset));

package/src/index.mjs

@@ -1,5 +1,6 @@
+import http from 'http';
 import http2 from 'http2';
-import { request } from 'https';
+import https from 'https';
 import { ackn } from './ackn.mjs';
 import { Cookies } from './cookies.mjs';
 import { RequestError } from './errors.mjs';
@@ -63,7 +64,8 @@ export default async function rekwest(url, options = {}) {
 
   options = preflight(options);
 
-  const { cookies, digest, follow, h2, redirect, redirected, thenable } = options;
+  const { cookies, digest, follow, h2, redirect, redirected, thenable, url: { protocol } } = options;
+  const { request } = (protocol === 'http:' ? http : https);
   let { body } = options;
 
   const promise = new Promise((resolve, reject) => {
@@ -222,6 +224,9 @@ Reflect.defineProperty(rekwest, 'stream', {
       return req;
     }
 
+    const { url: { protocol } } = options;
+    const { request } = (protocol === 'http:' ? http : https);
+
     return request(options.url, options);
   },
 });