improve

Author: Uzlopak

lib/core/connect.js

@@ -47,6 +47,8 @@ const SessionCache = class WeakSessionCache {
   }
 }
 
+/** @typedef {import('node:net').Socket} Socket */
+
 /**
  * @typedef {Object} BuildConnectorOptions
  * @property {boolean} [allowH2=false]
@@ -69,40 +71,47 @@ const SessionCache = class WeakSessionCache {
  * @property {number|string|null|undefined} [port]
  * @property {string|null} [servername]
  * @property {string} localAddress
- * @property {import('net').Socket} httpSocket
+ * @property {Socket} httpSocket
  */
 /**
- * @typedef {(err: Error | null, socket?: import('net').Socket) => void} ConnectCallback
+ * @typedef {((err: Error | null, socket?: Socket) => void)|null} ConnectCallback
  */
 
 /**
- * @typedef {(options: ConnectorOptions, callback: ConnectCallback) => import('net').Socket} Connector
+ * @typedef {(options: ConnectorOptions, callback: ConnectCallback) => Socket} Connector
  */
 
 /**
  * @param {BuildConnectorOptions} param0
  * @returns {Connector}
  */
-function buildConnector ({ allowH2, maxCachedSessions = 100, socketPath, timeout = 10e3, session: customSession, keepAliveInitialDelay = 60e3, ...opts }) {
-  if (maxCachedSessions != null && (!Number.isInteger(maxCachedSessions) || maxCachedSessions < 0)) {
+function buildConnector ({
+  allowH2,
+  maxCachedSessions = 100,
+  socketPath,
+  timeout = 10e3,
+  session: customSession,
+  ...opts
+}) {
+  if (
+    maxCachedSessions != null &&
+    (!Number.isInteger(maxCachedSessions) ||
+    maxCachedSessions < 0)
+  ) {
     throw new InvalidArgumentError('maxCachedSessions must be a positive integer or zero')
   }
 
   const options = { path: socketPath, ...opts }
   const sessionCache = new SessionCache(maxCachedSessions)
-  const optionsServername = options.servername
-  const ALPNProtocols = allowH2 != null ? http2Alpn : http1Alpn
+  const ALPNProtocols = allowH2 ? http2Alpn : http1Alpn
 
-  /**
-   * @type {(options: ConnectorOptions, callback: ((err: Error | null, socket?: net.Socket) => void) | null) => net.Socket}
-   */
-  return function connector ({ hostname, host, protocol, port, servername, localAddress, httpSocket }, callback) {
+  return function connect ({ hostname, host, protocol, port, servername, localAddress, httpSocket }, callback) {
     let socket
     if (protocol === 'https:') {
       if (!tls) {
         tls = require('node:tls')
       }
-      servername = servername || optionsServername || util.getServerName(host) || null
+      servername = servername || options.servername || util.getServerName(host) || null
 
       const sessionKey = servername || hostname
       assert(sessionKey)
@@ -146,6 +155,7 @@ function buildConnector ({ allowH2, maxCachedSessions = 100, socketPath, timeout
 
     // Set TCP keep alive options on the socket here instead of in connect() for the case of assigning the socket
     if (options.keepAlive !== false) {
+      const keepAliveInitialDelay = options.keepAliveInitialDelay === undefined ? 60e3 : options.keepAliveInitialDelay
       socket.setKeepAlive(true, keepAliveInitialDelay)
     }
 

lib/core/util.js

@@ -281,7 +281,7 @@ function getHostname (host) {
 /**
  * IP addresses are not valid server names per RFC6066
  * Currently, the only server names supported are DNS hostnames
- * @param {string|null} host
+ * @param {string|null|undefined} host
  * @returns {string|null}
  */
 function getServerName (host) {