rekwest 4.2.0 → 4.2.1

package/dist/index.js

@@ -93,14 +93,14 @@ Reflect.defineProperty(rekwest, 'stream', {
       h2,
       url
     } = options;
-    const {
-      request
-    } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
     let client, req;
     if (h2) {
       client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
+      const {
+        request
+      } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
       req = request(url, options);
     }
     (0, _utils.affix)(client, req, options);

package/dist/postflight.js

@@ -88,6 +88,7 @@ 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/dist/preflight.js

@@ -22,7 +22,7 @@ const preflight = options => {
   const {
     cookies,
     credentials,
-    h2 = false,
+    h2,
     headers,
     method,
     url
@@ -49,7 +49,6 @@ const preflight = options => {
       ...headers
     };
   }
-  options.h2 ??= h2;
   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/utils.js

@@ -261,13 +261,21 @@ async function* tap(value) {
 }
 const transfer = async options => {
   const {
+    digest,
+    h2,
+    redirected,
+    thenable,
     url
   } = options;
   if (options.follow === 0) {
     throw new _errors.RequestError(`Maximum redirect reached at: ${url.href}`);
   }
   if (url.protocol === 'https:') {
-    options = await (0, _ackn.ackn)(options);
+    options = !h2 ? await (0, _ackn.ackn)(options) : {
+      ...options,
+      createConnection: null,
+      protocol: url.protocol
+    };
   } else if (Reflect.has(options, 'alpnProtocol')) {
     ['alpnProtocol', 'createConnection', 'h2', 'protocol'].forEach(it => Reflect.deleteProperty(options, it));
   }
@@ -277,21 +285,15 @@ const transfer = async options => {
     options.createConnection?.().destroy();
     throw ex;
   }
-  const {
-    digest,
-    h2,
-    redirected,
-    thenable
-  } = options;
-  const {
-    request
-  } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
   const promise = new Promise((resolve, reject) => {
     let client, req;
-    if (h2) {
+    if (options.h2) {
       client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
+      const {
+        request
+      } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
       req = request(url, options);
     }
     affix(client, req, options);

package/package.json

@@ -67,5 +67,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "4.2.0"
+  "version": "4.2.1"
 }

package/src/index.mjs

@@ -1,84 +1,85 @@
-import http from 'node:http';
-import http2 from 'node:http2';
-import https from 'node:https';
-import { requestRedirect } from './constants.mjs';
-import defaults from './defaults.mjs';
-import { APPLICATION_OCTET_STREAM } from './mediatypes.mjs';
-import { preflight } from './preflight.mjs';
-import {
-  admix,
-  affix,
-  merge,
-  sanitize,
-  transfer,
-  validation,
-} from './utils.mjs';
-
-export { constants } from 'node:http2';
-
-export * from './ackn.mjs';
-export * from './constants.mjs';
-export * from './cookies.mjs';
-export * from './errors.mjs';
-export * from './file.mjs';
-export * from './formdata.mjs';
-export * as mediatypes from './mediatypes.mjs';
-export * from './utils.mjs';
-
-const {
-  HTTP2_HEADER_CONTENT_TYPE,
-} = http2.constants;
-
-export default function rekwest(...args) {
-  let options = sanitize(...args);
-
-  if (!options.redirected) {
-    options = merge(rekwest.defaults, options);
-  }
-
-  return transfer(validation(options));
-}
-
-Reflect.defineProperty(rekwest, 'stream', {
-  enumerable: true,
-  value(...args) {
-    const options = preflight({
-      ...validation(merge(rekwest.defaults, {
-        headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
-      }, sanitize(...args))),
-      redirect: requestRedirect.manual,
-    });
-
-    const { h2, url } = options;
-    const { request } = (url.protocol === 'http:' ? http : https);
-    let client, req;
-
-    if (h2) {
-      client = http2.connect(url.origin, options);
-      req = client.request(options.headers, options);
-    } else {
-      req = request(url, options);
-    }
-
-    affix(client, req, options);
-
-    req.once('response', (res) => {
-      let headers;
-
-      if (h2) {
-        headers = res;
-        res = req;
-      }
-
-      admix(res, headers, options);
-    });
-
-    return req;
-  },
-});
-
-Reflect.defineProperty(rekwest, 'defaults', {
-  enumerable: true,
-  get() { return defaults.stash; },
-  set(value) { defaults.stash = merge(defaults.stash, value); },
-});
+import http from 'node:http';
+import http2 from 'node:http2';
+import https from 'node:https';
+import { requestRedirect } from './constants.mjs';
+import defaults from './defaults.mjs';
+import { APPLICATION_OCTET_STREAM } from './mediatypes.mjs';
+import { preflight } from './preflight.mjs';
+import {
+  admix,
+  affix,
+  merge,
+  sanitize,
+  transfer,
+  validation,
+} from './utils.mjs';
+
+export { constants } from 'node:http2';
+
+export * from './ackn.mjs';
+export * from './constants.mjs';
+export * from './cookies.mjs';
+export * from './errors.mjs';
+export * from './file.mjs';
+export * from './formdata.mjs';
+export * as mediatypes from './mediatypes.mjs';
+export * from './utils.mjs';
+
+const {
+  HTTP2_HEADER_CONTENT_TYPE,
+} = http2.constants;
+
+export default function rekwest(...args) {
+  let options = sanitize(...args);
+
+  if (!options.redirected) {
+    options = merge(rekwest.defaults, options);
+  }
+
+  return transfer(validation(options));
+}
+
+Reflect.defineProperty(rekwest, 'stream', {
+  enumerable: true,
+  value(...args) {
+    const options = preflight({
+      ...validation(merge(rekwest.defaults, {
+        headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
+      }, sanitize(...args))),
+      redirect: requestRedirect.manual,
+    });
+
+    const { h2, url } = options;
+    let client, req;
+
+    if (h2) {
+      client = http2.connect(url.origin, options);
+      req = client.request(options.headers, options);
+    } else {
+      const { request } = (url.protocol === 'http:' ? http : https);
+
+      req = request(url, options);
+    }
+
+    affix(client, req, options);
+
+    req.once('response', (res) => {
+      let headers;
+
+      if (h2) {
+        headers = res;
+        res = req;
+      }
+
+      admix(res, headers, options);
+    });
+
+    return req;
+  },
+});
+
+Reflect.defineProperty(rekwest, 'defaults', {
+  enumerable: true,
+  get() { return defaults.stash; },
+  set(value) { defaults.stash = merge(defaults.stash, value); },
+});

package/src/postflight.mjs

@@ -109,6 +109,7 @@ 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]) {

package/src/preflight.mjs

@@ -20,7 +20,7 @@ const {
 } = http2.constants;
 
 export const preflight = (options) => {
-  const { cookies, credentials, h2 = false, headers, method, url } = options;
+  const { cookies, credentials, h2, headers, method, url } = options;
 
   if (h2) {
     options.endStream = [
@@ -52,7 +52,6 @@ export const preflight = (options) => {
     };
   }
 
-  options.h2 ??= h2;
   options.headers = {
     [HTTP2_HEADER_ACCEPT]: `${ APPLICATION_JSON }, ${ TEXT_PLAIN }, ${ WILDCARD }`,
     [HTTP2_HEADER_ACCEPT_ENCODING]: 'br, deflate, deflate-raw, gzip, identity',

package/src/utils.mjs

@@ -299,14 +299,18 @@ export async function* tap(value) {
 }
 
 export const transfer = async (options) => {
-  const { url } = options;
+  const { digest, h2, redirected, thenable, url } = options;
 
   if (options.follow === 0) {
     throw new RequestError(`Maximum redirect reached at: ${ url.href }`);
   }
 
   if (url.protocol === 'https:') {
-    options = await ackn(options);
+    options = !h2 ? await ackn(options) : {
+      ...options,
+      createConnection: null,
+      protocol: url.protocol,
+    };
   } else if (Reflect.has(options, 'alpnProtocol')) {
     [
       'alpnProtocol',
@@ -323,16 +327,15 @@ export const transfer = async (options) => {
     throw ex;
   }
 
-  const { digest, h2, redirected, thenable } = options;
-  const { request } = (url.protocol === 'http:' ? http : https);
-
   const promise = new Promise((resolve, reject) => {
     let client, req;
 
-    if (h2) {
+    if (options.h2) {
       client = http2.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
+      const { request } = (url.protocol === 'http:' ? http : https);
+
       req = request(url, options);
     }