Merge pull request libp2p#49 from diasdavid/fix/close-count

fix: call cb in close after all transport are closed

Author: daviddias

package.json

@@ -54,6 +54,7 @@
     "stream-pair": "^1.0.3"
   },
   "dependencies": {
+    "async": "^2.0.0-rc.4",
     "babel-runtime": "^6.6.1",
     "duplex-passthrough": "github:diasdavid/duplex-passthrough",
     "ip-address": "^5.8.0",
@@ -78,4 +79,4 @@
     "Richard Littauer <[email protected]>",
     "dignifiedquire <[email protected]>"
   ]
-}
+}

src/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const async = require('async')
 const multistream = require('multistream-select')
 const identify = require('./identify')
 const DuplexPassThrough = require('duplex-passthrough')
@@ -367,19 +368,18 @@ function Swarm (peerInfo) {
   }
 
   this.close = (callback) => {
-    var count = 0
-
     Object.keys(this.muxedConns).forEach((key) => {
       this.muxedConns[key].muxer.end()
     })
 
-    Object.keys(this.transports).forEach((key) => {
-      this.transports[key].close(() => {
-        if (++count === Object.keys(this.transports).length) {
-          callback()
-        }
-      })
-    })
+    async.each(
+      Object.keys(this.transports),
+      (key, cb) => this.transports[key].close(cb),
+      () => {
+        // Ignoring close errors
+        callback()
+      }
+    )
   }
 }