fix: don't set socket on client before init

Refs: nodejs#1633
crysmags · Feb 27, 2024 · a1322fd · a1322fd
1 parent b91963b
commit a1322fd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -1074,8 +1074,6 @@ async function connect (client) {
 
     assert(socket)
 
-    client[kSocket] = socket
-
     socket[kNoRef] = false
     socket[kWriting] = false
     socket[kReset] = false
@@ -1091,6 +1089,8 @@ async function connect (client) {
       .on('end', onSocketEnd)
       .on('close', onSocketClose)
 
+    client[kSocket] = socket
+
     if (channels.connected.hasSubscribers) {
       channels.connected.publish({
         connectParams: {
@@ -1176,7 +1176,7 @@ function _resume (client, sync) {
 
     const socket = client[kSocket]
 
-    if (socket) {
+    if (socket && !socket.destroyed) {
       if (client[kSize] === 0) {
         if (!socket[kNoRef] && socket.unref) {
           socket.unref()
@@ -1243,7 +1243,7 @@ function _resume (client, sync) {
 
     if (!socket) {
       connect(client)
-      continue
+      return
     }
 
     if (socket.destroyed || socket[kWriting] || socket[kReset] || socket[kBlocking]) {