rekwest 2.3.5 → 2.3.6

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");
 
@@ -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);
   }
 

package/dist/index.js

@@ -7,11 +7,13 @@ 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 _https = _interopRequireDefault(require("https"));
 
 var _ackn = require("./ackn.js");
 
@@ -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

@@ -59,5 +59,5 @@
     "test": "mocha --exit --recursive",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "2.3.5"
+  "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,

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);
   },
 });