refactor: clean up some logic and make inc muxed conns FSMs

src/connection/base.js

@@ -40,6 +40,16 @@ class BaseConnection extends EventEmitter {
     this._state('upgrade')
   }
 
+  /**
+   * Event handler for disconneced.
+   *
+   * @returns {void}
+   */
+  _onDisconnected () {
+    this.log(`disconnected from ${this.theirB58Id}`)
+    this.removeAllListeners()
+  }
+
   /**
    * Wraps this.conn with the Switch.protector for private connections
    *
@@ -67,5 +77,5 @@ class BaseConnection extends EventEmitter {
 
 module.exports = withIs(BaseConnection, {
   className: 'BaseConnection',
-  symbolName: 'libp2p-switch/BaseConnection',
+  symbolName: 'libp2p-switch/BaseConnection'
 })

src/connection/handler.js

@@ -1,10 +1,6 @@
 'use strict'
 
-const FSM = require('fsm-event')
 const debug = require('debug')
-const multistream = require('multistream-select')
-const withIs = require('class-is')
-
 const IncomingConnection = require('./incoming')
 const observeConn = require('../observe-connection')
 

src/connection/incoming.js

@@ -1,11 +1,9 @@
 'use strict'
 
 const FSM = require('fsm-event')
-const debug = require('debug')
 const multistream = require('multistream-select')
 const withIs = require('class-is')
 
-const observeConn = require('../observe-connection')
 const BaseConnection = require('./base')
 
 class IncomingConnectionFSM extends BaseConnection {
@@ -69,6 +67,7 @@ class IncomingConnectionFSM extends BaseConnection {
       if (this.theirPeerInfo) {
         this.theirPeerInfo.disconnect()
       }
+      this._state('done')
     })
   }
 
@@ -120,5 +119,5 @@ class IncomingConnectionFSM extends BaseConnection {
 
 module.exports = withIs(IncomingConnectionFSM, {
   className: 'IncomingConnectionFSM',
-  symbolName: 'libp2p-switch/IncomingConnectionFSM',
-})
+  symbolName: 'libp2p-switch/IncomingConnectionFSM'
+})

src/connection/index.js

@@ -43,10 +43,12 @@ class ConnectionFSM extends BaseConnection {
 
     // TODO: If given a muxer, we need to set the state
     // at connected.
-    // * A muxed connection should be fully connected.
-    // * A protocol handshake should generate a new connection
+    let startState = 'DISCONNECTED'
+    if (this.muxer) {
+      startState = 'MUXED'
+    }
 
-    this._state = FSM('DISCONNECTED', {
+    this._state = FSM(startState, {
       DISCONNECTED: { // No active connections exist for the peer
         dial: 'DIALING'
       },
@@ -254,15 +256,6 @@ class ConnectionFSM extends BaseConnection {
     this.emit('connected', this.conn)
   }
 
-  /**
-   * Event handler for disconneced.
-   *
-   * @returns {void}
-   */
-  _onDisconnected () {
-    this.log(`disconnected from ${this.theirB58Id}`)
-  }
-
   /**
    * Event handler for disconnecting. Handles any needed cleanup
    *
@@ -459,5 +452,5 @@ class ConnectionFSM extends BaseConnection {
 
 module.exports = withIs(ConnectionFSM, {
   className: 'ConnectionFSM',
-  symbolName: 'libp2p-switch/ConnectionFSM',
+  symbolName: 'libp2p-switch/ConnectionFSM'
 })

src/connection/manager.js

@@ -7,6 +7,7 @@ const debug = require('debug')
 const log = debug('libp2p:switch:conn-manager')
 const once = require('once')
 const setImmediate = require('async/setImmediate')
+const ConnectionFSM = require('../connection')
 
 const Circuit = require('libp2p-circuit')
 
@@ -89,7 +90,11 @@ class ConnectionManager {
             }
             const b58Str = peerInfo.id.toB58String()
 
-            this.switch.muxedConns[b58Str] = { muxer: muxedConn }
+            this.switch.muxedConns[b58Str] = new ConnectionFSM({
+              _switch: this.switch,
+              peerInfo,
+              muxer: muxedConn
+            })
 
             if (peerInfo.multiaddrs.size > 0) {
               // with incomming conn and through identify, going to pick one

src/dialer.js

@@ -61,32 +61,31 @@ function dial (_switch) {
         peerInfo,
         muxer: _switch.muxedConns[b58Id] || null
       })
+      connection.once('error', (err) => callback(err))
+      connection.on('connected', () => connection.protect())
+      connection.on('private', () => connection.encrypt())
+      connection.on('encrypted', () => connection.upgrade())
+      connection.on('muxed', () => {
+        maybePerformHandshake({
+          protocol,
+          proxyConnection,
+          connection,
+          callback
+        })
+      })
+      connection.on('unmuxed', () => {
+        maybePerformHandshake({
+          protocol,
+          proxyConnection,
+          connection,
+          callback
+        })
+      })
     }
 
     const proxyConnection = new Connection()
     proxyConnection.setPeerInfo(peerInfo)
 
-    connection.once('error', (err) => callback(err))
-    connection.once('connected', () => connection.protect())
-    connection.once('private', () => connection.encrypt())
-    connection.once('encrypted', () => connection.upgrade())
-    connection.once('muxed', () => {
-      maybePerformHandshake({
-        protocol,
-        proxyConnection,
-        connection,
-        callback
-      })
-    })
-    connection.once('unmuxed', () => {
-      maybePerformHandshake({
-        protocol,
-        proxyConnection,
-        connection,
-        callback
-      })
-    })
-
     // If we have a connection, maybe perform the protocol handshake
     // TODO: The basic connection probably shouldnt be reused
     const state = connection.getState()