Merge pull request #60 from diasdavid/feat/crypto-not-crypto

plaintext proto to be compatible with go-ipfs

Author: daviddias

src/dial.js

@@ -84,7 +84,19 @@ module.exports = function dial (swarm) {
             }
             return nextTransport(tKeys.shift())
           }
-          cb(null, conn)
+
+          cryptoDial()
+
+          function cryptoDial () {
+            // currently, js-libp2p-swarm doesn't implement any crypto
+            const ms = new multistream.Dialer()
+            ms.handle(conn, (err) => {
+              if (err) {
+                return cb(err)
+              }
+              ms.select('/plaintext/1.0.0', cb)
+            })
+          }
         })
       }
     }

src/index.js

@@ -8,6 +8,7 @@ const contains = require('lodash.contains')
 const transport = require('./transport')
 const connection = require('./connection')
 const dial = require('./dial')
+const connHandler = require('./default-handler')
 
 exports = module.exports = Swarm
 
@@ -86,6 +87,11 @@ function Swarm (peerInfo) {
     this.protocols[protocol] = handler
   }
 
+  // our crypto handshake :)
+  this.handle('/plaintext/1.0.0', (conn) => {
+    connHandler(this.protocols, conn)
+  })
+
   this.unhandle = (protocol, handler) => {
     if (this.protocols[protocol]) {
       delete this.protocols[protocol]

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

@@ -47,7 +47,7 @@ describe('high level API - 1st without stream multiplexing (on TCP)', function (
     swarmB.handle('/bananas/1.0.0', (conn) => {
       conn.pipe(conn)
     })
-    expect(Object.keys(swarmB.protocols).length).to.equal(1)
+    expect(Object.keys(swarmB.protocols).length).to.equal(2)
     done()
   })