chore: do not wrap raw socket error handler with a promise

package.json

@@ -48,6 +48,7 @@
     "mafmt": "^8.0.1",
     "multiaddr": "^8.1.1",
     "multiaddr-to-uri": "^6.0.0",
+    "p-defer": "^3.0.0",
     "p-timeout": "^3.2.0"
   },
   "devDependencies": {

src/index.js

@@ -4,6 +4,7 @@ const connect = require('it-ws/client')
 const withIs = require('class-is')
 const toUri = require('multiaddr-to-uri')
 const { AbortError } = require('abortable-iterator')
+const pDefer = require('p-defer')
 
 const debug = require('debug')
 const log = debug('libp2p:websockets')
@@ -65,25 +66,24 @@ class WebSockets {
     const cOpts = ma.toOptions()
     log('dialing %s:%s', cOpts.host, cOpts.port)
 
-    const rawSocket = connect(toUri(ma), Object.assign({ binary: true }, options))
+    const errorPromise = pDefer()
+    const errfn = (err) => {
+      const msg = `connection error: ${err.message}`
+      log.error(msg)
 
-    const errorPromise = new Promise((resolve, reject) => {
-      const errfn = (err) => {
-        const msg = `connection error: ${err.message}`
-        log.error(msg)
+      errorPromise.reject(err)
+    }
 
-        reject(err)
-      }
+    const rawSocket = connect(toUri(ma), Object.assign({ binary: true }, options))
 
-      if (rawSocket.socket.on) {
-        rawSocket.socket.on('error', errfn)
-      } else {
-        rawSocket.socket.onerror = errfn
-      }
-    })
+    if (rawSocket.socket.on) {
+      rawSocket.socket.on('error', errfn)
+    } else {
+      rawSocket.socket.onerror = errfn
+    }
 
     if (!options.signal) {
-      await Promise.race([rawSocket.connected(), errorPromise])
+      await Promise.race([rawSocket.connected(), errorPromise.promise])
 
       log('connected %s', ma)
       return rawSocket
@@ -96,7 +96,7 @@ class WebSockets {
         reject(new AbortError())
         setTimeout(() => {
           rawSocket.close()
-        }, 0)
+        }
       }
 
       // Already aborted?
@@ -105,7 +105,7 @@ class WebSockets {
     })
 
     try {
-      await Promise.race([abort, errorPromise, rawSocket.connected()])
+      await Promise.race([abort, errorPromise.promise, rawSocket.connected()])
     } finally {
       options.signal.removeEventListener('abort', onAbort)
     }