fix: minor connect cleanup

lib/dispatcher/client-h1.js

@@ -49,7 +49,8 @@ const {
   kMaxResponseSize,
   kListeners,
   kOnError,
-  kResume
+  kResume,
+  kHTTPContext
 } = require('../core/symbols.js')
 
 const constants = require('../llhttp/constants.js')
@@ -403,6 +404,7 @@ class Parser {
     removeAllListeners(socket)
 
     client[kSocket] = null
+    client[kHTTPContext] = null // TODO (fix): This is hacky...
     client[kQueue][client[kRunningIdx]++] = null
     client.emit('disconnect', client[kUrl], [client], new InformationalError('upgrade'))
 
@@ -706,6 +708,7 @@ async function connectH1 (client, socket) {
     const err = this[kError] || new SocketError('closed', util.getSocketInfo(this))
 
     client[kSocket] = null
+    client[kHTTPContext] = null // TODO (fix): This is hacky...
 
     if (client.destroyed) {
       assert(client[kPending] === 0)
@@ -744,36 +747,41 @@ async function connectH1 (client, socket) {
     },
     destroy () {
     },
+    get destroyed () {
+      return socket.destroyed
+    },
     busy (request) {
       if (socket[kWriting] || socket[kReset] || socket[kBlocking]) {
         return true
       }
 
-      if (client[kRunning] > 0 && !request.idempotent) {
-        // Non-idempotent request cannot be retried.
-        // Ensure that no other requests are inflight and
-        // could cause failure.
-        return true
-      }
-
-      if (client[kRunning] > 0 && (request.upgrade || request.method === 'CONNECT')) {
-        // Don't dispatch an upgrade until all preceding requests have completed.
-        // A misbehaving server might upgrade the connection before all pipelined
-        // request has completed.
-        return true
-      }
+      if (request) {
+        if (client[kRunning] > 0 && !request.idempotent) {
+          // Non-idempotent request cannot be retried.
+          // Ensure that no other requests are inflight and
+          // could cause failure.
+          return true
+        }
 
-      if (client[kRunning] > 0 && util.bodyLength(request.body) !== 0 &&
-        (util.isStream(request.body) || util.isAsyncIterable(request.body) || util.isFormDataLike(request.body))) {
-        // Request with stream or iterator body can error while other requests
-        // are inflight and indirectly error those as well.
-        // Ensure this doesn't happen by waiting for inflight
-        // to complete before dispatching.
+        if (client[kRunning] > 0 && (request.upgrade || request.method === 'CONNECT')) {
+          // Don't dispatch an upgrade until all preceding requests have completed.
+          // A misbehaving server might upgrade the connection before all pipelined
+          // request has completed.
+          return true
+        }
 
-        // Request with stream or iterator body cannot be retried.
-        // Ensure that no other requests are inflight and
-        // could cause failure.
-        return true
+        if (client[kRunning] > 0 && util.bodyLength(request.body) !== 0 &&
+          (util.isStream(request.body) || util.isAsyncIterable(request.body) || util.isFormDataLike(request.body))) {
+          // Request with stream or iterator body can error while other requests
+          // are inflight and indirectly error those as well.
+          // Ensure this doesn't happen by waiting for inflight
+          // to complete before dispatching.
+
+          // Request with stream or iterator body cannot be retried.
+          // Ensure that no other requests are inflight and
+          // could cause failure.
+          return true
+        }
       }
 
       return false

lib/dispatcher/client-h2.js

@@ -135,6 +135,9 @@ async function connectH2 (client, socket) {
     destroy (err) {
       session.destroy(err)
     },
+    get destroyed () {
+      return socket.destroyed
+    },
     busy () {
       return false
     }

lib/dispatcher/client.js

@@ -17,17 +17,14 @@ const {
 const buildConnector = require('../core/connect.js')
 const {
   kUrl,
-  kReset,
   kServerName,
   kClient,
   kBusy,
   kConnect,
-  kBlocking,
   kResuming,
   kRunning,
   kPending,
   kSize,
-  kWriting,
   kQueue,
   kConnected,
   kConnecting,
@@ -277,13 +274,12 @@ class Client extends DispatcherBase {
   }
 
   get [kConnected] () {
-    return !!this[kSocket] && !this[kConnecting] && !this[kSocket].destroyed
+    return !!this[kHTTPContext] && !this[kConnecting] && !this[kHTTPContext].destroyed
   }
 
   get [kBusy] () {
-    const socket = this[kSocket]
-    return (
-      (socket && (socket[kReset] || socket[kWriting] || socket[kBlocking])) ||
+    return Boolean(
+      this[kHTTPContext]?.busy(null) ||
       (this[kSize] >= (getPipelining(this) || 1)) ||
       this[kPending] > 0
     )
@@ -441,13 +437,18 @@ async function connect (client) {
       return
     }
 
-    client[kConnecting] = false
-
     assert(socket)
 
-    client[kHTTPContext] = socket.alpnProtocol === 'h2'
-      ? await connectH2(client, socket)
-      : await connectH1(client, socket)
+    try {
+      client[kHTTPContext] = socket.alpnProtocol === 'h2'
+        ? await connectH2(client, socket)
+        : await connectH1(client, socket)
+    } catch (err) {
+      socket.destroy().on('error', () => {})
+      throw err
+    }
+
+    client[kConnecting] = false
 
     socket[kCounter] = 0
     socket[kMaxRequests] = client[kMaxRequests]
@@ -546,8 +547,6 @@ function _resume (client, sync) {
       return
     }
 
-    const socket = client[kSocket]
-
     if (client[kHTTPContext]) {
       client[kHTTPContext].resume()
     }
@@ -574,13 +573,15 @@ function _resume (client, sync) {
 
     const request = client[kQueue][client[kPendingIdx]]
 
+    // TODO (fix): Move into H1?
     if (client[kUrl].protocol === 'https:' && client[kServerName] !== request.servername) {
       if (client[kRunning] > 0) {
         return
       }
 
       client[kServerName] = request.servername
 
+      const socket = client[kSocket]
       if (socket && socket.servername !== request.servername) {
         util.destroy(socket, new InformationalError('servername changed'))
         return
@@ -591,16 +592,12 @@ function _resume (client, sync) {
       return
     }
 
-    if (!socket) {
+    if (!client[kHTTPContext]) {
       connect(client)
       return
     }
 
-    if (socket.destroyed) {
-      return
-    }
-
-    if (!client[kHTTPContext]) {
+    if (client[kHTTPContext].destroyed) {
       return
     }