feat: adding passive/active dialing test

Author: dryajov

src/circuit/relay.js

@@ -13,8 +13,8 @@ const once = require('once')
 
 const multicodec = require('./../multicodec')
 
-const log = debug('libp2p:circuit:relay')
-log.err = debug('libp2p:circuit:error:relay')
+const log = debug('swarm:circuit:relay')
+log.err = debug('swarm:circuit:error:relay')
 
 class Relay extends EE {
 
@@ -29,21 +29,22 @@ class Relay extends EE {
    */
   constructor (options) {
     super()
-    this.config = options
-    this.libp2p
+    this.config = Object.assign(options, {Active: true})
+    this.swarm = null
+    this.active = options.Active
   }
 
   /**
    * Mount the relay
-   * @param {libp2p} libp2p
+   * @param {swarm} swarm
    *
    * @return {void}
    */
-  mount (libp2p) {
-    this.libp2p = libp2p
-    this.libp2p.handle(multicodec.hop, (proto, conn) => {
-      let stream = handshake({timeout: 1000 * 60})
-      let shake = stream.handshake
+  mount (swarm) {
+    this.swarm = swarm
+    this.swarm.handle(multicodec.hop, (proto, conn) => {
+      const stream = handshake({timeout: 1000 * 60})
+      const shake = stream.handshake
 
       pull(
         stream,
@@ -55,66 +56,49 @@ class Relay extends EE {
         if (err) {
           log.err(err)
 
+          // TODO: pull-length-prefixed should probably return an `Error` object with a error code
           if (typeof err === 'string' && err.includes('size longer than max permitted length of')) {
-            this.emit('error', String(constants.RESPONSE.HOP.DST_ADDR_TOO_LONG))
-            shake.write(String(constants.RESPONSE.HOP.DST_ADDR_TOO_LONG))
+            this.emit('circuit:error', String(constants.RESPONSE.HOP.DST_ADDR_TOO_LONG))
+            shake.write(new Buffer(String(constants.RESPONSE.HOP.DST_ADDR_TOO_LONG)))
             return
           }
 
-          shake.write(String(constants.RESPONSE.FAILURE))
+          shake.write(new Buffer(String(constants.RESPONSE.FAILURE)))
+          return
+        }
+
+        let addr
+        try {
+          addr = multiaddr(msg.toString()) // read the src multiaddr
+        } catch (err) {
+          this.emit('circuit:error', constants.RESPONSE.HOP.DST_MULTIADDR_INVALID)
+          shake.write(new Buffer(String(constants.RESPONSE.HOP.DST_MULTIADDR_INVALID)))
+          return
+        }
+
+        if (addr.getPeerId() === this.swarm._peerInfo.id.toB58String()) {
+          this.emit('circuit:error', constants.RESPONSE.HOP.CANT_CONNECT_TO_SELF)
+          shake.write(new Buffer(String(constants.RESPONSE.HOP.CANT_CONNECT_TO_SELF)))
           return
         }
 
-        let addr = multiaddr(msg.toString()) // read the src multiaddr
-        if (addr.getPeerId() === this.libp2p.peerInfo.id.toB58String()) {
-          this.emit('error', String(constants.RESPONSE.HOP.CANT_CONNECT_TO_SELF))
-          shake.write(String(constants.RESPONSE.HOP.CANT_CONNECT_TO_SELF))
+        if (!this.active && !this.swarm.conns[addr.getPeerId()]) {
+          this.emit('circuit:error', constants.RESPONSE.HOP.NO_CONN_TO_DST)
+          shake.write(new Buffer(String(constants.RESPONSE.HOP.NO_CONN_TO_DST)))
           return
         }
 
         this.circuit(shake.rest(), addr, (err) => {
           if (err) {
             log.err(err)
-            this.emit('error', err)
+            this.emit('circuit:error', err)
           }
 
-          this.emit('circuit')
+          this.emit('circuit:success')
         })
       })
     })
-  }
-
-  /**
-   * Write error message to conn
-   *
-   * @param {Connection} conn
-   * @param {Number} errCode
-   * @param {Function} cb
-   * @return {void}
-   */
-  writeErr (conn, errCode, cb) {
-    let stream = handshake({timeout: 1000 * 60}, cb)
-    let shake = stream.handshake
-
-    // create handshake stream
-    pull(
-      stream,
-      conn,
-      stream
-    )
-
-    pull(
-      pull.values([errCode]),
-      lp.encode(),
-      pull.collect((err, encoded) => {
-        if (err) {
-          return cb(err)
-        }
-
-        shake.write(encoded[0])
-        cb()
-      })
-    )
+    this.emit('mounted')
   }
 
   /**
@@ -175,7 +159,7 @@ class Relay extends EE {
   _dialPeer (ma, callback) {
     const peerInfo = new PeerInfo(PeerId.createFromB58String(ma.getPeerId()))
     peerInfo.multiaddrs.add(ma)
-    this.libp2p.dial(peerInfo, multicodec.stop, once((err, conn) => {
+    this.swarm.dial(peerInfo, multicodec.stop, once((err, conn) => {
       if (err) {
         log.err(err)
         return callback(err)