chore: release version v0.23.1

License: MIT
Signed-off-by: Alan Shaw <alan@tableflip.io>

.aegir.js

@@ -5,10 +5,11 @@ const PeerId = require('peer-id')
 const pull = require('pull-stream')
 const parallel = require('async/parallel')
 
-const rawPeer = require('./test/fixtures/test-peer.json')
-const Node = require('./test/utils/bundle.node.js')
-const sigServer = require('libp2p-webrtc-star/src/sig-server')
 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')
 
 let wrtcRendezvous
 let wsRendezvous
@@ -21,7 +22,9 @@ const before = (done) => {
         port: 15555
         // cryptoChallenge: true TODO: needs https://github.com/libp2p/js-libp2p-webrtc-star/issues/128
       }, (err, server) => {
-        if (err) { return cb(err) }
+        if (err) {
+          return cb(err)
+        }
         wrtcRendezvous = server
         cb()
       })
@@ -33,7 +36,9 @@ const before = (done) => {
         strictMultiaddr: false,
         cryptoChallenge: true
       }, (err, _server) => {
-        if (err) { return cb(err) }
+        if (err) {
+          return cb(err)
+        }
         wsRendezvous = _server
         cb()
       })
@@ -47,7 +52,9 @@ const before = (done) => {
 
         peer.multiaddrs.add('/ip4/127.0.0.1/tcp/9200/ws')
 
-        node = new Node(peer)
+        node = new Node({
+          peerInfo: peer
+        })
         node.handle('/echo/1.0.0', (protocol, conn) => pull(conn, conn))
         node.start(cb)
       })
@@ -56,11 +63,11 @@ const before = (done) => {
 }
 
 const after = (done) => {
-  setTimeout(() => parallel(
+  setTimeout(() =>
-    [node, wrtcRendezvous, wsRendezvous].map((s) => {
+    parallel(
-      return (cb) => s.stop(cb)
+      [node, wrtcRendezvous, wsRendezvous].map((s) => (cb) => s.stop(cb)),
-    })
+      done),
-   , done), 2000)
+  2000)
 }
 
 module.exports = {

.travis.yml

@@ -1,23 +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.
-sudo: false
-language: node_js
-
-matrix:
-  include:
-  - node_js: 'stable'
-    env: CXX=g++-4.8
-
-script:
-  - npm run test
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
-addons:
-  firefox: 'latest'
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8

CHANGELOG.md

@@ -1,3 +1,73 @@
+<a name="0.23.1"></a>
+## [0.23.1](https://github.com/libp2p/js-libp2p/compare/v0.23.0...v0.23.1) (2018-08-13)
+
+
+### Bug Fixes
+
+* callback with error for invalid or non-peer multiaddr ([#232](https://github.com/libp2p/js-libp2p/issues/232)) ([c8a86db](https://github.com/libp2p/js-libp2p/commit/c8a86db))
+
+
+
+<a name="0.23.0"></a>
+# [0.23.0](https://github.com/libp2p/js-libp2p/compare/v0.22.0...v0.23.0) (2018-07-27)
+
+
+### Bug Fixes
+
+* start and stop connection manager with libp2p ([6106915](https://github.com/libp2p/js-libp2p/commit/6106915))
+
+
+### Features
+
+* add check for protector and enforced pnet ([2b7cc55](https://github.com/libp2p/js-libp2p/commit/2b7cc55))
+
+
+
+<a name="0.22.0"></a>
+# [0.22.0](https://github.com/libp2p/js-libp2p/compare/v0.21.0...v0.22.0) (2018-06-29)
+
+
+### Bug Fixes
+
+* add null property guards ([80f0b60](https://github.com/libp2p/js-libp2p/commit/80f0b60))
+* do not mutate the config object ([ac5cacb](https://github.com/libp2p/js-libp2p/commit/ac5cacb))
+* remove .only ([be9eafe](https://github.com/libp2p/js-libp2p/commit/be9eafe))
+* remove peer discovery module config checks ([4ad70ef](https://github.com/libp2p/js-libp2p/commit/4ad70ef))
+* typo in fixture and fail for correct reason ([1af5ba9](https://github.com/libp2p/js-libp2p/commit/1af5ba9))
+
+
+### Features
+
+* enable peer discovery modules by default ([e320854](https://github.com/libp2p/js-libp2p/commit/e320854))
+
+
+
+<a name="0.21.0"></a>
+# [0.21.0](https://github.com/libp2p/js-libp2p/compare/v0.20.4...v0.21.0) (2018-06-28)
+
+
+### Bug Fixes
+
+* lock wrtc to 0.1.1 ([6507379](https://github.com/libp2p/js-libp2p/commit/6507379))
+
+
+### Features
+
+* (BREAKING CHANGE) overhaul libp2p config and constructor ([6905f1b](https://github.com/libp2p/js-libp2p/commit/6905f1b))
+* set and hook up libp2p-connection-manager ([#184](https://github.com/libp2p/js-libp2p/issues/184)) ([d597204](https://github.com/libp2p/js-libp2p/commit/d597204))
+
+
+
+<a name="0.20.4"></a>
+## [0.20.4](https://github.com/libp2p/js-libp2p/compare/v0.20.2...v0.20.4) (2018-04-30)
+
+
+
+<a name="0.20.3"></a>
+## [0.20.3](https://github.com/libp2p/js-libp2p/compare/v0.20.2...v0.20.3) (2018-04-30)
+
+
+
 <a name="0.20.2"></a>
 ## [0.20.2](https://github.com/libp2p/js-libp2p/compare/v0.20.1...v0.20.2) (2018-04-10)
 

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 libp2p as a project, including js-libp2p and all of its modules, follows the [standard IPFS Community contributing guidelines](https://github.com/ipfs/community/blob/master/contribution-guidelines.md).
 
-We also adhere to the [IPFS JavaScript Community contributing guidelines](https://github.com/ipfs/community/blob/master/js-project-guidelines.md) which provide additional information of how to collaborate and contribute in the JavaScript implementation of libp2p.
+We also adhere to the [IPFS JavaScript Community contributing guidelines](https://github.com/ipfs/community/blob/master/js-code-guidelines.md) which provide additional information of how to collaborate and contribute in the JavaScript implementation of libp2p.
 
 We appreciate your time and attention for going over these. Please open an issue on [ipfs/community](https://github.com/ipfs/community) if you have any question.
 

OKR.md

@@ -0,0 +1,11 @@
+# Quarterly Objectives and Key Results
+
+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.
+
+## 2018 Q3
+
+Find the js-libp2p OKRs for 2018 Q2 at the [2018 Q3 libp2p OKRs Spreadsheet](https://docs.google.com/spreadsheets/d/1HTXfgR5FyPTFhsTkFPRThkeMvHvCgJOaAs7BSl_vQ_0/edit#gid=1241853194)
+
+## Previous Quarters
+
+For the quarters before 2018 Q3, js-libp2p shared their KRs with the [IPFS OKRs](https://github.com/ipfs/js-ipfs/blob/master/OKR.md).

README.md

@@ -1,20 +1,19 @@
 <h1 align="center">
-  <a href="libp2p.io"><img width="250" src="https://github.com/libp2p/libp2p/blob/master/logo/alternates/libp2p-logo-alt-2.png?raw=true" alt="libp2p hex logo" /></a>
+  <a href="libp2p.io"><img width="250" src="https://github.com/libp2p/libp2p/blob/master/logo/black-bg-2.png?raw=true" alt="libp2p hex logo" /></a>
 </h1>
 
 <h3 align="center">The JavaScript implementation of the libp2p Networking Stack.</h3>
 
 <p align="center">
   <a href="http://ipn.io"><img src="https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square" /></a>
-  <a href="http://libp2p.io/"><img src="https://img.shields.io/badge/project-libp2p-blue.svg?style=flat-square" /></a>
+  <a href="http://libp2p.io/"><img src="https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square" /></a>
-  <a href="http://webchat.freenode.net/?channels=%23ipfs"><img src="https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square" /></a>
+  <a href="http://webchat.freenode.net/?channels=%23libp2p"><img src="https://img.shields.io/badge/freenode-%23libp2p-yellow.svg?style=flat-square" /></a>
-  <a href="https://waffle.io/libp2p/libp2p"><img src="https://img.shields.io/badge/pm-waffle-blue.svg?style=flat-square" /></a>
+  <a href="https://waffle.io/libp2p/libp2p"><img src="https://img.shields.io/badge/pm-waffle-yellow.svg?style=flat-square" /></a>
 </p>
 
 <p align="center">
-  <a href="https://travis-ci.org/libp2p/js-libp2p"><img src="https://travis-ci.org/libp2p/js-libp2p.svg?branch=master" /></a>
+  <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://circleci.com/gh/libp2p/js-libp2p"><img src="https://circleci.com/gh/libp2p/js-libp2p.svg?style=svg" /></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://coveralls.io/github/libp2p/js-libp2p?branch=master"><img src="https://coveralls.io/repos/github/libp2p/js-libp2p/badge.svg?branch=master"></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>
@@ -32,6 +31,16 @@ We've come a long way, but this project is still in Alpha, lots of development i
 
 [![Throughput Graph](https://graphs.waffle.io/libp2p/js-libp2p/throughput.svg)](https://waffle.io/libp2p/js-libp2p/metrics/throughput)
 
+[**`Weekly Core Dev Calls`**](https://github.com/ipfs/pm/issues/650)
+
+## Tech Lead
+
+[David Dias](https://github.com/diasdavid/)
+
+## Lead Maintainer
+
+[Jacob Heun](https://github.com/jacobheun/)
+
 ## Table of Contents
 
 - [Background](#background)
@@ -93,47 +102,88 @@ libp2p becomes very simple and basically acts as a glue for every module that co
 ```JavaScript
 // Creating a bundle that adds:
 //   transport: websockets + tcp
-//   stream-muxing: SPDY
+//   stream-muxing: spdy & mplex
 //   crypto-channel: secio
 //   discovery: multicast-dns
 
 const libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
-const spdy = require('libp2p-spdy')
+const SPDY = require('libp2p-spdy')
-const secio = require('libp2p-secio')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
 const MulticastDNS = require('libp2p-mdns')
 const DHT = require('libp2p-kad-dht')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const Protector = require('libp2p-pnet')
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
+  constructor (_peerInfo, _peerBook, _options) {
-    options = options || {}
+    const defaults = {
+      peerInfo: _peerInfo,            // The Identity of your Peer
+      peerBook: _peerBook,            // Where peers get tracked, if undefined libp2p will create one instance
 
-    const modules = {
+      // The libp2p modules for this libp2p bundle
+      modules: {
         transport: [
-        new TCP(),
+          TCP,
-        new WS()
+          new WS()                    // It can take instances too!
         ],
-      connection: {
+        streamMuxer: [
-        muxer: [
+          SPDY,
-          spdy
+          MPLEX
         ],
-        crypto: [
+        connEncryption: [
-          secio
+          SECIO
-        ]
+        ],
+        connProtector: new Protector(/*protector specific opts*/),
+        peerDiscovery: [
+          MulticastDNS
+        ],
+        peerRouting: {},              // Currently both peerRouting and contentRouting are patched through the DHT,
+        contentRouting: {},           // this will change once we factor that into two modules, for now do the following line:
+        dht: DHT                      // DHT enables PeerRouting, ContentRouting and DHT itself components
       },
-      discovery: [
-        new MulticastDNS(peerInfo)
-      ],
-      // DHT is passed as its own enabling PeerRouting, ContentRouting and DHT itself components
-      dht: DHT
-    }
 
-    super(modules, peerInfo, peerBook, options)
+      // libp2p config options (typically found on a config.json)
+      config: {                       // The config object is the part of the config that can go into a file, config.json.
+        peerDiscovery: {
+          mdns: {                     // mdns options
+            interval: 1000            // ms
+            enabled: true
+          },
+          webrtcStar: {               // webrtc-star options
+            interval: 1000            // ms
+            enabled: false
+          }
+          // .. other discovery module options.
+        },
+        peerRouting: {},
+        contentRouting: {},
+        relay: {                      // Circuit Relay options
+          enabled: false,
+          hop: {
+            enabled: false,
+            active: false
+          }
+        },
+        dht: {
+          kBucketSize: 20
+        },
+        // Enable/Disable Experimental features
+        EXPERIMENTAL: {               // Experimental features ("behind a flag")
+          pubsub: false,
+          dht: false
+        }
       }
     }
 
-// Now all the nodes you create, will have TCP, WebSockets, SPDY, SECIO and MulticastDNS support.
+    // overload any defaults of your bundle using https://github.com/nodeutils/defaults-deep
+    super(defaultsDeep(_options, defaults))
+  }
+}
+
+// Now all the nodes you create, will have TCP, WebSockets, SPDY, MPLEX, SECIO and MulticastDNS support.
 ```
 
 ### API
@@ -383,6 +433,16 @@ Each one of these values is [an exponential moving-average instance](https://git
 
 Stats are not updated in real-time. Instead, measurements are buffered and stats are updated at an interval. The maximum interval can be defined through the `Switch` constructor option `stats.computeThrottleTimeout`, defined in miliseconds.
 
+### Private Networks
+
+#### Enforcement
+
+Libp2p provides support for connection protection, such as for private networks. You can enforce network protection by setting the environment variable `LIBP2P_FORCE_PNET=1`. When this variable is on, if no protector is set via `options.connProtector`, Libp2p will throw an error upon creation.
+
+#### Protectors
+
+Some available network protectors:
+* [libp2p-pnet](https://github.com/libp2p/js-libp2p-pnet)
 
 ## Development
 
@@ -425,39 +485,70 @@ N/A
 
 List of packages currently in existence for libp2p
 
-| Package | Version | Dependencies | DevDependencies |
+| Package | Version | Deps | CI | Coverage |
-|---------|---------|--------------|-----------------|
+| ---------|---------|---------|---------|--------- |
-| **Transports**                                     |
+| **Libp2p** |
-| [`libp2p-utp`](//github.com/libp2p/js-libp2p-utp) | [![npm](https://img.shields.io/npm/v/libp2p-utp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-utp/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-utp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-utp) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-utp/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-utp?type=dev) |
+| [`interface-libp2p`](//github.com/libp2p/interface-libp2p) | [![npm](https://img.shields.io/npm/v/interface-libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/interface-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/interface-libp2p) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-libp2p/master)](https://ci.ipfs.team/job/libp2p/job/interface-libp2p/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-libp2p) |
-| [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-websockets/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets?type=dev) |
+| [`libp2p`](//github.com/libp2p/js-libp2p) | [![npm](https://img.shields.io/npm/v/libp2p.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p) |
-| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-webrtc-star/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star?type=dev) |
+| **Connection** |
-| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-websocket-star/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star?type=dev) |
+| [`interface-connection`](//github.com/libp2p/interface-connection) | [![npm](https://img.shields.io/npm/v/interface-connection.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-connection/releases) | [![Deps](https://david-dm.org/libp2p/interface-connection.svg?style=flat-square)](https://david-dm.org/libp2p/interface-connection) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-connection/master)](https://ci.ipfs.team/job/libp2p/job/interface-connection/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-connection/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-connection) |
-| [`libp2p-websocket-star-rendezvous`](//github.com/libp2p/js-libp2p-websocket-star-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star-rendezvous/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous?type=dev) |
+| **Transport** |
-| **Connection Upgrades**                            |
+| [`interface-transport`](//github.com/libp2p/interface-transport) | [![npm](https://img.shields.io/npm/v/interface-transport.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-transport/releases) | [![Deps](https://david-dm.org/libp2p/interface-transport.svg?style=flat-square)](https://david-dm.org/libp2p/interface-transport) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-transport/master)](https://ci.ipfs.team/job/libp2p/job/interface-transport/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-transport/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-transport) |
-| [`interface-connection`](//github.com/libp2p/interface-connection) | [![npm](https://img.shields.io/npm/v/interface-connection.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-connection/releases) | [![Dependency Status](https://david-dm.org/libp2p/interface-connection.svg?style=flat-square)](https://david-dm.org/libp2p/interface-connection) | [![devDependency Status](https://david-dm.org/libp2p/interface-connection/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/interface-connection?type=dev) |
+| [`libp2p-circuit`](//github.com/libp2p/js-libp2p-circuit) | [![npm](https://img.shields.io/npm/v/libp2p-circuit.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-circuit/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-circuit.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-circuit) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-circuit/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-circuit/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-circuit/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-circuit) |
-| **Stream Muxers**                                  |
+| [`libp2p-tcp`](//github.com/libp2p/js-libp2p-tcp) | [![npm](https://img.shields.io/npm/v/libp2p-tcp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-tcp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-tcp/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-tcp/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-tcp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-tcp) |
-| [`interface-stream-muxer`](//github.com/libp2p/interface-stream-muxer) | [![npm](https://img.shields.io/npm/v/interface-stream-muxer.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-stream-muxer/releases) | [![Dependency Status](https://david-dm.org/libp2p/interface-stream-muxer.svg?style=flat-square)](https://david-dm.org/libp2p/interface-stream-muxer) | [![devDependency Status](https://david-dm.org/libp2p/interface-stream-muxer/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/interface-stream-muxer?type=dev) |
+| [`libp2p-udp`](//github.com/libp2p/js-libp2p-udp) | [![npm](https://img.shields.io/npm/v/libp2p-udp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udp) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-udp/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-udp/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udp) |
-| [`libp2p-spdy`](//github.com/libp2p/js-libp2p-spdy) | [![npm](https://img.shields.io/npm/v/libp2p-spdy.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-spdy/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-spdy.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-spdy) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-spdy/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-spdy?type=dev) |
+| [`libp2p-udt`](//github.com/libp2p/js-libp2p-udt) | [![npm](https://img.shields.io/npm/v/libp2p-udt.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-udt/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-udt.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-udt) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-udt/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-udt/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-udt/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-udt) |
-| [`libp2p-multiplex`](https://github.com/libp2p/js-libp2p-multiplex)
+| [`libp2p-utp`](//github.com/libp2p/js-libp2p-utp) | [![npm](https://img.shields.io/npm/v/libp2p-utp.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-utp/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-utp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-utp) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-utp/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-utp/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-utp/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-utp) |
-| **Discovery**                                       |
+| [`libp2p-webrtc-direct`](//github.com/libp2p/js-libp2p-webrtc-direct) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-direct.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-direct/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-direct.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-direct) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-direct/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-direct/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-direct) |
-| [`libp2p-mdns-discovery`](//github.com/libp2p/js-libp2p-mdns-discovery) | [![npm](https://img.shields.io/npm/v/libp2p-mdns-discovery.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mdns-discovery/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-mdns-discovery.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns-discovery) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-mdns-discovery/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns-discovery?type=dev) |
+| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) |
-| [`libp2p-railing`](//github.com/libp2p/js-libp2p-railing) | [![npm](https://img.shields.io/npm/v/libp2p-railing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-railing/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-railing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-railing) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-railing/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-railing?type=dev) |
+| [`libp2p-websockets`](//github.com/libp2p/js-libp2p-websockets) | [![npm](https://img.shields.io/npm/v/libp2p-websockets.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websockets/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websockets.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websockets) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-websockets/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-websockets/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websockets/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websockets) |
+| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-websocket-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-websocket-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) |
+| [`libp2p-websocket-star-rendezvous`](//github.com/libp2p/js-libp2p-websocket-star-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star-rendezvous) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-websocket-star-rendezvous/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-websocket-star-rendezvous/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star-rendezvous) |
 | **Crypto Channels** |
-| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-secio/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-secio/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio?type=dev) |
+| [`libp2p-secio`](//github.com/libp2p/js-libp2p-secio) | [![npm](https://img.shields.io/npm/v/libp2p-secio.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-secio/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-secio/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-secio/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-secio/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-secio) |
-| **Peer Routing**                                     |
+| **Stream Muxers** |
-| [`libp2p-kad-routing`](//github.com/libp2p/js-libp2p-kad-routing) | [![npm](https://img.shields.io/npm/v/libp2p-kad-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-routing/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-kad-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-routing) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-kad-routing/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-routing?type=dev) |
+| [`interface-stream-muxer`](//github.com/libp2p/interface-stream-muxer) | [![npm](https://img.shields.io/npm/v/interface-stream-muxer.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-stream-muxer/releases) | [![Deps](https://david-dm.org/libp2p/interface-stream-muxer.svg?style=flat-square)](https://david-dm.org/libp2p/interface-stream-muxer) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-stream-muxer/master)](https://ci.ipfs.team/job/libp2p/job/interface-stream-muxer/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-stream-muxer/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-stream-muxer) |
-| **Content Routing**                                |
+| [`libp2p-mplex`](//github.com/libp2p/js-libp2p-mplex) | [![npm](https://img.shields.io/npm/v/libp2p-mplex.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mplex/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mplex.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mplex) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-mplex/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-mplex/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mplex/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mplex) |
-| [`interface-record-store`](//github.com/libp2p/interface-record-store) | [![npm](https://img.shields.io/npm/v/interface-record-store.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-record-store/releases) | [![Dependency Status](https://david-dm.org/libp2p/interface-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/interface-record-store) | [![devDependency Status](https://david-dm.org/libp2p/interface-record-store/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/interface-record-store?type=dev) |
+| [`libp2p-spdy`](//github.com/libp2p/js-libp2p-spdy) | [![npm](https://img.shields.io/npm/v/libp2p-spdy.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-spdy/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-spdy.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-spdy) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-spdy/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-spdy/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-spdy/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-spdy) |
-| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [![npm](https://img.shields.io/npm/v/libp2p-record.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-record/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-record.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-record/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record?type=dev) |
+| **Discovery** |
-| [`libp2p-distributed-record-store`](//github.com/libp2p/js-libp2p-distributed-record-store) | [![npm](https://img.shields.io/npm/v/undefined.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-distributed-record-store/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-distributed-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-distributed-record-store) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-distributed-record-store/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-distributed-record-store?type=dev) |
+| [`interface-peer-discovery`](//github.com/libp2p/interface-peer-discovery) | [![npm](https://img.shields.io/npm/v/interface-peer-discovery.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-discovery/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-discovery.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-discovery) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-peer-discovery/master)](https://ci.ipfs.team/job/libp2p/job/interface-peer-discovery/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-peer-discovery/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-discovery) |
-| [`libp2p-kad-record-store`](//github.com/libp2p/js-libp2p-kad-record-store) | [![npm](https://img.shields.io/npm/v/libp2p-kad-record-store.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-record-store/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-kad-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-record-store) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-kad-record-store/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-record-store?type=dev) |
+| [`libp2p-bootstrap`](//github.com/libp2p/js-libp2p-bootstrap) | [![npm](https://img.shields.io/npm/v/libp2p-bootstrap.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-bootstrap/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-bootstrap.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-bootstrap) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-bootstrap/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-bootstrap/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-bootstrap/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-bootstrap) |
-| **Generics**                                        |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) |
-| [`libp2p-swarm`](//github.com/libp2p/js-libp2p-swarm) | [![npm](https://img.shields.io/npm/v/libp2p-swarm.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-swarm/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-swarm.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-swarm) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-swarm/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-swarm?type=dev) |
+| [`libp2p-mdns`](//github.com/libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-mdns/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-mdns/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-mdns) |
-| [`libp2p-ping`](//github.com/libp2p/js-libp2p-ping) | [![npm](https://img.shields.io/npm/v/libp2p-ping.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-ping/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-ping.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-ping) | [![devDependency Status](https://david-dm.org/libp2p/js-libp2p-ping/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-ping?type=dev) |
+| [`libp2p-rendezvous`](//github.com/libp2p/js-libp2p-rendezvous) | [![npm](https://img.shields.io/npm/v/libp2p-rendezvous.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-rendezvous/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-rendezvous.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-rendezvous) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-rendezvous/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-rendezvous/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-rendezvous/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-rendezvous) |
-| [`multistream-select`](//github.com/libp2p/js-multistream) | [![npm](https://img.shields.io/npm/v/multistream-select.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-multistream/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-multistream.svg?style=flat-square)](https://david-dm.org/libp2p/js-multistream) | [![devDependency Status](https://david-dm.org/libp2p/js-multistream/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-multistream?type=dev) |
+| [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-webrtc-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-webrtc-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) |
+| [`libp2p-websocket-star`](//github.com/libp2p/js-libp2p-websocket-star) | [![npm](https://img.shields.io/npm/v/libp2p-websocket-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-websocket-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-websocket-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-websocket-star) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-websocket-star/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-websocket-star/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-websocket-star/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-websocket-star) |
+| **NAT Traversal** |
+| [`libp2p-circuit`](//github.com/libp2p/js-libp2p-circuit) | [![npm](https://img.shields.io/npm/v/libp2p-circuit.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-circuit/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-circuit.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-circuit) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-circuit/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-circuit/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-circuit/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-circuit) |
+| [`libp2p-nat-mngr`](//github.com/libp2p/js-libp2p-nat-mngr) | [![npm](https://img.shields.io/npm/v/libp2p-nat-mngr.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-nat-mngr/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-nat-mngr.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-nat-mngr) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-nat-mngr/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-nat-mngr/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-nat-mngr) |
 | **Data Types** |
-| [`peer-book`](//github.com/libp2p/js-peer-book) | [![npm](https://img.shields.io/npm/v/peer-book.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-book/releases) | [![Dependency Status](https://david-dm.org/libp2p/js-peer-book.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-book) | [![devDependency Status](https://david-dm.org/libp2p/js-peer-book/dev-status.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-book?type=dev) |
+| [`peer-book`](//github.com/libp2p/js-peer-book) | [![npm](https://img.shields.io/npm/v/peer-book.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-book/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-book.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-book) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-peer-book/master)](https://ci.ipfs.team/job/libp2p/job/js-peer-book/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-peer-book/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-book) |
-| [`peer-id`](https://github.com/libp2p/js-peer-id)
+| [`peer-id`](//github.com/libp2p/js-peer-id) | [![npm](https://img.shields.io/npm/v/peer-id.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-id/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-id.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-id) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-peer-id/master)](https://ci.ipfs.team/job/libp2p/job/js-peer-id/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-peer-id/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-id) |
+| [`peer-info`](//github.com/libp2p/js-peer-info) | [![npm](https://img.shields.io/npm/v/peer-info.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-peer-info/releases) | [![Deps](https://david-dm.org/libp2p/js-peer-info.svg?style=flat-square)](https://david-dm.org/libp2p/js-peer-info) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-peer-info/master)](https://ci.ipfs.team/job/libp2p/job/js-peer-info/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-peer-info/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-peer-info) |
+| **Content Routing** |
+| [`interface-content-routing`](//github.com/libp2p/interface-content-routing) | [![npm](https://img.shields.io/npm/v/interface-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-content-routing) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-content-routing/master)](https://ci.ipfs.team/job/libp2p/job/interface-content-routing/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-content-routing) |
+| [`libp2p-delegated-content-routing`](//github.com/libp2p/js-libp2p-delegated-content-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-delegated-content-routing/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-delegated-content-routing/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing) |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) |
+| **Peer Routing** |
+| [`interface-peer-routing`](//github.com/libp2p/interface-peer-routing) | [![npm](https://img.shields.io/npm/v/interface-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/interface-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/interface-peer-routing) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-peer-routing/master)](https://ci.ipfs.team/job/libp2p/job/interface-peer-routing/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-peer-routing) |
+| [`libp2p-delegated-peer-routing`](//github.com/libp2p/js-libp2p-delegated-peer-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-peer-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-peer-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-peer-routing) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-delegated-peer-routing/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-delegated-peer-routing/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-delegated-peer-routing) |
+| [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-kad-dht/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-kad-dht/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) |
+| **Record Store** |
+| [`interface-record-store`](//github.com/libp2p/interface-record-store) | [![npm](https://img.shields.io/npm/v/interface-record-store.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/interface-record-store/releases) | [![Deps](https://david-dm.org/libp2p/interface-record-store.svg?style=flat-square)](https://david-dm.org/libp2p/interface-record-store) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/interface-record-store/master)](https://ci.ipfs.team/job/libp2p/job/interface-record-store/job/master/) | [![codecov](https://codecov.io/gh/libp2p/interface-record-store/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/interface-record-store) |
+| [`libp2p-record`](//github.com/libp2p/js-libp2p-record) | [![npm](https://img.shields.io/npm/v/libp2p-record.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-record/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-record.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-record) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-record/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-record/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-record/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-record) |
+| **Generics** |
+| [`libp2p-connection-manager`](//github.com/libp2p/js-libp2p-connection-manager) | [![npm](https://img.shields.io/npm/v/libp2p-connection-manager.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-connection-manager/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-connection-manager.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-connection-manager) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-connection-manager/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-connection-manager/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-connection-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-connection-manager) |
+| [`libp2p-crypto`](//github.com/libp2p/js-libp2p-crypto) | [![npm](https://img.shields.io/npm/v/libp2p-crypto.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-crypto/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-crypto/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto) |
+| [`libp2p-crypto-secp256k1`](//github.com/libp2p/js-libp2p-crypto-secp256k1) | [![npm](https://img.shields.io/npm/v/libp2p-crypto-secp256k1.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-crypto-secp256k1/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto-secp256k1) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-crypto-secp256k1/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-crypto-secp256k1/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-crypto-secp256k1) |
+| [`libp2p-switch`](//github.com/libp2p/js-libp2p-switch) | [![npm](https://img.shields.io/npm/v/libp2p-switch.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-switch/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-switch.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-switch) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-switch/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-switch/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-switch/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-switch) |
+| **Extensions** |
+| [`libp2p-floodsub`](//github.com/libp2p/js-libp2p-floodsub) | [![npm](https://img.shields.io/npm/v/libp2p-floodsub.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-floodsub/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-floodsub.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-floodsub) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-floodsub/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-floodsub/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-floodsub/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-floodsub) |
+| [`libp2p-identify`](//github.com/libp2p/js-libp2p-identify) | [![npm](https://img.shields.io/npm/v/libp2p-identify.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-identify/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-identify.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-identify) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-identify/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-identify/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-identify/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-identify) |
+| [`libp2p-keychain`](//github.com/libp2p/js-libp2p-keychain) | [![npm](https://img.shields.io/npm/v/libp2p-keychain.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-keychain/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-keychain.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-keychain) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-keychain/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-keychain/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-keychain/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-keychain) |
+| [`libp2p-ping`](//github.com/libp2p/js-libp2p-ping) | [![npm](https://img.shields.io/npm/v/libp2p-ping.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-ping/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-ping.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-ping) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-ping/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-ping/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-ping/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-ping) |
+| [`libp2p-pnet`](//github.com/libp2p/js-libp2p-pnet) | [![npm](https://img.shields.io/npm/v/libp2p-pnet.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-pnet/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-pnet.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-pnet) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-libp2p-pnet/master)](https://ci.ipfs.team/job/libp2p/job/js-libp2p-pnet/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-pnet/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-libp2p-pnet) |
+| **Utilities** |
+| [`p2pcat`](//github.com/libp2p/js-p2pcat) | [![npm](https://img.shields.io/npm/v/p2pcat.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-p2pcat/releases) | [![Deps](https://david-dm.org/libp2p/js-p2pcat.svg?style=flat-square)](https://david-dm.org/libp2p/js-p2pcat) | [![jenkins](https://ci.ipfs.team/buildStatus/icon?job=libp2p/js-p2pcat/master)](https://ci.ipfs.team/job/libp2p/job/js-p2pcat/job/master/) | [![codecov](https://codecov.io/gh/libp2p/js-p2pcat/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/js-p2pcat) |
 
 ## Contribute
 

RELEASE.md

@@ -0,0 +1,41 @@
+# Release Template
+
+> short tl;dr; of the release
+
+# 🗺 What's left for release
+
+# 🔦 Highlights
+
+# 🏗 API Changes
+
+# ✅ Release Checklist
+
+- Robustness and quality
+  - [ ] Ensure that all tests are passing, this includes:
+    - [ ] unit
+  - [ ] Run tests of the following projects with the new release:
+    - [ ] [js-ipfs](https://github.com/ipfs/js-ipfs)
+- Documentation
+  - [ ] Ensure that README.md is up to date
+  - [ ] Ensure that all the examples run
+- Communication
+  - [ ] Create the release issue
+  - [ ] Announcements (both pre-release and post-release)
+    - [ ] Twitter
+    - [ ] IRC
+    - [ ] Reddit
+  - [ ] Blog post
+
+# 🙌🏽 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
+- 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!
+
+# ⁉️ Do you have questions?
+
+The best place to ask your questions about libp2p, how it works and what you can do with it is at [discuss.ipfs.io](http://discuss.ipfs.io). We are also available at the #libp2p channel on Freenode.

circle.yml

@@ -1,10 +1,8 @@
 machine:
   node:
-    version: stable
+    version: 8.11.3
 
 test:
-  pre:
-    - npm run lint
   post:
     - npm run coverage -- --upload --providers coveralls
 

examples/README.md

@@ -22,4 +22,4 @@ Let us know if you find any issue or if you want to contribute and add a new tut
 - [Running libp2p in the Browser](./libp2p-in-the-browser)
 - Running libp2p in the Electron (future)
 - [The standard echo net example with libp2p](./echo)
-- [A simple chat app with](./chat)
+- [A simple chat app with libp2p](./chat)

examples/chat/README.md

@@ -1 +1,13 @@
 # Chat example with libp2p
+
+This example creates a simple chat app in your terminal.
+
+## Setup
+1. Install the modules, `npm install`.
+2. Open 2 terminal windows in the `./src` directory.
+
+## Running
+1. Run the listener in window 1, `node listener.js`
+2. Run the dialer in window 2, `node dialer.js`
+3. Type a message in either window and hit _enter_
+4. Tell youself secrets to your hearts content!

examples/chat/src/dialer.js

@@ -31,7 +31,9 @@ async.parallel([
   if (err) throw err
   const peerDialer = new PeerInfo(ids[0])
   peerDialer.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-  const nodeDialer = new Node(peerDialer)
+  const nodeDialer = new Node({
+    peerInfo: peerDialer
+  })
 
   const peerListener = new PeerInfo(ids[1])
   idListener = ids[1]

examples/chat/src/libp2p-bundle.js

@@ -3,11 +3,12 @@
 const TCP = require('libp2p-tcp')
 const MulticastDNS = require('libp2p-mdns')
 const WS = require('libp2p-websockets')
-const Railing = require('libp2p-railing')
+const Bootstrap = require('libp2p-railing')
 const spdy = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
 const mplex = require('libp2p-mplex')
 const secio = require('libp2p-secio')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../../..')
 
 function mapMuxers (list) {
@@ -36,44 +37,40 @@ function getMuxers (muxers) {
 }
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
+  constructor (_options) {
-    options = options || {}
+    const defaults = {
-
+      modules: {
-    const modules = {
         transport: [
-        new TCP(),
+          TCP,
-        new WS()
+          WS
         ],
-      connection: {
+        streamMuxer: getMuxers(_options.muxer),
-        muxer: getMuxers(options.muxer),
+        connEncryption: [ secio ],
-        crypto: [ secio ]
+        peerDiscovery: [
+          MulticastDNS,
+          Bootstrap
+        ],
+        dht: KadDHT
       },
-      discovery: []
+      config: {
+        peerDiscovery: {
+          mdns: {
+            interval: 10000,
+            enabled: false
+          },
+          bootstrap: {
+            interval: 10000,
+            enabled: false,
+            list: _options.bootstrapList
+          }
+        },
+        dht: {
+          kBucketSize: 20
+        }
+      }
     }
 
-    if (options.dht) {
+    super(defaultsDeep(_options, defaults))
-      modules.DHT = KadDHT
-    }
-
-    if (options.mdns) {
-      const mdns = new MulticastDNS(peerInfo, 'ipfs.local')
-      modules.discovery.push(mdns)
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
-    }
-
-    if (options.modules && options.modules.transport) {
-      options.modules.transport.forEach((t) => modules.transport.push(t))
-    }
-
-    if (options.modules && options.modules.discovery) {
-      options.modules.discovery.forEach((d) => modules.discovery.push(d))
-    }
-
-    super(modules, peerInfo, peerBook, options)
   }
 }
 

examples/chat/src/listener.js

@@ -14,14 +14,16 @@ PeerId.createFromJSON(require('./peer-id-listener'), (err, idListener) => {
   }
   const peerListener = new PeerInfo(idListener)
   peerListener.multiaddrs.add('/ip4/0.0.0.0/tcp/10333')
-  const nodeListener = new Node(peerListener)
+  const nodeListener = new Node({
+    peerInfo: peerListener
+  })
 
   nodeListener.start((err) => {
     if (err) {
       throw err
     }
 
-    nodeListener.switch.on('peer-mux-established', (peerInfo) => {
+    nodeListener.on('peer:connect', (peerInfo) => {
       console.log(peerInfo.id.toB58String())
     })
 

examples/discovery-mechanisms/1.js

@@ -1,12 +1,13 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
-const Railing = require('libp2p-railing')
+const Bootstrap = require('libp2p-railing')
 const waterfall = require('async/waterfall')
+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 = [
@@ -22,16 +23,26 @@ const bootstrapers = [
 ]
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
+        peerDiscovery: [ Bootstrap ]
       },
-      discovery: [new Railing(bootstrapers)]
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            interval: 2000,
+            enabled: true,
+            list: bootstrapers
           }
-    super(modules, peerInfo)
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -41,7 +52,9 @@ waterfall([
   (cb) => PeerInfo.create(cb),
   (peerInfo, cb) => {
     peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle(peerInfo)
+    node = new MyBundle({
+      peerInfo
+    })
     node.start(cb)
   }
 ], (err) => {

examples/discovery-mechanisms/2.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
@@ -8,18 +8,28 @@ const PeerInfo = require('peer-info')
 const MulticastDNS = require('libp2p-mdns')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
+        peerDiscovery: [ MulticastDNS ]
       },
-      discovery: [new MulticastDNS(peerInfo, { interval: 1000 })]
+      config: {
+        peerDiscovery: {
+          mdns: {
+            interval: 1000,
+            enabled: true
           }
-    super(modules, peerInfo)
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -30,7 +40,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/discovery-mechanisms/README.md

@@ -13,17 +13,28 @@ For this demo, we will connect to IPFS default bootstrapper nodes and so, we wil
 First, we create our libp2p bundle.
 
 ```JavaScript
+const Bootstrap = require('libp2p-railing')
 class MyBundle extends libp2p {
   constructor (peerInfo) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
+        peerDiscovery: [ Bootstrap ]
       },
-      discovery: [new Railing(bootstrapers)]
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            interval: 2000,
+            enabled: true,
+            list: bootstrapers
           }
-    super(modules, peerInfo)
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```
@@ -53,7 +64,9 @@ waterfall([
   (cb) => PeerInfo.create(cb),
   (peerInfo, cb) => {
     peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle(peerInfo)
+    node = new MyBundle({
+      peerInfo
+    })
     node.start(cb)
   }
 ], (err) => {
@@ -108,17 +121,25 @@ Update your libp2p bundle to include MulticastDNS.
 ```JavaScript
 class MyBundle extends libp2p {
   constructor (peerInfo) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
+        peerDiscovery: [ MulticastDNS ]
       },
-      // We set the interval here to 1 second so that is faster to observe. The
+      config: {
-      // default is 10 seconds.
+        peerDiscovery: {
-      discovery: [new MulticastDNS(peerInfo, { interval: 1000 })]
+          mdns: {
+            // Run at 1s so we can observe more quickly, default is 10s
+            interval: 1000,
+            enabled: true
           }
-    super(modules, peerInfo)
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```

examples/echo/README.md

@@ -1 +1,13 @@
 # Echo example with libp2p
+
+This example performs a simple echo from the listener to the dialer.
+
+## Setup
+1. Install the modules, `npm install`.
+2. Open 2 terminal windows in the `./src` directory.
+
+## Running
+1. Run the listener in window 1, `node listener.js`
+2. Run the dialer in window 2, `node dialer.js`
+3. You should see console logs showing the dial, and the received echo of _hey_
+4. If you look at the listener window, you will see it receiving the dial

examples/echo/src/dialer.js

@@ -21,7 +21,9 @@ async.parallel([
   const dialerId = ids[0]
   const dialerPeerInfo = new PeerInfo(dialerId)
   dialerPeerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-  const dialerNode = new Node(dialerPeerInfo)
+  const dialerNode = new Node({
+    peerInfo: dialerPeerInfo
+  })
 
   // Peer to Dial
   const listenerPeerInfo = new PeerInfo(ids[1])

examples/echo/src/libp2p-bundle.js

@@ -3,11 +3,12 @@
 const TCP = require('libp2p-tcp')
 const MulticastDNS = require('libp2p-mdns')
 const WS = require('libp2p-websockets')
-const Railing = require('libp2p-railing')
+const Bootstrap = require('libp2p-railing')
 const spdy = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
 const mplex = require('libp2p-mplex')
 const secio = require('libp2p-secio')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../../..')
 
 function mapMuxers (list) {
@@ -36,44 +37,40 @@ function getMuxers (muxers) {
 }
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
+  constructor (_options) {
-    options = options || {}
+    const defaults = {
-
+      modules: {
-    const modules = {
         transport: [
-        new TCP(),
+          TCP,
-        new WS()
+          WS
         ],
-      connection: {
+        streamMuxer: getMuxers(_options.muxer),
-        muxer: getMuxers(options.muxer),
+        connEncryption: [ secio ],
-        crypto: [ secio ]
+        peerDiscovery: [
+          MulticastDNS,
+          Bootstrap
+        ],
+        dht: KadDHT
       },
-      discovery: []
+      config: {
+        peerDiscovery: {
+          mdns: {
+            interval: 10000,
+            enabled: false
+          },
+          bootstrap: {
+            interval: 10000,
+            enabled: false,
+            list: _options.bootstrapList
+          }
+        },
+        dht: {
+          kBucketSize: 20
+        }
+      }
     }
 
-    if (options.dht) {
+    super(defaultsDeep(_options, defaults))
-      modules.DHT = KadDHT
-    }
-
-    if (options.mdns) {
-      const mdns = new MulticastDNS(peerInfo, 'ipfs.local')
-      modules.discovery.push(mdns)
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
-    }
-
-    if (options.modules && options.modules.transport) {
-      options.modules.transport.forEach((t) => modules.transport.push(t))
-    }
-
-    if (options.modules && options.modules.discovery) {
-      options.modules.discovery.forEach((d) => modules.discovery.push(d))
-    }
-
-    super(modules, peerInfo, peerBook, options)
   }
 }
 

examples/echo/src/listener.js

@@ -25,9 +25,11 @@ series([
   (cb) => {
     const listenerPeerInfo = new PeerInfo(listenerId)
     listenerPeerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/10333')
-    listenerNode = new Node(listenerPeerInfo)
+    listenerNode = new Node({
+      peerInfo: listenerPeerInfo
+    })
 
-    listenerNode.switch.on('peer-mux-established', (peerInfo) => {
+    listenerNode.on('peer:connect', (peerInfo) => {
       console.log('received dial to me from:', peerInfo.id.toB58String())
     })
 

examples/encrypted-communications/1.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const SPDY = require('libp2p-spdy')
 const SECIO = require('libp2p-secio')
@@ -8,17 +8,19 @@ const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const pull = require('pull-stream')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [SPDY],
+        streamMuxer: [ SPDY ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ]
       }
     }
-    super(modules, peerInfo)
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -29,7 +31,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/encrypted-communications/README.md

@@ -19,15 +19,16 @@ const SECIO = require('libp2p-secio')
 
 class MyBundle extends libp2p {
   constructor (peerInfo) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [SPDY],
+        streamMuxer: [ SPDY ],
         // Attach secio as the crypto channel to use
-        crypto: [SECIO]
+        connEncryption: [ SECIO ]
       }
     }
-    super(modules, peerInfo)
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```

examples/libp2p-in-the-browser/1/package.json

@@ -13,17 +13,16 @@
     "browserify": "^14.5.0",
     "concat-stream": "^1.6.0",
     "detect-dom-ready": "^1.0.2",
-    "node-static": "^0.7.10"
+    "node-static": "~0.7.10"
   },
   "dependencies": {
     "detect-dom-ready": "^1.0.2",
-    "libp2p": "^0.13.0",
+    "libp2p-mplex": "~0.8.0",
-    "libp2p-mplex": "^0.6.0",
+    "libp2p-railing": "~0.9.1",
-    "libp2p-railing": "^0.7.1",
+    "libp2p-secio": "~0.10.0",
-    "libp2p-secio": "^0.8.1",
+    "libp2p-spdy": "~0.12.1",
-    "libp2p-spdy": "^0.11.0",
+    "libp2p-webrtc-star": "~0.15.3",
-    "libp2p-webrtc-star": "^0.13.2",
+    "libp2p-websockets": "~0.12.0",
-    "libp2p-websockets": "^0.10.4",
+    "peer-info": "~0.14.1"
-    "peer-info": "^0.11.0"
   }
 }

examples/libp2p-in-the-browser/1/src/browser-bundle.js

@@ -2,13 +2,12 @@
 
 const WebRTCStar = require('libp2p-webrtc-star')
 const WebSockets = require('libp2p-websockets')
-
 const Mplex = require('libp2p-mplex')
 const SPDY = require('libp2p-spdy')
 const SECIO = require('libp2p-secio')
-
+const Bootstrap = require('libp2p-railing')
-const Railing = require('libp2p-railing')
+const defaultsDeep = require('@nodeutils/defaults-deep')
-const libp2p = require('libp2p')
+const libp2p = require('../../../../')
 
 // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json
 const bootstrapers = [
@@ -25,30 +24,56 @@ const bootstrapers = [
 ]
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
+  constructor (_options) {
-    options = options || {}
+    const wrtcStar = new WebRTCStar({ id: _options.peerInfo.id })
 
-    const wstar = new WebRTCStar()
+    const defaults = {
-
+      modules: {
-    const modules = {
         transport: [
-        wstar,
+          wrtcStar,
           new WebSockets()
         ],
-      connection: {
+        streamMuxer: [
-        muxer: [
           Mplex,
           SPDY
         ],
-        crypto: [SECIO]
+        connEncryption: [
-      },
+          SECIO
-      discovery: [
+        ],
-        wstar.discovery,
+        peerDiscovery: [
-        new Railing(bootstrapers)
+          wrtcStar.discovery,
+          Bootstrap
         ]
+      },
+      config: {
+        peerDiscovery: {
+          webRTCStar: {
+            enabled: true
+          },
+          websocketStar: {
+            enabled: true
+          },
+          bootstrap: {
+            interval: 10000,
+            enabled: false,
+            list: bootstrapers
+          }
+        },
+        relay: {
+          enabled: false,
+          hop: {
+            enabled: false,
+            active: false
+          }
+        },
+        EXPERIMENTAL: {
+          dht: false,
+          pubsub: false
+        }
+      }
     }
 
-    super(modules, peerInfo, peerBook, options)
+    super(defaultsDeep(_options, defaults))
   }
 }
 

examples/libp2p-in-the-browser/1/src/create-node.js

@@ -14,7 +14,9 @@ function createNode (callback) {
 
     peerInfo.multiaddrs.add(ma)
 
-    const node = new Node(peerInfo)
+    const node = new Node({
+      peerInfo
+    })
 
     node.idStr = peerIdStr
     callback(null, node)

examples/peer-and-content-routing/1.js

@@ -1,27 +1,36 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const KadDHT = require('libp2p-kad-dht')
-
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
-      },
         // we add the DHT module that will enable Peer and Content Routing
-      DHT: KadDHT
+        dht: KadDHT
+      },
+      config: {
+        dht: {
+          kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          dht: true
         }
-    super(modules, peerInfo)
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -32,7 +41,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/peer-and-content-routing/2.js

@@ -1,28 +1,37 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const CID = require('cids')
 const KadDHT = require('libp2p-kad-dht')
-
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
-      },
         // we add the DHT module that will enable Peer and Content Routing
-      DHT: KadDHT
+        dht: KadDHT
+      },
+      config: {
+        dht: {
+          kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          dht: true
         }
-    super(modules, peerInfo)
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -33,7 +42,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/peer-and-content-routing/README.md

@@ -14,17 +14,27 @@ First, let's update our bundle to support Peer Routing and Content Routing.
 
 ```JavaScript
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
-      },
         // we add the DHT module that will enable Peer and Content Routing
-      DHT: KadDHT
+        dht: KadDHT
+      },
+      config: {
+        dht: {
+          kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          // dht must be enabled
+          dht: true
         }
-    super(modules, peerInfo)
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```

examples/protocol-and-stream-muxing/1.js

@@ -1,18 +1,22 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const pull = require('pull-stream')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()]
+      modules: {
+        transport: [ TCP ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -23,7 +27,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/protocol-and-stream-muxing/2.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const SPDY = require('libp2p-spdy')
 const PeerInfo = require('peer-info')
@@ -8,16 +8,18 @@ const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const series = require('async/series')
 const pull = require('pull-stream')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [SPDY]
+        streamMuxer: [ SPDY ]
       }
     }
-    super(modules, peerInfo)
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -28,7 +30,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/protocol-and-stream-muxing/3.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const SPDY = require('libp2p-spdy')
 const PeerInfo = require('peer-info')
@@ -8,16 +8,18 @@ const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const series = require('async/series')
 const pull = require('pull-stream')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [SPDY]
+        streamMuxer: [ SPDY ]
       }
     }
-    super(modules, peerInfo)
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -28,7 +30,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))
@@ -60,12 +64,12 @@ parallel([
   })
 
   series([
-    (cb) => node1.dial(node2.peerInfo, '/node-2', (err, conn) => {
+    (cb) => node1.dialProtocol(node2.peerInfo, '/node-2', (err, conn) => {
       if (err) { throw err }
       pull(pull.values(['from 1 to 2']), conn)
       cb()
     }),
-    (cb) => node2.dial(node1.peerInfo, '/node-1', (err, conn) => {
+    (cb) => node2.dialProtocol(node1.peerInfo, '/node-1', (err, conn) => {
       if (err) { throw err }
       pull(pull.values(['from 2 to 1']), conn)
       cb()

examples/protocol-and-stream-muxing/README.md

@@ -94,17 +94,18 @@ Currently, we have two available [libp2p-spdy](https://github.com/libp2p/js-libp
 const SPDY = require('libp2p-spdy')
 //...
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
+        transport: [ TCP ],
         // Here we are adding the SPDY muxer to our libp2p bundle.
       // Thanks to protocol muxing, a libp2p bundle can support multiple Stream Muxers at the same
       // time and pick the right one when dialing to a node
-      connection: {
+        streamMuxer: [ SPDY ]
-        muxer: [SPDY]
       }
     }
-    super(modules, peerInfo)
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```

examples/pubsub/1.js

@@ -1,28 +1,39 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const MulticastDNS = require('libp2p-mdns')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const series = require('async/series')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()],
+      modules: {
-      connection: {
+        transport: [ TCP ],
-        muxer: [Mplex],
+        streamMuxer: [ Mplex ],
-        crypto: [SECIO]
+        connEncryption: [ SECIO ],
+        peerDiscovery: [ MulticastDNS ]
       },
-      discovery: [
+      config: {
-        new MulticastDNS(peerInfo, { interval: 2000 })
+        peerDiscovery: {
-      ]
+          mdns: {
+            interval: 2000,
+            enabled: true
           }
-    super(modules, peerInfo)
+        },
+        EXPERIMENTAL: {
+          pubsub: true
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -33,7 +44,9 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({
+        peerInfo
+      })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/transports/1.js

@@ -1,16 +1,22 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()]
+      modules: {
+        transport: [
+          TCP
+        ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -20,7 +26,7 @@ waterfall([
   (cb) => PeerInfo.create(cb),
   (peerInfo, cb) => {
     peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-    node = new MyBundle(peerInfo)
+    node = new MyBundle({ peerInfo: peerInfo })
     node.start(cb)
   }
 ], (err) => {

examples/transports/2.js

@@ -1,18 +1,24 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const parallel = require('async/parallel')
 const pull = require('pull-stream')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP()]
+      modules: {
+        transport: [
+          TCP
+        ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -23,7 +29,7 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({ peerInfo: peerInfo })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/transports/3.js

@@ -1,19 +1,26 @@
 'use strict'
 
-const libp2p = require('libp2p')
+const libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const WebSockets = require('libp2p-websockets')
 const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 const parallel = require('async/parallel')
 const pull = require('pull-stream')
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP(), new WebSockets()]
+      modules: {
+        transport: [
+          TCP,
+          WebSockets
+        ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 
@@ -28,7 +35,7 @@ function createNode (addrs, callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       addrs.forEach((addr) => peerInfo.multiaddrs.add(addr))
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({ peerInfo: peerInfo })
       node.start(cb)
     }
   ], (err) => callback(err, node))

examples/transports/README.md

@@ -10,10 +10,10 @@ A more complete definition of what is a transport can be found on the [interface
 
 When using libp2p, you always want to create your own libp2p Bundle, that is, pick your set of modules and create your network stack with the properties you need. In this example, we will create a bundle with TCP. You can find the complete solution on the file [1.js](./1.js).
 
-You will need 4 deps total, so go ahead and install all of them with: 
+You will need 5 deps total, so go ahead and install all of them with:
 
-```
+```bash
-> npm install libp2p libp2p-tcp peer-info async
+> npm install libp2p libp2p-tcp peer-info async @nodeutils/defaults-deep
 ```
 
 Then, on your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.
@@ -27,16 +27,22 @@ const libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const PeerInfo = require('peer-info')
 const waterfall = require('async/waterfall')
+const defaultsDeep = require('@nodeutils/defaults-deep')
 
 // This MyBundle class is your libp2p bundle packed with TCP
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
+    const defaults = {
       // modules is a JS object that will describe the components
       // we want for our libp2p bundle
-    const modules = {
+      modules: {
-      transport: [new TCP()]
+        transport: [
+          TCP
+        ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```
@@ -57,7 +63,7 @@ waterfall([
     // the multiaddr format, a self describable address
     peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
     // Now we can create a node with that PeerInfo object
-    node = new MyBundle(peerInfo)
+    node = new MyBundle({ peerInfo: peerInfo })
     // Last, we start the node!
     node.start(cb)
   }
@@ -76,7 +82,7 @@ waterfall([
 })
 ```
 
-Running this should result in somehting like:
+Running this should result in something like:
 
 ```bash
 > node 1.js
@@ -98,6 +104,12 @@ For this step, we will need one more dependency.
 > npm install pull-stream
 ```
 
+And we also need to import the module on our .js file:
+
+```js
+const pull = require('pull-stream')
+```
+
 We are going to reuse the MyBundle class from step 1, but this time to make things simpler, we will create two functions, one to create nodes and another to print the addrs to avoid duplicating code.
 
 ```JavaScript
@@ -108,7 +120,7 @@ function createNode (callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({ peerInfo: peerInfo })
       node.start(cb)
     }
   ], (err) => callback(err, node))
@@ -118,11 +130,18 @@ function printAddrs (node, number) {
   console.log('node %s is listening on:', number)
   node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 }
-```
-
-Now we are going to use `async/parallel` to create two nodes, print their addresses and dial from one node to the other.
 
 ```
+
+Now we are going to use `async/parallel` to create two nodes, print their addresses and dial from one node to the other. We already added `async` as a dependency, but still need to import `async/parallel`:
+
+```js
+const parallel = require('async/parallel')
+```
+
+Then,
+
+```js
 parallel([
   (cb) => createNode(cb),
   (cb) => createNode(cb)
@@ -172,7 +191,7 @@ What we are going to do in this step is to create 3 nodes, one with TCP, another
 
 In this example, we will need to also install `libp2p-websockets`, go ahead and install:
 
-```sh
+```bash
 > npm install libp2p-websockets
 ```
 
@@ -183,11 +202,17 @@ const WebSockets = require('libp2p-websockets')
 // ...
 
 class MyBundle extends libp2p {
-  constructor (peerInfo) {
+  constructor (_options) {
-    const modules = {
+    const defaults = {
-      transport: [new TCP(), new WebSockets()]
+      modules: {
+        transport: [
+          TCP,
+          WebSockets
+        ]
       }
-    super(modules, peerInfo)
+    }
+
+    super(defaultsDeep(_options, defaults))
   }
 }
 ```
@@ -206,7 +231,7 @@ function createNode (addrs, callback) {
     (cb) => PeerInfo.create(cb),
     (peerInfo, cb) => {
       addrs.forEach((addr) => peerInfo.multiaddrs.add(addr))
-      node = new MyBundle(peerInfo)
+      node = new MyBundle({ peerInfo: peerInfo })
       node.start(cb)
     }
   ], (err) => callback(err, node))

package.json

@@ -1,7 +1,8 @@
 {
   "name": "libp2p",
-  "version": "0.20.2",
+  "version": "0.23.1",
   "description": "JavaScript base class for libp2p bundles",
+  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
   "main": "src/index.js",
   "scripts": {
     "lint": "aegir lint",
@@ -26,55 +27,58 @@
     "node": ">=6.0.0",
     "npm": ">=3.0.0"
   },
-  "pre-push": [
-    "lint",
-    "test"
-  ],
-  "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/libp2p/js-libp2p/issues"
   },
   "homepage": "https://github.com/libp2p/js-libp2p",
+  "browser": {
+    "joi": "joi-browser",
+    "./test/utils/bundle-nodejs": "./test/utils/bundle-browser"
+  },
   "dependencies": {
-    "async": "^2.6.0",
+    "async": "^2.6.1",
-    "libp2p-floodsub": "^0.15.0",
+    "joi": "^13.4.0",
-    "libp2p-ping": "~0.7.0",
+    "joi-browser": "^13.4.0",
-    "libp2p-switch": "~0.39.0",
+    "libp2p-connection-manager": "~0.0.2",
+    "libp2p-floodsub": "~0.15.0",
+    "libp2p-ping": "~0.8.0",
+    "libp2p-switch": "~0.40.7",
+    "libp2p-websockets": "~0.12.0",
     "mafmt": "^6.0.0",
-    "multiaddr": "^4.0.0",
+    "multiaddr": "^5.0.0",
-    "peer-book": "~0.7.0",
+    "peer-book": "~0.8.0",
-    "peer-id": "~0.10.7",
+    "peer-id": "~0.11.0",
-    "libp2p-websockets": "^0.11.0",
     "peer-info": "~0.14.1"
   },
   "devDependencies": {
-    "aegir": "^13.0.6",
+    "@nodeutils/defaults-deep": "^1.1.0",
+    "aegir": "^15.1.0",
     "chai": "^4.1.2",
     "cids": "~0.5.3",
     "dirty-chai": "^2.0.1",
     "electron-webrtc": "~0.3.0",
     "libp2p-circuit": "~0.2.0",
-    "libp2p-kad-dht": "~0.10.0",
+    "libp2p-kad-dht": "~0.10.1",
-    "libp2p-mdns": "~0.11.0",
+    "libp2p-mdns": "~0.12.0",
-    "libp2p-mplex": "~0.7.0",
+    "libp2p-mplex": "~0.8.0",
-    "libp2p-railing": "~0.8.0",
+    "libp2p-railing": "~0.9.2",
     "libp2p-secio": "~0.10.0",
     "libp2p-spdy": "~0.12.1",
     "libp2p-tcp": "~0.12.0",
-    "libp2p-webrtc-star": "~0.14.0",
+    "libp2p-webrtc-star": "~0.15.3",
-    "libp2p-websocket-star": "~0.8.0",
+    "libp2p-websocket-star": "~0.8.1",
     "libp2p-websocket-star-rendezvous": "~0.2.3",
     "lodash.times": "^4.3.2",
-    "pre-commit": "^1.2.2",
     "pull-goodbye": "0.0.2",
     "pull-serializer": "~0.3.2",
-    "pull-stream": "^3.6.7",
+    "pull-stream": "^3.6.8",
-    "safe-buffer": "^5.1.1",
+    "sinon": "^6.1.4",
-    "sinon": "^4.5.0",
+    "webrtcsupport": "^2.2.0",
-    "wrtc": "0.1.1"
+    "wrtc": "~0.1.6"
   },
   "contributors": [
+    "Alan Shaw <alan@tableflip.io>",
     "Chris Bratlien <chrisbratlien@gmail.com>",
     "Chris Dostert <chrisdostert@users.noreply.github.com>",
     "Daijiro Wachi <daijiro.wachi@gmail.com>",
@@ -82,21 +86,27 @@
     "Diogo Silva <fsdiogo@gmail.com>",
     "Dmitriy Ryajov <dryajov@gmail.com>",
     "Elven <mon.samuel@qq.com>",
+    "Florian-Merle <florian.david.merle@gmail.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Giovanni T. Parra <fiatjaf@gmail.com>",
+    "Hugo Dias <hugomrdias@gmail.com>",
     "Irakli Gozalishvili <rfobic@gmail.com>",
+    "Jacob Heun <jacobheun@gmail.com>",
     "Joel Gustafson <joelg@mit.edu>",
     "John Rees <johnrees@users.noreply.github.com>",
+    "João Santos <joaosantos15@users.noreply.github.com>",
     "Kevin Kwok <antimatter15@gmail.com>",
     "Lars Gierth <lgierth@users.noreply.github.com>",
     "Maciej Krüger <mkg20001@gmail.com>",
     "Nuno Nogueira <nunofmn@gmail.com>",
+    "Pedro Teixeira <pedro@protocol.ai>",
     "Pedro Teixeira <i@pgte.me>",
     "RasmusErik Voel Jensen <github@solsort.com>",
     "Richard Littauer <richard.littauer@gmail.com>",
     "Ryan Bell <ryan@piing.net>",
     "Sönke Hahn <soenkehahn@gmail.com>",
     "Tiago Alves <alvesjtiago@gmail.com>",
+    "Volker Mische <volker.mische@gmail.com>",
     "Zane Starr <zcstarr@gmail.com>",
     "greenkeeperio-bot <support@greenkeeper.io>",
     "mayerwin <mayerwin@users.noreply.github.com>",

scripts/generate-package-table-for-readme.js

@@ -0,0 +1,146 @@
+#! /usr/bin/env node
+
+'use strict'
+
+// This script generates the table of packages you can see in the readme
+
+// Columns to show at the header of the table
+const columns = [
+  'Package',
+  'Version',
+  'Deps',
+  'CI',
+  'Coverage'
+]
+
+// Headings are a string
+// Arrays are packages. Index 0 is the GitHub repo and index 1 is the npm package
+const rows = [
+  'Libp2p',
+  ['libp2p/interface-libp2p', 'interface-libp2p'],
+  ['libp2p/js-libp2p', 'libp2p'],
+
+  'Connection',
+  ['libp2p/interface-connection', 'interface-connection'],
+
+  'Transport',
+  ['libp2p/interface-transport', 'interface-transport'],
+  ['libp2p/js-libp2p-circuit', 'libp2p-circuit'], // should this be NAT Traversal only?
+  ['libp2p/js-libp2p-tcp', 'libp2p-tcp'],
+  ['libp2p/js-libp2p-udp', 'libp2p-udp'],
+  ['libp2p/js-libp2p-udt', 'libp2p-udt'],
+  ['libp2p/js-libp2p-utp', 'libp2p-utp'],
+  ['libp2p/js-libp2p-webrtc-direct', 'libp2p-webrtc-direct'],
+  ['libp2p/js-libp2p-webrtc-star', 'libp2p-webrtc-star'],
+  ['libp2p/js-libp2p-websockets', 'libp2p-websockets'],
+  ['libp2p/js-libp2p-websocket-star', 'libp2p-websocket-star'],
+  ['libp2p/js-libp2p-websocket-star-rendezvous', 'libp2p-websocket-star-rendezvous'],
+
+  'Crypto Channels',
+  ['libp2p/js-libp2p-secio', 'libp2p-secio'],
+
+  'Stream Muxers',
+  ['libp2p/interface-stream-muxer', 'interface-stream-muxer'],
+  ['libp2p/js-libp2p-mplex', 'libp2p-mplex'],
+  ['libp2p/js-libp2p-spdy', 'libp2p-spdy'],
+
+  'Discovery',
+  ['libp2p/interface-peer-discovery', 'interface-peer-discovery'],
+  ['libp2p/js-libp2p-bootstrap', 'libp2p-bootstrap'],
+  ['libp2p/js-libp2p-kad-dht', 'libp2p-kad-dht'], // should this be here?
+  ['libp2p/js-libp2p-mdns', 'libp2p-mdns'],
+  ['libp2p/js-libp2p-rendezvous', 'libp2p-rendezvous'],
+  ['libp2p/js-libp2p-webrtc-star', 'libp2p-webrtc-star'],
+  ['libp2p/js-libp2p-websocket-star', 'libp2p-websocket-star'],
+
+  'NAT Traversal',
+  ['libp2p/js-libp2p-circuit', 'libp2p-circuit'],
+  ['libp2p/js-libp2p-nat-mngr', 'libp2p-nat-mngr'],
+
+  'Data Types',
+  ['libp2p/js-peer-book', 'peer-book'],
+  ['libp2p/js-peer-id', 'peer-id'],
+  ['libp2p/js-peer-info', 'peer-info'],
+
+  'Content Routing',
+  ['libp2p/interface-content-routing', 'interface-content-routing'],
+  ['libp2p/js-libp2p-delegated-content-routing', 'libp2p-delegated-content-routing'],
+  ['libp2p/js-libp2p-kad-dht', 'libp2p-kad-dht'],
+
+  'Peer Routing',
+  ['libp2p/interface-peer-routing', 'interface-peer-routing'],
+  ['libp2p/js-libp2p-delegated-peer-routing', 'libp2p-delegated-peer-routing'],
+  ['libp2p/js-libp2p-kad-dht', 'libp2p-kad-dht'],
+
+  'Record Store',
+  ['libp2p/interface-record-store', 'interface-record-store'],
+  ['libp2p/js-libp2p-record', 'libp2p-record'],
+
+  'Generics',
+  ['libp2p/js-libp2p-connection-manager', 'libp2p-connection-manager'],
+  ['libp2p/js-libp2p-crypto', 'libp2p-crypto'],
+  ['libp2p/js-libp2p-crypto-secp256k1', 'libp2p-crypto-secp256k1'],
+  ['libp2p/js-libp2p-switch', 'libp2p-switch'],
+
+  'Extensions',
+  ['libp2p/js-libp2p-floodsub', 'libp2p-floodsub'],
+  ['libp2p/js-libp2p-identify', 'libp2p-identify'],
+  ['libp2p/js-libp2p-keychain', 'libp2p-keychain'],
+  ['libp2p/js-libp2p-ping', 'libp2p-ping'],
+  ['libp2p/js-libp2p-pnet', 'libp2p-pnet'],
+
+  'Utilities',
+  ['libp2p/js-p2pcat', 'p2pcat']
+]
+
+const isItemPackage = (item) => {
+  return Array.isArray(item)
+}
+
+const packageBadges = [
+  // Package
+  (gh, npm) => `[\`${npm}\`](//github.com/${gh})`,
+  // Version
+  (gh, npm) => `[![npm](https://img.shields.io/npm/v/${npm}.svg?maxAge=86400&style=flat-square)](//github.com/${gh}/releases)`,
+  // Deps
+  (gh, npm) => `[![Deps](https://david-dm.org/${gh}.svg?style=flat-square)](https://david-dm.org/${gh})`,
+  // CI
+  (gh, npm) => {
+    // Need to fix the path for jenkins links, as jenkins adds `/job/` between everything
+    const jenkinsPath = gh.split('/').join('/job/')
+    return `[![jenkins](https://ci.ipfs.team/buildStatus/icon?job=${gh}/master)](https://ci.ipfs.team/job/${jenkinsPath}/job/master/)`
+  },
+  // Coverage
+  (gh, npm) => `[![codecov](https://codecov.io/gh/${gh}/branch/master/graph/badge.svg)](https://codecov.io/gh/${gh})`
+]
+
+// Creates the table row for a package
+const generatePackageRow = (item) => {
+  const row = packageBadges.map((func) => {
+    // First string is GitHub path, second is npm package name
+    return func(item[0], item[1])
+  }).join(' | ')
+  const fullRow = `| ${row} |`
+  return fullRow
+}
+
+// Generates a row for the table, depending if it's a package or a heading
+const generateRow = (item) => {
+  if (isItemPackage(item)) {
+    return generatePackageRow(item)
+  } else {
+    return `| **${item}** |`
+  }
+}
+
+const header = `| ${columns.join(' | ')} |`
+const hr = `| ${columns.map(() => '---------').join('|')} |`
+
+const toPrint = [
+  header,
+  hr,
+  rows.map((row) => generateRow(row)).join('\n')
+]
+
+toPrint.forEach((t) => console.log(t))
+

src/config.js

@@ -0,0 +1,50 @@
+'use strict'
+
+const Joi = require('joi')
+
+const ModuleSchema = Joi.alternatives().try(Joi.func(), Joi.object())
+
+const OptionsSchema = Joi.object({
+  // TODO: create proper validators for the generics
+  connectionManager: Joi.object(),
+  peerInfo: Joi.object().required(),
+  peerBook: Joi.object(),
+  modules: Joi.object().keys({
+    transport: Joi.array().items(ModuleSchema).min(1).required(),
+    streamMuxer: Joi.array().items(ModuleSchema).allow(null),
+    connEncryption: Joi.array().items(ModuleSchema).allow(null),
+    connProtector: Joi.object().keys({
+      protect: Joi.func().required()
+    }).unknown(),
+    peerDiscovery: Joi.array().items(ModuleSchema).allow(null),
+    dht: ModuleSchema.allow(null)
+  }).required(),
+  config: Joi.object().keys({
+    peerDiscovery: Joi.object().allow(null),
+    relay: Joi.object().keys({
+      enabled: Joi.boolean().default(false),
+      hop: Joi.object().keys({
+        enabled: Joi.boolean().default(false),
+        active: Joi.boolean().default(false)
+      })
+    }).default(),
+    dht: Joi.object().keys({
+      kBucketSize: Joi.number().allow(null)
+    }),
+    EXPERIMENTAL: Joi.object().keys({
+      dht: Joi.boolean().default(false),
+      pubsub: Joi.boolean().default(false)
+    }).default()
+  }).default()
+})
+
+module.exports.validate = (options) => {
+  options = Joi.attempt(options, OptionsSchema)
+
+  // Ensure dht is correct
+  if (options.config.EXPERIMENTAL.dht) {
+    Joi.assert(options.modules.dht, ModuleSchema.required())
+  }
+
+  return options
+}

src/get-peer-info.js

@@ -3,6 +3,7 @@
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const multiaddr = require('multiaddr')
+const setImmediate = require('async/setImmediate')
 
 module.exports = (node) => {
   /*
@@ -16,12 +17,19 @@ module.exports = (node) => {
     // Multiaddr instance or Multiaddr String
     } else if (multiaddr.isMultiaddr(peer) || typeof peer === 'string') {
       if (typeof peer === 'string') {
+        try {
           peer = multiaddr(peer)
+        } catch (err) {
+          return setImmediate(() => callback(err))
+        }
       }
 
       const peerIdB58Str = peer.getPeerId()
+
       if (!peerIdB58Str) {
-        throw new Error(`peer multiaddr instance or string must include peerId`)
+        return setImmediate(() => {
+          callback(new Error('peer multiaddr instance or string must include peerId'))
+        })
       }
 
       try {

src/index.js

@@ -3,101 +3,110 @@
 const EventEmitter = require('events').EventEmitter
 const assert = require('assert')
 
-const setImmediate = require('async/setImmediate')
 const each = require('async/each')
 const series = require('async/series')
+const parallel = require('async/parallel')
 
 const PeerBook = require('peer-book')
 const Switch = require('libp2p-switch')
 const Ping = require('libp2p-ping')
 const WebSockets = require('libp2p-websockets')
+const ConnectionManager = require('libp2p-connection-manager')
 
 const peerRouting = require('./peer-routing')
 const contentRouting = require('./content-routing')
 const dht = require('./dht')
 const pubsub = require('./pubsub')
 const getPeerInfo = require('./get-peer-info')
+const validateConfig = require('./config').validate
 
 exports = module.exports
 
 const NOT_STARTED_ERROR_MESSAGE = 'The libp2p node is not started yet'
 
 class Node extends EventEmitter {
-  constructor (_modules, _peerInfo, _peerBook, _options) {
+  constructor (_options) {
     super()
-    assert(_modules, 'requires modules to equip libp2p with features')
+    // validateConfig will ensure the config is correct,
-    assert(_peerInfo, 'requires a PeerInfo instance')
+    // and add default values where appropriate
+    _options = validateConfig(_options)
 
-    this.modules = _modules
+    this.peerInfo = _options.peerInfo
-    this.peerInfo = _peerInfo
+    this.peerBook = _options.peerBook || new PeerBook()
-    this.peerBook = _peerBook || new PeerBook()
-    _options = _options || {}
 
+    this._modules = _options.modules
+    this._config = _options.config
     this._isStarted = false
+    this._transport = [] // Transport instances/references
+    this._discovery = [] // Discovery service instances/references
 
-    this.switch = new Switch(this.peerInfo, this.peerBook, _options.switch)
+    this._switch = new Switch(this.peerInfo, this.peerBook, _options.switch)
-    this.stats = this.switch.stats
+    this.stats = this._switch.stats
+    this.connectionManager = new ConnectionManager(this, _options.connectionManager)
 
     // Attach stream multiplexers
-    if (this.modules.connection && this.modules.connection.muxer) {
+    if (this._modules.streamMuxer) {
-      let muxers = this.modules.connection.muxer
+      let muxers = this._modules.streamMuxer
-      muxers = Array.isArray(muxers) ? muxers : [muxers]
+      muxers.forEach((muxer) => this._switch.connection.addStreamMuxer(muxer))
-      muxers.forEach((muxer) => this.switch.connection.addStreamMuxer(muxer))
 
-      // If muxer exists, we can use Identify
+      // If muxer exists
-      this.switch.connection.reuse()
+      //   we can use Identify
+      this._switch.connection.reuse()
+      //   we can use Relay for listening/dialing
+      this._switch.connection.enableCircuitRelay(this._config.relay)
 
-      // If muxer exists, we can use Relay for listening/dialing
+      // Received incomming dial and muxer upgrade happened,
-      this.switch.connection.enableCircuitRelay(_options.relay)
-
-      // Received incommind dial and muxer upgrade happened,
       // reuse this muxed connection
-      this.switch.on('peer-mux-established', (peerInfo) => {
+      this._switch.on('peer-mux-established', (peerInfo) => {
         this.emit('peer:connect', peerInfo)
         this.peerBook.put(peerInfo)
       })
 
-      this.switch.on('peer-mux-closed', (peerInfo) => {
+      this._switch.on('peer-mux-closed', (peerInfo) => {
         this.emit('peer:disconnect', peerInfo)
       })
     }
 
     // Attach crypto channels
-    if (this.modules.connection && this.modules.connection.crypto) {
+    if (this._modules.connEncryption) {
-      let cryptos = this.modules.connection.crypto
+      let cryptos = this._modules.connEncryption
-      cryptos = Array.isArray(cryptos) ? cryptos : [cryptos]
       cryptos.forEach((crypto) => {
-        this.switch.connection.crypto(crypto.tag, crypto.encrypt)
+        this._switch.connection.crypto(crypto.tag, crypto.encrypt)
       })
     }
 
-    // Attach discovery mechanisms
+    // Attach private network protector
-    if (this.modules.discovery) {
+    if (this._modules.connProtector) {
-      let discoveries = this.modules.discovery
+      this._switch.protector = this._modules.connProtector
-      discoveries = Array.isArray(discoveries) ? discoveries : [discoveries]
+    } else if (process.env.LIBP2P_FORCE_PNET) {
-
+      throw new Error('Private network is enforced, but no protector was provided')
-      discoveries.forEach((discovery) => {
-        discovery.on('peer', (peerInfo) => this.emit('peer:discovery', peerInfo))
-      })
     }
 
     // dht provided components (peerRouting, contentRouting, dht)
-    if (_modules.DHT) {
+    if (this._config.EXPERIMENTAL.dht) {
-      this._dht = new this.modules.DHT(this.switch, {
+      const DHT = this._modules.dht
-        kBucketSize: 20,
+      this._dht = new DHT(this._switch, {
-        datastore: _options.DHT && _options.DHT.datastore
+        kBucketSize: this._config.dht.kBucketSize || 20,
+        // TODO make datastore an option of libp2p itself so
+        // that other things can use it as well
+        datastore: dht.datastore
       })
     }
 
+    // enable/disable pubsub
+    if (this._config.EXPERIMENTAL.pubsub) {
+      this.pubsub = pubsub(this)
+    }
+
+    // Attach remaining APIs
     this.peerRouting = peerRouting(this)
     this.contentRouting = contentRouting(this)
     this.dht = dht(this)
-    this.pubsub = pubsub(this)
 
     this._getPeerInfo = getPeerInfo(this)
 
     // Mount default protocols
-    Ping.mount(this.switch)
+    Ping.mount(this._switch)
   }
 
   /*
@@ -105,14 +114,11 @@ class Node extends EventEmitter {
    *   - create listeners on the multiaddrs the Peer wants to listen
    */
   start (callback) {
-    if (!this.modules.transport) {
+    if (!this._modules.transport) {
       return callback(new Error('no transports were present'))
     }
 
     let ws
-    let transports = this.modules.transport
-
-    transports = Array.isArray(transports) ? transports : [transports]
 
     // so that we can have webrtc-star addrs without adding manually the id
     const maOld = []
@@ -126,30 +132,71 @@ class Node extends EventEmitter {
     this.peerInfo.multiaddrs.replace(maOld, maNew)
 
     const multiaddrs = this.peerInfo.multiaddrs.toArray()
-    transports.forEach((transport) => {
+
-      if (transport.filter(multiaddrs).length > 0) {
+    this._modules.transport.forEach((Transport) => {
-        this.switch.transport.add(
+      let t
-          transport.tag || transport.constructor.name, transport)
+
-      } else if (WebSockets.isWebSockets(transport)) {
+      if (typeof Transport === 'function') {
-        // TODO find a cleaner way to signal that a transport is always
+        t = new Transport()
-        // used for dialing, even if no listener
+      } else {
-        ws = transport
+        t = Transport
       }
+
+      if (t.filter(multiaddrs).length > 0) {
+        this._switch.transport.add(t.tag || t.constructor.name, 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
+        ws = t
+      }
+      this._transport.push(t)
     })
 
     series([
-      (cb) => this.switch.start(cb),
+      (cb) => {
+        this.connectionManager.start()
+        this._switch.start(cb)
+      },
       (cb) => {
         if (ws) {
           // always add dialing on websockets
-          this.switch.transport.add(ws.tag || ws.constructor.name, ws)
+          this._switch.transport.add(ws.tag || ws.constructor.name, ws)
         }
 
         // all transports need to be setup before discover starts
-        if (this.modules.discovery) {
+        if (this._modules.peerDiscovery) {
-          return each(this.modules.discovery, (d, cb) => d.start(cb), cb)
+          each(this._modules.peerDiscovery, (D, _cb) => {
+            let config = {}
+
+            if (D.tag &&
+              this._config.peerDiscovery &&
+              this._config.peerDiscovery[D.tag]) {
+              config = this._config.peerDiscovery[D.tag]
             }
+
+            // If not configured to be enabled/disabled then enable by default
+            const enabled = config.enabled == null ? true : config.enabled
+
+            // If enabled then start it
+            if (enabled) {
+              let d
+
+              if (typeof D === 'function') {
+                d = new D(Object.assign({}, config, { peerInfo: this.peerInfo }))
+              } else {
+                d = D
+              }
+
+              d.on('peer', (peerInfo) => this.emit('peer:discovery', peerInfo))
+              this._discovery.push(d)
+              d.start(_cb)
+            } else {
+              _cb()
+            }
+          }, cb)
+        } else {
           cb()
+        }
       },
       (cb) => {
         // TODO: chicken-and-egg problem #1:
@@ -164,7 +211,7 @@ class Node extends EventEmitter {
       (cb) => {
         // TODO: chicken-and-egg problem #2:
         // have to set started here because FloodSub requires libp2p is already started
-        if (this._options !== false) {
+        if (this._floodSub) {
           this._floodSub.start(cb)
         } else {
           cb()
@@ -175,14 +222,12 @@ class Node extends EventEmitter {
         // detect which multiaddrs we don't have a transport for and remove them
         const multiaddrs = this.peerInfo.multiaddrs.toArray()
 
-        transports.forEach((transport) => {
         multiaddrs.forEach((multiaddr) => {
           if (!multiaddr.toString().match(/\/p2p-circuit($|\/)/) &&
-                !transports.find((transport) => transport.filter(multiaddr).length > 0)) {
+              !this._transport.find((transport) => transport.filter(multiaddr).length > 0)) {
             this.peerInfo.multiaddrs.delete(multiaddr)
           }
         })
-        })
         cb()
       },
       (cb) => {
@@ -196,17 +241,24 @@ class Node extends EventEmitter {
    * Stop the libp2p node by closing its listeners and open connections
    */
   stop (callback) {
-    if (this.modules.discovery) {
-      this.modules.discovery.forEach((discovery) => {
-        setImmediate(() => discovery.stop(() => {}))
-      })
-    }
-
     series([
       (cb) => {
-        if (this._floodSub.started) {
+        if (this._modules.peerDiscovery) {
-          this._floodSub.stop(cb)
+          // stop all discoveries before continuing with shutdown
+          return parallel(
+            this._discovery.map((d) => {
+              return (_cb) => d.stop(() => { _cb() })
+            }),
+            cb
+          )
         }
+        cb()
+      },
+      (cb) => {
+        if (this._floodSub) {
+          return this._floodSub.stop(cb)
+        }
+        cb()
       },
       (cb) => {
         if (this._dht) {
@@ -214,7 +266,10 @@ class Node extends EventEmitter {
         }
         cb()
       },
-      (cb) => this.switch.stop(cb),
+      (cb) => {
+        this.connectionManager.stop()
+        this._switch.stop(cb)
+      },
       (cb) => {
         this.emit('stop')
         cb()
@@ -235,7 +290,7 @@ class Node extends EventEmitter {
     this._getPeerInfo(peer, (err, peerInfo) => {
       if (err) { return callback(err) }
 
-      this.switch.dial(peerInfo, (err) => {
+      this._switch.dial(peerInfo, (err) => {
         if (err) { return callback(err) }
 
         this.peerBook.put(peerInfo)
@@ -255,7 +310,7 @@ class Node extends EventEmitter {
     this._getPeerInfo(peer, (err, peerInfo) => {
       if (err) { return callback(err) }
 
-      this.switch.dial(peerInfo, protocol, (err, conn) => {
+      this._switch.dial(peerInfo, protocol, (err, conn) => {
         if (err) { return callback(err) }
         this.peerBook.put(peerInfo)
         callback(null, conn)
@@ -269,25 +324,28 @@ class Node extends EventEmitter {
     this._getPeerInfo(peer, (err, peerInfo) => {
       if (err) { return callback(err) }
 
-      this.switch.hangUp(peerInfo, callback)
+      this._switch.hangUp(peerInfo, callback)
     })
   }
 
   ping (peer, callback) {
-    assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
+    if (!this.isStarted()) {
+      return callback(new Error(NOT_STARTED_ERROR_MESSAGE))
+    }
+
     this._getPeerInfo(peer, (err, peerInfo) => {
       if (err) { return callback(err) }
 
-      callback(null, new Ping(this.switch, peerInfo))
+      callback(null, new Ping(this._switch, peerInfo))
     })
   }
 
   handle (protocol, handlerFunc, matchFunc) {
-    this.switch.handle(protocol, handlerFunc, matchFunc)
+    this._switch.handle(protocol, handlerFunc, matchFunc)
   }
 
   unhandle (protocol) {
-    this.switch.unhandle(protocol)
+    this._switch.unhandle(protocol)
   }
 }
 

test/base.js

@@ -1,14 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-chai.use(require('dirty-chai'))
-const expect = chai.expect
-
-const libp2p = require('../src')
-
-describe('libp2p', () => {
-  it('the skeleton is fine, now go build your own libp2p bundle', () => {
-    expect(libp2p).to.exist()
-  })
-})

test/browser.js

@@ -1,4 +1,3 @@
 'use strict'
 
-require('./base')
 require('./transports.browser')

test/circuit-relay.node.js

@@ -1,20 +1,21 @@
 /* eslint-env mocha */
 'use strict'
 
-const waterfall = require('async/waterfall')
-const series = require('async/series')
-const parallel = require('async/parallel')
-const utils = require('./utils/node')
-const Circuit = require('libp2p-circuit')
-const multiaddr = require('multiaddr')
-const tryEcho = require('./utils/try-echo')
-
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const sinon = require('sinon')
+const waterfall = require('async/waterfall')
+const series = require('async/series')
+const parallel = require('async/parallel')
+const Circuit = require('libp2p-circuit')
+const multiaddr = require('multiaddr')
 
-describe('circuit relay', function () {
+const createNode = require('./utils/create-node')
+const tryEcho = require('./utils/try-echo')
+const echo = require('./utils/echo')
+
+describe('circuit relay', () => {
   let handlerSpies = []
   let relayNode1
   let relayNode2
@@ -23,29 +24,32 @@ describe('circuit relay', function () {
   let nodeTCP1
   let nodeTCP2
 
-  function setupNode (addrs, options, cb) {
+  function setupNode (addrs, options, callback) {
     if (typeof options === 'function') {
-      cb = options
+      callback = options
       options = {}
     }
 
     options = options || {}
 
-    return utils.createNode(addrs, options, (err, node) => {
+    return createNode(addrs, options, (err, node) => {
       expect(err).to.not.exist()
 
-      node.handle('/echo/1.0.0', utils.echo)
+      node.handle('/echo/1.0.0', echo)
       node.start((err) => {
         expect(err).to.not.exist()
 
-        handlerSpies.push(sinon.spy(node.switch.transports[Circuit.tag].listeners[0].hopHandler, 'handle'))
+        handlerSpies.push(sinon.spy(
-        cb(node)
+          node._switch.transports[Circuit.tag].listeners[0].hopHandler, 'handle'
+        ))
+
+        callback(node)
       })
     })
   }
 
   before(function (done) {
-    this.timeout(20000)
+    this.timeout(20 * 1000)
 
     waterfall([
       // set up passive relay
@@ -53,6 +57,7 @@ describe('circuit relay', function () {
         '/ip4/0.0.0.0/tcp/0/ws',
         '/ip4/0.0.0.0/tcp/0'
       ], {
+        config: {
           relay: {
             enabled: true,
             hop: {
@@ -60,6 +65,7 @@ describe('circuit relay', function () {
               active: false // passive relay
             }
           }
+        }
       }, (node) => {
         relayNode1 = node
         cb()
@@ -69,6 +75,7 @@ describe('circuit relay', function () {
         '/ip4/0.0.0.0/tcp/0/ws',
         '/ip4/0.0.0.0/tcp/0'
       ], {
+        config: {
           relay: {
             enabled: true,
             hop: {
@@ -76,6 +83,7 @@ describe('circuit relay', function () {
               active: false // passive relay
             }
           }
+        }
       }, (node) => {
         relayNode2 = node
         cb()
@@ -84,9 +92,11 @@ describe('circuit relay', function () {
       (cb) => setupNode([
         '/ip4/0.0.0.0/tcp/0/ws'
       ], {
+        config: {
           relay: {
             enabled: true
           }
+        }
       }, (node) => {
         nodeWS1 = node
         cb()
@@ -95,9 +105,11 @@ describe('circuit relay', function () {
       (cb) => setupNode([
         '/ip4/0.0.0.0/tcp/0/ws'
       ], {
+        config: {
           relay: {
             enabled: true
           }
+        }
       }, (node) => {
         nodeWS2 = node
         cb()
@@ -107,9 +119,11 @@ describe('circuit relay', function () {
         '/ip4/0.0.0.0/tcp/0',
         `/ipfs/${relayNode1.peerInfo.id.toB58String()}/p2p-circuit`
       ], {
+        config: {
           relay: {
             enabled: true
           }
+        }
       }, (node) => {
         nodeTCP1 = node
         cb()
@@ -119,9 +133,11 @@ describe('circuit relay', function () {
         '/ip4/0.0.0.0/tcp/0',
         `/ip4/0.0.0.0/tcp/0/ipfs/${relayNode2.peerInfo.id.toB58String()}/p2p-circuit`
       ], {
+        config: {
           relay: {
             enabled: true
           }
+        }
       }, (node) => {
         nodeTCP2 = node
         cb()

test/config.spec.js

@@ -0,0 +1,116 @@
+/* eslint-env mocha */
+'use strict'
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+const PeerInfo = require('peer-info')
+const PeerId = require('peer-id')
+const waterfall = require('async/waterfall')
+const WS = require('libp2p-websockets')
+const Bootstrap = require('libp2p-railing')
+
+const validateConfig = require('../src/config').validate
+
+describe('configuration', () => {
+  let peerInfo
+
+  before((done) => {
+    waterfall([
+      (cb) => PeerId.create({ bits: 512 }, cb),
+      (peerId, cb) => PeerInfo.create(peerId, cb),
+      (info, cb) => {
+        peerInfo = info
+        cb()
+      }
+    ], () => done())
+  })
+
+  it('should throw an error if peerInfo is missing', () => {
+    expect(() => {
+      validateConfig({
+        modules: {
+          transport: [ WS ]
+        }
+      })
+    }).to.throw()
+  })
+
+  it('should throw an error if modules is missing', () => {
+    expect(() => {
+      validateConfig({
+        peerInfo
+      })
+    }).to.throw()
+  })
+
+  it('should throw an error if there are no transports', () => {
+    expect(() => {
+      validateConfig({
+        peerInfo,
+        modules: {
+          transport: [ ]
+        }
+      })
+    }).to.throw()
+  })
+
+  it('should add defaults to missing items', () => {
+    const options = {
+      peerInfo,
+      modules: {
+        transport: [ WS ],
+        peerDiscovery: [ Bootstrap ]
+      },
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            interval: 1000,
+            enabled: true
+          }
+        }
+      }
+    }
+
+    const expected = {
+      peerInfo,
+      modules: {
+        transport: [ WS ],
+        peerDiscovery: [ Bootstrap ]
+      },
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            interval: 1000,
+            enabled: true
+          }
+        },
+        EXPERIMENTAL: {
+          pubsub: false,
+          dht: false
+        },
+        relay: {
+          enabled: false
+        }
+      }
+    }
+
+    expect(validateConfig(options)).to.deep.equal(expected)
+  })
+
+  it('should not allow for dht to be enabled without it being provided', () => {
+    const options = {
+      peerInfo,
+      modules: {
+        transport: [ WS ]
+      },
+      config: {
+        EXPERIMENTAL: {
+          dht: true
+        }
+      }
+    }
+
+    expect(() => validateConfig(options)).to.throw()
+  })
+})

test/content-routing.node.js

@@ -9,8 +9,8 @@ const expect = chai.expect
 const parallel = require('async/parallel')
 const _times = require('lodash.times')
 const CID = require('cids')
-const utils = require('./utils/node')
+
-const createNode = utils.createNode
+const createNode = require('./utils/create-node')
 
 describe('.contentRouting', () => {
   let nodeA
@@ -23,8 +23,11 @@ describe('.contentRouting', () => {
     this.timeout(5 * 1000)
     const tasks = _times(5, () => (cb) => {
       createNode('/ip4/0.0.0.0/tcp/0', {
-        mdns: false,
+        config: {
+          EXPERIMENTAL: {
             dht: true
+          }
+        }
       }, (err, node) => {
         expect(err).to.not.exist()
         node.start((err) => cb(err, node))

test/create.spec.js

@@ -0,0 +1,79 @@
+/* eslint-env mocha */
+'use strict'
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+const series = require('async/series')
+const createNode = require('./utils/create-node')
+const sinon = require('sinon')
+
+describe('libp2p creation', () => {
+  it('should be able to start and stop successfully', (done) => {
+    createNode([], {
+      config: {
+        EXPERIMENTAL: {
+          dht: true,
+          pubsub: true
+        }
+      }
+    }, (err, node) => {
+      expect(err).to.not.exist()
+
+      let sw = node._switch
+      let cm = node.connectionManager
+      let dht = node._dht
+      let pub = node._floodSub
+
+      sinon.spy(sw, 'start')
+      sinon.spy(cm, 'start')
+      sinon.spy(dht, 'start')
+      sinon.spy(pub, 'start')
+      sinon.spy(sw, 'stop')
+      sinon.spy(cm, 'stop')
+      sinon.spy(dht, 'stop')
+      sinon.spy(pub, 'stop')
+      sinon.spy(node, 'emit')
+
+      series([
+        (cb) => node.start(cb),
+        (cb) => {
+          expect(sw.start.calledOnce).to.equal(true)
+          expect(cm.start.calledOnce).to.equal(true)
+          expect(dht.start.calledOnce).to.equal(true)
+          expect(pub.start.calledOnce).to.equal(true)
+          expect(node.emit.calledWith('start')).to.equal(true)
+
+          cb()
+        },
+        (cb) => node.stop(cb)
+      ], (err) => {
+        expect(err).to.not.exist()
+
+        expect(sw.stop.calledOnce).to.equal(true)
+        expect(cm.stop.calledOnce).to.equal(true)
+        expect(dht.stop.calledOnce).to.equal(true)
+        expect(pub.stop.calledOnce).to.equal(true)
+        expect(node.emit.calledWith('stop')).to.equal(true)
+
+        done()
+      })
+    })
+  })
+
+  it('should not create disabled modules', (done) => {
+    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()
+    })
+  })
+})

test/get-peer-info.spec.js

@@ -0,0 +1,26 @@
+/* eslint-env mocha */
+'use strict'
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+
+const getPeerInfo = require('../src/get-peer-info')
+
+describe('getPeerInfo', () => {
+  it('should callback with error for invalid string multiaddr', (done) => {
+    getPeerInfo(null)('INVALID MULTIADDR', (err) => {
+      expect(err).to.exist()
+      expect(err.message).to.contain('must start with a "/"')
+      done()
+    })
+  })
+
+  it('should callback with error for invalid non-peer multiaddr', (done) => {
+    getPeerInfo(null)('/ip4/8.8.8.8/tcp/1080', (err) => {
+      expect(err).to.exist()
+      expect(err.message).to.equal('peer multiaddr instance or string must include peerId')
+      done()
+    })
+  })
+})

test/multiaddr-trim.node.js

@@ -5,7 +5,8 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const series = require('async/series')
-const createNode = require('./utils/node').createNode
+
+const createNode = require('./utils/create-node')
 
 describe('multiaddr trim', () => {
   it('non used multiaddrs get trimmed', (done) => {
@@ -20,7 +21,6 @@ describe('multiaddr trim', () => {
         expect(err).to.not.exist()
         node = _node
         const multiaddrs = node.peerInfo.multiaddrs.toArray()
-        // multiaddrs.forEach((ma) => console.log(ma.toString()))
         expect(multiaddrs).to.have.length(3)
         cb()
       }),
@@ -29,11 +29,10 @@ describe('multiaddr trim', () => {
       expect(err).to.not.exist()
 
       const multiaddrs = node.peerInfo.multiaddrs.toArray()
-      // console.log('--')
-      // multiaddrs.forEach((ma) => console.log(ma.toString()))
 
       expect(multiaddrs.length).to.at.least(2)
-      expect(multiaddrs[0].toString()).to.match(/^\/ip4\/127\.0\.0\.1\/tcp\/[0-9]+\/ws\/ipfs\/\w+$/)
+      expect(multiaddrs[0].toString())
+        .to.match(/^\/ip4\/127\.0\.0\.1\/tcp\/[0-9]+\/ws\/ipfs\/\w+$/)
       node.stop(done)
     })
   })

test/node.js

@@ -1,6 +1,6 @@
 'use strict'
 
-require('./base')
+require('./pnet.node')
 require('./transports.node')
 require('./stream-muxing.node')
 require('./peer-discovery.node')
@@ -8,5 +8,5 @@ require('./pubsub.node')
 require('./peer-routing.node')
 require('./content-routing.node')
 require('./circuit-relay.node')
-require('./multiaddr-trim')
+require('./multiaddr-trim.node')
 require('./stats')

test/peer-discovery.node.js

@@ -4,11 +4,13 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
+const sinon = require('sinon')
 const signalling = require('libp2p-webrtc-star/src/sig-server')
 const parallel = require('async/parallel')
-const utils = require('./utils/node')
+const crypto = require('crypto')
-const createNode = utils.createNode
+
-const echo = utils.echo
+const createNode = require('./utils/create-node')
+const echo = require('./utils/echo')
 
 describe('peer discovery', () => {
   let nodeA
@@ -52,13 +54,202 @@ describe('peer discovery', () => {
       parallel([
         (cb) => nodeA.stop(cb),
         (cb) => nodeB.stop(cb),
-        (cb) => ss.stop(done)
+        (cb) => ss.stop(cb)
       ], done)
     })
   }
 
+  describe('module registration', () => {
+    it('should enable by default a module passed as an object', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0)
+      }
+
+      const options = { modules: { peerDiscovery: [ mockDiscovery ] } }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.true()
+          node.stop(done)
+        })
+      })
+    })
+
+    it('should enable by default a module passed as a function', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0)
+      }
+
+      const MockDiscovery = sinon.stub().returns(mockDiscovery)
+
+      const options = { modules: { peerDiscovery: [ MockDiscovery ] } }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.true()
+          node.stop(done)
+        })
+      })
+    })
+
+    it('should enable module by configutation', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0),
+        tag: 'mockDiscovery'
+      }
+
+      const enabled = sinon.stub().returns(true)
+
+      const options = {
+        modules: { peerDiscovery: [ mockDiscovery ] },
+        config: {
+          peerDiscovery: {
+            mockDiscovery: {
+              get enabled () {
+                return enabled()
+              }
+            }
+          }
+        }
+      }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.true()
+          expect(enabled.called).to.be.true()
+          node.stop(done)
+        })
+      })
+    })
+
+    it('should disable module by configutation', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0),
+        tag: 'mockDiscovery'
+      }
+
+      const disabled = sinon.stub().returns(false)
+
+      const options = {
+        modules: { peerDiscovery: [ mockDiscovery ] },
+        config: {
+          peerDiscovery: {
+            mockDiscovery: {
+              get enabled () {
+                return disabled()
+              }
+            }
+          }
+        }
+      }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.false()
+          expect(disabled.called).to.be.true()
+          node.stop(done)
+        })
+      })
+    })
+
+    it('should register module passed as function', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0)
+      }
+
+      const MockDiscovery = sinon.stub().returns(mockDiscovery)
+      MockDiscovery.tag = 'mockDiscovery'
+
+      const options = {
+        modules: { peerDiscovery: [ MockDiscovery ] },
+        config: {
+          peerDiscovery: {
+            mockDiscovery: {
+              enabled: true,
+              time: Date.now()
+            }
+          }
+        }
+      }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.true()
+          expect(MockDiscovery.called).to.be.true()
+          // Ensure configuration was passed
+          expect(MockDiscovery.firstCall.args[0])
+            .to.deep.include(options.config.peerDiscovery.mockDiscovery)
+          node.stop(done)
+        })
+      })
+    })
+
+    it('should register module passed as object', (done) => {
+      const mockDiscovery = {
+        on: sinon.stub(),
+        start: sinon.stub().callsArg(0),
+        stop: sinon.stub().callsArg(0),
+        tag: 'mockDiscovery'
+      }
+
+      const options = {
+        modules: { peerDiscovery: [ mockDiscovery ] },
+        config: {
+          peerDiscovery: {
+            mockDiscovery: { enabled: true }
+          }
+        }
+      }
+
+      createNode(['/ip4/0.0.0.0/tcp/0'], options, (err, node) => {
+        expect(err).to.not.exist()
+
+        node.start((err) => {
+          expect(err).to.not.exist()
+          expect(mockDiscovery.start.called).to.be.true()
+          node.stop(done)
+        })
+      })
+    })
+  })
+
   describe('MulticastDNS', () => {
-    setup({ mdns: true })
+    setup({
+      config: {
+        peerDiscovery: {
+          mdns: {
+            enabled: true,
+            // use a random tag to prevent CI collision
+            serviceTag: crypto.randomBytes(10).toString('hex')
+          }
+        }
+      }
+    })
 
     it('find a peer', function (done) {
       this.timeout(15 * 1000)
@@ -73,7 +264,15 @@ describe('peer discovery', () => {
 
   // TODO needs a delay (this test is already long)
   describe.skip('WebRTCStar', () => {
-    setup({ webRTCStar: true })
+    setup({
+      config: {
+        peerDiscovery: {
+          webRTCStar: {
+            enabled: true
+          }
+        }
+      }
+    })
 
     it('find a peer', function (done) {
       this.timeout(15 * 1000)
@@ -87,8 +286,18 @@ describe('peer discovery', () => {
 
   describe('MulticastDNS + WebRTCStar', () => {
     setup({
-      webRTCStar: true,
+      config: {
-      mdns: true
+        peerDiscovery: {
+          mdns: {
+            enabled: true,
+            // use a random tag to prevent CI collision
+            serviceTag: crypto.randomBytes(10).toString('hex')
+          },
+          webRTCStar: {
+            enabled: true
+          }
+        }
+      }
     })
 
     it('find a peer', function (done) {

test/peer-routing.node.js

@@ -8,8 +8,8 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const parallel = require('async/parallel')
 const _times = require('lodash.times')
-const utils = require('./utils/node')
+
-const createNode = utils.createNode
+const createNode = require('./utils/create-node')
 
 describe('.peerRouting', () => {
   let nodeA
@@ -23,8 +23,11 @@ describe('.peerRouting', () => {
 
     const tasks = _times(5, () => (cb) => {
       createNode('/ip4/0.0.0.0/tcp/0', {
-        mdns: false,
+        config: {
+          EXPERIMENTAL: {
             dht: true
+          }
+        }
       }, (err, node) => {
         expect(err).to.not.exist()
         node.start((err) => cb(err, node))

test/pnet.node.js

@@ -0,0 +1,90 @@
+/* eslint-env mocha */
+'use strict'
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+const PeerInfo = require('peer-info')
+const PeerId = require('peer-id')
+const waterfall = require('async/waterfall')
+const WS = require('libp2p-websockets')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+
+const Libp2p = require('../src')
+
+describe('private network', () => {
+  let config
+
+  before((done) => {
+    waterfall([
+      (cb) => PeerId.create({ bits: 512 }, cb),
+      (peerId, cb) => PeerInfo.create(peerId, cb),
+      (peerInfo, cb) => {
+        config = {
+          peerInfo,
+          modules: {
+            transport: [ WS ]
+          }
+        }
+        cb()
+      }
+    ], () => done())
+  })
+
+  describe('enforced network protection', () => {
+    before(() => {
+      process.env.LIBP2P_FORCE_PNET = 1
+    })
+
+    after(() => {
+      delete process.env.LIBP2P_FORCE_PNET
+    })
+
+    it('should throw an error without a provided protector', () => {
+      expect(() => {
+        return new Libp2p(config)
+      }).to.throw('Private network is enforced, but no protector was provided')
+    })
+
+    it('should create a libp2p node with a provided protector', () => {
+      let node
+      let protector = {
+        psk: '123',
+        tag: '/psk/1.0.0',
+        protect: () => { }
+      }
+
+      expect(() => {
+        let options = defaultsDeep(config, {
+          modules: {
+            connProtector: protector
+          }
+        })
+
+        node = new Libp2p(options)
+        return node
+      }).to.not.throw()
+      expect(node._switch.protector).to.deep.equal(protector)
+    })
+
+    it('should throw an error if the protector does not have a protect method', () => {
+      expect(() => {
+        let options = defaultsDeep(config, {
+          modules: {
+            connProtector: { }
+          }
+        })
+
+        return new Libp2p(options)
+      }).to.throw()
+    })
+  })
+
+  describe('network protection not enforced', () => {
+    it('should not throw an error with no provided protector', () => {
+      expect(() => {
+        return new Libp2p(config)
+      }).to.not.throw()
+    })
+  })
+})

test/pubsub.node.js

@@ -9,13 +9,22 @@ const expect = chai.expect
 const parallel = require('async/parallel')
 const waterfall = require('async/waterfall')
 const _times = require('lodash.times')
-const utils = require('./utils/node')
+
-const createNode = utils.createNode
+const createNode = require('./utils/create-node')
 
 function startTwo (callback) {
   const tasks = _times(2, () => (cb) => {
     createNode('/ip4/0.0.0.0/tcp/0', {
-      mdns: false
+      config: {
+        peerDiscovery: {
+          mdns: {
+            enabled: false
+          }
+        },
+        EXPERIMENTAL: {
+          pubsub: true
+        }
+      }
     }, (err, node) => {
       expect(err).to.not.exist()
       node.start((err) => cb(err, node))
@@ -69,18 +78,20 @@ describe('.pubsub', () => {
   describe('.pubsub off', () => {
     it('fail to use pubsub if disabled', (done) => {
       createNode('/ip4/0.0.0.0/tcp/0', {
-        mdns: false,
+        config: {
+          peerDiscovery: {
+            mdns: {
+              enabled: false
+            }
+          },
+          EXPERIMENTAL: {
             pubsub: false
+          }
+        }
       }, (err, node) => {
         expect(err).to.not.exist()
-
+        expect(node.pubsub).to.not.exist()
-        node.pubsub.subscribe('news',
-          (msg) => {},
-          (err) => {
-            expect(err).to.exist()
         done()
-          }
-        )
       })
     })
   })

test/stats.js

@@ -5,13 +5,21 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 
-const createNode = require('./utils/node').createNode
+const createNode = require('./utils/create-node')
 
-describe('libp2p', (done) => {
+describe('libp2p', () => {
-  it('has stats', () => {
+  it('has stats', (done) => {
     createNode('/ip4/127.0.0.1/tcp/0', {
-      mdns: false,
+      config: {
+        peerDiscovery: {
+          mdns: {
+            enabled: false
+          }
+        },
+        EXPERIMENTAL: {
           dht: true
+        }
+      }
     }, (err, node) => {
       expect(err).to.not.exist()
       node.start((err) => {

test/stream-muxing.node.js

@@ -6,10 +6,11 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const parallel = require('async/parallel')
 const series = require('async/series')
-const utils = require('./utils/node')
+const Mplex = require('libp2p-mplex')
+const SPDY = require('libp2p-spdy')
+const createNode = require('./utils/create-node')
 const tryEcho = require('./utils/try-echo')
-const createNode = utils.createNode
+const echo = require('./utils/echo')
-const echo = utils.echo
 
 function test (nodeA, nodeB, callback) {
   nodeA.dialProtocol(nodeB.peerInfo, '/echo/1.0.0', (err, conn) => {
@@ -35,7 +36,9 @@ describe('stream muxing', () => {
     function setup (callback) {
       parallel([
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy']
+          modules: {
+            streamMuxer: [ SPDY ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -43,7 +46,9 @@ describe('stream muxing', () => {
           node.start(cb)
         }),
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy']
+          modules: {
+            streamMuxer: [ SPDY ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -67,7 +72,9 @@ describe('stream muxing', () => {
     function setup (callback) {
       parallel([
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['mplex']
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -75,7 +82,9 @@ describe('stream muxing', () => {
           node.start(cb)
         }),
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['mplex']
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -101,7 +110,9 @@ describe('stream muxing', () => {
     function setup (callback) {
       parallel([
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy', 'mplex']
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -109,7 +120,9 @@ describe('stream muxing', () => {
           node.start(cb)
         }),
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy', 'mplex']
+          modules: {
+            streamMuxer: [ SPDY, Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -135,7 +148,9 @@ describe('stream muxing', () => {
     function setup (callback) {
       parallel([
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy', 'mplex']
+          modules: {
+            streamMuxer: [ SPDY, Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -143,7 +158,9 @@ describe('stream muxing', () => {
           node.start(cb)
         }),
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['mplex', 'spdy']
+          modules: {
+            streamMuxer: [ Mplex, SPDY ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -169,7 +186,9 @@ describe('stream muxing', () => {
     function setup (callback) {
       parallel([
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['spdy']
+          modules: {
+            streamMuxer: [ SPDY ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -177,7 +196,9 @@ describe('stream muxing', () => {
           node.start(cb)
         }),
         (cb) => createNode('/ip4/0.0.0.0/tcp/0', {
-          muxer: ['mplex']
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
         }, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -191,12 +212,12 @@ describe('stream muxing', () => {
       (cb) => setup(cb),
       (cb) => {
         // it will just 'warm up a conn'
-        expect(Object.keys(nodeA.switch.muxers)).to.have.length(1)
+        expect(Object.keys(nodeA._switch.muxers)).to.have.length(1)
-        expect(Object.keys(nodeB.switch.muxers)).to.have.length(1)
+        expect(Object.keys(nodeB._switch.muxers)).to.have.length(1)
 
         nodeA.dial(nodeB.peerInfo, (err) => {
           expect(err).to.not.exist()
-          expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
+          expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
           cb()
         })
       },

test/transports.browser.js

@@ -7,6 +7,7 @@ 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 pull = require('pull-stream')
 const parallel = require('async/parallel')
 const goodbye = require('pull-goodbye')
@@ -14,46 +15,49 @@ const serializer = require('pull-serializer')
 const w = require('webrtcsupport')
 const tryEcho = require('./utils/try-echo')
 
-const Node = require('./utils/bundle.browser')
+const Node = require('./utils/bundle-browser')
-const rawPeer = require('./fixtures/test-peer.json')
+const jsonPeerId = require('./fixtures/test-peer.json')
 
 describe('transports', () => {
   describe('websockets', () => {
     let peerB
+    let peerBMultiaddr = '/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + jsonPeerId.id
     let nodeA
 
     before((done) => {
-      const ma = '/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + rawPeer.id
+      PeerId.createFromPrivKey(jsonPeerId.privKey, (err, id) => {
-
+        expect(err).to.not.exist()
-      PeerId.createFromPrivKey(rawPeer.privKey, (err, id) => {
-        if (err) {
-          return done(err)
-        }
 
         peerB = new PeerInfo(id)
-        peerB.multiaddrs.add(ma)
+        peerB.multiaddrs.add(peerBMultiaddr)
         done()
       })
     })
 
     after((done) => nodeA.stop(done))
 
-    it('create libp2pNode', (done) => {
+    it('create a libp2p Node', (done) => {
       PeerInfo.create((err, peerInfo) => {
         expect(err).to.not.exist()
-        peerInfo.multiaddrs.add('/ip4/0.0.0.0/tcp/0')
 
-        nodeA = new Node(peerInfo)
+        nodeA = new Node({
+          peerInfo: peerInfo
+        })
         done()
       })
     })
 
-    it('create libp2pNode with mplex only', (done) => {
+    it('create a libp2p Node with mplex only', (done) => {
       PeerInfo.create((err, peerInfo) => {
         expect(err).to.not.exist()
 
-        const b = new Node(peerInfo, null, { muxer: ['mplex'] })
+        const b = new Node({
-        expect(b.modules.connection.muxer).to.eql([require('libp2p-mplex')])
+          peerInfo: peerInfo,
+          modules: {
+            streamMuxer: [ Mplex ]
+          }
+        })
+        expect(b._modules.streamMuxer).to.eql([require('libp2p-mplex')])
         done()
       })
     })
@@ -65,7 +69,7 @@ describe('transports', () => {
     // General connectivity tests
 
     it('.dial using Multiaddr', (done) => {
-      nodeA.dial(peerB.multiaddrs.toArray()[0], (err) => {
+      nodeA.dial(peerBMultiaddr, (err) => {
         expect(err).to.not.exist()
 
         setTimeout(check, 500) // Some time for Identify to finish
@@ -79,7 +83,7 @@ describe('transports', () => {
     })
 
     it('.dialProtocol using Multiaddr', (done) => {
-      nodeA.dialProtocol(peerB.multiaddrs.toArray()[0], '/echo/1.0.0', (err, conn) => {
+      nodeA.dialProtocol(peerBMultiaddr, '/echo/1.0.0', (err, conn) => {
         expect(err).to.not.exist()
 
         const peers = nodeA.peerBook.getAll()
@@ -90,7 +94,7 @@ describe('transports', () => {
     })
 
     it('.hangUp using Multiaddr', (done) => {
-      nodeA.hangUp(peerB.multiaddrs.toArray()[0], (err) => {
+      nodeA.hangUp(peerBMultiaddr, (err) => {
         expect(err).to.not.exist()
 
         setTimeout(check, 500)
@@ -98,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(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
           done()
         }
       })
@@ -138,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(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
           done()
         }
       })
@@ -197,8 +201,8 @@ describe('transports', () => {
 
     it('create two peerInfo with webrtc-star addrs', (done) => {
       parallel([
-        (cb) => PeerId.create({ bits: 1024 }, cb),
+        (cb) => PeerId.create({ bits: 512 }, cb),
-        (cb) => PeerId.create({ bits: 1024 }, cb)
+        (cb) => PeerId.create({ bits: 512 }, cb)
       ], (err, ids) => {
         expect(err).to.not.exist()
 
@@ -215,8 +219,12 @@ describe('transports', () => {
     })
 
     it('create two libp2p nodes with those peers', (done) => {
-      node1 = new Node(peer1, null, { webRTCStar: true })
+      node1 = new Node({
-      node2 = new Node(peer2, null, { webRTCStar: true })
+        peerInfo: peer1
+      })
+      node2 = new Node({
+        peerInfo: peer2
+      })
       done()
     })
 
@@ -256,24 +264,26 @@ 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(Object.keys(node1._switch.muxedConns)).to.have.length(0)
           done()
         }
       })
     })
 
-    it('create a third node and check that discovery works', (done) => {
+    it('create a third node and check that discovery works', function (done) {
+      this.timeout(60 * 1000)
+
       let counter = 0
 
       function check () {
         if (++counter === 3) {
-          expect(Object.keys(node1.switch.muxedConns).length).to.equal(1)
+          expect(Object.keys(node1._switch.muxedConns).length).to.equal(1)
-          expect(Object.keys(node2.switch.muxedConns).length).to.equal(1)
+          expect(Object.keys(node2._switch.muxedConns).length).to.equal(1)
           done()
         }
       }
 
-      PeerId.create((err, id3) => {
+      PeerId.create({ bits: 512 }, (err, id3) => {
         expect(err).to.not.exist()
 
         const peer3 = new PeerInfo(id3)
@@ -283,7 +293,9 @@ describe('transports', () => {
         node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))
         node2.on('peer:discovery', (peerInfo) => node2.dial(peerInfo, check))
 
-        const node3 = new Node(peer3, null, { webRTCStar: true })
+        const node3 = new Node({
+          peerInfo: peer3
+        })
         node3.start(check)
       })
     })
@@ -297,8 +309,8 @@ describe('transports', () => {
 
     it('create two peerInfo with websocket-star addrs', (done) => {
       parallel([
-        (cb) => PeerId.create({ bits: 1024 }, cb),
+        (cb) => PeerId.create({ bits: 512 }, cb),
-        (cb) => PeerId.create({ bits: 1024 }, cb)
+        (cb) => PeerId.create({ bits: 512 }, cb)
       ], (err, ids) => {
         expect(err).to.not.exist()
 
@@ -315,8 +327,12 @@ describe('transports', () => {
     })
 
     it('create two libp2p nodes with those peers', (done) => {
-      node1 = new Node(peer1, null, { wsStar: true })
+      node1 = new Node({
-      node2 = new Node(peer2, null, { wsStar: true })
+        peerInfo: peer1
+      })
+      node2 = new Node({
+        peerInfo: peer2
+      })
       done()
     })
 
@@ -356,19 +372,21 @@ 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(Object.keys(node1._switch.muxedConns)).to.have.length(0)
           done()
         }
       })
     })
 
-    it('create a third node and check that discovery works', (done) => {
+    it('create a third node and check that discovery works', function (done) {
+      this.timeout(10 * 1000)
+
       let counter = 0
 
       function check () {
         if (++counter === 3) {
-          expect(Object.keys(node1.switch.muxedConns).length).to.equal(1)
+          expect(Object.keys(node1._switch.muxedConns).length).to.equal(1)
-          expect(Object.keys(node2.switch.muxedConns).length).to.equal(1)
+          expect(Object.keys(node2._switch.muxedConns).length).to.equal(1)
           done()
         }
       }
@@ -383,7 +401,9 @@ describe('transports', () => {
         node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))
         node2.on('peer:discovery', (peerInfo) => node2.dial(peerInfo, check))
 
-        const node3 = new Node(peer3, null, { wsStar: true })
+        const node3 = new Node({
+          peerInfo: peer3
+        })
         node3.start(check)
       })
     })

test/transports.node.js

@@ -6,16 +6,17 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const parallel = require('async/parallel')
 const series = require('async/series')
-const utils = require('./utils/node.js')
 const signalling = require('libp2p-webrtc-star/src/sig-server')
 const rendezvous = require('libp2p-websocket-star-rendezvous')
+const TCP = require('libp2p-tcp')
+const WS = require('libp2p-websockets')
 const WSStar = require('libp2p-websocket-star')
 const WRTCStar = require('libp2p-webrtc-star')
 const wrtc = require('wrtc')
-const tryEcho = require('./utils/try-echo')
 
-const createNode = utils.createNode
+const createNode = require('./utils/create-node.js')
-const echo = utils.echo
+const tryEcho = require('./utils/try-echo')
+const echo = require('./utils/echo')
 
 describe('transports', () => {
   describe('TCP only', () => {
@@ -90,14 +91,14 @@ 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(Object.keys(nodeA._switch.muxedConns)).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(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
               cb()
             }
           ], done)
@@ -117,14 +118,14 @@ describe('transports', () => {
               const peers = nodeA.peerBook.getAll()
               expect(Object.keys(peers)).to.have.length(1)
 
-              expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(1)
+              expect(Object.keys(nodeA._switch.muxedConns)).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(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
               cb()
             }
           ], () => tryEcho(conn, done))
@@ -143,14 +144,14 @@ describe('transports', () => {
               const peers = nodeA.peerBook.getAll()
               expect(Object.keys(peers)).to.have.length(1)
 
-              expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
+              expect(Object.keys(nodeA._switch.muxedConns)).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(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
               cb()
             }
           ], done)
@@ -169,13 +170,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(Object.keys(nodeA._switch.muxedConns)).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(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
               cb()
             }
           ], () => tryEcho(conn, done))
@@ -193,13 +194,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(Object.keys(nodeA._switch.muxedConns)).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(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
               cb()
             }
           ], done)
@@ -263,13 +264,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(Object.keys(nodeTCP._switch.muxedConns)).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(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(1)
               cb()
             }
           ], done)
@@ -287,14 +288,14 @@ 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(Object.keys(nodeTCP._switch.muxedConns)).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(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(0)
               cb()
             }
           ], done)
@@ -314,13 +315,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(Object.keys(nodeTCPnWS._switch.muxedConns)).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(Object.keys(nodeWS._switch.muxedConns)).to.have.length(1)
               cb()
             }
           ], done)
@@ -338,14 +339,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(Object.keys(nodeTCPnWS._switch.muxedConns)).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(Object.keys(nodeWS._switch.muxedConns)).to.have.length(0)
               cb()
             }
           ], done)
@@ -367,7 +368,7 @@ describe('transports', () => {
     let nodeAll
     let nodeTCP
     let nodeWS
-    let nodeWStar
+    let nodeWebRTCStar
 
     let ss
 
@@ -375,23 +376,33 @@ describe('transports', () => {
       this.timeout(5 * 1000)
 
       parallel([
-        (cb) => {
+        (cb) => signalling.start({ port: 24642 }, (err, server) => {
-          signalling.start({ port: 24642 }, (err, server) => {
           expect(err).to.not.exist()
           ss = server
           cb()
-          })
+        }),
-        },
         (cb) => {
           const wstar = new WRTCStar({wrtc: wrtc})
+
           createNode([
             '/ip4/0.0.0.0/tcp/0',
             '/ip4/127.0.0.1/tcp/25011/ws',
             '/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'
           ], {
             modules: {
-              transport: [wstar],
+              transport: [
-              discovery: [wstar.discovery]
+                TCP,
+                WS,
+                wstar
+              ],
+              peerDiscovery: [wstar.discovery]
+            },
+            config: {
+              peerDiscovery: {
+                [wstar.discovery.tag]: {
+                  enabled: true
+                }
+              }
             }
           }, (err, node) => {
             expect(err).to.not.exist()
@@ -425,11 +436,18 @@ describe('transports', () => {
           ], {
             modules: {
               transport: [wstar],
-              discovery: [wstar.discovery]
+              peerDiscovery: [wstar.discovery]
+            },
+            config: {
+              peerDiscovery: {
+                [wstar.discovery.tag]: {
+                  enabled: true
+                }
+              }
             }
           }, (err, node) => {
             expect(err).to.not.exist()
-            nodeWStar = node
+            nodeWebRTCStar = node
             node.handle('/echo/1.0.0', echo)
             node.start(cb)
           })
@@ -444,7 +462,7 @@ describe('transports', () => {
         (cb) => nodeAll.stop(cb),
         (cb) => nodeTCP.stop(cb),
         (cb) => nodeWS.stop(cb),
-        (cb) => nodeWStar.stop(cb),
+        (cb) => nodeWebRTCStar.stop(cb),
         (cb) => ss.stop(cb)
       ], done)
     })
@@ -453,7 +471,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(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
       })
       callback()
     }
@@ -490,20 +508,20 @@ describe('transports', () => {
       })
     })
 
-    it('nodeAll.dial nodeWStar using PeerInfo', function (done) {
+    it('nodeAll.dial nodeWebRTCStar using PeerInfo', function (done) {
       this.timeout(40 * 1000)
 
-      nodeAll.dial(nodeWStar.peerInfo, (err) => {
+      nodeAll.dial(nodeWebRTCStar.peerInfo, (err) => {
         expect(err).to.not.exist()
         // Some time for Identify to finish
-        setTimeout(() => check(nodeWStar, 1, 3, done), 500)
+        setTimeout(() => check(nodeWebRTCStar, 1, 3, done), 500)
       })
     })
 
-    it('nodeAll.hangUp nodeWStar using PeerInfo', (done) => {
+    it('nodeAll.hangUp nodeWebRTCStar using PeerInfo', (done) => {
-      nodeAll.hangUp(nodeWStar.peerInfo, (err) => {
+      nodeAll.hangUp(nodeWebRTCStar.peerInfo, (err) => {
         expect(err).to.not.exist()
-        setTimeout(() => check(nodeWStar, 0, 3, done), 500)
+        setTimeout(() => check(nodeWebRTCStar, 0, 3, done), 500)
       })
     })
   })
@@ -512,7 +530,7 @@ describe('transports', () => {
     let nodeAll
     let nodeTCP
     let nodeWS
-    let nodeWStar
+    let nodeWebSocketStar
 
     let ss
 
@@ -527,14 +545,26 @@ describe('transports', () => {
         },
         (cb) => {
           const wstar = new WSStar()
+
           createNode([
             '/ip4/0.0.0.0/tcp/0',
             '/ip4/127.0.0.1/tcp/25011/ws',
             '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star'
           ], {
             modules: {
-              transport: [wstar],
+              transport: [
-              discovery: [wstar.discovery]
+                TCP,
+                WS,
+                wstar
+              ],
+              peerDiscovery: [wstar.discovery]
+            },
+            config: {
+              peerDiscovery: {
+                [wstar.discovery.tag]: {
+                  enabled: true
+                }
+              }
             }
           }, (err, node) => {
             expect(err).to.not.exist()
@@ -569,11 +599,18 @@ describe('transports', () => {
           ], {
             modules: {
               transport: [wstar],
-              discovery: [wstar.discovery]
+              peerDiscovery: [wstar.discovery]
+            },
+            config: {
+              peerDiscovery: {
+                [wstar.discovery.tag]: {
+                  enabled: true
+                }
+              }
             }
           }, (err, node) => {
             expect(err).to.not.exist()
-            nodeWStar = node
+            nodeWebSocketStar = node
             wstar.lazySetId(node.peerInfo.id)
             node.handle('/echo/1.0.0', echo)
             node.start(cb)
@@ -587,7 +624,7 @@ describe('transports', () => {
         (cb) => nodeAll.stop(cb),
         (cb) => nodeTCP.stop(cb),
         (cb) => nodeWS.stop(cb),
-        (cb) => nodeWStar.stop(cb),
+        (cb) => nodeWebSocketStar.stop(cb),
         (cb) => ss.stop(cb)
       ], done)
     })
@@ -596,7 +633,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(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
       })
       done()
     }
@@ -633,19 +670,19 @@ describe('transports', () => {
       })
     })
 
-    it('nodeAll.dial nodeWStar using PeerInfo', (done) => {
+    it('nodeAll.dial nodeWebSocketStar using PeerInfo', (done) => {
-      nodeAll.dial(nodeWStar.peerInfo, (err) => {
+      nodeAll.dial(nodeWebSocketStar.peerInfo, (err) => {
         expect(err).to.not.exist()
         // Some time for Identify to finish
-        setTimeout(() => check(nodeWStar, 1, 3, done), 500)
+        setTimeout(() => check(nodeWebSocketStar, 1, 3, done), 500)
       })
     })
 
-    it('nodeAll.hangUp nodeWStar using PeerInfo', (done) => {
+    it('nodeAll.hangUp nodeWebSocketStar using PeerInfo', (done) => {
-      nodeAll.hangUp(nodeWStar.peerInfo, (err) => {
+      nodeAll.hangUp(nodeWebSocketStar.peerInfo, (err) => {
         expect(err).to.not.exist()
         // Some time for Identify to finish
-        setTimeout(() => check(nodeWStar, 0, 3, done), 500)
+        setTimeout(() => check(nodeWebSocketStar, 0, 3, done), 500)
       })
     })
   })

test/utils/bundle-browser.js

@@ -0,0 +1,95 @@
+'use strict'
+
+const WS = require('libp2p-websockets')
+const WebRTCStar = require('libp2p-webrtc-star')
+const WebSocketStar = require('libp2p-websocket-star')
+const Bootstrap = require('libp2p-railing')
+const SPDY = require('libp2p-spdy')
+const MPLEX = require('libp2p-mplex')
+const KadDHT = require('libp2p-kad-dht')
+const SECIO = require('libp2p-secio')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../..')
+
+function mapMuxers (list) {
+  return list.map((pref) => {
+    if (typeof pref !== 'string') { return pref }
+    switch (pref.trim().toLowerCase()) {
+      case 'spdy': return SPDY
+      case 'mplex': return MPLEX
+      default:
+        throw new Error(pref + ' muxer not available')
+    }
+  })
+}
+
+function getMuxers (options) {
+  if (options) {
+    return mapMuxers(options)
+  } else {
+    return [MPLEX, SPDY]
+  }
+}
+
+class Node extends libp2p {
+  constructor (_options) {
+    _options = _options || {}
+
+    const starOpts = { id: _options.peerInfo.id }
+    const wrtcStar = new WebRTCStar(starOpts)
+    const wsStar = new WebSocketStar(starOpts)
+
+    const defaults = {
+      modules: {
+        transport: [
+          wrtcStar,
+          wsStar,
+          new WS()
+        ],
+        streamMuxer: getMuxers(_options.muxer),
+        connEncryption: [
+          SECIO
+        ],
+        peerDiscovery: [
+          wrtcStar.discovery,
+          wsStar.discovery,
+          Bootstrap
+        ],
+        dht: KadDHT
+      },
+      config: {
+        peerDiscovery: {
+          webRTCStar: {
+            enabled: true
+          },
+          websocketStar: {
+            enabled: true
+          },
+          bootstrap: {
+            interval: 10000,
+            enabled: false,
+            list: _options.boostrapList
+          }
+        },
+        relay: {
+          enabled: false,
+          hop: {
+            enabled: false,
+            active: false
+          }
+        },
+        dht: {
+          kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          dht: false,
+          pubsub: false
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
+  }
+}
+
+module.exports = Node

test/utils/bundle-nodejs.js

@@ -0,0 +1,88 @@
+'use strict'
+
+const TCP = require('libp2p-tcp')
+const MulticastDNS = require('libp2p-mdns')
+const WS = require('libp2p-websockets')
+const Bootstrap = require('libp2p-railing')
+const SPDY = require('libp2p-spdy')
+const KadDHT = require('libp2p-kad-dht')
+const MPLEX = require('libp2p-mplex')
+const SECIO = require('libp2p-secio')
+const defaultsDeep = require('@nodeutils/defaults-deep')
+const libp2p = require('../..')
+
+function mapMuxers (list) {
+  return list.map((pref) => {
+    if (typeof pref !== 'string') { return pref }
+    switch (pref.trim().toLowerCase()) {
+      case 'spdy': return SPDY
+      case 'mplex': return MPLEX
+      default:
+        throw new Error(pref + ' muxer not available')
+    }
+  })
+}
+
+function getMuxers (muxers) {
+  const muxerPrefs = process.env.LIBP2P_MUXER
+  if (muxerPrefs && !muxers) {
+    return mapMuxers(muxerPrefs.split(','))
+  } else if (muxers) {
+    return mapMuxers(muxers)
+  } else {
+    return [MPLEX, SPDY]
+  }
+}
+
+class Node extends libp2p {
+  constructor (_options) {
+    const defaults = {
+      modules: {
+        transport: [
+          TCP,
+          WS
+        ],
+        streamMuxer: getMuxers(_options.muxer),
+        connEncryption: [
+          SECIO
+        ],
+        peerDiscovery: [
+          MulticastDNS,
+          Bootstrap
+        ],
+        dht: KadDHT
+      },
+      config: {
+        peerDiscovery: {
+          mdns: {
+            interval: 10000,
+            enabled: false
+          },
+          bootstrap: {
+            interval: 10000,
+            enabled: false,
+            list: _options.bootstrapList
+          }
+        },
+        relay: {
+          enabled: false,
+          hop: {
+            enabled: false,
+            active: false
+          }
+        },
+        dht: {
+          kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          dht: false,
+          pubsub: false
+        }
+      }
+    }
+
+    super(defaultsDeep(_options, defaults))
+  }
+}
+
+module.exports = Node

test/utils/bundle.browser.js

@@ -1,74 +0,0 @@
-'use strict'
-
-const WS = require('libp2p-websockets')
-const WebRTCStar = require('libp2p-webrtc-star')
-const WebSocketStar = require('libp2p-websocket-star')
-const spdy = require('libp2p-spdy')
-const mplex = require('libp2p-mplex')
-const secio = require('libp2p-secio')
-const Railing = require('libp2p-railing')
-const libp2p = require('../..')
-
-function mapMuxers (list) {
-  return list.map((pref) => {
-    if (typeof pref !== 'string') {
-      return pref
-    }
-    switch (pref.trim().toLowerCase()) {
-      case 'spdy':
-        return spdy
-      case 'mplex':
-        return mplex
-      default:
-        throw new Error(pref + ' muxer not available')
-    }
-  })
-}
-
-function getMuxers (options) {
-  if (options) {
-    return mapMuxers(options)
-  } else {
-    return [mplex, spdy]
-  }
-}
-
-class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
-    options = options || {}
-    const wrtcStar = new WebRTCStar({ id: peerInfo.id })
-    const wsStar = new WebSocketStar({ id: peerInfo.id })
-
-    const modules = {
-      transport: [
-        new WS(),
-        wrtcStar,
-        wsStar
-      ],
-      connection: {
-        muxer: getMuxers(options.muxer),
-        crypto: [
-          secio
-        ]
-      },
-      discovery: []
-    }
-
-    if (options.webRTCStar) {
-      modules.discovery.push(wrtcStar.discovery)
-    }
-
-    if (options.wsStar) {
-      modules.discovery.push(wsStar.discovery)
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
-    }
-
-    super(modules, peerInfo, peerBook, options)
-  }
-}
-
-module.exports = Node

test/utils/bundle.node.js

@@ -1,80 +0,0 @@
-'use strict'
-
-const TCP = require('libp2p-tcp')
-const MulticastDNS = require('libp2p-mdns')
-const WS = require('libp2p-websockets')
-const Railing = require('libp2p-railing')
-const spdy = require('libp2p-spdy')
-const KadDHT = require('libp2p-kad-dht')
-const mplex = require('libp2p-mplex')
-const secio = require('libp2p-secio')
-const libp2p = require('../..')
-
-function mapMuxers (list) {
-  return list.map((pref) => {
-    if (typeof pref !== 'string') {
-      return pref
-    }
-    switch (pref.trim().toLowerCase()) {
-      case 'spdy': return spdy
-      case 'mplex': return mplex
-      default:
-        throw new Error(pref + ' muxer not available')
-    }
-  })
-}
-
-function getMuxers (muxers) {
-  const muxerPrefs = process.env.LIBP2P_MUXER
-  if (muxerPrefs && !muxers) {
-    return mapMuxers(muxerPrefs.split(','))
-  } else if (muxers) {
-    return mapMuxers(muxers)
-  } else {
-    return [mplex, spdy]
-  }
-}
-
-class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
-    options = options || {}
-
-    const modules = {
-      transport: [
-        new TCP(),
-        new WS()
-      ],
-      connection: {
-        muxer: getMuxers(options.muxer),
-        crypto: [ secio ]
-      },
-      discovery: []
-    }
-
-    if (options.dht) {
-      modules.DHT = KadDHT
-    }
-
-    if (options.mdns) {
-      const mdns = new MulticastDNS(peerInfo, 'ipfs.local')
-      modules.discovery.push(mdns)
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
-    }
-
-    if (options.modules && options.modules.transport) {
-      options.modules.transport.forEach((t) => modules.transport.push(t))
-    }
-
-    if (options.modules && options.modules.discovery) {
-      options.modules.discovery.forEach((d) => modules.discovery.push(d))
-    }
-
-    super(modules, peerInfo, peerBook, options)
-  }
-}
-
-module.exports = Node

test/utils/create-node.js

@@ -3,11 +3,10 @@
 
 const chai = require('chai')
 chai.use(require('dirty-chai'))
-const Node = require('./bundle.node')
 const PeerInfo = require('peer-info')
 const PeerId = require('peer-id')
 const waterfall = require('async/waterfall')
-const pull = require('pull-stream')
+const Node = require('./bundle-nodejs')
 
 function createNode (multiaddrs, options, callback) {
   if (typeof options === 'function') {
@@ -26,20 +25,10 @@ function createNode (multiaddrs, options, callback) {
     (peerId, cb) => PeerInfo.create(peerId, cb),
     (peerInfo, cb) => {
       multiaddrs.map((ma) => peerInfo.multiaddrs.add(ma))
-      cb(null, peerInfo)
+      options.peerInfo = peerInfo
-    },
+      cb(null, new Node(options))
-    (peerInfo, cb) => {
-      const node = new Node(peerInfo, undefined, options)
-      cb(null, node)
     }
   ], callback)
 }
 
-function echo (protocol, conn) {
+module.exports = createNode
-  pull(conn, conn)
-}
-
-module.exports = {
-  createNode: createNode,
-  echo: echo
-}

test/utils/echo.js

@@ -0,0 +1,10 @@
+/* eslint-env mocha */
+'use strict'
+
+const pull = require('pull-stream')
+
+function echo (protocol, conn) {
+  pull(conn, conn)
+}
+
+module.exports = echo