fix: a better revert

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

Author: Alan Shaw

src/limit-dialer/index.js

@@ -38,17 +38,25 @@ class LimitDialer {
     // we use a token to track if we want to cancel following dials
     const token = { cancel: false }
 
+    let errors = []
     const tasks = addrs.map((m) => {
-      return (cb) => this.dialSingle(peer, transport, m, token, cb)
+      return (cb) => this.dialSingle(peer, transport, m, token, (err, result) => {
+        if (err) {
+          errors.push(err)
+          return cb(err)
+        }
+        return cb(null, result)
+      })
     })
 
-    tryEach(tasks, (err, res) => {
-      if (err) {
-        log('dialMany:error', err)
-        return callback(err)
+    tryEach(tasks, (_, result) => {
+      if (result && result.conn) {
+        log('dialMany:success')
+        return callback(null, result)
       }
-      log('dialMany:success')
-      callback(null, res)
+
+      log('dialMany:error')
+      callback(errors)
     })
   }
 

test/limit-dialer.node.js

@@ -53,8 +53,6 @@ describe('LimitDialer', () => {
   it('two success', (done) => {
     const dialer = new LimitDialer(2, 10)
 
-    expect(2).checks(done)
-
     // mock transport
     const t1 = {
       dial (addr, cb) {
@@ -72,10 +70,7 @@ describe('LimitDialer', () => {
           setTimeout(cb, 8)
           return {
             source: pull.values([2]),
-            sink: pull.onEnd((err) => {
-              // Verify the unused connection gets closed
-              expect(err).to.not.exist().mark()
-            })
+            sink: pull.drain()
           }
         }
       }
@@ -89,7 +84,8 @@ describe('LimitDialer', () => {
         conn,
         pull.collect((err, res) => {
           expect(err).to.not.exist()
-          expect(res).to.be.eql([1]).mark()
+          expect(res).to.be.eql([1])
+          done()
         })
       )
     })