Feat/support new mss (#124)

* chore: updaet deps

* feat: support new mss

* docs: update readme

README.md

@@ -148,12 +148,13 @@ Hang up the muxed connection we have with the peer.
 
 Start listening on all added transports that are available on the current `peerInfo`.
 
-### `swarm.handle(protocol, handler)`
+### `swarm.handle(protocol, handlerFunc, matchFunc)`
 
 Handle a new protocol.
 
 - `protocol`
-- `handler` - function called when we receive a dial on `protocol. Signature must be `function (conn) {}`
+- `handlerFunc` - function called when we receive a dial on `protocol. Signature must be `function (protocol, conn) {}`
+- `matchFunc` - matchFunc for multistream-select
 
 ### `swarm.unhandle(protocol)`
 

gulpfile.js

@@ -72,7 +72,7 @@ gulp.task('test:browser:before', (done) => {
   createListenerB(ready)
   sigS = sigServer.start(15555, ready)
 
-  function echo (conn) {
+  function echo (protocol, conn) {
     pull(conn, conn)
   }
 })

package.json

@@ -41,7 +41,7 @@
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "libp2p-multiplex": "^0.2.1",
-    "libp2p-secio": "^0.6.0",
+    "libp2p-secio": "^0.6.2",
     "libp2p-spdy": "^0.10.0",
     "libp2p-tcp": "^0.9.1",
     "libp2p-webrtc-star": "^0.5.0",
@@ -60,7 +60,7 @@
     "libp2p-identify": "^0.3.0",
     "lodash.includes": "^4.3.0",
     "multiaddr": "^2.0.3",
-    "multistream-select": "^0.12.0",
+    "multistream-select": "^0.13.0",
     "peer-id": "^0.8.0",
     "peer-info": "^0.8.0",
     "protocol-buffers": "^3.1.6"

src/connection.js

@@ -18,7 +18,7 @@ module.exports = function connection (swarm) {
       swarm.muxers[muxer.multicodec] = muxer
 
       // for listening
-      swarm.handle(muxer.multicodec, (conn) => {
+      swarm.handle(muxer.multicodec, (protocol, conn) => {
         const muxedConn = muxer.listener(conn)
 
         muxedConn.on('stream', (conn) => {
@@ -70,7 +70,7 @@ module.exports = function connection (swarm) {
 
     reuse () {
       swarm.identify = true
-      swarm.handle(identify.multicodec, (conn) => {
+      swarm.handle(identify.multicodec, (protocol, conn) => {
         identify.listener(conn, swarm._peerInfo)
       })
     },
@@ -82,7 +82,7 @@ module.exports = function connection (swarm) {
       }
 
       swarm.unhandle(swarm.crypto.tag)
-      swarm.handle(tag, (conn) => {
+      swarm.handle(tag, (protocol, conn) => {
         const id = swarm._peerInfo.id
         const secure = encrypt(id, id.privKey, conn)
 

src/index.js

@@ -90,11 +90,14 @@ function Swarm (peerInfo) {
     }), callback)
   }
 
-  this.handle = (protocol, handler) => {
-    this.protocols[protocol] = handler
+  this.handle = (protocol, handlerFunc, matchFunc) => {
+    this.protocols[protocol] = {
+      handlerFunc: handlerFunc,
+      matchFunc: matchFunc
+    }
   }
 
-  this.handle(this.crypto.tag, (conn) => {
+  this.handle(this.crypto.tag, (protocol, conn) => {
     const id = this._peerInfo.id
     const wrapped = this.crypto.encrypt(id, id.privKey, conn)
     return protocolMuxer(this.protocols, wrapped)

src/protocol-muxer.js

@@ -10,7 +10,7 @@ module.exports = function protocolMuxer (protocols, conn) {
       return
     }
 
-    ms.addHandler(protocol, protocols[protocol])
+    ms.addHandler(protocol, protocols[protocol].handlerFunc, protocols[protocol].matchFunc)
   })
 
   ms.handle(conn, (err) => {

test/04-muxing-multiplex.node.js

@@ -73,7 +73,7 @@ describe.skip('stream muxing with multiplex (on TCP)', () => {
   })
 
   it('handle + dial on protocol', (done) => {
-    swarmB.handle('/abacaxi/1.0.0', (conn) => {
+    swarmB.handle('/abacaxi/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -98,7 +98,7 @@ describe.skip('stream muxing with multiplex (on TCP)', () => {
   })
 
   it('dial on protocol, reuse warmed conn', (done) => {
-    swarmA.handle('/papaia/1.0.0', (conn) => {
+    swarmA.handle('/papaia/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 

test/05-muxing-spdy.node.js

@@ -80,7 +80,7 @@ describe('stream muxing with spdy (on TCP)', () => {
   })
 
   it('handle + dial on protocol', (done) => {
-    swarmB.handle('/abacaxi/1.0.0', (conn) => {
+    swarmB.handle('/abacaxi/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -101,7 +101,7 @@ describe('stream muxing with spdy (on TCP)', () => {
   })
 
   it('dial on protocol, reuse warmed conn', (done) => {
-    swarmA.handle('/papaia/1.0.0', (conn) => {
+    swarmA.handle('/papaia/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -128,7 +128,7 @@ describe('stream muxing with spdy (on TCP)', () => {
   })
 
   it('with Identify, do getPeerInfo', (done) => {
-    swarmA.handle('/banana/1.0.0', (conn) => {
+    swarmA.handle('/banana/1.0.0', (protocol, conn) => {
       conn.getPeerInfo((err, peerInfoC) => {
         expect(err).to.not.exist
         expect(peerInfoC.id.toB58String()).to.equal(peerC.id.toB58String())
@@ -160,8 +160,11 @@ describe('stream muxing with spdy (on TCP)', () => {
     let count = 0
     const destroyed = () => ++count === 2 ? done() : null
 
-    swarmD.handle('/banana/1.0.0', (conn) => {
-      pull(conn, pull.onEnd(destroyed))
+    swarmD.handle('/banana/1.0.0', (protocol, conn) => {
+      pull(
+        conn,
+        pull.onEnd(destroyed)
+      )
     })
 
     swarmA.dial(peerD, '/banana/1.0.0', (err, conn) => {
@@ -210,8 +213,11 @@ describe('stream muxing with spdy (on TCP)', () => {
       let count = 0
       const destroyed = () => ++count === 2 ? close() : null
 
-      swarmE.handle('/avocado/1.0.0', (conn) => {
-        pull(conn, pull.onEnd(destroyed))
+      swarmE.handle('/avocado/1.0.0', (protocol, conn) => {
+        pull(
+          conn,
+          pull.onEnd(destroyed)
+        )
       })
 
       swarmF.dial(peerE, '/avocado/1.0.0', (err, conn) => {

test/06-conn-upgrade-secio.node.js

@@ -74,7 +74,7 @@ describe('secio conn upgrade (on TCP)', () => {
   })
 
   it('handle + dial on protocol', (done) => {
-    swarmB.handle('/abacaxi/1.0.0', (conn) => {
+    swarmB.handle('/abacaxi/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -95,7 +95,7 @@ describe('secio conn upgrade (on TCP)', () => {
   })
 
   it('dial on protocol, reuse warmed conn', (done) => {
-    swarmA.handle('/papaia/1.0.0', (conn) => {
+    swarmA.handle('/papaia/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 

test/08-swarm-without-muxing.node.js

@@ -49,15 +49,15 @@ describe('high level API - 1st without stream multiplexing (on TCP)', () => {
   })
 
   it('handle a protocol', (done) => {
-    swarmB.handle('/bananas/1.0.0', (conn) => {
+    swarmB.handle('/bananas/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
     expect(Object.keys(swarmB.protocols).length).to.equal(2)
     done()
   })
 
   it('dial on protocol', (done) => {
-    swarmB.handle('/pineapple/1.0.0', (conn) => {
+    swarmB.handle('/pineapple/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -68,7 +68,7 @@ describe('high level API - 1st without stream multiplexing (on TCP)', () => {
   })
 
   it('dial on protocol (returned conn)', (done) => {
-    swarmB.handle('/apples/1.0.0', (conn) => {
+    swarmB.handle('/apples/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 

test/09-swarm-with-muxing.node.js

@@ -145,7 +145,7 @@ describe('high level API - with everything mixed all together!', () => {
   })
 
   it('dial from tcp to tcp+ws, on protocol', (done) => {
-    swarmB.handle('/anona/1.0.0', (conn) => {
+    swarmB.handle('/anona/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -169,7 +169,7 @@ describe('high level API - with everything mixed all together!', () => {
   })
 
   it('dial from ws to ws', (done) => {
-    swarmE.handle('/abacaxi/1.0.0', (conn) => {
+    swarmE.handle('/abacaxi/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -192,7 +192,7 @@ describe('high level API - with everything mixed all together!', () => {
   })
 
   it('dial from tcp to tcp+ws (returned conn)', (done) => {
-    swarmB.handle('/grapes/1.0.0', (conn) => {
+    swarmB.handle('/grapes/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
 
@@ -209,7 +209,7 @@ describe('high level API - with everything mixed all together!', () => {
   })
 
   it('dial from tcp+ws to tcp+ws', (done) => {
-    swarmC.handle('/mamao/1.0.0', (conn) => {
+    swarmC.handle('/mamao/1.0.0', (protocol, conn) => {
       conn.getPeerInfo((err, peerInfo) => {
         expect(err).to.not.exist
         expect(peerInfo).to.exist

test/browser-03-swarm-with-muxing-plus-webrtc-star.js

@@ -81,7 +81,7 @@ describe('high level API (swarm with spdy + webrtc-star)', () => {
   })
 
   it('handle proto', () => {
-    swarm2.handle('/echo/1.0.0', (conn) => {
+    swarm2.handle('/echo/1.0.0', (protocol, conn) => {
       pull(conn, conn)
     })
   })