chore: release version v0.13.0

* feat: new super simplified API

* feat: append peer id to multiaddr if not there

* [WIP] Awesome DHT (#86)

* feat: integrate dht

* better interfaces

* docs: add documentation for peerRouting, contentRouting, dht

* fix: take in passed datastore

* fix: update usage of _getPeerInfo

* fix: getPeerInfo

* docs: update docs

* moar

feat: correctly handle p2p-circuit addrs when creating a peer info object

refactor: rework config options

* feat: adding circuit relaying

* feat: rework circuit relay for protobufs

* feat: circuit loading and tests

* fix: clean up _getPeerInfo to work with /p2p-circuit

* wip: tests cleaup

* test: clean up

* wip

* fix: bringing back test reworks and new aegir

* test: group tests

* test: clean up

* test: adjust test

* fix: use getPeerId to determine if the ipfs fragment is missing

* feat: adding circuit relaying

* feat: circuit loading and tests

* test: clean up

* wip

* feat: upgrade to latest aegir

* fix: removing unused tests

* feat: cleanup tests

* fix: create node defautl options

* chore: upgrade swarm to latest version

* fix: updated aegir and adjust timeouts

* feat: more timeouts

* chore: updating deps

* fix: circle ci builds

* test: timeouts

.aegir.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const gulp = require('gulp')
 const Node = require('./test/nodejs-bundle/nodejs-bundle.js')
 const PeerInfo = require('peer-info')
 const PeerId = require('peer-id')
@@ -12,7 +11,7 @@ let server
 let node
 const rawPeer = require('./test/browser-bundle/peer.json')
 
-gulp.task('libnode:start', (done) => {
+const before = (done) => {
   let count = 0
   const ready = () => ++count === 2 ? done() : null
 
@@ -36,20 +35,21 @@ gulp.task('libnode:start', (done) => {
     node.handle('/echo/1.0.0', (protocol, conn) => pull(conn, conn))
     node.start(() => ready())
   })
-})
+}
 
-gulp.task('libnode:stop', (done) => {
+const after = (done) => {
   setTimeout(() => node.stop((err) => {
     if (err) {
       return done(err)
     }
     server.stop(done)
   }), 2000)
-})
+}
 
-gulp.task('test:browser:before', ['libnode:start'])
-gulp.task('test:node:before', ['libnode:start'])
-gulp.task('test:browser:after', ['libnode:stop'])
-gulp.task('test:node:after', ['libnode:stop'])
+module.exports = {
+  hooks: {
+    pre: before,
+    post: after
+  }
+}
 
-require('aegir/gulp')(gulp)

.gitignore

@@ -1,7 +1,13 @@
+**/node_modules/
+**/*.log
+test/repo-tests*
+**/bundle.js
+
 # Logs
 logs
 *.log
-npm-debug.log*
+
+coverage
 
 # Runtime data
 pids
@@ -20,16 +26,17 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+build
 
 # Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
+lib
 dist
+test/test-data/go-ipfs-repo/LOCK
+test/test-data/go-ipfs-repo/LOG
+test/test-data/go-ipfs-repo/LOG.old
+
+# while testing npm5
+package-lock.json

.travis.yml

@@ -1,22 +1,20 @@
 sudo: false
 language: node_js
+
 matrix:
   include:
-  - node_js: 4
-    env: CXX=g++-4.8
   - node_js: 6
     env: CXX=g++-4.8
-  - node_js: stable
+  - node_js: 8
     env: CXX=g++-4.8
-
-# Make sure we have new NPM.
-before_install:
-  - npm install -g npm@4
+    #  - node_js: stable
+    #    env: CXX=g++-4.8
 
 script:
   - npm run lint
-  - npm test
+  - npm run test
   - npm run coverage
+  - make test
 
 before_script:
   - export DISPLAY=:99.0

CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="0.13.0"></a>
+# [0.13.0](https://github.com/libp2p/js-libp2p/compare/v0.12.4...v0.13.0) (2017-10-26)
+
+
+### Features
+
+* enable and test Circuit Relay ([29cc0af](https://github.com/libp2p/js-libp2p/commit/29cc0af))
+
+
+
+<a name="0.12.4"></a>
+## [0.12.4](https://github.com/libp2p/js-libp2p/compare/v0.12.3...v0.12.4) (2017-09-07)
+
+
+
+<a name="0.12.3"></a>
+## [0.12.3](https://github.com/libp2p/js-libp2p/compare/v0.12.2...v0.12.3) (2017-09-07)
+
+
+
+<a name="0.12.2"></a>
+## [0.12.2](https://github.com/libp2p/js-libp2p/compare/v0.12.0...v0.12.2) (2017-09-07)
+
+
+
+<a name="0.12.1"></a>
+## [0.12.1](https://github.com/libp2p/js-libp2p/compare/v0.12.0...v0.12.1) (2017-09-07)
+
+
+
+<a name="0.12.0"></a>
+# [0.12.0](https://github.com/libp2p/js-libp2p/compare/v0.11.0...v0.12.0) (2017-09-03)
+
+
+### Features
+
+* p2p addrs situation ([#119](https://github.com/libp2p/js-libp2p/issues/119)) ([cad173e](https://github.com/libp2p/js-libp2p/commit/cad173e))
+
+
+
 <a name="0.11.0"></a>
 # [0.11.0](https://github.com/libp2p/js-libp2p/compare/v0.10.2...v0.11.0) (2017-07-22)
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing guidelines
 
-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/js-project-guidelines.md).
+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.
 

ISSUE_TEMPLATE.md

@@ -0,0 +1,43 @@
+<!--
+Thank you for reporting an issue.
+
+This issue tracker is for bugs and issues found within the JavaScript implementation of libp2p.
+If you require more general support please file an issue on our discuss forum. https://discuss.ipfs.io/
+
+Please fill in as much of the template below as you're able.
+
+Version: package.json version or the commit you have installed.
+Platform: output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows). If using in a Browser, please share the browser version as well.
+Subsystem: if known, please specify affected core module name (e.g Transports, SECIO, etc).
+
+If possible, please provide code that demonstrates the problem, keeping it as
+simple and free of external dependencies as you are able.
+-->
+
+- **Version**:
+- **Platform**:
+- **Subsystem**:
+
+<!-- Bug, Feature, Question, Enhancement, Etc -->
+#### Type:
+
+<!-- 
+One of following:
+  Critical - System crash, application panic.
+  High - The main functionality of the application does not work, API breakage, repo format breakage, etc.
+  Medium - A non-essential functionality does not work, performance issues, etc.
+  Low - An optional functionality does not work.
+  Very Low - Translation or documentation mistake. Something that won't give anyone a bad day.
+-->
+#### Severity:
+
+#### Description:
+
+#### Steps to reproduce the error:
+
+<!--
+This is for you! Please read, and then delete this text before posting it.
+The js-ipfs issues are only for bug reports and directly actionable features.
+
+Read https://github.com/ipfs/community/blob/master/contributing.md#reporting-issues if your issue doesn't fit either of those categories.
+-->

README.md

@@ -20,10 +20,18 @@
   <a href="https://github.com/feross/standard"><img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square"></a>
   <a href="https://github.com/RichardLitt/standard-readme"><img src="https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square" /></a>
   <a href=""><img src="https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square" /></a>
-  <a href=""><img src="https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square" /></a>
+  <a href=""><img src="https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square" /></a>
   <br>
 </p>
 
+### Project status
+
+We've come a long way, but this project is still in Alpha, lots of development is happening, API might change, beware of the Dragons 🐉..
+
+**Want to get started?** Check our [examples folder](/examples). You can check the development status at the [Waffle Board](https://waffle.io/libp2p/js-libp2p).
+
+[![Throughput Graph](https://graphs.waffle.io/libp2p/js-libp2p/throughput.svg)](https://waffle.io/libp2p/js-libp2p/metrics/throughput)
+
 ## Table of Contents
 
 - [Background](#background)
@@ -42,7 +50,7 @@
 
 libp2p is the product of a long and arduous quest to understand the evolution of the Internet networking stack. In order to build P2P applications, dev have long had to made custom ad-hoc solutions to fit their needs, sometimes making some hard assumptions about their runtimes and the state of the network at the time of their development. Today, looking back more than 20 years, we see a clear pattern in the types of mechanisms built around the Internet Protocol, IP, which can be found throughout many layers of the OSI layer system, libp2p distils these mechanisms into flat categories and defines clear interfaces that once exposed, enable other protocols and applications to use and swap them, enabling upgradability and adaptability for the runtime, without breaking the API.
 
-We are in the process of writting better documentation, blog posts, tutorials and a formal specification. Today you can find:
+We are in the process of writing better documentation, blog posts, tutorials and a formal specification. Today you can find:
 
 - [libp2p.io](https://libp2p.io)
 - [Specification (WIP)](https://github.com/libp2p/specs)
@@ -74,7 +82,7 @@ npm install --save libp2p
 
 ### [Tutorials and Examples](/examples)
 
-You can find multiple examples on the [examples folder](/examples) that will guide you through using libp2p for several scenarions.
+You can find multiple examples on the [examples folder](/examples) that will guide you through using libp2p for several scenarios.
 
 ### Extending libp2p skeleton
 
@@ -191,7 +199,7 @@ class Node extends libp2p {
 - `handlerFunc`: Function with signature `function (protocol, conn) {}`
 - `matchFunc`: Function for matching on protocol (exact matching, semver, etc). Default to exact match.
 
-#### `libp2p.unhandle(protocol)
+#### `libp2p.unhandle(protocol)`
 
 > Stop handling protocol
 
@@ -255,6 +263,42 @@ class Node extends libp2p {
 [multiaddr]: https://github.com/multiformats/js-multiaddr
 [Connection]: https://github.com/libp2p/interface-connection
 
+## Development
+
+**Clone and install dependencies:**
+
+```sh
+> git clone https://github.com/ipfs/js-ipfs.git
+> cd js-ipfs
+> npm install
+```
+
+### Tests
+
+#### Run unit tests
+
+```sh
+# run all the unit tsts
+> npm test
+
+# run just Node.js tests
+> npm run test:node
+
+# run just Browser tests (Chrome)
+> npm run test:browser
+```
+
+#### Run interop tests
+
+```sh
+N/A
+```
+
+#### Run benchmark tests
+
+```sh
+N/A
+```
 
 ### Packages
 
@@ -296,7 +340,7 @@ List of packages currently in existence for libp2p
 
 The libp2p implementation in JavaScript is a work in progress. As such, there are a few things you can do right now to help out:
 
- - Go through the modules and **check out existing issues**. This would be especially useful for modules in active development. Some knowledge of IPFS/libp2p may be required, as well as the infrasture behind it - for instance, you may need to read up on p2p and more complex operations like muxing to be able to help technically.
+ - Go through the modules and **check out existing issues**. This would be especially useful for modules in active development. Some knowledge of IPFS/libp2p may be required, as well as the infrastructure behind it - for instance, you may need to read up on p2p and more complex operations like muxing to be able to help technically.
  - **Perform code reviews**. Most of this has been developed by @diasdavid, which means that more eyes will help a) speed the project along b) ensure quality and c) reduce possible future bugs.
  - **Add tests**. There can never be enough tests.
 

circle.yml

@@ -6,9 +6,13 @@ dependencies:
   pre:
     - google-chrome --version
     - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+    - for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb
     - sudo dpkg -i google-chrome.deb || true
+    - sudo dpkg -i libnss3*.deb || true
     - sudo apt-get update
+    - sudo apt-get install -f || true
+    - sudo dpkg -i libnss3*.deb
     - sudo apt-get install -f
     - sudo apt-get install --only-upgrade lsb-base
     - sudo dpkg -i google-chrome.deb
-    - google-chrome --version
+    - google-chrome --version

examples/encrypted-communications/README.md

@@ -32,7 +32,7 @@ class MyBundle extends libp2p {
 }
 ```
 
-And that's it, from now on, all your libp2p communications are encrypted. Try running the exampme [1.js](./1.js) to see it working.
+And that's it, from now on, all your libp2p communications are encrypted. Try running the example [1.js](./1.js) to see it working.
 
 If you want to want to learn more about how SECIO works, you can read the [great write up done by Dominic Tarr](https://github.com/auditdrivencrypto/secure-channel/blob/master/prior-art.md#ipfss-secure-channel).
 

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

@@ -10,20 +10,20 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "browserify": "^14.0.0",
+    "browserify": "^14.4.0",
     "concat-stream": "^1.6.0",
     "detect-dom-ready": "^1.0.2",
     "node-static": "^0.7.9"
   },
   "dependencies": {
     "detect-dom-ready": "^1.0.2",
-    "libp2p": "^0.10.0",
+    "libp2p": "^0.11.0",
     "libp2p-multiplex": "^0.4.4",
-    "libp2p-railing": "^0.5.2",
-    "libp2p-secio": "^0.6.8",
+    "libp2p-railing": "^0.6.1",
+    "libp2p-secio": "^0.7.1",
     "libp2p-spdy": "^0.10.6",
-    "libp2p-webrtc-star": "^0.11.0",
-    "libp2p-websockets": "^0.10.0",
-    "peer-info": "^0.9.3"
+    "libp2p-webrtc-star": "^0.12.0",
+    "libp2p-websockets": "^0.10.1",
+    "peer-info": "^0.10.0"
   }
 }

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

@@ -19,7 +19,9 @@ const bootstrapers = [
   '/dns4/sfo-3.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
   '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
   '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64'
+  '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
+  '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic',
+  '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6'
 ]
 
 class Node extends libp2p {

examples/libp2p-in-the-browser/README.md

@@ -12,3 +12,5 @@ Simple go into the folder [1](./1) and execute the following
 > npm start
 # open your browser in port :9090
 ```
+
+[Version Published on IPFS](http://ipfs.io/ipfs/QmcBnUWsPG9rFRnYUQH7FkgpxgUppnujcRvyVje77eiKwr)

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

@@ -53,7 +53,7 @@ parallel([
     (cb) => node1.dial(node2.peerInfo, cb),
     (cb) => node2.dial(node3.peerInfo, cb),
     // Set up of the cons might take time
-    (cb) => setTimeout(cb, 100)
+    (cb) => setTimeout(cb, 300)
   ], (err) => {
     if (err) { throw err }
 

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

@@ -54,7 +54,7 @@ parallel([
     (cb) => node1.dial(node2.peerInfo, cb),
     (cb) => node2.dial(node3.peerInfo, cb),
     // Set up of the cons might take time
-    (cb) => setTimeout(cb, 100)
+    (cb) => setTimeout(cb, 300)
   ], (err) => {
     if (err) { throw err }
 

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

@@ -74,10 +74,10 @@ parallel([
     if (err) { throw err }
     console.log('Addresses by which both peers are connected')
     node1.peerBook
-         .getAllArray()
-         .forEach((peer) => console.log('node 1 to node 2:', peer.isConnected().toString()))
+      .getAllArray()
+      .forEach((peer) => console.log('node 1 to node 2:', peer.isConnected().toString()))
     node2.peerBook
-         .getAllArray()
-         .forEach((peer) => console.log('node 2 to node 1:', peer.isConnected().toString()))
+      .getAllArray()
+      .forEach((peer) => console.log('node 2 to node 1:', peer.isConnected().toString()))
   })
 })

examples/transports/1.js

@@ -26,7 +26,7 @@ waterfall([
 ], (err) => {
   if (err) { throw err }
 
-  console.log('node has started (true/false):', node.isOn())
+  console.log('node has started (true/false):', node.isStarted())
   console.log('listening on:')
   node.peerInfo.multiaddrs.forEach((ma) => console.log(ma.toString()))
 })

examples/transports/README.md

@@ -8,7 +8,7 @@ A more complete definition of what is a transport can be found on the [interface
 
 ## 1. Creating a libp2p Bundle with TCP
 
-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).
+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: 
 
@@ -65,7 +65,7 @@ waterfall([
   if (err) { throw err }
 
   // At this point the node has started
-  console.log('node has started (true/false):', node.isOn())
+  console.log('node has started (true/false):', node.isStarted())
   // And we can print the now listening addresses.
   // If you are familiar with TCP, you might have noticed
   // that we specified the node to listen in 0.0.0.0 and port
@@ -90,7 +90,7 @@ That `QmW2cKTakTYqbQkUzBTEGXgWYFj1YEPeUndE1YWs6CBzDQ` is the PeerId that was cre
 
 ## 2. Dialing from one node to another node
 
-Now that we have our bundle, let's create two nodes and make them dial to each other! You can find the complete solution at [2.js](/2.js).
+Now that we have our bundle, let's create two nodes and make them dial to each other! You can find the complete solution at [2.js](./2.js).
 
 For this step, we will need one more dependency.
 
@@ -168,7 +168,7 @@ Hello p2p world!
 
 Next, we want to be available in multiple transports to increase our chances of having common transports in the network. A simple scenario, a node running in the browser only has access to HTTP, WebSockets and WebRTC since the browser doesn't let you open any other kind of transport, for this node to dial to some other node, that other node needs to share a common transport.
 
-What we are going to do in this step is to create 3 nodes, one with TCP, another with TCP+WebSockets and another one with just WebSockets. The full solution can be found on [3.js](3.js).
+What we are going to do in this step is to create 3 nodes, one with TCP, another with TCP+WebSockets and another one with just WebSockets. The full solution can be found on [3.js](./3.js).
 
 In this example, we will need to also install `libp2p-websockets`, go ahead and install:
 

package.json

@@ -1,19 +1,19 @@
 {
   "name": "libp2p",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "JavaScript base class for libp2p bundles",
   "main": "src/index.js",
   "scripts": {
-    "test": "gulp test",
-    "test:node": "gulp test:node",
-    "test:browser": "gulp test:browser --dom",
-    "release": "gulp release --dom",
-    "release-minor": "gulp release --type minor --dom",
-    "release-major": "gulp release --type major --dom",
-    "build": "gulp build",
-    "lint": "aegir-lint",
-    "coverage": "aegir-coverage",
-    "coverage-publish": "aegir-coverage publish"
+    "lint": "aegir lint",
+    "build": "aegir build",
+    "test": "aegir test --target node --target browser --no-parallel",
+    "test:node": "aegir test --target node --no-parallel",
+    "test:browser": "aegir test --target browser --no-parallel",
+    "release": "aegir test release --target node --target browser --no-parallel",
+    "release-minor": "aegir release --type minor --target node --target browser --no-parallel",
+    "release-major": "aegir release --type major --target node --target browser --no-parallel",
+    "coverage": "aegir coverage",
+    "coverage-publish": "aegir coverage --provider coveralls"
   },
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "IPFS"
   ],
   "engines": {
-    "node": ">=4.0.0",
+    "node": ">=6.0.0",
     "npm": ">=3.0.0"
   },
   "pre-commit": [
@@ -38,44 +38,53 @@
   "homepage": "https://github.com/libp2p/js-libp2p",
   "dependencies": {
     "async": "^2.5.0",
-    "libp2p-ping": "~0.5.0",
-    "libp2p-swarm": "~0.31.0",
-    "mafmt": "^2.1.8",
-    "multiaddr": "^2.3.0",
-    "peer-book": "~0.5.0",
-    "peer-id": "~0.9.0",
-    "peer-info": "~0.10.0"
+    "libp2p-ping": "~0.6.0",
+    "libp2p-swarm": "~0.33.0",
+    "mafmt": "^3.0.2",
+    "multiaddr": "^3.0.1",
+    "peer-book": "~0.5.1",
+    "peer-id": "~0.10.2",
+    "peer-info": "~0.11.0"
   },
   "devDependencies": {
-    "aegir": "^11.0.2",
-    "chai": "^4.1.0",
+    "aegir": "^12.1.1",
+    "chai": "^4.1.2",
+    "cids": "~0.5.2",
     "dirty-chai": "^2.0.1",
-    "cids": "~0.5.1",
-    "libp2p-kad-dht": "~0.4.1",
-    "libp2p-mdns": "~0.8.0",
-    "libp2p-multiplex": "~0.4.4",
-    "libp2p-railing": "~0.6.0",
-    "libp2p-secio": "~0.7.0",
-    "libp2p-spdy": "~0.10.6",
-    "libp2p-tcp": "~0.10.2",
-    "libp2p-webrtc-star": "~0.12.0",
-    "libp2p-websockets": "~0.10.1",
+    "electron-webrtc": "~0.3.0",
+    "libp2p-circuit": "~0.1.3",
+    "libp2p-kad-dht": "~0.5.1",
+    "libp2p-mdns": "~0.9.1",
+    "libp2p-multiplex": "~0.5.0",
+    "libp2p-railing": "~0.7.1",
+    "libp2p-secio": "~0.8.1",
+    "libp2p-spdy": "~0.11.0",
+    "libp2p-tcp": "~0.11.1",
+    "libp2p-webrtc-star": "~0.13.2",
+    "libp2p-websockets": "~0.10.4",
     "lodash.times": "^4.3.2",
     "pre-commit": "^1.2.2",
     "pull-goodbye": "0.0.2",
-    "pull-serializer": "^0.3.2",
-    "pull-stream": "^3.6.0",
+    "pull-serializer": "~0.3.2",
+    "pull-stream": "^3.6.1",
     "safe-buffer": "^5.1.1",
-    "electron-webrtc": "^0.3.0",
+    "sinon": "^4.0.2",
     "wrtc": "0.0.62"
   },
   "contributors": [
     "Chris Bratlien <chrisbratlien@gmail.com>",
+    "Daijiro Wachi <daijiro.wachi@gmail.com>",
     "David Dias <daviddias.p@gmail.com>",
+    "Dmitriy Ryajov <dryajov@gmail.com>",
+    "Elven <mon.samuel@qq.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
+    "Lars Gierth <lgierth@users.noreply.github.com>",
+    "Nuno Nogueira <nunofmn@gmail.com>",
     "Pedro Teixeira <i@pgte.me>",
+    "RasmusErik Voel Jensen <github@solsort.com>",
     "Richard Littauer <richard.littauer@gmail.com>",
+    "Ryan Bell <ryan@piing.net>",
     "greenkeeperio-bot <support@greenkeeper.io>",
     "mayerwin <mayerwin@users.noreply.github.com>"
   ]
-}
+}

src/index.js

@@ -12,7 +12,6 @@ const Swarm = require('libp2p-swarm')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const PeerBook = require('peer-book')
-const mafmt = require('mafmt')
 const multiaddr = require('multiaddr')
 
 exports = module.exports
@@ -43,6 +42,9 @@ class Node extends EventEmitter {
       // If muxer exists, we can use Identify
       this.swarm.connection.reuse()
 
+      // If muxer exists, we can use Relay for listening/dialing
+      this.swarm.connection.enableCircuitRelay(_options.relay)
+
       // Received incommind dial and muxer upgrade happened,
       // reuse this muxed connection
       this.swarm.on('peer-mux-established', (peerInfo) => {
@@ -155,7 +157,7 @@ class Node extends EventEmitter {
     const maOld = []
     const maNew = []
     this.peerInfo.multiaddrs.forEach((ma) => {
-      if (!mafmt.IPFS.matches(ma)) {
+      if (!ma.getPeerId()) {
         maOld.push(ma)
         maNew.push(ma.encapsulate('/ipfs/' + this.peerInfo.id.toB58String()))
       }

test/browser-bundle/webrtc-star-only.js

@@ -25,11 +25,11 @@ describe('libp2p-ipfs-browser (webrtc only)', () => {
       expect(err).to.not.exist()
 
       peer1 = new PeerInfo(ids[0])
-      const ma1 = '/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + ids[0].toB58String()
+      const ma1 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + ids[0].toB58String()
       peer1.multiaddrs.add(ma1)
 
       peer2 = new PeerInfo(ids[1])
-      const ma2 = '/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + ids[1].toB58String()
+      const ma2 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + ids[1].toB58String()
       peer2.multiaddrs.add(ma2)
 
       done()
@@ -67,7 +67,7 @@ describe('libp2p-ipfs-browser (webrtc only)', () => {
         expect(Object.keys(peers2)).to.have.length(1)
 
         pull(
-          pull.values([Buffer(text)]),
+          pull.values([Buffer.from(text)]),
           conn,
           pull.collect((err, data) => {
             expect(err).to.not.exist()
@@ -108,7 +108,7 @@ describe('libp2p-ipfs-browser (webrtc only)', () => {
       expect(err).to.not.exist()
 
       const peer3 = new PeerInfo(id3)
-      const ma3 = '/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id3.toB58String()
+      const ma3 = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/ipfs/' + id3.toB58String()
       peer3.multiaddrs.add(ma3)
 
       node1.on('peer:discovery', (peerInfo) => node1.dial(peerInfo, check))

test/node.js

@@ -8,3 +8,4 @@ require('./nodejs-bundle/stream-muxing')
 require('./nodejs-bundle/discovery')
 require('./nodejs-bundle/peer-routing')
 require('./nodejs-bundle/content-routing')
+require('./nodejs-bundle/circuit')

test/nodejs-bundle/circuit.js

@@ -0,0 +1,223 @@
+/* eslint-env mocha */
+'use strict'
+
+const pull = require('pull-stream')
+const waterfall = require('async/waterfall')
+const series = require('async/series')
+const parallel = require('async/parallel')
+const utils = require('./utils')
+const Circuit = require('libp2p-circuit')
+const multiaddr = require('multiaddr')
+
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+
+const expect = chai.expect
+const sinon = require('sinon')
+
+describe(`circuit`, function () {
+  let handlerSpies = []
+  let relayNode1
+  let relayNode2
+  let nodeWS1
+  let nodeWS2
+  let nodeTCP1
+  let nodeTCP2
+
+  function setupNode (addrs, options, cb) {
+    if (typeof options === 'function') {
+      cb = options
+      options = {}
+    }
+
+    options = options || {}
+
+    return utils.createNode(addrs, options, (err, node) => {
+      expect(err).to.not.exist()
+
+      node.handle('/echo/1.0.0', utils.echo)
+      node.start((err) => {
+        expect(err).to.not.exist()
+
+        handlerSpies.push(sinon.spy(node.swarm.transports[Circuit.tag].listeners[0].hopHandler, 'handle'))
+        cb(node)
+      })
+    })
+  }
+
+  before(function (done) {
+    this.timeout(20000)
+
+    waterfall([
+      // set up passive relay
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0/ws`,
+        `/ip4/0.0.0.0/tcp/0`
+      ], {
+        relay: {
+          enabled: true,
+          hop: {
+            enabled: true,
+            active: false // passive relay
+          }
+        }
+      }, (node) => {
+        relayNode1 = node
+        cb()
+      }),
+      // setup active relay
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0/ws`,
+        `/ip4/0.0.0.0/tcp/0`
+      ], {
+        relay: {
+          enabled: true,
+          hop: {
+            enabled: true,
+            active: false // passive relay
+          }
+        }
+      }, (node) => {
+        relayNode2 = node
+        cb()
+      }),
+      // setup node with WS
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0/ws`
+      ], {
+        relay: {
+          enabled: true
+        }
+      }, (node) => {
+        nodeWS1 = node
+        cb()
+      }),
+      // setup node with WS
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0/ws`
+      ], {
+        relay: {
+          enabled: true
+        }
+      }, (node) => {
+        nodeWS2 = node
+        cb()
+      }),
+      // set up node with TCP and listening on relay1
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0`,
+        `/ipfs/${relayNode1.peerInfo.id.toB58String()}/p2p-circuit`
+      ], {
+        relay: {
+          enabled: true
+        }
+      }, (node) => {
+        nodeTCP1 = node
+        cb()
+      }),
+      // set up node with TCP and listening on relay2 over TCP transport
+      (cb) => setupNode([
+        `/ip4/0.0.0.0/tcp/0`,
+        `/ip4/0.0.0.0/tcp/0/ipfs/${relayNode2.peerInfo.id.toB58String()}/p2p-circuit`
+      ], {
+        relay: {
+          enabled: true
+        }
+      }, (node) => {
+        nodeTCP2 = node
+        cb()
+      })
+    ], (err) => {
+      expect(err).to.not.exist()
+
+      series([
+        (cb) => nodeWS1.dial(relayNode1.peerInfo, cb),
+        (cb) => nodeWS1.dial(relayNode2.peerInfo, cb),
+        (cb) => nodeTCP1.dial(relayNode1.peerInfo, cb),
+        (cb) => nodeTCP2.dial(relayNode2.peerInfo, cb)
+      ], done)
+    })
+  })
+
+  after((done) => {
+    parallel([
+      (cb) => relayNode1.stop(cb),
+      (cb) => relayNode2.stop(cb),
+      (cb) => nodeWS1.stop(cb),
+      (cb) => nodeWS2.stop(cb),
+      (cb) => nodeTCP1.stop(cb),
+      (cb) => nodeTCP2.stop(cb)
+    ], done)
+  })
+
+  describe(`any relay`, function () {
+    this.timeout(20000)
+    it('should dial from WS1 to TCP1 over any R', function (done) {
+      nodeWS1.dial(nodeTCP1.peerInfo, '/echo/1.0.0', (err, conn) => {
+        expect(err).to.not.exist()
+        expect(conn).to.exist()
+
+        pull(
+          pull.values(['hello']),
+          conn,
+          pull.collect((e, result) => {
+            expect(e).to.not.exist()
+            expect(result[0].toString()).to.equal('hello')
+            done()
+          })
+        )
+      })
+    })
+
+    it(`should not dial - no R from WS2 to TCP1`, function (done) {
+      nodeWS2.dial(nodeTCP2.peerInfo, '/echo/1.0.0', (err, conn) => {
+        expect(err).to.exist()
+        expect(conn).to.not.exist()
+        done()
+      })
+    })
+  })
+
+  describe(`explicit relay`, function () {
+    this.timeout(20000)
+    it('should dial from WS1 to TCP1 over R1', function (done) {
+      nodeWS1.dial(nodeTCP1.peerInfo, '/echo/1.0.0', (err, conn) => {
+        expect(err).to.not.exist()
+        expect(conn).to.exist()
+
+        pull(
+          pull.values(['hello']),
+          conn,
+          pull.collect((e, result) => {
+            expect(e).to.not.exist()
+            expect(result[0].toString()).to.equal('hello')
+
+            const addr = multiaddr(handlerSpies[0].args[2][0].dstPeer.addrs[0]).toString()
+            expect(addr).to.equal(`/ipfs/${nodeTCP1.peerInfo.id.toB58String()}`)
+            done()
+          })
+        )
+      })
+    })
+
+    it(`should dial from WS1 to TCP2 over R2`, function (done) {
+      nodeWS1.dial(nodeTCP2.peerInfo, '/echo/1.0.0', (err, conn) => {
+        expect(err).to.not.exist()
+        expect(conn).to.exist()
+
+        pull(
+          pull.values(['hello']),
+          conn,
+          pull.collect((e, result) => {
+            expect(e).to.not.exist()
+            expect(result[0].toString()).to.equal('hello')
+
+            const addr = multiaddr(handlerSpies[1].args[2][0].dstPeer.addrs[0]).toString()
+            expect(addr).to.equal(`/ipfs/${nodeTCP2.peerInfo.id.toB58String()}`)
+            done()
+          })
+        )
+      })
+    })
+  })
+})

test/nodejs-bundle/content-routing.js

@@ -19,7 +19,8 @@ describe('.contentRouting', () => {
   let nodeD
   let nodeE
 
-  before((done) => {
+  before(function (done) {
+    this.timeout(5000)
     const tasks = _times(5, () => (cb) => {
       createNode('/ip4/0.0.0.0/tcp/0', {
         mdns: false,

test/nodejs-bundle/discovery.js

@@ -29,7 +29,7 @@ describe('discovery', () => {
         },
         (cb) => createNode([
           '/ip4/0.0.0.0/tcp/0',
-          `/libp2p-webrtc-star/ip4/127.0.0.1/tcp/${port}/ws`
+          `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star`
         ], options, (err, node) => {
           expect(err).to.not.exist()
           nodeA = node
@@ -38,7 +38,7 @@ describe('discovery', () => {
         }),
         (cb) => createNode([
           '/ip4/0.0.0.0/tcp/0',
-          `/libp2p-webrtc-star/ip4/127.0.0.1/tcp/${port}/ws`
+          `/ip4/127.0.0.1/tcp/${port}/ws/p2p-webrtc-star`
         ], options, (err, node) => {
           expect(err).to.not.exist()
           nodeB = node
@@ -60,7 +60,8 @@ describe('discovery', () => {
   describe('MulticastDNS', () => {
     setup({ mdns: true })
 
-    it('find a peer', (done) => {
+    it('find a peer', function (done) {
+      this.timeout(15000)
       nodeA.once('peer:discovery', (peerInfo) => {
         expect(nodeB.peerInfo.id.toB58String())
           .to.eql(peerInfo.id.toB58String())
@@ -73,7 +74,8 @@ describe('discovery', () => {
   describe.skip('WebRTCStar', () => {
     setup({ webRTCStar: true })
 
-    it('find a peer', (done) => {
+    it('find a peer', function (done) {
+      this.timeout(15000)
       nodeA.once('peer:discovery', (peerInfo) => {
         expect(nodeB.peerInfo.id.toB58String())
           .to.eql(peerInfo.id.toB58String())
@@ -88,7 +90,8 @@ describe('discovery', () => {
       mdns: true
     })
 
-    it('find a peer', (done) => {
+    it('find a peer', function (done) {
+      this.timeout(15000)
       nodeA.once('peer:discovery', (peerInfo) => {
         expect(nodeB.peerInfo.id.toB58String())
           .to.eql(peerInfo.id.toB58String())

test/nodejs-bundle/peer-routing.js

@@ -18,7 +18,8 @@ describe('.peerRouting', () => {
   let nodeD
   let nodeE
 
-  before((done) => {
+  before(function (done) {
+    this.timeout(5000)
     const tasks = _times(5, () => (cb) => {
       createNode('/ip4/0.0.0.0/tcp/0', {
         mdns: false,

test/nodejs-bundle/stream-muxing.js

@@ -16,11 +16,11 @@ function test (nodeA, nodeB, callback) {
     expect(err).to.not.exist()
 
     pull(
-      pull.values([new Buffer('hey')]),
+      pull.values([Buffer.from('hey')]),
       conn,
       pull.collect((err, data) => {
         expect(err).to.not.exist()
-        expect(data).to.be.eql([new Buffer('hey')])
+        expect(data).to.be.eql([Buffer.from('hey')])
         callback()
       })
     )
@@ -34,8 +34,10 @@ function teardown (nodeA, nodeB, callback) {
   ], callback)
 }
 
-describe('stream muxing', (done) => {
-  it('spdy only', (done) => {
+describe('stream muxing', () => {
+  it('spdy only', function (done) {
+    this.timeout(5000)
+
     let nodeA
     let nodeB
 
@@ -99,7 +101,9 @@ describe('stream muxing', (done) => {
     ], done)
   })
 
-  it('spdy + multiplex', (done) => {
+  it('spdy + multiplex', function (done) {
+    this.timeout(5000)
+
     let nodeA
     let nodeB
 
@@ -131,7 +135,9 @@ describe('stream muxing', (done) => {
     ], done)
   })
 
-  it('spdy + multiplex switched order', (done) => {
+  it('spdy + multiplex switched order', function (done) {
+    this.timeout(5000)
+
     let nodeA
     let nodeB
 
@@ -163,7 +169,9 @@ describe('stream muxing', (done) => {
     ], done)
   })
 
-  it('one without the other fails to establish a muxedConn', (done) => {
+  it('one without the other fails to establish a muxedConn', function (done) {
+    this.timeout(5000)
+
     let nodeA
     let nodeB
 

test/nodejs-bundle/tcp+websockets+webrtc-star.js

@@ -20,7 +20,8 @@ describe('TCP + WebSockets + WebRTCStar', () => {
 
   let ss
 
-  before((done) => {
+  before(function (done) {
+    this.timeout(5000)
     parallel([
       (cb) => {
         signalling.start({ port: 24642 }, (err, server) => {
@@ -34,7 +35,7 @@ describe('TCP + WebSockets + WebRTCStar', () => {
         createNode([
           '/ip4/0.0.0.0/tcp/0',
           '/ip4/127.0.0.1/tcp/25011/ws',
-          '/libp2p-webrtc-star/ip4/127.0.0.1/tcp/24642/ws'
+          '/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'
         ], {
           modules: {
             transport: [wstar],
@@ -68,7 +69,7 @@ describe('TCP + WebSockets + WebRTCStar', () => {
         const wstar = new WStar({wrtc: wrtc})
 
         createNode([
-          '/libp2p-webrtc-star/ip4/127.0.0.1/tcp/24642/ws'
+          '/ip4/127.0.0.1/tcp/24642/ws/p2p-webrtc-star'
         ], {
           modules: {
             transport: [wstar],
@@ -194,7 +195,8 @@ describe('TCP + WebSockets + WebRTCStar', () => {
     })
   })
 
-  it('nodeAll.dial nodeWStar using PeerInfo', (done) => {
+  it('nodeAll.dial nodeWStar using PeerInfo', function (done) {
+    this.timeout(10000)
     nodeAll.dial(nodeWStar.peerInfo, (err) => {
       expect(err).to.not.exist()
 

test/nodejs-bundle/tcp.js

@@ -70,11 +70,11 @@ describe('TCP only', () => {
       expect(err).to.not.exist()
 
       pull(
-        pull.values([new Buffer('hey')]),
+        pull.values([Buffer.from('hey')]),
         conn,
         pull.collect((err, data) => {
           expect(err).to.not.exist()
-          expect(data).to.be.eql([new Buffer('hey')])
+          expect(data).to.be.eql([Buffer.from('hey')])
           done()
         })
       )
@@ -130,11 +130,11 @@ describe('TCP only', () => {
           }
         ], () => {
           pull(
-            pull.values([new Buffer('hey')]),
+            pull.values([Buffer.from('hey')]),
             conn,
             pull.collect((err, data) => {
               expect(err).to.not.exist()
-              expect(data).to.be.eql([new Buffer('hey')])
+              expect(data).to.be.eql([Buffer.from('hey')])
               done()
             })
           )
@@ -193,11 +193,11 @@ describe('TCP only', () => {
           }
         ], () => {
           pull(
-            pull.values([new Buffer('hey')]),
+            pull.values([Buffer.from('hey')]),
             conn,
             pull.collect((err, data) => {
               expect(err).to.not.exist()
-              expect(data).to.be.eql([new Buffer('hey')])
+              expect(data).to.be.eql([Buffer.from('hey')])
               done()
             })
           )

test/nodejs-bundle/turbolence.js

@@ -57,11 +57,11 @@ describe('Turbolence tests', () => {
       expect(Object.keys(peers)).to.have.length(1)
 
       pull(
-        pull.values([new Buffer('hey')]),
+        pull.values([Buffer.from('hey')]),
         conn,
         pull.collect((err, data) => {
           expect(err).to.not.exist()
-          expect(data).to.eql([new Buffer('hey')])
+          expect(data).to.eql([Buffer.from('hey')])
           done()
         })
       )

test/nodejs-bundle/utils.js

@@ -15,6 +15,8 @@ function createNode (multiaddrs, options, callback) {
     options = {}
   }
 
+  options = options || {}
+
   if (!Array.isArray(multiaddrs)) {
     multiaddrs = [multiaddrs]
   }