chore: release version v0.25.0-rc.3

chore: update contributors
chore: add error codes to dht and pubsub errors (#328 )
2025-07-22 20:11:57 +00:00 · 2019-02-26 15:24:55 +01:00 · 2019-02-26 15:24:55 +01:00 · 2019-02-26 15:15:30 +01:00 · 2019-02-26 15:10:31 +01:00 · 2019-02-26 15:10:30 +01:00
57 changed files with 1092 additions and 432 deletions
--- a/.aegir.js
+++ b/.aegir.js
@@ -1,15 +1,16 @@
 'use strict'

-const PeerInfo = require('peer-info')
-const PeerId = require('peer-id')
 const pull = require('pull-stream')
 const parallel = require('async/parallel')
-
 const WebSocketStarRendezvous = require('libp2p-websocket-star-rendezvous')
 const sigServer = require('libp2p-webrtc-star/src/sig-server')

-const rawPeer = require('./test/fixtures/test-peer.json')
 const Node = require('./test/utils/bundle-nodejs.js')
+const {
+  getPeerRelay,
+  WRTC_RENDEZVOUS_MULTIADDR,
+  WS_RENDEZVOUS_MULTIADDR
+} = require('./test/utils/constants')

 let wrtcRendezvous
 let wsRendezvous
@@ -19,7 +20,7 @@ const before = (done) => {
  parallel([
    (cb) => {
      sigServer.start({
-        port: 15555
+        port: WRTC_RENDEZVOUS_MULTIADDR.nodeAddress().port
        // cryptoChallenge: true TODO: needs https://github.com/libp2p/js-libp2p-webrtc-star/issues/128
      }, (err, server) => {
        if (err) {
@@ -31,7 +32,7 @@ const before = (done) => {
    },
    (cb) => {
      WebSocketStarRendezvous.start({
-        port: 14444,
+        port: WS_RENDEZVOUS_MULTIADDR.nodeAddress().port,
        refreshPeerListIntervalMS: 1000,
        strictMultiaddr: false,
        cryptoChallenge: true
@@ -44,17 +45,24 @@ const before = (done) => {
      })
    },
    (cb) => {
-      PeerId.createFromJSON(rawPeer, (err, peerId) => {
+      getPeerRelay((err, peerInfo) => {
        if (err) {
          return done(err)
        }
-        const peer = new PeerInfo(peerId)
-
-        peer.multiaddrs.add('/ip4/127.0.0.1/tcp/9200/ws')

        node = new Node({
-          peerInfo: peer
+          peerInfo,
+          config: {
+            relay: {
+              enabled: true,
+              hop: {
+                enabled: true,
+                active: true
+              }
+            }
+          }
        })
+
        node.handle('/echo/1.0.0', (protocol, conn) => pull(conn, conn))
        node.start(cb)
      })
@@ -71,6 +79,7 @@ const after = (done) => {
 }

 module.exports = {
+  bundlesize: { maxSize: '215kB' },
  hooks: {
    pre: before,
    post: after
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ test/test-data/go-ipfs-repo/LOG.old

 # while testing npm5
 package-lock.json
+yarn.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,44 @@
+language: node_js
+cache: npm
+stages:
+  - check
+  - test
+  - cov
+
+node_js:
+  - '10'
+
+os:
+  - linux
+  - osx
+  
+script: npx nyc -s npm run test:node -- --bail
+after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
+
+jobs:
+  include:
+    - stage: check
+      script:
+        - npx aegir build --bundlesize
+        - npx aegir commitlint --travis
+        - npx aegir dep-check -- -i wrtc -i electron-webrtc
+        - npm run lint
+
+    - stage: test
+      name: chrome
+      addons:
+        chrome: stable
+      script:
+        - npx aegir test -t browser
+        - npx aegir test -t webworker
+
+    - stage: test
+      name: firefox
+      addons:
+        firefox: latest
+      script:
+        - npx aegir test -t browser -- --browsers FirefoxHeadless
+        - npx aegir test -t webworker -- --browsers FirefoxHeadless
+
+notifications:
+  email: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,59 @@
+<a name="0.25.0-rc.3"></a>
+# [0.25.0-rc.3](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.2...v0.25.0-rc.3) (2019-02-26)
+
+
+
+<a name="0.25.0-rc.2"></a>
+# [0.25.0-rc.2](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.1...v0.25.0-rc.2) (2019-02-26)
+
+
+### Bug Fixes
+
+* make the config less restrictive ([#329](https://github.com/libp2p/js-libp2p/issues/329)) ([5f92acd](https://github.com/libp2p/js-libp2p/commit/5f92acd))
+
+
+
+<a name="0.25.0-rc.1"></a>
+# [0.25.0-rc.1](https://github.com/libp2p/js-libp2p/compare/v0.25.0-rc.0...v0.25.0-rc.1) (2019-02-21)
+
+
+### Bug Fixes
+
+* bundle-size ([#298](https://github.com/libp2p/js-libp2p/issues/298)) ([d497961](https://github.com/libp2p/js-libp2p/commit/d497961))
+* emit peer discovery for dht discovery ([9e7a080](https://github.com/libp2p/js-libp2p/commit/9e7a080))
+
+
+### Features
+
+* support unsubscribe all for pubsub ([#321](https://github.com/libp2p/js-libp2p/issues/321)) ([6e76aad](https://github.com/libp2p/js-libp2p/commit/6e76aad))
+
+
+
+<a name="0.24.4"></a>
+## [0.24.4](https://github.com/libp2p/js-libp2p/compare/v0.24.3...v0.24.4) (2019-01-04)
+
+
+
+<a name="0.24.3"></a>
+## [0.24.3](https://github.com/libp2p/js-libp2p/compare/v0.24.2...v0.24.3) (2018-12-14)
+
+
+### Bug Fixes
+
+* not started yet ([#297](https://github.com/libp2p/js-libp2p/issues/297)) ([fdfb7b4](https://github.com/libp2p/js-libp2p/commit/fdfb7b4))
+
+
+
+<a name="0.24.2"></a>
+## [0.24.2](https://github.com/libp2p/js-libp2p/compare/v0.24.1...v0.24.2) (2018-12-04)
+
+
+### Bug Fixes
+
+* use symbol instead of constructor name ([#292](https://github.com/libp2p/js-libp2p/issues/292)) ([53ed3bd](https://github.com/libp2p/js-libp2p/commit/53ed3bd))
+
+
+
 <a name="0.24.1"></a>
 ## [0.24.1](https://github.com/libp2p/js-libp2p/compare/v0.24.0...v0.24.1) (2018-12-03)

--- a/OKR.md
+++ b/OKR.md
@@ -2,6 +2,10 @@

 We try to frame our ongoing work using a process based on quarterly Objectives and Key Results (OKRs). Objectives reflect outcomes that are challenging, but realistic. Results are tangible and measurable.

+## 2019 Q1
+
+Find the js-libp2p OKRs for 2019 Q1 at the [2019 Q1 libp2p OKRs Spreadsheet](https://docs.google.com/spreadsheets/d/11GKG1DBRIIAiQnHvLD7_IqWxDGsVdaZFpxJM6NWtXe8/edit#gid=1271182838)
+
 ## 2018 Q4

 Find the js-libp2p OKRs for 2018 Q4 at the [2018 Q4 libp2p OKRs Spreadsheet](https://docs.google.com/spreadsheets/d/1BYwmbVicgo6_tOHAbgiUXWge8Ej0qR1M_gAUulazmrg/edit#gid=1241853194)
--- a/README.md
+++ b/README.md
@@ -12,8 +12,9 @@
 </p>

 <p align="center">
-  <a href="https://ci.ipfs.team/job/libp2p/job/js-libp2p/job/master/"><img src="https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p/master" /></a>
-  <a href="https://codecov.io/gh/libp2p/js-libp2p"><img src="https://codecov.io/gh/libp2p/js-libp2p/branch/master/graph/badge.svg"></a>
+  <a href="https://travis-ci.com/libp2p/js-libp2p"><img src="https://flat.badgen.net/travis/libp2p/js-libp2p" /></a>
+  <a href="https://codecov.io/gh/libp2p/js-libp2p"><img src="https://img.shields.io/codecov/c/github/ipfs/js-ipfs-multipart/master.svg?style=flat-square"></a>
+  <a href="https://bundlephobia.com/result?p=ipfsd-ctl"><img src="https://flat.badgen.net/bundlephobia/minzip/ipfsd-ctl"></a>
  <br>
  <a href="https://david-dm.org/libp2p/js-libp2p"><img src="https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square" /></a>
  <a href="https://github.com/feross/standard"><img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square"></a>
@@ -175,12 +176,12 @@ class Node extends libp2p {
        },
        dht: {
          kBucketSize: 20,
+          enabled: true,
          enabledDiscovery: true      // Allows to disable discovery (enabled by default)
        },
        // Enable/Disable Experimental features
        EXPERIMENTAL: {               // Experimental features ("behind a flag")
-          pubsub: false,
-          dht: false
+          pubsub: false
        }
      }
    }
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -13,6 +13,14 @@
 - Robustness and quality
  - [ ] Ensure that all tests are passing, this includes:
    - [ ] unit
+  - [ ] Publish a release candidate to npm
+    ```sh
+    # Minor prerelease (e.g. 0.24.1 -> 0.25.0-rc.0)
+    $ npx aegir release --type preminor -t node -t browser --preid rc --dist-tag next
+
+    # Increment prerelease (e.g. 0.25.0-rc.0 -> 0.25.0-rc.1)
+    $ npx aegir release --type prerelease -t node -t browser --preid rc --dist-tag next
+    ```
  - [ ] Run tests of the following projects with the new release:
    - [ ] [js-ipfs](https://github.com/ipfs/js-ipfs)
 - Documentation
@@ -20,21 +28,30 @@
  - [ ] Ensure that all the examples run
 - Communication
  - [ ] Create the release issue
+  - [ ] Take a snapshot between of everyone that has contributed to this release (including its subdeps in IPFS, libp2p, IPLD and multiformats) using [`name-your-contributors`](https://www.npmjs.com/package/name-your-contributors). Generate a nice markdown list with [this script](https://gist.github.com/jacobheun/d2ff479ca991733c13cdcf688a1317e5)
  - [ ] Announcements (both pre-release and post-release)
    - [ ] Twitter
    - [ ] IRC
    - [ ] Reddit
+    - [ ] [discuss.ipfs.io](https://discuss.ipfs.io/c/announcements)
  - [ ] Blog post
+  - [ ] Copy release notes to the [GitHub Release description](https://github.com/libp2p/js-libp2p/releases)
+
+# ❤️ Huge thank you to everyone that made this release possible
+
+In alphabetical order, here are all the humans that contributed to the release:
+
+- ...

 # 🙌🏽 Want to contribute?

 Would you like to contribute to the libp2p project and don't know how? Well, there are a few places you can get started:

 - Check the issues with the `help wanted` label at the Ready column in our waffle board - https://waffle.io/libp2p/js-libp2p?label=help%20wanted
- Join an IPFS All Hands, introduce yourself and let us know where you would like to contribute - https://github.com/ipfs/pm/#all-hands-call
+- Join an IPFS All Hands, introduce yourself and let us know where you would like to contribute - https://github.com/ipfs/team-mgmt#all-hands-call
 - Hack with IPFS and show us what you made! The All Hands call is also the perfect venue for demos, join in and show us what you built
 - Join the discussion at http://discuss.ipfs.io/ and help users finding their answers.
- Join the [⚡️ⒿⓈ Core Dev Team Weekly Sync 🙌🏽 ](https://github.com/ipfs/pm/issues/650) and be part of the Sprint action!
+- Join the [⚡️ⒿⓈ Core Dev Team Weekly Sync 🙌🏽 ](https://github.com/ipfs/team-mgmt/issues/650) and be part of the Sprint action!

 # ⁉️ Do you have questions?

--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -1,2 +0,0 @@
-// Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories.
-javascript()
--- a/examples/chat/src/dialer.js
+++ b/examples/chat/src/dialer.js
@@ -46,7 +46,7 @@ async.parallel([
    console.log('Dialer ready, listening on:')

    peerListener.multiaddrs.forEach((ma) => {
-      console.log(ma.toString() + '/ipfs/' + idListener.toB58String())
+      console.log(ma.toString() + '/p2p/' + idListener.toB58String())
    })

    nodeDialer.dialProtocol(peerListener, '/chat/1.0.0', (err, conn) => {
--- a/examples/chat/src/listener.js
+++ b/examples/chat/src/listener.js
@@ -50,7 +50,7 @@ PeerId.createFromJSON(require('./peer-id-listener'), (err, idListener) => {

    console.log('Listener ready, listening on:')
    peerListener.multiaddrs.forEach((ma) => {
-      console.log(ma.toString() + '/ipfs/' + idListener.toB58String())
+      console.log(ma.toString() + '/p2p/' + idListener.toB58String())
    })
  })
 })
--- a/examples/delegated-routing/src/App.js
+++ b/examples/delegated-routing/src/App.js
@@ -7,7 +7,7 @@ const Ipfs = require('ipfs')
 const libp2pBundle = require('./libp2p-bundle')
 // require('./App.css')

-const BootstrapNode = '/ip4/127.0.0.1/tcp/8081/ws/ipfs/QmdoG8DpzYUZMVP5dGmgmigZwR1RE8Cf6SxMPg1SBXJAQ8'
+const BootstrapNode = '/ip4/127.0.0.1/tcp/8081/ws/p2p/QmdoG8DpzYUZMVP5dGmgmigZwR1RE8Cf6SxMPg1SBXJAQ8'

 class App extends Component {
  constructor (props) {
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@@ -12,15 +12,15 @@ const defaultsDeep = require('@nodeutils/defaults-deep')

 // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-nodejs.json
 const bootstrapers = [
-  '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-  '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-  '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-  '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-  '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-  '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-  '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-  '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
+  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+  '/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/ip4/162.243.248.213/tcp/4001/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/ip4/178.62.61.185/tcp/4001/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/ip4/104.236.151.122/tcp/4001/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
 ]

 class MyBundle extends libp2p {
--- a/examples/discovery-mechanisms/README.md
+++ b/examples/discovery-mechanisms/README.md
@@ -43,15 +43,15 @@ In this bundle, we use a `bootstrappers` array listing peers to connect _on boot

 ```JavaScript
 const bootstrapers = [
-  '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-  '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-  '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-  '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-  '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-  '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-  '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-  '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
+  '/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
+  '/ip4/104.236.176.52/tcp/4001/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/ip4/162.243.248.213/tcp/4001/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/ip4/178.62.61.185/tcp/4001/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/ip4/104.236.151.122/tcp/4001/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
 ]
 ```

--- a/examples/echo/src/dialer.js
+++ b/examples/echo/src/dialer.js
@@ -28,7 +28,7 @@ async.parallel([
  // Peer to Dial
  const listenerPeerInfo = new PeerInfo(ids[1])
  const listenerId = ids[1]
-  const listenerMultiaddr = '/ip4/127.0.0.1/tcp/10333/ipfs/' +
+  const listenerMultiaddr = '/ip4/127.0.0.1/tcp/10333/p2p/' +
      listenerId.toB58String()
  listenerPeerInfo.multiaddrs.add(listenerMultiaddr)

@@ -37,7 +37,7 @@ async.parallel([

    console.log('Dialer ready, listening on:')
    dialerPeerInfo.multiaddrs.forEach((ma) => console.log(ma.toString() +
-          '/ipfs/' + dialerId.toB58String()))
+          '/p2p/' + dialerId.toB58String()))

    console.log('Dialing to peer:', listenerMultiaddr.toString())
    dialerNode.dialProtocol(listenerPeerInfo, '/echo/1.0.0', (err, conn) => {
--- a/examples/echo/src/listener.js
+++ b/examples/echo/src/listener.js
@@ -41,6 +41,6 @@ series([

  console.log('Listener ready, listening on:')
  listenerNode.peerInfo.multiaddrs.forEach((ma) => {
-    console.log(ma.toString() + '/ipfs/' + listenerId.toB58String())
+    console.log(ma.toString() + '/p2p/' + listenerId.toB58String())
  })
 })
--- a/examples/libp2p-in-the-browser/1/package.json
+++ b/examples/libp2p-in-the-browser/1/package.json
@@ -24,6 +24,6 @@
    "libp2p-webrtc-star": "~0.15.3",
    "libp2p-websocket-star": "~0.8.1",
    "libp2p-websockets": "~0.12.0",
-    "peer-info": "~0.14.1"
+    "peer-info": "~0.15.1"
  }
 }
--- a/examples/libp2p-in-the-browser/1/src/browser-bundle.js
+++ b/examples/libp2p-in-the-browser/1/src/browser-bundle.js
@@ -12,16 +12,16 @@ const libp2p = require('../../../../')

 // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json
 const bootstrapList = [
-  '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-  '/dns4/sfo-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
-  '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-  '/dns4/sfo-2.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-  '/dns4/sfo-3.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-  '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-  '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-  '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
-  '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
+  '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
+  '/dns4/sfo-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
+  '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
+  '/dns4/sfo-2.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
+  '/dns4/sfo-3.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
+  '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
+  '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
+  '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/dns4/node0.preload.ipfs.io/tcp/443/wss/p2p/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
+  '/dns4/node0.preload.ipfs.io/tcp/443/wss/p2p/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
 ]

 class Node extends libp2p {
--- a/examples/libp2p-in-the-browser/1/src/create-node.js
+++ b/examples/libp2p-in-the-browser/1/src/create-node.js
@@ -10,7 +10,7 @@ function createNode (callback) {
    }

    const peerIdStr = peerInfo.id.toB58String()
-    const ma = `/dns4/star-signal.cloud.ipfs.team/tcp/443/wss/p2p-webrtc-star/ipfs/${peerIdStr}`
+    const ma = `/dns4/star-signal.cloud.ipfs.team/tcp/443/wss/p2p-webrtc-star/p2p/${peerIdStr}`

    peerInfo.multiaddrs.add(ma)

--- a/examples/libp2p-in-the-browser/README.md
+++ b/examples/libp2p-in-the-browser/README.md
@@ -4,7 +4,15 @@ One of the primary goals with libp2p P2P was to get it fully working in the brow

 # 1. Setting up a simple app that lists connections to other nodes

-Simple go into the folder [1](./1) and execute the following
+Start by installing libp2p's dependencies.
+
+```bash
+> cd ../../
+> npm install
+> cd examples/libp2p-in-the-browser
+```
+
+Then simply go into the folder [1](./1) and execute the following

 ```bash
 > cd 1
--- a/examples/peer-and-content-routing/README.md
+++ b/examples/peer-and-content-routing/README.md
@@ -69,8 +69,8 @@ You should see the output being something like:
 ```Bash
 > node 1.js
 Found it, multiaddrs are:
-/ip4/127.0.0.1/tcp/63617/ipfs/QmWrFXvZr9S4iDqycyoyc2zDdrT1jg9wpdenUTdd1LTar6
-/ip4/192.168.86.41/tcp/63617/ipfs/QmWrFXvZr9S4iDqycyoyc2zDdrT1jg9wpdenUTdd1LTar6
+/ip4/127.0.0.1/tcp/63617/p2p/QmWrFXvZr9S4iDqycyoyc2zDdrT1jg9wpdenUTdd1LTar6
+/ip4/192.168.86.41/tcp/63617/p2p/QmWrFXvZr9S4iDqycyoyc2zDdrT1jg9wpdenUTdd1LTar6
 ```

 You have successfully used Peer Routing to find a peer that you were not directly connected. Now all you have to do is to dial to the multiaddrs you discovered.
--- a/examples/protocol-and-stream-muxing/README.md
+++ b/examples/protocol-and-stream-muxing/README.md
@@ -169,7 +169,7 @@ You can see this working on example [3.js](./3.js). The result should look like
 > node 3.js
 from 1 to 2
 Addresses by which both peers are connected
-node 1 to node 2: /ip4/127.0.0.1/tcp/50629/ipfs/QmZwMKTo6wG4Te9A6M2eJnWDpR8uhsGed4YRegnV5DcKiv
-node 2 to node 1: /ip4/127.0.0.1/tcp/50630/ipfs/QmRgormJQeDyXhDKma11eUtksoh8vWmeBoxghVt4meauW9
+node 1 to node 2: /ip4/127.0.0.1/tcp/50629/p2p/QmZwMKTo6wG4Te9A6M2eJnWDpR8uhsGed4YRegnV5DcKiv
+node 2 to node 1: /ip4/127.0.0.1/tcp/50630/p2p/QmRgormJQeDyXhDKma11eUtksoh8vWmeBoxghVt4meauW9
 from 2 to 1
 ```
--- a/examples/transports/README.md
+++ b/examples/transports/README.md
@@ -88,8 +88,8 @@ Running this should result in something like:
 > node 1.js
 node has started (true/false): true
 listening on:
-/ip4/127.0.0.1/tcp/61329/ipfs/QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ
-/ip4/192.168.2.156/tcp/61329/ipfs/QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ
+/ip4/127.0.0.1/tcp/61329/p2p/QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ
+/ip4/192.168.2.156/tcp/61329/p2p/QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ
 ```

 That `QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ` is the PeerId that was created during the PeerInfo generation.
@@ -175,11 +175,11 @@ The result should be look like:
 ```bash
 > node 2.js
 node 1 is listening on:
-/ip4/127.0.0.1/tcp/62279/ipfs/QmeM4wNWv1uci7UJjUXZYfvcy9uqAbw7G9icuxdqy88Mj9
-/ip4/192.168.2.156/tcp/62279/ipfs/QmeM4wNWv1uci7UJjUXZYfvcy9uqAbw7G9icuxdqy88Mj9
+/ip4/127.0.0.1/tcp/62279/p2p/QmeM4wNWv1uci7UJjUXZYfvcy9uqAbw7G9icuxdqy88Mj9
+/ip4/192.168.2.156/tcp/62279/p2p/QmeM4wNWv1uci7UJjUXZYfvcy9uqAbw7G9icuxdqy88Mj9
 node 2 is listening on:
-/ip4/127.0.0.1/tcp/62278/ipfs/QmWp58xJgzbouNJcyiNNTpZuqQCJU8jf6ixc7TZT9xEZhV
-/ip4/192.168.2.156/tcp/62278/ipfs/QmWp58xJgzbouNJcyiNNTpZuqQCJU8jf6ixc7TZT9xEZhV
+/ip4/127.0.0.1/tcp/62278/p2p/QmWp58xJgzbouNJcyiNNTpZuqQCJU8jf6ixc7TZT9xEZhV
+/ip4/192.168.2.156/tcp/62278/p2p/QmWp58xJgzbouNJcyiNNTpZuqQCJU8jf6ixc7TZT9xEZhV
 Hello p2p world!
 ```

@@ -304,14 +304,14 @@ If everything was set correctly, you now should see the following after you run
 ```Bash
 > node 3.js
 node 1 is listening on:
-/ip4/127.0.0.1/tcp/62620/ipfs/QmWpWmcVJkF6EpmAaVDauku8g1uFGuxPsGP35XZp9GYEqs
-/ip4/192.168.2.156/tcp/62620/ipfs/QmWpWmcVJkF6EpmAaVDauku8g1uFGuxPsGP35XZp9GYEqs
+/ip4/127.0.0.1/tcp/62620/p2p/QmWpWmcVJkF6EpmAaVDauku8g1uFGuxPsGP35XZp9GYEqs
+/ip4/192.168.2.156/tcp/62620/p2p/QmWpWmcVJkF6EpmAaVDauku8g1uFGuxPsGP35XZp9GYEqs
 node 2 is listening on:
-/ip4/127.0.0.1/tcp/10000/ws/ipfs/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
-/ip4/127.0.0.1/tcp/62619/ipfs/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
-/ip4/192.168.2.156/tcp/62619/ipfs/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
+/ip4/127.0.0.1/tcp/10000/ws/p2p/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
+/ip4/127.0.0.1/tcp/62619/p2p/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
+/ip4/192.168.2.156/tcp/62619/p2p/QmWAQtWdzWXibgfyc7WRHhhv6MdqVKzXvyfSTnN2aAvixX
 node 3 is listening on:
-/ip4/127.0.0.1/tcp/20000/ws/ipfs/QmVq1PWh3VSDYdFqYMtqp4YQyXcrH27N7968tGdM1VQPj1
+/ip4/127.0.0.1/tcp/20000/ws/p2p/QmVq1PWh3VSDYdFqYMtqp4YQyXcrH27N7968tGdM1VQPj1
 node 3 failed to dial to node 1 with: No available transport to dial to
 node 1 dialed to node 2 successfully
 node 2 dialed to node 3 successfully
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "libp2p",
-  "version": "0.24.1",
+  "version": "0.25.0-rc.3",
  "description": "JavaScript base class for libp2p bundles",
  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
  "main": "src/index.js",
@@ -16,9 +16,7 @@
    "test:browser": "aegir test -t browser",
    "release": "aegir release -t node -t browser",
    "release-minor": "aegir release --type minor -t node -t browser",
-    "release-major": "aegir release --type major -t node -t browser",
-    "coverage": "aegir coverage",
-    "coverage-publish": "aegir coverage --provider coveralls"
+    "release-major": "aegir release --type major -t node -t browser"
  },
  "repository": {
    "type": "git",
@@ -37,7 +35,6 @@
  },
  "homepage": "https://github.com/libp2p/js-libp2p",
  "browser": {
-    "joi": "joi-browser",
    "./test/utils/bundle-nodejs": "./test/utils/bundle-browser"
  },
  "dependencies": {
@@ -45,22 +42,22 @@
    "debug": "^4.1.0",
    "err-code": "^1.1.2",
    "fsm-event": "^2.1.0",
-    "joi": "^14.0.6",
-    "joi-browser": "^13.4.0",
    "libp2p-connection-manager": "~0.0.2",
-    "libp2p-floodsub": "~0.15.1",
-    "libp2p-ping": "~0.8.3",
-    "libp2p-switch": "~0.41.2",
-    "libp2p-websockets": "~0.12.0",
-    "mafmt": "^6.0.2",
-    "multiaddr": "^5.0.2",
-    "peer-book": "~0.8.0",
-    "peer-id": "~0.12.0",
-    "peer-info": "~0.14.1"
+    "libp2p-floodsub": "~0.15.7",
+    "libp2p-ping": "~0.8.5",
+    "libp2p-switch": "~0.41.5",
+    "libp2p-websockets": "~0.12.1",
+    "mafmt": "^6.0.4",
+    "multiaddr": "^6.0.3",
+    "once": "^1.4.0",
+    "peer-book": "~0.9.1",
+    "peer-id": "~0.12.2",
+    "peer-info": "~0.15.1",
+    "superstruct": "~0.6.0"
  },
  "devDependencies": {
    "@nodeutils/defaults-deep": "^1.1.0",
-    "aegir": "^17.0.1",
+    "aegir": "^18.2.0",
    "chai": "^4.2.0",
    "chai-checkmark": "^1.0.1",
    "cids": "~0.5.5",
@@ -71,25 +68,26 @@
    "libp2p-circuit": "~0.3.0",
    "libp2p-delegated-content-routing": "~0.2.2",
    "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "~0.11.1",
+    "libp2p-kad-dht": "~0.14.5",
    "libp2p-mdns": "~0.12.0",
    "libp2p-mplex": "~0.8.4",
-    "libp2p-secio": "~0.10.1",
+    "libp2p-secio": "~0.11.0",
    "libp2p-spdy": "~0.13.0",
    "libp2p-tcp": "~0.13.0",
    "libp2p-webrtc-star": "~0.15.5",
-    "libp2p-websocket-star": "~0.9.0",
-    "libp2p-websocket-star-rendezvous": "~0.2.4",
+    "libp2p-websocket-star": "~0.10.1",
+    "libp2p-websocket-star-rendezvous": "~0.3.0",
    "lodash.times": "^4.3.2",
    "nock": "^10.0.2",
    "pull-goodbye": "0.0.2",
+    "pull-mplex": "~0.1.0",
    "pull-serializer": "~0.3.2",
    "pull-stream": "^3.6.9",
-    "sinon": "^7.1.1",
-    "webrtcsupport": "^2.2.0",
+    "sinon": "^7.2.4",
    "wrtc": "~0.3.2"
  },
  "contributors": [
+    "Alan Shaw <alan.shaw@protocol.ai>",
    "Alan Shaw <alan@tableflip.io>",
    "Chris Bratlien <chrisbratlien@gmail.com>",
    "Chris Dostert <chrisdostert@users.noreply.github.com>",
@@ -102,6 +100,7 @@
    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
    "Giovanni T. Parra <fiatjaf@gmail.com>",
    "Henrique Dias <hacdias@gmail.com>",
+    "Hugo Dias <mail@hugodias.me>",
    "Hugo Dias <hugomrdias@gmail.com>",
    "Irakli Gozalishvili <rfobic@gmail.com>",
    "Jacob Heun <jacobheun@gmail.com>",
@@ -118,13 +117,17 @@
    "RasmusErik Voel Jensen <github@solsort.com>",
    "Richard Littauer <richard.littauer@gmail.com>",
    "Ryan Bell <ryan@piing.net>",
+    "Soeren <nikorpoulsen@gmail.com>",
    "Sönke Hahn <soenkehahn@gmail.com>",
+    "Thomas Eizinger <thomas@eizinger.io>",
    "Tiago Alves <alvesjtiago@gmail.com>",
    "Vasco Santos <vasco.santos@ua.pt>",
    "Vasco Santos <vasco.santos@moxy.studio>",
    "Volker Mische <volker.mische@gmail.com>",
    "Zane Starr <zcstarr@gmail.com>",
+    "ebinks <elizabethjbinks@gmail.com>",
    "greenkeeperio-bot <support@greenkeeper.io>",
+    "isan_rivkin <isanrivkin@gmail.com>",
    "mayerwin <mayerwin@users.noreply.github.com>",
    "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>"
  ]
--- a/pdd/pdd-the-ipfs-bundle--story-1--peer-a.js
+++ b/pdd/pdd-the-ipfs-bundle--story-1--peer-a.js
@@ -59,7 +59,7 @@ test('story 1 - peerA', (t) => {
    t.ifErr(err, 'created Node successfully')
    t.ok(node.isStarted(), 'PeerA is Running')

-    const peerBAddr = `/ip4/127.0.0.1/tcp/10001/ipfs/${PeerB.id}`
+    const peerBAddr = `/ip4/127.0.0.1/tcp/10001/p2p/${PeerB.id}`

    node.handle('/time/1.0.0', (protocol, conn) => {
      pull(
--- a/pdd/pdd-the-ipfs-bundle--story-1--peer-b.js
+++ b/pdd/pdd-the-ipfs-bundle--story-1--peer-b.js
@@ -59,7 +59,7 @@ test('story 1 - peerA', (t) => {
    t.ifErr(err, 'created Node successfully')
    t.ok(node.isStarted(), 'PeerB is Running')

-    const peerAAddr = `/ip4/127.0.0.1/tcp/10000/ipfs/${PeerA.id}`
+    const peerAAddr = `/ip4/127.0.0.1/tcp/10000/p2p/${PeerA.id}`

    node.handle('/echo/1.0.0', (protocol, conn) => {
      pull(
--- a/pdd/pdd-transport--story-1--peer-a.js
+++ b/pdd/pdd-transport--story-1--peer-a.js
@@ -33,7 +33,7 @@ test('story 1 - peerA', (t) => {
    t.ifErr(err, 'created Node')
    t.ok(node.isStarted(), 'PeerA is running')

-    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/ipfs/${PeerB.id}`
+    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/p2p/${PeerB.id}`

    node.dial(PeerBAddr, '/echo/1.0.0', (err, conn) => {
      t.ifErr(err, 'dial successful')
--- a/pdd/pdd-transport--story-2--peer-a.js
+++ b/pdd/pdd-transport--story-2--peer-a.js
@@ -33,7 +33,7 @@ test('story 2 - peerA', (t) => {
    t.ifErr(err, 'created Node')
    t.ok(node.isStarted(), 'PeerA is running')

-    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/ws/ipfs/${PeerB.id}`
+    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/p2p/${PeerB.id}`

    node.dial(PeerBAddr, '/echo/1.0.0', (err, conn) => {
      t.ifErr(err, 'dial successful')
--- a/pdd/pdd-transport--story-3--peer-a.js
+++ b/pdd/pdd-transport--story-3--peer-a.js
@@ -32,7 +32,7 @@ test('story 3 - peerA', (t) => {
    t.ifErr(err, 'created Node')
    t.ok(node.isStarted(), 'PeerA is running')

-    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/ws/ipfs/${PeerB.id}`
+    const PeerBAddr = `/ip4/127.0.0.1/tcp/10001/ws/p2p/${PeerB.id}`

    setTimeout(() => node.dial(PeerBAddr, '/echo/1.0.0', (err, conn) => {
      t.ok(err, 'dial failed')
--- a/pdd/pdd-transport--story-3--peer-b.js
+++ b/pdd/pdd-transport--story-3--peer-b.js
@@ -32,7 +32,7 @@ test('story 3 - peerB', (t) => {
    t.ifErr(err, 'created Node')
    t.ok(node.isStarted(), 'PeerA is running')

-    const PeerAAddr = `/ip4/127.0.0.1/tcp/10000/ws/ipfs/${PeerA.id}`
+    const PeerAAddr = `/ip4/127.0.0.1/tcp/10000/ws/p2p/${PeerA.id}`

    setTimeout(() => node.dial(PeerAAddr, '/echo/1.0.0', (err, conn) => {
      t.ok(err, 'dial failed')
--- a/src/config.js
+++ b/src/config.js
@@ -1,55 +1,77 @@
 'use strict'

-const Joi = require('joi')
+const { struct, superstruct } = require('superstruct')
+const { optional, list } = struct

-const ModuleSchema = Joi.alternatives().try(Joi.func(), Joi.object())
+// Define custom types
+const s = superstruct()
+const transport = s.union([
+  s.interface({
+    createListener: 'function',
+    dial: 'function'
+  }),
+  'function'
+])

-const OptionsSchema = Joi.object({
-  // TODO: create proper validators for the generics
-  connectionManager: Joi.object(),
-  datastore: Joi.object(),
-  peerInfo: Joi.object().required(),
-  peerBook: Joi.object(),
-  modules: Joi.object().keys({
-    connEncryption: Joi.array().items(ModuleSchema).allow(null),
-    connProtector: Joi.object().keys({
-      protect: Joi.func().required()
-    }).unknown(),
-    contentRouting: Joi.array().items(Joi.object()).allow(null),
-    dht: ModuleSchema.allow(null),
-    peerDiscovery: Joi.array().items(ModuleSchema).allow(null),
-    peerRouting: Joi.array().items(Joi.object()).allow(null),
-    streamMuxer: Joi.array().items(ModuleSchema).allow(null),
-    transport: Joi.array().items(ModuleSchema).min(1).required()
-  }).required(),
-  config: Joi.object().keys({
-    peerDiscovery: Joi.object().allow(null),
-    relay: Joi.object().keys({
-      enabled: Joi.boolean().default(true),
-      hop: Joi.object().keys({
-        enabled: Joi.boolean().default(false),
-        active: Joi.boolean().default(false)
-      })
-    }).default(),
-    dht: Joi.object().keys({
-      kBucketSize: Joi.number().default(20),
-      enabledDiscovery: Joi.boolean().default(true),
-      validators: Joi.object().allow(null),
-      selectors: Joi.object().allow(null)
-    }).default(),
-    EXPERIMENTAL: Joi.object().keys({
-      dht: Joi.boolean().default(false),
-      pubsub: Joi.boolean().default(false)
-    }).default()
-  }).default()
-})
+const optionsSchema = s(
+  {
+    connectionManager: 'object?',
+    datastore: 'object?',
+    peerInfo: 'object',
+    peerBook: 'object?',
+    modules: s({
+      connEncryption: optional(list([s('object|function')])),
+      // this is hacky to simulate optional because interface doesnt work correctly with it
+      // change to optional when fixed upstream
+      connProtector: s.union(['undefined', s.interface({ protect: 'function' })]),
+      contentRouting: optional(list(['object'])),
+      dht: optional(s('null|function|object')),
+      peerDiscovery: optional(list([s('object|function')])),
+      peerRouting: optional(list(['object'])),
+      streamMuxer: optional(list([s('object|function')])),
+      transport: list([transport])
+    }),
+    config: s({
+      peerDiscovery: 'object?',
+      relay: s({
+        enabled: 'boolean',
+        hop: optional(s({
+          enabled: 'boolean',
+          active: 'boolean'
+        },
+        { enabled: false, active: false }))
+      }, { enabled: true, hop: {} }),
+      dht: s({
+        kBucketSize: 'number',
+        enabled: 'boolean?',
+        randomWalk: optional(s({
+          enabled: 'boolean?',
+          queriesPerPeriod: 'number?',
+          interval: 'number?',
+          timeout: 'number?'
+        }, { enabled: true, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })),
+        validators: 'object?',
+        selectors: 'object?'
+      }, { enabled: true, kBucketSize: 20, enabledDiscovery: true }),
+      EXPERIMENTAL: s({
+        pubsub: 'boolean'
+      }, { pubsub: false })
+    }, { relay: {}, dht: {}, EXPERIMENTAL: {} })
+  },
+  { config: {}, modules: {} }
+)

-module.exports.validate = (options) => {
-  options = Joi.attempt(options, OptionsSchema)
+module.exports.validate = (opts) => {
+  const [error, options] = optionsSchema.validate(opts)

-  // Ensure dht is correct
-  if (options.config.EXPERIMENTAL.dht) {
-    Joi.assert(options.modules.dht, ModuleSchema.required())
+  // Improve errors throwed, reduce stack by throwing here and add reason to the message
+  if (error) {
+    throw new Error(`${error.message}${error.reason ? ' - ' + error.reason : ''}`)
+  } else {
+    // Throw when dht is enabled but no dht module provided
+    if (options.config.dht.enabled) {
+      s('function|object')(options.modules.dht)
+    }
  }

  return options
--- a/src/dht.js
+++ b/src/dht.js
@@ -1,10 +1,15 @@
 'use strict'

+const nextTick = require('async/nextTick')
+const errCode = require('err-code')
+
+const { messages, codes } = require('./errors')
+
 module.exports = (node) => {
  return {
    put: (key, value, callback) => {
      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.put(key, value, callback)
@@ -16,7 +21,7 @@ module.exports = (node) => {
      }

      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.get(key, options, callback)
@@ -28,7 +33,7 @@ module.exports = (node) => {
      }

      if (!node._dht) {
-        return callback(new Error('DHT is not available'))
+        return nextTick(callback, errCode(new Error(messages.DHT_DISABLED), codes.DHT_DISABLED))
      }

      node._dht.getMany(key, nVals, options, callback)
--- a/src/error-messages.js
+++ b/src/error-messages.js
@@ -1,3 +0,0 @@
-'use strict'
-
-exports.NOT_STARTED_YET = 'The libp2p node is not started yet'
--- a/src/errors.js
+++ b/src/errors.js
@@ -0,0 +1,11 @@
+'use strict'
+
+exports.messages = {
+  NOT_STARTED_YET: 'The libp2p node is not started yet',
+  DHT_DISABLED: 'DHT is not available'
+}
+
+exports.codes = {
+  DHT_DISABLED: 'ERR_DHT_DISABLED',
+  PUBSUB_NOT_STARTED: 'ERR_PUBSUB_NOT_STARTED'
+}
--- a/src/index.js
+++ b/src/index.js
@@ -2,10 +2,10 @@

 const FSM = require('fsm-event')
 const EventEmitter = require('events').EventEmitter
-const assert = require('assert')
 const debug = require('debug')
 const log = debug('libp2p')
 log.error = debug('libp2p:error')
+const errCode = require('err-code')

 const each = require('async/each')
 const series = require('async/series')
@@ -17,6 +17,7 @@ const Ping = require('libp2p-ping')
 const WebSockets = require('libp2p-websockets')
 const ConnectionManager = require('libp2p-connection-manager')

+const { emitFirst } = require('./util')
 const peerRouting = require('./peer-routing')
 const contentRouting = require('./content-routing')
 const dht = require('./dht')
@@ -24,7 +25,12 @@ const pubsub = require('./pubsub')
 const getPeerInfo = require('./get-peer-info')
 const validateConfig = require('./config').validate

-const NOT_STARTED_ERROR_MESSAGE = 'The libp2p node is not started yet'
+const notStarted = (action, state) => {
+  return errCode(
+    new Error(`libp2p cannot ${action} when not started; state is ${state}`),
+    'ERR_NODE_NOT_STARTED'
+  )
+}

 /**
 * @fires Node#error Emitted when an error occurs
@@ -47,7 +53,6 @@ class Node extends EventEmitter {

    this._modules = _options.modules
    this._config = _options.config
-    this._isStarted = false
    this._transport = [] // Transport instances/references
    this._discovery = [] // Discovery service instances/references

@@ -97,16 +102,12 @@ class Node extends EventEmitter {
    }

    // dht provided components (peerRouting, contentRouting, dht)
-    if (this._config.EXPERIMENTAL.dht) {
+    if (this._config.dht.enabled) {
      const DHT = this._modules.dht
-      const enabledDiscovery = this._config.dht.enabledDiscovery !== false

      this._dht = new DHT(this._switch, {
-        kBucketSize: this._config.dht.kBucketSize,
-        enabledDiscovery,
        datastore: this.datastore,
-        validators: this._config.dht.validators,
-        selectors: this._config.dht.selectors
+        ...this._config.dht
      })
    }

@@ -189,7 +190,7 @@ class Node extends EventEmitter {
   * @returns {void}
   */
  start (callback = () => {}) {
-    this.once('start', callback)
+    emitFirst(this, ['error', 'start'], callback)
    this.state('start')
  }

@@ -200,7 +201,7 @@ class Node extends EventEmitter {
   * @returns {void}
   */
  stop (callback = () => {}) {
-    this.once('stop', callback)
+    emitFirst(this, ['error', 'stop'], callback)
    this.state('stop')
  }

@@ -217,8 +218,6 @@ class Node extends EventEmitter {
   * @returns {void}
   */
  dial (peer, callback) {
-    assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
-
    this.dialProtocol(peer, null, callback)
  }

@@ -233,7 +232,9 @@ class Node extends EventEmitter {
   * @returns {void}
   */
  dialProtocol (peer, protocol, callback) {
-    assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
+    if (!this.isStarted()) {
+      return callback(notStarted('dial', this.state._state))
+    }

    if (typeof protocol === 'function') {
      callback = protocol
@@ -261,7 +262,9 @@ class Node extends EventEmitter {
   * @returns {void}
   */
  dialFSM (peer, protocol, callback) {
-    assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
+    if (!this.isStarted()) {
+      return callback(notStarted('dial', this.state._state))
+    }

    if (typeof protocol === 'function') {
      callback = protocol
@@ -282,8 +285,6 @@ class Node extends EventEmitter {
  }

  hangUp (peer, callback) {
-    assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
-
    this._getPeerInfo(peer, (err, peerInfo) => {
      if (err) { return callback(err) }

@@ -293,7 +294,7 @@ class Node extends EventEmitter {

  ping (peer, callback) {
    if (!this.isStarted()) {
-      return callback(new Error(NOT_STARTED_ERROR_MESSAGE))
+      return callback(notStarted('ping', this.state._state))
    }

    this._getPeerInfo(peer, (err, peerInfo) => {
@@ -325,7 +326,7 @@ class Node extends EventEmitter {
    this.peerInfo.multiaddrs.toArray().forEach((ma) => {
      if (!ma.getPeerId()) {
        maOld.push(ma)
-        maNew.push(ma.encapsulate('/ipfs/' + this.peerInfo.id.toB58String()))
+        maNew.push(ma.encapsulate('/p2p/' + this.peerInfo.id.toB58String()))
      }
    })
    this.peerInfo.multiaddrs.replace(maOld, maNew)
@@ -342,7 +343,7 @@ class Node extends EventEmitter {
      }

      if (t.filter(multiaddrs).length > 0) {
-        this._switch.transport.add(t.tag || t.constructor.name, t)
+        this._switch.transport.add(t.tag || t[Symbol.toStringTag], t)
      } else if (WebSockets.isWebSockets(t)) {
        // TODO find a cleaner way to signal that a transport is always used
        // for dialing, even if no listener
@@ -398,18 +399,16 @@ class Node extends EventEmitter {
        }
      },
      (cb) => {
-        // TODO: chicken-and-egg problem #1:
-        // have to set started here because DHT requires libp2p is already started
-        this._isStarted = true
        if (this._dht) {
-          this._dht.start(cb)
+          this._dht.start(() => {
+            this._dht.on('peer', (peerInfo) => this.emit('peer:discovery', peerInfo))
+            cb()
+          })
        } else {
          cb()
        }
      },
      (cb) => {
-        // TODO: chicken-and-egg problem #2:
-        // have to set started here because FloodSub requires libp2p is already started
        if (this._floodSub) {
          return this._floodSub.start(cb)
        }
@@ -463,13 +462,14 @@ class Node extends EventEmitter {
        }
        cb()
      },
-      (cb) => {
-        // Ensures idempotency for restarts
-        this._switch.transport.removeAll(cb)
-      },
      (cb) => {
        this.connectionManager.stop()
        this._switch.stop(cb)
+      },
+      (cb) => {
+        // Ensures idempotent restarts, ignore any errors
+        // from removeAll, they're not useful at this point
+        this._switch.transport.removeAll(() => cb())
      }
    ], (err) => {
      if (err) {
--- a/src/pubsub.js
+++ b/src/pubsub.js
@@ -1,9 +1,11 @@
 'use strict'

-const setImmediate = require('async/setImmediate')
-const NOT_STARTED_YET = require('./error-messages').NOT_STARTED_YET
+const nextTick = require('async/nextTick')
+const { messages, codes } = require('./errors')
 const FloodSub = require('libp2p-floodsub')

+const errCode = require('err-code')
+
 module.exports = (node) => {
  const floodSub = new FloodSub(node)

@@ -18,7 +20,7 @@ module.exports = (node) => {
      }

      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      function subscribe (cb) {
@@ -27,51 +29,58 @@ module.exports = (node) => {
        }

        floodSub.on(topic, handler)
-        setImmediate(cb)
+        nextTick(cb)
      }

      subscribe(callback)
    },

-    unsubscribe: (topic, handler) => {
+    unsubscribe: (topic, handler, callback) => {
      if (!node.isStarted() && !floodSub.started) {
-        throw new Error(NOT_STARTED_YET)
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
+      }
+      if (!handler && !callback) {
+        floodSub.removeAllListeners(topic)
+      } else {
+        floodSub.removeListener(topic, handler)
      }
-
-      floodSub.removeListener(topic, handler)

      if (floodSub.listenerCount(topic) === 0) {
        floodSub.unsubscribe(topic)
      }
+
+      if (typeof callback === 'function') {
+        nextTick(() => callback())
+      }
    },

    publish: (topic, data, callback) => {
      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      if (!Buffer.isBuffer(data)) {
-        return setImmediate(() => callback(new Error('data must be a Buffer')))
+        return nextTick(callback, errCode(new Error('data must be a Buffer'), 'ERR_DATA_IS_NOT_A_BUFFER'))
      }

      floodSub.publish(topic, data)

-      setImmediate(() => callback())
+      nextTick(() => callback())
    },

    ls: (callback) => {
      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      const subscriptions = Array.from(floodSub.subscriptions)

-      setImmediate(() => callback(null, subscriptions))
+      nextTick(() => callback(null, subscriptions))
    },

    peers: (topic, callback) => {
      if (!node.isStarted() && !floodSub.started) {
-        return setImmediate(() => callback(new Error(NOT_STARTED_YET)))
+        return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
      }

      if (typeof topic === 'function') {
@@ -83,7 +92,7 @@ module.exports = (node) => {
        .filter((peer) => topic ? peer.topics.has(topic) : true)
        .map((peer) => peer.info.id.toB58String())

-      setImmediate(() => callback(null, peers))
+      nextTick(() => callback(null, peers))
    },

    setMaxListeners (n) {
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -0,0 +1,33 @@
+'use strict'
+const once = require('once')
+
+/**
+ * Registers `handler` to each event in `events`. The `handler`
+ * will only be called for the first event fired, at which point
+ * the `handler` will be removed as a listener.
+ *
+ * Ensures `handler` is only called once.
+ *
+ * @example
+ * // will call `callback` when `start` or `error` is emitted by `this`
+ * emitFirst(this, ['error', 'start'], callback)
+ *
+ * @private
+ * @param {EventEmitter} emitter The emitter to listen on
+ * @param {Array<string>} events The events to listen for
+ * @param {function(*)} handler The handler to call when an event is triggered
+ * @returns {void}
+ */
+function emitFirst (emitter, events, handler) {
+  handler = once(handler)
+  events.forEach((e) => {
+    emitter.once(e, (...args) => {
+      events.forEach((ev) => {
+        emitter.removeListener(ev, handler)
+      })
+      handler.apply(emitter, args)
+    })
+  })
+}
+
+module.exports.emitFirst = emitFirst
--- a/test/browser.js
+++ b/test/browser.js
@@ -1,3 +1,4 @@
 'use strict'

+require('./circuit-relay.browser')
 require('./transports.browser')
--- a/test/circuit-relay.browser.js
+++ b/test/circuit-relay.browser.js
@@ -0,0 +1,98 @@
+/* eslint-env mocha */
+'use strict'
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+
+const createNode = require('./utils/create-node')
+const tryEcho = require('./utils/try-echo')
+const echo = require('./utils/echo')
+
+const {
+  getPeerRelay
+} = require('./utils/constants')
+
+function setupNodeWithRelay (addrs, options = {}) {
+  options = {
+    config: {
+      relay: {
+        enabled: true
+      },
+      ...options.config
+    },
+    ...options
+  }
+
+  return new Promise((resolve) => {
+    createNode(addrs, options, (err, node) => {
+      expect(err).to.not.exist()
+
+      node.handle(echo.multicodec, echo)
+      node.start((err) => {
+        expect(err).to.not.exist()
+        resolve(node)
+      })
+    })
+  })
+}
+
+describe('circuit relay', () => {
+  let browserNode1
+  let browserNode2
+  let peerRelay
+
+  before('get peer relay', async () => {
+    peerRelay = await new Promise(resolve => {
+      getPeerRelay((err, peer) => {
+        expect(err).to.not.exist()
+        resolve(peer)
+      })
+    })
+  })
+
+  before('create the browser nodes', async () => {
+    [browserNode1, browserNode2] = await Promise.all([
+      setupNodeWithRelay([]),
+      setupNodeWithRelay([])
+    ])
+  })
+
+  before('connect to the relay node', async () => {
+    await Promise.all(
+      [browserNode1, browserNode2].map((node) => {
+        return new Promise(resolve => {
+          node.dialProtocol(peerRelay, (err) => {
+            expect(err).to.not.exist()
+            resolve()
+          })
+        })
+      })
+    )
+  })
+
+  before('give time for HOP support to be determined', async () => {
+    await new Promise(resolve => {
+      setTimeout(resolve, 1e3)
+    })
+  })
+
+  after(async () => {
+    await Promise.all(
+      [browserNode1, browserNode2].map((node) => {
+        return new Promise((resolve) => {
+          node.stop(resolve)
+        })
+      })
+    )
+  })
+
+  it('should be able to echo over relay', (done) => {
+    browserNode1.dialProtocol(browserNode2.peerInfo, echo.multicodec, (err, conn) => {
+      expect(err).to.not.exist()
+      expect(conn).to.exist()
+
+      tryEcho(conn, done)
+    })
+  })
+})
--- a/test/circuit-relay.node.js
+++ b/test/circuit-relay.node.js
@@ -117,7 +117,7 @@ describe('circuit relay', () => {
      // set up node with TCP and listening on relay1
      (cb) => setupNode([
        '/ip4/0.0.0.0/tcp/0',
-        `/ipfs/${relayNode1.peerInfo.id.toB58String()}/p2p-circuit`
+        `/p2p/${relayNode1.peerInfo.id.toB58String()}/p2p-circuit`
      ], {
        config: {
          relay: {
@@ -131,7 +131,7 @@ describe('circuit relay', () => {
      // set up node with TCP and listening on relay2 over TCP transport
      (cb) => setupNode([
        '/ip4/0.0.0.0/tcp/0',
-        `/ip4/0.0.0.0/tcp/0/ipfs/${relayNode2.peerInfo.id.toB58String()}/p2p-circuit`
+        `/ip4/0.0.0.0/tcp/0/p2p/${relayNode2.peerInfo.id.toB58String()}/p2p-circuit`
      ], {
        config: {
          relay: {
--- a/test/config.spec.js
+++ b/test/config.spec.js
@@ -63,7 +63,8 @@ describe('configuration', () => {
      peerInfo,
      modules: {
        transport: [ WS ],
-        peerDiscovery: [ Bootstrap ]
+        peerDiscovery: [ Bootstrap ],
+        dht: DHT
      },
      config: {
        peerDiscovery: {
@@ -79,7 +80,8 @@ describe('configuration', () => {
      peerInfo,
      modules: {
        transport: [ WS ],
-        peerDiscovery: [ Bootstrap ]
+        peerDiscovery: [ Bootstrap ],
+        dht: DHT
      },
      config: {
        peerDiscovery: {
@@ -89,15 +91,24 @@ describe('configuration', () => {
          }
        },
        EXPERIMENTAL: {
-          pubsub: false,
-          dht: false
+          pubsub: false
        },
        dht: {
          kBucketSize: 20,
-          enabledDiscovery: true
+          enabled: true,
+          randomWalk: {
+            enabled: true,
+            queriesPerPeriod: 1,
+            interval: 30000,
+            timeout: 10000
+          }
        },
        relay: {
-          enabled: true
+          enabled: true,
+          hop: {
+            active: false,
+            enabled: false
+          }
        }
      }
    }
@@ -115,7 +126,8 @@ describe('configuration', () => {
        transport: [ WS ],
        peerDiscovery: [ Bootstrap ],
        peerRouting: [ peerRouter ],
-        contentRouting: [ contentRouter ]
+        contentRouting: [ contentRouter ],
+        dht: DHT
      },
      config: {
        peerDiscovery: {
@@ -160,9 +172,6 @@ describe('configuration', () => {
        dht: DHT
      },
      config: {
-        EXPERIMENTAL: {
-          dht: true
-        },
        dht: {
          selectors,
          validators
@@ -177,15 +186,24 @@ describe('configuration', () => {
      },
      config: {
        EXPERIMENTAL: {
-          pubsub: false,
-          dht: true
+          pubsub: false
        },
        relay: {
-          enabled: true
+          enabled: true,
+          hop: {
+            active: false,
+            enabled: false
+          }
        },
        dht: {
          kBucketSize: 20,
-          enabledDiscovery: true,
+          enabled: true,
+          randomWalk: {
+            enabled: true,
+            queriesPerPeriod: 1,
+            interval: 30000,
+            timeout: 10000
+          },
          selectors,
          validators
        }
--- a/test/content-routing.node.js
+++ b/test/content-routing.node.js
@@ -30,13 +30,7 @@ describe('.contentRouting', () => {
    before(function (done) {
      this.timeout(5 * 1000)
      const tasks = _times(5, () => (cb) => {
-        createNode('/ip4/0.0.0.0/tcp/0', {
-          config: {
-            EXPERIMENTAL: {
-              dht: true
-            }
-          }
-        }, (err, node) => {
+        createNode('/ip4/0.0.0.0/tcp/0', (err, node) => {
          expect(err).to.not.exist()
          node.start((err) => cb(err, node))
        })
@@ -159,6 +153,9 @@ describe('.contentRouting', () => {
              contentRouting: [ delegate ]
            },
            config: {
+              dht: {
+                enabled: false
+              },
              relay: {
                enabled: true,
                hop: {
@@ -320,9 +317,6 @@ describe('.contentRouting', () => {
                  enabled: true,
                  active: false
                }
-              },
-              EXPERIMENTAL: {
-                dht: true
              }
            }
          })
@@ -387,7 +381,13 @@ describe('.contentRouting', () => {
  describe('no routers', () => {
    let nodeA
    before((done) => {
-      createNode('/ip4/0.0.0.0/tcp/0', (err, node) => {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          dht: {
+            enabled: false
+          }
+        }
+      }, (err, node) => {
        expect(err).to.not.exist()
        nodeA = node
        done()
--- a/test/create.spec.js
+++ b/test/create.spec.js
@@ -13,8 +13,10 @@ describe('libp2p creation', () => {
    createNode([], {
      config: {
        EXPERIMENTAL: {
-          dht: true,
          pubsub: true
+        },
+        dht: {
+          enabled: true
        }
      }
    }, (err, node) => {
@@ -69,13 +71,11 @@ describe('libp2p creation', () => {
    createNode([], {
      config: {
        EXPERIMENTAL: {
-          dht: false,
          pubsub: false
        }
      }
    }, (err, node) => {
      expect(err).to.not.exist()
-      expect(node._dht).to.not.exist()
      expect(node._floodSub).to.not.exist()
      done()
    })
--- a/test/dht.node.js
+++ b/test/dht.node.js
@@ -17,12 +17,7 @@ describe('.dht', () => {

    before(function (done) {
      createNode('/ip4/0.0.0.0/tcp/0', {
-        datastore,
-        config: {
-          EXPERIMENTAL: {
-            dht: true
-          }
-        }
+        datastore
      }, (err, node) => {
        expect(err).to.not.exist()
        nodeA = node
@@ -124,8 +119,8 @@ describe('.dht', () => {
    before(function (done) {
      createNode('/ip4/0.0.0.0/tcp/0', {
        config: {
-          EXPERIMENTAL: {
-            dht: false
+          dht: {
+            enabled: false
          }
        }
      }, (err, node) => {
@@ -145,6 +140,7 @@ describe('.dht', () => {

      nodeA.dht.put(key, value, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
@@ -154,6 +150,7 @@ describe('.dht', () => {

      nodeA.dht.get(key, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
@@ -163,6 +160,7 @@ describe('.dht', () => {

      nodeA.dht.getMany(key, 10, (err) => {
        expect(err).to.exist()
+        expect(err.code).to.equal('ERR_DHT_DISABLED')
        done()
      })
    })
--- a/test/fsm.spec.js
+++ b/test/fsm.spec.js
@@ -13,13 +13,20 @@ describe('libp2p state machine (fsm)', () => {
  describe('starting and stopping', () => {
    let node
    beforeEach((done) => {
-      createNode([], (err, _node) => {
+      createNode([], {
+        config: {
+          dht: {
+            enabled: false
+          }
+        }
+      }, (err, _node) => {
        node = _node
        done(err)
      })
    })
    afterEach(() => {
      node.removeAllListeners()
+      sinon.restore()
    })
    after((done) => {
      node.stop(done)
@@ -58,6 +65,23 @@ describe('libp2p state machine (fsm)', () => {
      node.start()
    })

+    it('should callback with an error when it occurs on stop', (done) => {
+      const error = new Error('some error starting')
+      node.once('start', () => {
+        node.once('error', (err) => {
+          expect(err).to.eql(error).mark()
+        })
+        node.stop((err) => {
+          expect(err).to.eql(error).mark()
+        })
+      })
+
+      expect(2).checks(done)
+
+      sinon.stub(node._switch, 'stop').callsArgWith(0, error)
+      node.start()
+    })
+
    it('should noop when starting a started node', (done) => {
      node.once('start', () => {
        node.state.on('STARTING', () => {
@@ -110,9 +134,35 @@ describe('libp2p state machine (fsm)', () => {
        throw new Error('should not start')
      })

-      expect(2).checks(done)
+      expect(3).checks(done)

-      node.start()
+      node.start((err) => {
+        expect(err).to.eql(error).mark()
+      })
+    })
+
+    it('should not dial when the node is stopped', (done) => {
+      node.on('stop', () => {
+        node.dial(null, (err) => {
+          expect(err).to.exist()
+          expect(err.code).to.eql('ERR_NODE_NOT_STARTED')
+          done()
+        })
+      })
+
+      node.stop()
+    })
+
+    it('should not dial (fsm) when the node is stopped', (done) => {
+      node.on('stop', () => {
+        node.dialFSM(null, null, (err) => {
+          expect(err).to.exist()
+          expect(err.code).to.eql('ERR_NODE_NOT_STARTED')
+          done()
+        })
+      })
+
+      node.stop()
    })
  })
 })
--- a/test/peer-discovery.node.js
+++ b/test/peer-discovery.node.js
@@ -9,6 +9,9 @@ const signalling = require('libp2p-webrtc-star/src/sig-server')
 const parallel = require('async/parallel')
 const crypto = require('crypto')

+const PeerId = require('peer-id')
+const PeerInfo = require('peer-info')
+
 const createNode = require('./utils/create-node')
 const echo = require('./utils/echo')

@@ -241,6 +244,9 @@ describe('peer discovery', () => {
  describe('MulticastDNS', () => {
    setup({
      config: {
+        dht: {
+          enabled: false
+        },
        peerDiscovery: {
          mdns: {
            enabled: true,
@@ -266,6 +272,9 @@ describe('peer discovery', () => {
  describe.skip('WebRTCStar', () => {
    setup({
      config: {
+        dht: {
+          enabled: false
+        },
        peerDiscovery: {
          webRTCStar: {
            enabled: true
@@ -287,6 +296,9 @@ describe('peer discovery', () => {
  describe('MulticastDNS + WebRTCStar', () => {
    setup({
      config: {
+        dht: {
+          enabled: false
+        },
        peerDiscovery: {
          mdns: {
            enabled: true,
@@ -309,4 +321,37 @@ describe('peer discovery', () => {
      })
    })
  })
+
+  describe('dht', () => {
+    setup({
+      config: {
+        peerDiscovery: {
+          mdns: {
+            enabled: false
+          },
+          webRTCStar: {
+            enabled: false
+          }
+        }
+      }
+    })
+
+    it('find a peer', function (done) {
+      this.timeout(15 * 1000)
+
+      nodeA.once('peer:discovery', (peerInfo) => {
+        expect(nodeB.peerInfo.id.toB58String())
+          .to.eql(peerInfo.id.toB58String())
+        done()
+      })
+
+      // connect two dhts
+      const publicPeerId = new PeerId(nodeB._dht.peerInfo.id.id, null, nodeB._dht.peerInfo.id.pubKey)
+      const target = new PeerInfo(publicPeerId)
+      target.multiaddrs = nodeB._dht.peerInfo.multiaddrs
+      nodeA._dht.switch.dial(target, (err) => {
+        expect(err).to.not.exist()
+      })
+    })
+  })
 })
--- a/test/peer-routing.node.js
+++ b/test/peer-routing.node.js
@@ -24,13 +24,7 @@ describe('.peerRouting', () => {

    before('create the outer ring of connections', (done) => {
      const tasks = _times(5, () => (cb) => {
-        createNode('/ip4/0.0.0.0/tcp/0', {
-          config: {
-            EXPERIMENTAL: {
-              dht: true
-            }
-          }
-        }, (err, node) => {
+        createNode('/ip4/0.0.0.0/tcp/0', (err, node) => {
          expect(err).to.not.exist()
          node.start((err) => cb(err, node))
        })
@@ -112,6 +106,11 @@ describe('.peerRouting', () => {
          createNode('/ip4/0.0.0.0/tcp/0', {
            modules: {
              peerRouting: [ delegate ]
+            },
+            config: {
+              dht: {
+                enabled: false
+              }
            }
          }, (err, node) => {
            expect(err).to.not.exist()
@@ -213,11 +212,6 @@ describe('.peerRouting', () => {
          createNode('/ip4/0.0.0.0/tcp/0', {
            modules: {
              peerRouting: [ delegate ]
-            },
-            config: {
-              EXPERIMENTAL: {
-                dht: true
-              }
            }
          }, (err, node) => {
            expect(err).to.not.exist()
@@ -270,7 +264,13 @@ describe('.peerRouting', () => {
  describe('no routers', () => {
    let nodeA
    before((done) => {
-      createNode('/ip4/0.0.0.0/tcp/0', (err, node) => {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          dht: {
+            enabled: false
+          }
+        }
+      }, (err, node) => {
        expect(err).to.not.exist()
        nodeA = node
        done()
--- a/test/pnet.node.js
+++ b/test/pnet.node.js
@@ -9,6 +9,7 @@ const PeerId = require('peer-id')
 const waterfall = require('async/waterfall')
 const WS = require('libp2p-websockets')
 const defaultsDeep = require('@nodeutils/defaults-deep')
+const DHT = require('libp2p-kad-dht')

 const Libp2p = require('../src')

@@ -23,7 +24,8 @@ describe('private network', () => {
        config = {
          peerInfo,
          modules: {
-            transport: [ WS ]
+            transport: [ WS ],
+            dht: DHT
          }
        }
        cb()
--- a/test/pubsub.node.js
+++ b/test/pubsub.node.js
@@ -5,11 +5,13 @@

 const chai = require('chai')
 chai.use(require('dirty-chai'))
+chai.use(require('chai-checkmark'))
 const expect = chai.expect
 const parallel = require('async/parallel')
-const waterfall = require('async/waterfall')
+const series = require('async/series')
 const _times = require('lodash.times')

+const { codes } = require('../src/errors')
 const createNode = require('./utils/create-node')

 function startTwo (callback) {
@@ -52,26 +54,115 @@ function stopTwo (nodes, callback) {
 // TODO: consider if all or some of those should come here
 describe('.pubsub', () => {
  describe('.pubsub on (default)', (done) => {
-    it('start two nodes and send one message', (done) => {
-      waterfall([
-        (cb) => startTwo(cb),
-        (nodes, cb) => {
-          const data = Buffer.from('test')
-          nodes[0].pubsub.subscribe('pubsub',
-            (msg) => {
-              expect(msg.data).to.eql(data)
-              cb(null, nodes)
-            },
-            (err) => {
-              expect(err).to.not.exist()
-              setTimeout(() => nodes[1].pubsub.publish('pubsub', data, (err) => {
-                expect(err).to.not.exist()
-              }), 500)
-            }
-          )
+    it('start two nodes and send one message, then unsubscribe', (done) => {
+      // Check the final series error, and the publish handler
+      expect(2).checks(done)
+
+      let nodes
+      const data = Buffer.from('test')
+      const handler = (msg) => {
+        // verify the data is correct and mark the expect
+        expect(msg.data).to.eql(data).mark()
+      }
+
+      series([
+        // Start the nodes
+        (cb) => startTwo((err, _nodes) => {
+          nodes = _nodes
+          cb(err)
+        }),
+        // subscribe on the first
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        // Wait a moment before publishing
+        (cb) => setTimeout(cb, 500),
+        // publish on the second
+        (cb) => nodes[1].pubsub.publish('pubsub', data, cb),
+        // ls subscripts
+        (cb) => nodes[1].pubsub.ls(cb),
+        // get subscribed peers
+        (cb) => nodes[1].pubsub.peers('pubsub', cb),
+        // Wait a moment before unsubscribing
+        (cb) => setTimeout(cb, 500),
+        // unsubscribe on the first
+        (cb) => nodes[0].pubsub.unsubscribe('pubsub', handler, cb),
+        // Stop both nodes
+        (cb) => stopTwo(nodes, cb)
+      ], (err) => {
+        // Verify there was no error, and mark the expect
+        expect(err).to.not.exist().mark()
+      })
+    })
+    it('start two nodes and send one message, then unsubscribe without handler', (done) => {
+      // Check the final series error, and the publish handler
+      expect(3).checks(done)
+
+      let nodes
+      const data = Buffer.from('test')
+      const handler = (msg) => {
+        // verify the data is correct and mark the expect
+        expect(msg.data).to.eql(data).mark()
+      }
+
+      series([
+        // Start the nodes
+        (cb) => startTwo((err, _nodes) => {
+          nodes = _nodes
+          cb(err)
+        }),
+        // subscribe on the first
+        (cb) => nodes[0].pubsub.subscribe('pubsub', handler, cb),
+        // Wait a moment before publishing
+        (cb) => setTimeout(cb, 500),
+        // publish on the second
+        (cb) => nodes[1].pubsub.publish('pubsub', data, cb),
+        // Wait a moment before unsubscribing
+        (cb) => setTimeout(cb, 500),
+        // unsubscribe on the first
+        (cb) => {
+          nodes[0].pubsub.unsubscribe('pubsub')
+          // Wait a moment to make sure the ubsubscribe-from-all worked
+          setTimeout(cb, 500)
        },
-        (nodes, cb) => stopTwo(nodes, cb)
-      ], done)
+        // Verify unsubscribed
+        (cb) => {
+          nodes[0].pubsub.ls((err, topics) => {
+            expect(topics.length).to.eql(0).mark()
+            cb(err)
+          })
+        },
+        // Stop both nodes
+        (cb) => stopTwo(nodes, cb)
+      ], (err) => {
+        // Verify there was no error, and mark the expect
+        expect(err).to.not.exist().mark()
+      })
+    })
+    it('publish should fail if data is not a buffer', (done) => {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          EXPERIMENTAL: {
+            pubsub: true
+          }
+        }
+      }, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+
+          node.pubsub.publish('pubsub', 'datastr', (err) => {
+            expect(err).to.exist()
+            expect(err.code).to.equal('ERR_DATA_IS_NOT_A_BUFFER')
+
+            done()
+          })
+        })
+      })
    })
  })

@@ -95,4 +186,73 @@ describe('.pubsub', () => {
      })
    })
  })
+
+  describe('.pubsub on and node not started', () => {
+    let libp2pNode
+
+    before(function (done) {
+      createNode('/ip4/0.0.0.0/tcp/0', {
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          EXPERIMENTAL: {
+            pubsub: true
+          }
+        }
+      }, (err, node) => {
+        expect(err).to.not.exist()
+
+        libp2pNode = node
+        done()
+      })
+    })
+
+    it('fail to subscribe if node not started yet', (done) => {
+      libp2pNode.pubsub.subscribe('pubsub', () => { }, (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to unsubscribe if node not started yet', (done) => {
+      libp2pNode.pubsub.unsubscribe('pubsub', () => { }, (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to publish if node not started yet', (done) => {
+      libp2pNode.pubsub.publish('pubsub', Buffer.from('data'), (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to ls if node not started yet', (done) => {
+      libp2pNode.pubsub.ls((err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+
+    it('fail to get subscribed peers to a topic if node not started yet', (done) => {
+      libp2pNode.pubsub.peers('pubsub', (err) => {
+        expect(err).to.exist()
+        expect(err.code).to.equal(codes.PUBSUB_NOT_STARTED)
+
+        done()
+      })
+    })
+  })
 })
--- a/test/stats.js
+++ b/test/stats.js
@@ -15,9 +15,6 @@ describe('libp2p', () => {
          mdns: {
            enabled: false
          }
-        },
-        EXPERIMENTAL: {
-          dht: true
        }
      }
    }, (err, node) => {
--- a/test/stream-muxing.node.js
+++ b/test/stream-muxing.node.js
@@ -6,6 +6,7 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const parallel = require('async/parallel')
 const series = require('async/series')
+const pMplex = require('pull-mplex')
 const Mplex = require('libp2p-mplex')
 const SPDY = require('libp2p-spdy')
 const createNode = require('./utils/create-node')
@@ -99,6 +100,42 @@ describe('stream muxing', () => {
    ], done)
  })

+  it('pMplex only', (done) => {
+    let nodeA
+    let nodeB
+
+    function setup (callback) {
+      parallel([
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ pMplex ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeA = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        }),
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ pMplex ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeB = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        })
+      ], callback)
+    }
+
+    series([
+      (cb) => setup(cb),
+      (cb) => test(nodeA, nodeB, cb),
+      (cb) => teardown(nodeA, nodeB, cb)
+    ], done)
+  })
+
  it('spdy + mplex', function (done) {
    this.timeout(5000)

@@ -137,7 +174,45 @@ describe('stream muxing', () => {
    ], done)
  })

-  it('spdy + mplex switched order', function (done) {
+  it('mplex + pull-mplex', function (done) {
+    this.timeout(5000)
+
+    let nodeA
+    let nodeB
+
+    function setup (callback) {
+      parallel([
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeA = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        }),
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ pMplex ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeB = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        })
+      ], callback)
+    }
+
+    series([
+      (cb) => setup(cb),
+      (cb) => test(nodeA, nodeB, cb),
+      (cb) => teardown(nodeA, nodeB, cb)
+    ], done)
+  })
+
+  it('spdy + mplex in reverse muxer order', function (done) {
    this.timeout(5 * 1000)

    let nodeA
@@ -175,6 +250,44 @@ describe('stream muxing', () => {
    ], done)
  })

+  it('spdy + pull-mplex in reverse muxer order', function (done) {
+    this.timeout(5 * 1000)
+
+    let nodeA
+    let nodeB
+
+    function setup (callback) {
+      parallel([
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ SPDY, pMplex ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeA = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        }),
+        (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
+          modules: {
+            streamMuxer: [ pMplex, SPDY ]
+          }
+        }, (err, node) => {
+          expect(err).to.not.exist()
+          nodeB = node
+          node.handle('/echo/1.0.0', echo)
+          node.start(cb)
+        })
+      ], callback)
+    }
+
+    series([
+      (cb) => setup(cb),
+      (cb) => test(nodeA, nodeB, cb),
+      (cb) => teardown(nodeA, nodeB, cb)
+    ], done)
+  })
+
  it('one without the other fails to establish a muxedConn', function (done) {
    this.timeout(5 * 1000)

@@ -215,7 +328,7 @@ describe('stream muxing', () => {

        nodeA.dial(nodeB.peerInfo, (err) => {
          expect(err).to.not.exist()
-          expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+          expect(nodeA._switch.connection.getAll()).to.have.length(0)
          cb()
        })
      },
--- a/test/transports.browser.js
+++ b/test/transports.browser.js
@@ -7,28 +7,28 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const PeerInfo = require('peer-info')
 const PeerId = require('peer-id')
-const Mplex = require('libp2p-mplex')
+const Mplex = require('pull-mplex')
 const pull = require('pull-stream')
 const parallel = require('async/parallel')
 const goodbye = require('pull-goodbye')
 const serializer = require('pull-serializer')
-const w = require('webrtcsupport')
+const wrtcSupport = self.RTCPeerConnection && ('createDataChannel' in self.RTCPeerConnection.prototype)
 const tryEcho = require('./utils/try-echo')

 const Node = require('./utils/bundle-browser')
-const jsonPeerId = require('./fixtures/test-peer.json')
+const { getPeerRelay } = require('./utils/constants')

 describe('transports', () => {
  describe('websockets', () => {
    let peerB
-    let peerBMultiaddr = '/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + jsonPeerId.id
+    let peerBMultiaddr
    let nodeA

    before((done) => {
-      PeerId.createFromPrivKey(jsonPeerId.privKey, (err, id) => {
+      getPeerRelay((err, peerInfo) => {
        expect(err).to.not.exist()
-
-        peerB = new PeerInfo(id)
+        peerB = new PeerInfo(peerInfo.id)
+        peerBMultiaddr = `/ip4/127.0.0.1/tcp/9200/ws/p2p/${peerInfo.id.toB58String()}`
        peerB.multiaddrs.add(peerBMultiaddr)
        done()
      })
@@ -57,7 +57,7 @@ describe('transports', () => {
            streamMuxer: [ Mplex ]
          }
        })
-        expect(b._modules.streamMuxer).to.eql([require('libp2p-mplex')])
+        expect(b._modules.streamMuxer).to.eql([require('pull-mplex')])
        done()
      })
    })
@@ -102,7 +102,7 @@ describe('transports', () => {
        function check () {
          const peers = nodeA.peerBook.getAll()
          expect(Object.keys(peers)).to.have.length(1)
-          expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+          expect(nodeA._switch.connection.getAll()).to.have.length(0)
          done()
        }
      })
@@ -142,7 +142,7 @@ describe('transports', () => {
          const peers = nodeA.peerBook.getAll()
          expect(err).to.not.exist()
          expect(Object.keys(peers)).to.have.length(1)
-          expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+          expect(nodeA._switch.connection.getAll()).to.have.length(0)
          done()
        }
      })
@@ -153,16 +153,17 @@ describe('transports', () => {
        expect(err).to.not.exist()

        connFSM.once('muxed', () => {
-          expect(nodeA._switch.muxedConns).to.have.any.keys(
-            peerB.id.toB58String()
-          )
+          expect(
+            nodeA._switch.connection.getAllById(peerB.id.toB58String())
+          ).to.have.length(1)

          connFSM.once('error', done)
          connFSM.once('close', () => {
            // ensure the connection is closed
-            expect(nodeA._switch.muxedConns).to.not.have.any.keys([
-              peerB.id.toB58String()
-            ])
+            expect(
+              nodeA._switch.connection.getAllById(peerB.id.toB58String())
+            ).to.have.length(0)
+
            done()
          })

@@ -231,7 +232,7 @@ describe('transports', () => {

  describe('webrtc-star', () => {
    /* eslint-disable-next-line no-console */
-    if (!w.support) { return console.log('NO WEBRTC SUPPORT') }
+    if (!wrtcSupport) { return console.log('NO WEBRTC SUPPORT') }

    let peer1
    let peer2
@@ -255,11 +256,11 @@ describe('transports', () => {
        expect(err).to.not.exist()

        peer1 = new PeerInfo(ids[0])
-        const ma1 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + ids[0].toB58String()
+        const ma1 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/p2p/' + ids[0].toB58String()
        peer1.multiaddrs.add(ma1)

        peer2 = new PeerInfo(ids[1])
-        const ma2 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + ids[1].toB58String()
+        const ma2 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/p2p/' + ids[1].toB58String()
        peer2.multiaddrs.add(ma2)

        done()
@@ -312,7 +313,7 @@ describe('transports', () => {
        function check () {
          const peers = node1.peerBook.getAll()
          expect(Object.keys(peers)).to.have.length(1)
-          expect(Object.keys(node1._switch.muxedConns)).to.have.length(0)
+          expect(node1._switch.connection.getAll()).to.have.length(0)
          done()
        }
      })
@@ -326,13 +327,13 @@ describe('transports', () => {

        function check () {
          // Verify both nodes are connected to node 3
-          if (node1._switch.muxedConns[b58Id] && node2._switch.muxedConns[b58Id]) {
+          if (node1._switch.connection.getAllById(b58Id) && node2._switch.connection.getAllById(b58Id)) {
            done()
          }
        }

        const peer3 = new PeerInfo(id3)
-        const ma3 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + b58Id
+        const ma3 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/p2p/' + b58Id
        peer3.multiaddrs.add(ma3)

        node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))
@@ -417,7 +418,7 @@ describe('transports', () => {
        function check () {
          const peers = node1.peerBook.getAll()
          expect(Object.keys(peers)).to.have.length(1)
-          expect(Object.keys(node1._switch.muxedConns)).to.have.length(0)
+          expect(node1._switch.connection.getAll()).to.have.length(0)
          done()
        }
      })
@@ -430,8 +431,8 @@ describe('transports', () => {

      function check () {
        if (++counter === 3) {
-          expect(Object.keys(node1._switch.muxedConns).length).to.equal(1)
-          expect(Object.keys(node2._switch.muxedConns).length).to.equal(1)
+          expect(node1._switch.connection.getAll()).to.have.length(1)
+          expect(node2._switch.connection.getAll()).to.have.length(1)
          done()
        }
      }
@@ -440,7 +441,7 @@ describe('transports', () => {
        expect(err).to.not.exist()

        const peer3 = new PeerInfo(id3)
-        const ma3 = '/ip4/127.0.0.1/tcp/14444/ws/p2p-websocket-star/ipfs/' + id3.toB58String()
+        const ma3 = '/ip4/127.0.0.1/tcp/14444/ws/p2p-websocket-star/p2p/' + id3.toB58String()
        peer3.multiaddrs.add(ma3)

        node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))
--- a/test/transports.node.js
+++ b/test/transports.node.js
@@ -91,14 +91,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeA.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+              expect(nodeA._switch.connection.getAll()).to.have.length(0)
              cb()
            },
            (cb) => {
              const peers = nodeB.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-
-              expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
+              expect(nodeB._switch.connection.getAll()).to.have.length(0)
              cb()
            }
          ], done)
@@ -117,15 +116,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeA.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
+              expect(nodeA._switch.connection.getAll()).to.have.length(1)
              cb()
            },
            (cb) => {
              const peers = nodeB.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
+              expect(nodeA._switch.connection.getAll()).to.have.length(1)
              cb()
            }
          ], () => tryEcho(conn, done))
@@ -143,15 +140,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeA.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+              expect(nodeA._switch.connection.getAll()).to.have.length(0)
              cb()
            },
            (cb) => {
              const peers = nodeB.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-
-              expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
+              expect(nodeB._switch.connection.getAll()).to.have.length(0)
              cb()
            }
          ], done)
@@ -170,13 +165,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeA.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
+              expect(nodeA._switch.connection.getAll()).to.have.length(1)
              cb()
            },
            (cb) => {
              const peers = nodeB.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
+              expect(nodeA._switch.connection.getAll()).to.have.length(1)
              cb()
            }
          ], () => tryEcho(conn, done))
@@ -194,13 +189,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeA.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
+              expect(nodeA._switch.connection.getAll()).to.have.length(0)
              cb()
            },
            (cb) => {
              const peers = nodeB.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
+              expect(nodeB._switch.connection.getAll()).to.have.length(0)
              cb()
            }
          ], done)
@@ -213,16 +208,16 @@ describe('transports', () => {
        expect(err).to.not.exist()

        connFSM.once('muxed', () => {
-          expect(nodeA._switch.muxedConns).to.have.any.keys(
-            nodeB.peerInfo.id.toB58String()
-          )
+          expect(
+            nodeA._switch.connection.getAllById(nodeB.peerInfo.id.toB58String())
+          ).to.have.length(1)

          connFSM.once('error', done)
          connFSM.once('close', () => {
            // ensure the connection is closed
-            expect(nodeA._switch.muxedConns).to.not.have.any.keys([
-              nodeB.peerInfo.id.toB58String()
-            ])
+            expect(
+              nodeA._switch.connection.getAllById(nodeB.peerInfo.id.toB58String())
+            ).to.have.length(0)
            done()
          })

@@ -235,9 +230,9 @@ describe('transports', () => {
      nodeA.dialFSM(nodeB.peerInfo, '/echo/1.0.0', (err, connFSM) => {
        expect(err).to.not.exist()
        connFSM.once('connection', (conn) => {
-          expect(nodeA._switch.muxedConns).to.have.all.keys([
-            nodeB.peerInfo.id.toB58String()
-          ])
+          expect(
+            nodeA._switch.connection.getAllById(nodeB.peerInfo.id.toB58String())
+          ).to.have.length(1)
          tryEcho(conn, () => {
            connFSM.close()
          })
@@ -245,9 +240,9 @@ describe('transports', () => {
        connFSM.once('error', done)
        connFSM.once('close', () => {
          // ensure the connection is closed
-          expect(nodeA._switch.muxedConns).to.not.have.any.keys([
-            nodeB.peerInfo.id.toB58String()
-          ])
+          expect(
+            nodeA._switch.connection.getAllById(nodeB.peerInfo.id.toB58String())
+          ).to.have.length(0)
          done()
        })
      })
@@ -309,13 +304,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeTCP.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeTCP._switch.muxedConns)).to.have.length(1)
+              expect(nodeTCP._switch.connection.getAll()).to.have.length(1)
              cb()
            },
            (cb) => {
              const peers = nodeTCPnWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(1)
+              expect(nodeTCPnWS._switch.connection.getAll()).to.have.length(1)
              cb()
            }
          ], done)
@@ -333,14 +328,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeTCP.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeTCP._switch.muxedConns)).to.have.length(0)
-
+              expect(nodeTCP._switch.connection.getAll()).to.have.length(0)
              cb()
            },
            (cb) => {
              const peers = nodeTCPnWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(0)
+              expect(nodeTCPnWS._switch.connection.getAll()).to.have.length(0)
              cb()
            }
          ], done)
@@ -360,13 +354,13 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeTCPnWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(2)
-              expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(1)
+              expect(nodeTCPnWS._switch.connection.getAll()).to.have.length(1)
              cb()
            },
            (cb) => {
              const peers = nodeWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeWS._switch.muxedConns)).to.have.length(1)
+              expect(nodeWS._switch.connection.getAll()).to.have.length(1)
              cb()
            }
          ], done)
@@ -384,14 +378,14 @@ describe('transports', () => {
            (cb) => {
              const peers = nodeTCPnWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(2)
-              expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(0)
+              expect(nodeTCPnWS._switch.connection.getAll()).to.have.length(0)

              cb()
            },
            (cb) => {
              const peers = nodeWS.peerBook.getAll()
              expect(Object.keys(peers)).to.have.length(1)
-              expect(Object.keys(nodeWS._switch.muxedConns)).to.have.length(0)
+              expect(nodeWS._switch.connection.getAll()).to.have.length(0)
              cb()
            }
          ], done)
@@ -516,7 +510,7 @@ describe('transports', () => {
      let i = 1;
      [nodeAll, otherNode].forEach((node) => {
        expect(Object.keys(node.peerBook.getAll())).to.have.length(i-- ? peers : 1)
-        expect(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
+        expect(node._switch.connection.getAll()).to.have.length(muxed)
      })
      callback()
    }
@@ -678,7 +672,7 @@ describe('transports', () => {
      let i = 1;
      [nodeAll, otherNode].forEach((node) => {
        expect(Object.keys(node.peerBook.getAll())).to.have.length(i-- ? peers : 1)
-        expect(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
+        expect(node._switch.connection.getAll()).to.have.length(muxed)
      })
      done()
    }
--- a/test/turbolence.node.js
+++ b/test/turbolence.node.js
@@ -1,84 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-chai.use(require('dirty-chai'))
-const expect = chai.expect
-const multiaddr = require('multiaddr')
-const spawn = require('child_process').spawn
-const path = require('path')
-const pull = require('pull-stream')
-const utils = require('./utils/node')
-const createNode = utils.createNode
-const echo = utils.echo
-
-describe('Turbolence tests', () => {
-  let nodeA
-  let nodeSpawn
-
-  before((done) => {
-    createNode('/ip4/0.0.0.0/tcp/0', (err, node) => {
-      expect(err).to.not.exist()
-      nodeA = node
-      node.handle('/echo/1.0.0', echo)
-      node.start(done)
-    })
-  })
-
-  after((done) => nodeA.stop(done))
-
-  it('spawn a node in a different process', (done) => {
-    const filePath = path.join(__dirname, './spawn-libp2p-node.js')
-
-    nodeSpawn = spawn(filePath, { env: process.env })
-
-    let spawned = false
-
-    nodeSpawn.stdout.on('data', (data) => {
-      // console.log(data.toString())
-      if (!spawned) {
-        spawned = true
-        done()
-      }
-    })
-
-    /* eslint-disable-next-line no-console */
-    nodeSpawn.stderr.on('data', (data) => console.log(data.toString()))
-  })
-
-  it('connect nodeA to that node', (done) => {
-    const spawnedId = require('./test-data/test-id.json')
-    const maddr = multiaddr('/ip4/127.0.0.1/tcp/12345/ipfs/' + spawnedId.id)
-
-    nodeA.dial(maddr, '/echo/1.0.0', (err, conn) => {
-      expect(err).to.not.exist()
-      const peers = nodeA.peerBook.getAll()
-
-      expect(Object.keys(peers)).to.have.length(1)
-
-      pull(
-        pull.values([Buffer.from('hey')]),
-        conn,
-        pull.collect((err, data) => {
-          expect(err).to.not.exist()
-          expect(data).to.eql([Buffer.from('hey')])
-          done()
-        })
-      )
-    })
-  })
-
-  it('crash that node, ensure nodeA continues going steady', (done) => {
-    // TODO investigate why CI crashes
-    setTimeout(() => nodeSpawn.kill('SIGKILL'), 1000)
-    // nodeSpawn.kill('SIGKILL')
-    setTimeout(check, 5000)
-
-    function check () {
-      const peers = nodeA.peerBook.getAll()
-      expect(Object.keys(peers)).to.have.length(1)
-      expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
-      done()
-    }
-  })
-})
--- a/test/utils/bundle-browser.js
+++ b/test/utils/bundle-browser.js
@@ -6,6 +6,7 @@ const WebSocketStar = require('libp2p-websocket-star')
 const Bootstrap = require('libp2p-bootstrap')
 const SPDY = require('libp2p-spdy')
 const MPLEX = require('libp2p-mplex')
+const PULLMPLEX = require('pull-mplex')
 const KadDHT = require('libp2p-kad-dht')
 const SECIO = require('libp2p-secio')
 const defaultsDeep = require('@nodeutils/defaults-deep')
@@ -17,6 +18,7 @@ function mapMuxers (list) {
    switch (pref.trim().toLowerCase()) {
      case 'spdy': return SPDY
      case 'mplex': return MPLEX
+      case 'pullmplex': return PULLMPLEX
      default:
        throw new Error(pref + ' muxer not available')
    }
@@ -27,7 +29,7 @@ function getMuxers (options) {
  if (options) {
    return mapMuxers(options)
  } else {
-    return [MPLEX, SPDY]
+    return [PULLMPLEX, MPLEX, SPDY]
  }
 }

@@ -80,10 +82,12 @@ class Node extends libp2p {
        },
        dht: {
          kBucketSize: 20,
-          enabledDiscovery: true
+          randomWalk: {
+            enabled: true
+          },
+          enabled: false
        },
        EXPERIMENTAL: {
-          dht: false,
          pubsub: false
        }
      }
--- a/test/utils/bundle-nodejs.js
+++ b/test/utils/bundle-nodejs.js
@@ -7,6 +7,7 @@ const Bootstrap = require('libp2p-bootstrap')
 const SPDY = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
 const MPLEX = require('libp2p-mplex')
+const PULLMPLEX = require('pull-mplex')
 const SECIO = require('libp2p-secio')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../..')
@@ -17,6 +18,7 @@ function mapMuxers (list) {
    switch (pref.trim().toLowerCase()) {
      case 'spdy': return SPDY
      case 'mplex': return MPLEX
+      case 'pullmplex': return PULLMPLEX
      default:
        throw new Error(pref + ' muxer not available')
    }
@@ -30,7 +32,7 @@ function getMuxers (muxers) {
  } else if (muxers) {
    return mapMuxers(muxers)
  } else {
-    return [MPLEX, SPDY]
+    return [PULLMPLEX, MPLEX, SPDY]
  }
 }

@@ -73,10 +75,12 @@ class Node extends libp2p {
        },
        dht: {
          kBucketSize: 20,
-          enabledDiscovery: true
+          randomWalk: {
+            enabled: true
+          },
+          enabled: true
        },
        EXPERIMENTAL: {
-          dht: false,
          pubsub: false
        }
      }
--- a/test/utils/constants.js
+++ b/test/utils/constants.js
@@ -0,0 +1,40 @@
+'use strict'
+
+const PeerId = require('peer-id')
+const PeerInfo = require('peer-info')
+const nextTick = require('async/nextTick')
+const peerJSON = require('../fixtures/test-peer')
+const multiaddr = require('multiaddr')
+
+let peerRelay = null
+
+/**
+ * Creates a `PeerInfo` that can be used across testing. Once the
+ * relay `PeerInfo` has been requested, it will be reused for each
+ * additional request.
+ *
+ * This is currently being used to create a relay on test bootstrapping
+ * so that it can be used by browser nodes during their test suite. This
+ * is necessary for running a TCP node during browser tests.
+ * @private
+ * @param {function(error, PeerInfo)} callback
+ * @returns {void}
+ */
+module.exports.getPeerRelay = (callback) => {
+  if (peerRelay) return nextTick(callback, null, peerRelay)
+
+  PeerId.createFromJSON(peerJSON, (err, peerId) => {
+    if (err) {
+      return callback(err)
+    }
+    peerRelay = new PeerInfo(peerId)
+
+    peerRelay.multiaddrs.add('/ip4/127.0.0.1/tcp/9200/ws')
+    peerRelay.multiaddrs.add('/ip4/127.0.0.1/tcp/9245')
+
+    callback(null, peerRelay)
+  })
+}
+
+module.exports.WS_RENDEZVOUS_MULTIADDR = multiaddr('/ip4/127.0.0.1/tcp/14444/wss')
+module.exports.WRTC_RENDEZVOUS_MULTIADDR = multiaddr('/ip4/127.0.0.1/tcp/15555/wss')
--- a/test/utils/echo.js
+++ b/test/utils/echo.js
@@ -8,3 +8,4 @@ function echo (protocol, conn) {
 }

 module.exports = echo
+module.exports.multicodec = '/echo/1.0.0'
Author	SHA1	Message	Date
Jacob Heun	a282fbe139	chore: release version v0.25.0-rc.3	2019-02-26 15:24:55 +01:00
Jacob Heun	6cfb0b2692	chore: update contributors	2019-02-26 15:24:55 +01:00
Vasco Santos	de84ee473c	chore: add error codes to dht and pubsub errors (#328 ) * chore: add error codes to dht and pubsub errors * fix: code review	2019-02-26 15:15:30 +01:00
Jacob Heun	f28ecb2483	chore: release version v0.25.0-rc.2	2019-02-26 15:10:31 +01:00
Jacob Heun	bba6f7eff8	chore: update contributors	2019-02-26 15:10:30 +01:00
Jacob Heun	9f5f07269e	test: add circuit browser test (#326 )	2019-02-25 13:44:56 +01:00
Jacob Heun	5f92acd5bb	fix: make the config less restrictive (#329 )	2019-02-25 12:19:37 +01:00
Jacob Heun	dfe8f632f7	chore: release version v0.25.0-rc.1	2019-02-21 17:46:11 +01:00
Jacob Heun	9f47100713	chore: update contributors	2019-02-21 17:46:09 +01:00
Hugo Dias	d497961938	fix: bundle-size (#298 ) * fix: bundle-size * fix: feedback * fix: lint * chore: update deps * fix: add bundle size check and update deps * fix: fix badges * fix: add once to package.json * fix: fix config validation	2019-02-21 17:07:35 +01:00
isan_rivkin	6e76aade7f	feat: support unsubscribe all for pubsub (#321 ) * chore: unsubscribe without handler reference * chore: added unsubscribe 1 param	2019-02-21 14:46:31 +01:00
Jacob Heun	ec7d0761de	test: add pull-mplex to test suite	2019-02-18 15:45:33 +01:00
Hugo Dias	59fe9732d7	chore: move to travis (#322 ) * chore: move to travis * chore: move to travis 2 * chore: remove unused test file * chore: remove travis webworker * chore: fix webworker * chore: remove webrtcsupport module * chore: test windows * chore: make windows-build-tools silent * chore: test dllss * chore: test dllss 2 * chore: test dllss 3 * chore: remove before_install stuff * chore: remove windows from CI	2019-02-14 18:07:13 +01:00
Thomas Eizinger	4ed5c039fc	chore: change from ipfs to p2p protocol (#315 ) https://github.com/multiformats/js-multiaddr/pull/76 changed the default protocol from ipfs to p2p. js-multiaddr is a transitive dependency of peer-info, so in order to get this change, we had to bump the version of peer-info. * fix: revert ipfs -> p2p change for some tests As per PR feedback. Needed for backwards-compatibility.	2019-02-05 19:59:42 +01:00
Vasco Santos	9e7a080a5c	fix: emit peer discovery for dht discovery	2019-02-05 19:54:02 +01:00
Jacob Heun	558e5987be	chore: remove _isStarted as it's no longer used _isStarted is an outdated property and shouldn't exist in the code anymore. The state machine handles start logic and the isStarted computed property pulls from there. The code comments around dht and pubsub are also no longer valid, so they were deleted.	2019-02-05 15:57:10 +01:00
Jacob Heun	dcf59a8468	chore: update the release template	2019-02-05 15:37:25 +01:00
Jacob Heun	ab028a2be3	chore: update contributors	2019-02-05 13:56:50 +01:00
Thomas Eizinger	91e60d4253	feat: prepare for new randomWalk config parameters As per: https://github.com/libp2p/js-libp2p-kad-dht/issues/76 fix: pass whole dht config into DHT constructor	2019-02-05 12:42:40 +01:00
ebinks	679d446daa	fix: add callback to pubsub.unsubscribe and test (#300 )	2019-02-01 19:27:47 +01:00
Jacob Heun	8047fb76fa	fix: start and stop error callback (#316 ) * fix: ensure start and stop callbacks are called	2019-02-01 16:32:34 +01:00
Vasco Santos	c4cab007af	feat: enable dht by default (#313 ) BREAKING CHANGE: dht experimental flag was removed and a dht.enabled property was added to the config	2019-01-29 18:57:09 +01:00
Jacob Heun	ebaab3e47f	chore: add discuss.ipfs.io to release checklist	2019-01-24 18:00:54 +00:00
Soeren	b31690c8e6	docs: add install dependencies	2019-01-07 15:07:42 -07:00
Jacob Heun	3bde9c8bed	chore: release version v0.24.4	2019-01-04 10:15:49 -07:00
Jacob Heun	14e12ee1f1	chore: update contributors	2019-01-04 10:15:48 -07:00
Alan Shaw	2374929990	chore: update deps License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>	2019-01-04 10:11:49 -07:00
Jacob Heun	26de739bb1	chore: 2019 q1 okrs planning (#293 ) * chore: add q1 2019 okr section * docs: add proposed okr items * chore: update OKR.md * chore: remove quic transport * chore: add thoughts on okr priorities * chore: add detailed interop tests * chore: add line for floodsub interop * chore: move q1 okrs to the google spreadsheet	2018-12-17 12:20:12 +01:00
Jacob Heun	0f8d6afd8f	chore: release version v0.24.3	2018-12-14 17:57:32 +01:00
Jacob Heun	daa26859e0	chore: update contributors	2018-12-14 17:57:31 +01:00
Jacob Heun	fdfb7b4e86	fix: not started yet (#297 ) * fix: callback when not started rather than throwing asserts * fix: dont remove transports until the switch has stopped * test: update connection check logic * test: fix variable reference * chore: update switch dep * chore: update switch dep	2018-12-14 17:54:32 +01:00
Jacob Heun	15bdb795a4	chore: release version v0.24.2	2018-12-04 17:10:52 +01:00
Jacob Heun	7d78728f54	chore: update contributors	2018-12-04 17:10:52 +01:00
Jacob Heun	53ed3bdb99	fix: use symbol instead of constructor name (#292 )	2018-12-04 16:04:17 +01:00