feat: adding relay (#181)

libp2p · Apr 7, 2017 · ea3b9ff · ea3b9ff
1 parent ccbf0db
commit ea3b9ff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/connection.js b/src/connection.js
@@ -96,17 +96,21 @@ module.exports = function connection (swarm) {
 
     relay (config) {
       swarm.relay = true
-      let circuitDialer = new Circuit.Dialer(swarm, config)
-      circuitDialer.installSwarmHandler((err, conn) => {
-        if (err) {
-          log(err)
-          return
-        }
 
-        if (conn) {
+      // TODO: we shouldn't have to pass a handler to the dialer here,
+      // since the default dialer init should do exactly the same, but
+      // so far I haven't been able to make it work like that...
+      let circuitDialer = new Circuit.Dialer(swarm,
+        config,
+        (err, conn) => {
+          if (err) {
+            log(err)
+            return
+          }
+
           protocolMuxer(swarm.protocols, conn)
-        }
-      })
+        })
+
       swarm.transport.add(Circuit.tag, circuitDialer)
     },
 

diff --git a/src/index.js b/src/index.js
@@ -141,6 +141,8 @@ function Swarm (peerInfo, peerBook) {
           }, cb)
         }, cb)
       }
-    ], callback)
+    ], (err) => {
+      callback(err)
+    })
   }
 }