chore: release version v0.13.0

chore: update contributors
chore: update deps
2025-07-08 21:31:32 +00:00 · 2017-10-26 13:02:16 +01:00 · 2017-10-26 13:02:16 +01:00 · 2017-10-26 12:57:33 +01:00 · 2017-10-26 12:52:01 +01:00 · 2017-10-26 12:51:36 +01:00
21 changed files with 376 additions and 70 deletions
--- a/gulpfile.js
+++ b/gulpfile.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)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,18 @@
+<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/README.md
+++ b/README.md
@ -263,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

--- a/circle.yml
+++ b/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
--- a/examples/encrypted-communications/README.md
+++ b/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).

--- a/examples/libp2p-in-the-browser/1/src/browser-bundle.js
+++ b/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 {
--- a/examples/peer-and-content-routing/1.js
+++ b/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 }

--- a/examples/peer-and-content-routing/2.js
+++ b/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 }

--- a/examples/protocol-and-stream-muxing/3.js
+++ b/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()))
  })
 })
--- a/package.json
+++ b/package.json
@ -1,19 +1,19 @@
 {
  "name": "libp2p",
-  "version": "0.12.3",
+  "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",
@ -39,46 +39,52 @@
  "dependencies": {
    "async": "^2.5.0",
    "libp2p-ping": "~0.6.0",
-    "libp2p-swarm": "~0.32.2",
-    "mafmt": "^3.0.1",
+    "libp2p-swarm": "~0.33.0",
+    "mafmt": "^3.0.2",
    "multiaddr": "^3.0.1",
-    "peer-book": "~0.5.0",
-    "peer-id": "~0.10.0",
+    "peer-book": "~0.5.1",
+    "peer-id": "~0.10.2",
    "peer-info": "~0.11.0"
  },
  "devDependencies": {
-    "aegir": "^11.0.2",
+    "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.5.0",
-    "libp2p-mdns": "~0.9.0",
+    "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.0",
+    "libp2p-railing": "~0.7.1",
    "libp2p-secio": "~0.8.1",
    "libp2p-spdy": "~0.11.0",
-    "libp2p-tcp": "~0.11.0",
-    "libp2p-webrtc-star": "~0.13.1",
-    "libp2p-websockets": "~0.10.1",
+    "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>"
  ]
-}
+}
--- a/src/index.js
+++ b/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()))
      }
--- a/test/node.js
+++ b/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')
--- a/test/nodejs-bundle/circuit.js
+++ b/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()
+          })
+        )
+      })
+    })
+  })
+})
--- a/test/nodejs-bundle/content-routing.js
+++ b/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,
--- a/test/nodejs-bundle/discovery.js
+++ b/test/nodejs-bundle/discovery.js
@ -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())
--- a/test/nodejs-bundle/peer-routing.js
+++ b/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,
--- a/test/nodejs-bundle/stream-muxing.js
+++ b/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

--- a/test/nodejs-bundle/tcp+websockets+webrtc-star.js
+++ b/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) => {
@ -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()

--- a/test/nodejs-bundle/tcp.js
+++ b/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()
            })
          )
--- a/test/nodejs-bundle/turbolence.js
+++ b/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()
        })
      )
--- a/test/nodejs-bundle/utils.js
+++ b/test/nodejs-bundle/utils.js
@ -15,6 +15,8 @@ function createNode (multiaddrs, options, callback) {
    options = {}
  }

+  options = options || {}
+
  if (!Array.isArray(multiaddrs)) {
    multiaddrs = [multiaddrs]
  }
Author	SHA1	Message	Date
David Dias	3ad696445d	chore: release version v0.13.0	2017-10-26 13:02:16 +01:00
David Dias	30bec8d53b	chore: update contributors	2017-10-26 13:02:16 +01:00
David Dias	db2b5300b4	chore: update deps	2017-10-26 12:57:33 +01:00
Lars Gierth	df4d60df88	docs(examples): update browser /wss bootstrap list (#129 )	2017-10-26 12:52:01 +01:00
Dmitriy Ryajov	29cc0afc64	feat: enable and test Circuit Relay * 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	2017-10-26 12:51:36 +01:00
David Dias	2504cbeb26	docs: add missing sections to the README (#128 )	2017-10-22 10:27:36 +01:00
Ryan Bell	468cc421fa	docs: update README.md (#124 )	2017-10-22 10:19:50 +01:00
Nuno Nogueira	0b991e19d1	docs(examples): fix peer-content routing example scripts (#126 ). (#127 )	2017-10-22 10:19:16 +01:00
David Dias	2a81fc75a8	chore: update deps	2017-09-10 05:20:56 +01:00
David Dias	e04c249d4d	chore: update deps	2017-09-10 04:52:07 +01:00
David Dias	4a995613ae	chore: release version v0.12.4	2017-09-07 17:17:38 +01:00
David Dias	066c4976bb	chore: update contributors	2017-09-07 17:17:38 +01:00
David Dias	429cf9c361	chore: update deps	2017-09-07 17:15:08 +01:00