Fixed regressions

index.js

@@ -24,7 +24,7 @@ function initParams (uri, options, callback) {
     callback = options
   }
 
-  var params = {protocol: 'http1'}
+  var params = {httpVersion: 'http1'}
   if (options !== null && typeof options === 'object') {
     extend(params, options, {uri: uri})
   } else if (typeof uri === 'string') {

lib/autohttp/agent.ts

@@ -1,13 +1,13 @@
 import {Agent} from 'https';
-import {Http2Agent} from "../http2/http2Agent";
+import {Http2Agent, type AgentOptions as Http2AgentOptions} from "../http2/http2Agent";
 import * as https from "https";
 import {RequestOptions} from "../http2/request";
 import {MultiProtocolRequest} from "./request";
 import * as tls from "tls";
 import {EventEmitter} from "node:events";
 
 
-interface AgentOptions extends Omit<RequestOptions, 'agent'> {
+interface AgentOptions extends Http2AgentOptions {
 }
 
 // @ts-ignore
@@ -23,7 +23,7 @@ export class AutoHttp2Agent extends EventEmitter implements Agent {
         this.ALPNCache = new Map();
     }
 
-    createConnection(req: MultiProtocolRequest, options: AgentOptions) {
+    createConnection(req: MultiProtocolRequest, options: RequestOptions) {
         const uri = options.uri;
         const port = options.port ?? 443;
 

lib/autohttp/index.ts

@@ -3,5 +3,6 @@ import {request} from "./request";
 
 export default  {
     Agent: AutoHttp2Agent,
-    request: request
+    request: request,
+    globalAgent: new AutoHttp2Agent({})
 }

lib/http2/http2Agent.ts

@@ -10,7 +10,7 @@ interface Options {
 
 }
 
-interface AgentOptions{
+export interface AgentOptions{
     ca?: Buffer;
     extraCa?:string;
     ciphers?: string;

lib/http2/index.ts

@@ -3,5 +3,7 @@ import {request} from "./request";
 
 export default  {
     Agent: Http2Agent,
-    request: request
+    request: request,
+    globalAgent: new Http2Agent({})
+
 }

lib/redirect.js

@@ -210,6 +210,8 @@ Redirect.prototype.onResponse = function (response) {
 
   request.emit('redirect')
 
+  options.httpVersion = this.request.httpVersion;
+
   request.init(options)
 
   return true

request.js

@@ -593,7 +593,9 @@ Request.prototype.init = function (options) {
   var defaultModules = {'http:': { h2: http, http1: http, auto: http }, 'https:': { http1: https, h2: http2, auto: autohttp2 }}
   var httpModules = self.httpModules || {}
 
-  self.httpModule = httpModules[protocol]?.[options.protocol] || defaultModules[protocol][options.protocol]
+  // If user defines httpModules, respect if they have different httpModules for different http versions, else use the tls specific http module
+  // If the user defines nothing, revert to default modules
+  self.httpModule = httpModules[protocol]?.[options.httpVersion] || httpModules[protocol] || defaultModules[protocol][options.httpVersion]
 
   if (!self.httpModule) {
     return self.emit('error', new Error('Invalid protocol: ' + protocol))
@@ -810,8 +812,6 @@ Request.prototype.getNewAgent = function () {
     poolKey += Agent.name
   }
 
-  poolKey += self.protocol;
-
   // ca option is only relevant if proxy or destination are https
   var proxy = self.proxy
   if (typeof proxy === 'string') {
@@ -891,7 +891,7 @@ Request.prototype.getNewAgent = function () {
   }
 
   // we're using a stored agent.  Make sure it's protocol-specific
-  poolKey = self.uri.protocol + poolKey
+  poolKey = self.httpVersion + ':' + self.uri.protocol + poolKey
 
   // generate a new agent for this setting if none yet exists
   if (!self.pool[poolKey]) {

test.js

@@ -9,7 +9,7 @@ const http2url = 'https://localhost:3000/h2'
 const pool = {};
 const proto = 'auto';
 const r = request(TEST_URL,{
-  protocol: proto,
+  httpVersion: proto,
   timing:true,
   strictSSL:true,
   gzip:true,
@@ -24,7 +24,7 @@ const r = request(TEST_URL,{
 }, (err, resp, body)=> {
   console.log(resp?.timings, err, body);
   request(TEST_URL,{
-    protocol: proto,
+    httpVersion: proto,
     timing:true,
     strictSSL:true,
     gzip:true,