chore: release version v0.12.9

test: cleanup and fix hanging tests

README.md

@@ -109,6 +109,12 @@ handle a new protocol.
 - `protocol`
 - `handler` - function called when we receive a dial on `protocol. Signature must be `function (conn) {}`
 
+### `swarm.unhandle(protocol)`
+
+unhandle a protocol.
+
+- `protocol`
+
 ### `swarm.close(callback)`
 
 close all the listeners and muxers.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p-swarm",
-  "version": "0.12.5",
+  "version": "0.12.9",
   "description": "libp2p swarm implementation in JavaScript",
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
@@ -40,16 +40,13 @@
     "bl": "^1.1.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
-    "aegir": "^3.0.0",
+    "aegir": "^3.0.1",
     "gulp": "^3.9.1",
     "istanbul": "^0.4.3",
     "libp2p-multiplex": "^0.2.1",
     "libp2p-spdy": "^0.3.1",
-    "libp2p-tcp": "^0.5.0",
+    "libp2p-tcp": "^0.5.1",
-    "libp2p-websockets": "^0.4.1",
+    "libp2p-websockets": "^0.4.4",
-    "multiaddr": "^1.4.0",
-    "peer-id": "^0.6.6",
-    "peer-info": "^0.6.2",
     "pre-commit": "^1.1.2",
     "stream-pair": "^1.0.3"
   },
@@ -58,8 +55,12 @@
     "duplex-passthrough": "github:diasdavid/duplex-passthrough",
     "ip-address": "^5.8.0",
     "lodash.contains": "^2.4.3",
+    "multiaddr": "^1.4.1",
     "multistream-select": "^0.6.5",
-    "protocol-buffers-stream": "^1.3.1"
+    "peer-id": "^0.6.6",
+    "peer-info": "^0.6.2",
+    "protocol-buffers-stream": "^1.3.1",
+    "run-parallel": "^1.1.6"
   },
   "aegir": {
     "webpack": {
@@ -74,8 +75,8 @@
     "David Dias <daviddias.p@gmail.com>",
     "David Dias <mail@daviddias.me>",
     "Francisco Baio Dias <xicombd@gmail.com>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Pau Ramon Revilla <masylum@gmail.com>",
-    "Richard Littauer <richard.littauer@gmail.com>",
+    "Richard Littauer <richard.littauer@gmail.com>"
-    "dignifiedquire <dignifiedquire@gmail.com>"
   ]
 }

src/index.js

@@ -6,6 +6,7 @@ const DuplexPassThrough = require('duplex-passthrough')
 const contains = require('lodash.contains')
 const util = require('util')
 const EE = require('events').EventEmitter
+const parallel = require('run-parallel')
 
 exports = module.exports = Swarm
 
@@ -117,7 +118,13 @@ function Swarm (peerInfo) {
   }
 
   this.transport.close = (key, callback) => {
-    this.transports[key].close(callback)
+    const transport = this.transports[key]
+
+    if (!transport) {
+      return callback(new Error(`Trying to close non existing transport: ${key}`))
+    }
+
+    transport.close(callback)
   }
 
   // connections --
@@ -239,6 +246,9 @@ function Swarm (peerInfo) {
         gotWarmedUpConn(conn)
       }
     } else {
+      if (!protocol) {
+        return callback()
+      }
       gotMuxer(this.muxedConns[b58Id].muxer)
     }
 
@@ -360,20 +370,20 @@ function Swarm (peerInfo) {
     this.protocols[protocol] = handler
   }
 
-  this.close = (callback) => {
+  this.unhandle = (protocol, handler) => {
-    var count = 0
+    if (this.protocols[protocol]) {
+      delete this.protocols[protocol]
+    }
+  }
 
+  this.close = (callback) => {
     Object.keys(this.muxedConns).forEach((key) => {
       this.muxedConns[key].muxer.end()
     })
 
-    Object.keys(this.transports).forEach((key) => {
+    parallel(Object.keys(this.transports).map((key) => {
-      this.transports[key].close(() => {
+      return (cb) => this.transports[key].close(cb)
-        if (++count === Object.keys(this.transports).length) {
+    }), callback)
-          callback()
-        }
-      })
-    })
   }
 }
 

test/00-basic.node.js

@@ -6,8 +6,7 @@ const expect = require('chai').expect
 const Swarm = require('../src')
 
 describe('basics', () => {
-  it('throws on missing peerInfo', (done) => {
+  it('throws on missing peerInfo', () => {
-    expect(Swarm).to.throw(Error)
+    expect(() => Swarm()).to.throw(Error)
-    done()
   })
 })

test/01-transport-tcp.node.js

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -92,15 +93,10 @@ describe('transport - tcp', function () {
   })
 
   it('close', (done) => {
-    var count = 0
+    parallel([
-    swarmA.transport.close('tcp', closed)
+      (cb) => swarmA.transport.close('tcp', cb),
-    swarmB.transport.close('tcp', closed)
+      (cb) => swarmB.transport.close('tcp', cb)
-
+    ], done)
-    function closed () {
-      if (++count === 2) {
-        done()
-      }
-    }
   })
 
   it('support port 0', (done) => {

test/03-transport-websockets.node.js

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -17,12 +18,11 @@ describe('transport - websockets', function () {
   var peerA = new Peer()
   var peerB = new Peer()
 
-  before((done) => {
+  before(() => {
     peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9888/websockets'))
     peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9999/websockets'))
     swarmA = new Swarm(peerA)
     swarmB = new Swarm(peerB)
-    done()
   })
 
   it('add', (done) => {
@@ -35,16 +35,14 @@ describe('transport - websockets', function () {
   })
 
   it('listen', (done) => {
-    var count = 0
+    parallel([
-    swarmA.transport.listen('ws', {}, (conn) => {
+      (cb) => swarmA.transport.listen('ws', {}, (conn) => {
         conn.pipe(conn)
-    }, ready)
+      }, cb),
-    swarmB.transport.listen('ws', {}, (conn) => {
+      (cb) => swarmB.transport.listen('ws', {}, (conn) => {
         conn.pipe(conn)
-    }, ready)
+      }, cb)
-
+    ], () => {
-    function ready () {
-      if (++count === 2) {
       expect(peerA.multiaddrs.length).to.equal(1)
       expect(
         peerA.multiaddrs[0].equals(multiaddr('/ip4/127.0.0.1/tcp/9888/websockets'))
@@ -58,8 +56,7 @@ describe('transport - websockets', function () {
         true
       )
       done()
-      }
+    })
-    }
   })
 
   it('dial', (done) => {
@@ -88,14 +85,9 @@ describe('transport - websockets', function () {
   })
 
   it('close', (done) => {
-    var count = 0
+    parallel([
-    swarmA.transport.close('ws', closed)
+      (cb) => swarmA.transport.close('ws', cb),
-    swarmB.transport.close('ws', closed)
+      (cb) => swarmB.transport.close('ws', cb)
-
+    ], done)
-    function closed () {
-      if (++count === 2) {
-        done()
-      }
-    }
   })
 })

test/04-muxing-multiplex.node.js

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -10,7 +11,7 @@ const TCP = require('libp2p-tcp')
 const multiplex = require('libp2p-spdy')
 
 describe('stream muxing with multiplex (on TCP)', function () {
-  this.timeout(20000)
+  this.timeout(60 * 1000)
 
   var swarmA
   var peerA
@@ -37,35 +38,22 @@ describe('stream muxing with multiplex (on TCP)', function () {
     swarmC = new Swarm(peerC)
 
     swarmA.transport.add('tcp', new TCP())
-    swarmA.transport.listen('tcp', {}, null, ready)
-
     swarmB.transport.add('tcp', new TCP())
-    swarmB.transport.listen('tcp', {}, null, ready)
-
     swarmC.transport.add('tcp', new TCP())
-    swarmC.transport.listen('tcp', {}, null, ready)
 
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.transport.listen('tcp', {}, null, cb),
-    function ready () {
+      (cb) => swarmB.transport.listen('tcp', {}, null, cb),
-      if (++counter === 3) {
+      (cb) => swarmC.transport.listen('tcp', {}, null, cb)
-        done()
+    ], done)
-      }
-    }
   })
 
   after((done) => {
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.close(cb),
-    swarmA.close(closed)
+      (cb) => swarmB.close(cb),
-    swarmB.close(closed)
+      (cb) => swarmC.close(cb)
-    swarmC.close(closed)
+    ], done)
-
-    function closed () {
-      if (++counter === 3) {
-        done()
-      }
-    }
   })
 
   it('add', (done) => {

test/05-muxing-spdy.node.js

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -10,7 +11,7 @@ const TCP = require('libp2p-tcp')
 const spdy = require('libp2p-spdy')
 
 describe('stream muxing with spdy (on TCP)', function () {
-  this.timeout(20000)
+  this.timeout(60 * 1000)
 
   var swarmA
   var peerA
@@ -37,42 +38,28 @@ describe('stream muxing with spdy (on TCP)', function () {
     swarmC = new Swarm(peerC)
 
     swarmA.transport.add('tcp', new TCP())
-    swarmA.transport.listen('tcp', {}, null, ready)
-
     swarmB.transport.add('tcp', new TCP())
-    swarmB.transport.listen('tcp', {}, null, ready)
-
     swarmC.transport.add('tcp', new TCP())
-    swarmC.transport.listen('tcp', {}, null, ready)
 
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.transport.listen('tcp', {}, null, cb),
-    function ready () {
+      (cb) => swarmB.transport.listen('tcp', {}, null, cb),
-      if (++counter === 3) {
+      (cb) => swarmC.transport.listen('tcp', {}, null, cb)
-        done()
+    ], done)
-      }
-    }
   })
 
   after((done) => {
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.close(cb),
-    swarmA.close(closed)
+      (cb) => swarmB.close(cb)
-    swarmB.close(closed)
+      // (cb) => swarmC.close(cb)
-    swarmC.close(closed)
+    ], done)
-
-    function closed () {
-      if (++counter === 3) {
-        done()
-      }
-    }
   })
 
-  it('add', (done) => {
+  it('add', () => {
     swarmA.connection.addStreamMuxer(spdy)
     swarmB.connection.addStreamMuxer(spdy)
     swarmC.connection.addStreamMuxer(spdy)
-    done()
   })
 
   it('handle + dial on protocol', (done) => {
@@ -128,4 +115,12 @@ describe('stream muxing with spdy (on TCP)', function () {
       }, 500)
     })
   })
+
+  it('close one end, make sure the other does not blow', (done) => {
+    swarmC.close((err) => {
+      if (err) throw err
+      // to make sure it has time to propagate
+      setTimeout(done, 1000)
+    })
+  })
 })

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

@@ -4,9 +4,6 @@
 describe('secio conn upgrade (on TCP)', function () {
   this.timeout(20000)
 
-  before((done) => { done() })
-  after((done) => { done() })
-
   it.skip('add', (done) => {})
   it.skip('dial', (done) => {})
   it.skip('tls on a muxed stream (not the full conn)', (done) => {})

test/07-conn-upgrade-tls.node.js

@@ -2,9 +2,6 @@
 'use strict'
 
 describe('tls conn upgrade (on TCP)', function () {
-  before((done) => { done() })
-  after((done) => { done() })
-
   it.skip('add', (done) => {})
   it.skip('dial', (done) => {})
   it.skip('tls on a muxed stream (not the full conn)', (done) => {})

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

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -27,31 +28,19 @@ describe('high level API - 1st without stream multiplexing (on TCP)', function (
     swarmB = new Swarm(peerB)
 
     swarmA.transport.add('tcp', new TCP())
-    swarmA.transport.listen('tcp', {}, null, ready)
-
     swarmB.transport.add('tcp', new TCP())
-    swarmB.transport.listen('tcp', {}, null, ready)
 
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.transport.listen('tcp', {}, null, cb),
-    function ready () {
+      (cb) => swarmB.transport.listen('tcp', {}, null, cb)
-      if (++counter === 2) {
+    ], done)
-        done()
-      }
-    }
   })
 
   after((done) => {
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.close(cb),
-    swarmA.close(closed)
+      (cb) => swarmB.close(cb)
-    swarmB.close(closed)
+    ], done)
-
-    function closed () {
-      if (++counter === 2) {
-        done()
-      }
-    }
   })
 
   it('handle a protocol', (done) => {
@@ -103,4 +92,11 @@ describe('high level API - 1st without stream multiplexing (on TCP)', function (
       conn.on('end', done)
     })
   })
+
+  it('unhandle', (done) => {
+    const proto = '/bananas/1.0.0'
+    swarmA.unhandle(proto)
+    expect(swarmA.protocols[proto]).to.not.exist
+    done()
+  })
 })

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

@@ -3,6 +3,7 @@
 
 const expect = require('chai').expect
 
+const parallel = require('run-parallel')
 const multiaddr = require('multiaddr')
 const Peer = require('peer-info')
 const Swarm = require('../src')
@@ -45,19 +46,13 @@ describe('high level API - with everything mixed all together!', function () {
   })
 
   after((done) => {
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.close(cb),
-    swarmA.close(closed)
+      (cb) => swarmB.close(cb),
-    swarmB.close(closed)
+      // (cb) => swarmC.close(cb),
-    // swarmC.close(closed)
+      (cb) => swarmD.close(cb),
-    swarmD.close(closed)
+      (cb) => swarmE.close(cb)
-    swarmE.close(closed)
+    ], done)
-
-    function closed () {
-      if (++counter === 4) {
-        done()
-      }
-    }
   })
 
   it('add tcp', (done) => {
@@ -66,21 +61,14 @@ describe('high level API - with everything mixed all together!', function () {
     peerC.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/0'))
 
     swarmA.transport.add('tcp', new TCP())
-    swarmA.transport.listen('tcp', {}, null, ready)
-
     swarmB.transport.add('tcp', new TCP())
-    swarmB.transport.listen('tcp', {}, null, ready)
-
     swarmC.transport.add('tcp', new TCP())
-    swarmC.transport.listen('tcp', {}, null, ready)
 
-    var counter = 0
+    parallel([
-
+      (cb) => swarmA.transport.listen('tcp', {}, null, cb),
-    function ready () {
+      (cb) => swarmB.transport.listen('tcp', {}, null, cb),
-      if (++counter === 3) {
+      (cb) => swarmC.transport.listen('tcp', {}, null, cb)
-        done()
+    ], done)
-      }
-    }
   })
 
   it.skip('add utp', (done) => {})
@@ -92,27 +80,19 @@ describe('high level API - with everything mixed all together!', function () {
     peerE.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9042/websockets'))
 
     swarmB.transport.add('ws', new WebSockets())
-    swarmB.transport.listen('ws', {}, null, ready)
-
     swarmC.transport.add('ws', new WebSockets())
-    swarmC.transport.listen('ws', {}, null, ready)
-
     swarmD.transport.add('ws', new WebSockets())
-    swarmD.transport.listen('ws', {}, null, ready)
-
     swarmE.transport.add('ws', new WebSockets())
-    swarmE.transport.listen('ws', {}, null, ready)
 
-    var counter = 0
+    parallel([
-
+      (cb) => swarmB.transport.listen('ws', {}, null, cb),
-    function ready () {
+      (cb) => swarmC.transport.listen('ws', {}, null, cb),
-      if (++counter === 4) {
+      (cb) => swarmD.transport.listen('ws', {}, null, cb),
-        done()
+      (cb) => swarmE.transport.listen('ws', {}, null, cb)
-      }
+    ], done)
-    }
   })
 
-  it('add spdy', (done) => {
+  it('add spdy', () => {
     swarmA.connection.addStreamMuxer(spdy)
     swarmB.connection.addStreamMuxer(spdy)
     swarmC.connection.addStreamMuxer(spdy)
@@ -124,25 +104,41 @@ describe('high level API - with everything mixed all together!', function () {
     swarmC.connection.reuse()
     swarmD.connection.reuse()
     swarmE.connection.reuse()
+  })
 
+  it.skip('add multiplex', () => {})
+
+  it('warm up from A to B on tcp to tcp+ws', (done) => {
+    parallel([
+      (cb) => swarmB.once('peer-mux-established', (peerInfo) => {
+        expect(peerInfo.id.toB58String()).to.equal(peerA.id.toB58String())
+        cb()
+      }),
+      (cb) => swarmA.once('peer-mux-established', (peerInfo) => {
+        expect(peerInfo.id.toB58String()).to.equal(peerB.id.toB58String())
+        cb()
+      }),
+      (cb) => swarmA.dial(peerB, (err) => {
+        expect(err).to.not.exist
+        expect(Object.keys(swarmA.muxedConns).length).to.equal(1)
+        cb()
+      })
+    ], done)
+  })
+
+  it('warm up a warmed up, from B to A', (done) => {
+    swarmB.dial(peerA, (err) => {
+      expect(err).to.not.exist
+      expect(Object.keys(swarmA.muxedConns).length).to.equal(1)
       done()
     })
+  })
 
-  it.skip('add multiplex', (done) => {})
+  it('dial from tcp to tcp+ws, on protocol', (done) => {
-
-  it('dial from tcp to tcp+ws', (done) => {
     swarmB.handle('/anona/1.0.0', (conn) => {
       conn.pipe(conn)
     })
 
-    swarmB.once('peer-mux-established', (peerInfo) => {
-      expect(peerInfo.id.toB58String()).to.equal(peerA.id.toB58String())
-    })
-
-    swarmA.once('peer-mux-established', (peerInfo) => {
-      expect(peerInfo.id.toB58String()).to.equal(peerB.id.toB58String())
-    })
-
     swarmA.dial(peerB, '/anona/1.0.0', (err, conn) => {
       expect(err).to.not.exist
       expect(Object.keys(swarmA.muxedConns).length).to.equal(1)
@@ -153,6 +149,14 @@ describe('high level API - with everything mixed all together!', function () {
     })
   })
 
+  it('dial from ws to ws no proto', (done) => {
+    swarmD.dial(peerE, (err) => {
+      expect(err).to.not.exist
+      expect(Object.keys(swarmD.muxedConns).length).to.equal(1)
+      done()
+    })
+  })
+
   it('dial from ws to ws', (done) => {
     swarmE.handle('/abacaxi/1.0.0', (conn) => {
       conn.pipe(conn)
@@ -206,9 +210,9 @@ describe('high level API - with everything mixed all together!', function () {
   })
 
   it('close a muxer emits event', (done) => {
-    swarmC.close(() => {})
+    parallel([
-    swarmA.once('peer-mux-closed', (peerInfo) => {
+      (cb) => swarmC.close(cb),
-      done()
+      (cb) => swarmA.once('peer-mux-closed', () => cb())
-    })
+    ], done)
   })
 })

test/browser.js

@@ -22,14 +22,12 @@ describe('transport - websockets', function () {
 
   var swarm
 
-  before((done) => {
+  before(() => {
     const b58IdSrc = 'QmYzgdesgjdvD3okTPGZT9NPmh1BuH5FfTVNKjsvaAprhb'
     // use a pre generated Id to save time
     const idSrc = Id.createFromB58String(b58IdSrc)
     const peerSrc = new Peer(idSrc)
     swarm = new Swarm(peerSrc)
-
-    done()
   })
 
   it('add', (done) => {
@@ -62,28 +60,24 @@ describe('high level API - 1st without stream multiplexing (on websockets)', fun
   var swarm
   var peerDst
 
-  before((done) => {
+  before(() => {
     const b58IdSrc = 'QmYzgdesgjdvD3okTPGZT9NPmh1BuH5FfTVNKjsvaAprhb'
     // use a pre generated Id to save time
     const idSrc = Id.createFromB58String(b58IdSrc)
     const peerSrc = new Peer(idSrc)
     swarm = new Swarm(peerSrc)
-
-    done()
   })
 
   after((done) => {
-    done()
+    swarm.close(done)
-    // swarm.close(done)
   })
 
-  it('add ws', (done) => {
+  it('add ws', () => {
     swarm.transport.add('ws', new WebSockets())
     expect(Object.keys(swarm.transports).length).to.equal(1)
-    done()
   })
 
-  it('create Dst peer info', (done) => {
+  it('create Dst peer info', () => {
     const b58IdDst = 'QmYzgdesgjdvD3okTPGZT9NPmh1BuH5FfTVNKjsvaAprhb'
     // use a pre generated Id to save time
     const idDst = Id.createFromB58String(b58IdDst)
@@ -91,7 +85,6 @@ describe('high level API - 1st without stream multiplexing (on websockets)', fun
 
     const ma = multiaddr('/ip4/127.0.0.1/tcp/9200/websockets')
     peerDst.multiaddr.add(ma)
-    done()
   })
 
   it('dial on protocol', (done) => {