From 09312b1a87fdb9d000673aefeeb56f5274a73a78 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 7 Jan 2018 10:03:34 +0000 Subject: [PATCH] chore: update dependencies, including latest aegir and CI --- .aegir.js | 39 +++++++++++++++++++++++++++++++++++++++ .travis.yml | 3 --- circle.yml | 4 ++++ gulpfile.js | 43 ------------------------------------------- package.json | 42 +++++++++++++++++++++--------------------- test/index.spec.js | 8 ++++++-- 6 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 .aegir.js delete mode 100644 gulpfile.js diff --git a/.aegir.js b/.aegir.js new file mode 100644 index 0000000..f70335f --- /dev/null +++ b/.aegir.js @@ -0,0 +1,39 @@ +'use strict' + +const multiaddr = require('multiaddr') +const pull = require('pull-stream') +const WS = require('libp2p-websockets') +const PeerId = require('peer-id') + +const secio = require('./src') + +const peerNodeJSON = require('./test/peer-node.json') +const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws') +let listener + +module.exports = { + hooks: { + browser: { + pre: (done) => { + PeerId.createFromJSON(peerNodeJSON, (err, id) => { + if (err) { throw err } + + const ws = new WS() + + listener = ws.createListener((conn) => { + const encrypted = secio.encrypt(id, id._privKey, conn, (err) => { + if (err) { throw err } + }) + + pull(encrypted, encrypted) + }) + + listener.listen(ma, done) + }) + }, + post: (done) => { + listener.close(done) + } + } + } +} diff --git a/.travis.yml b/.travis.yml index 5102ee5..79d62ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,10 @@ matrix: env: CXX=g++-4.8 - node_js: 8 env: CXX=g++-4.8 - # - node_js: stable - # env: CXX=g++-4.8 script: - npm run lint - npm run test - - npm run coverage before_script: - export DISPLAY=:99.0 diff --git a/circle.yml b/circle.yml index 0009693..e0338e6 100644 --- a/circle.yml +++ b/circle.yml @@ -3,6 +3,10 @@ machine: node: version: stable +test: + post: + - npm run coverage -- --upload --providers coveralls + dependencies: pre: - google-chrome --version diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index f0b82b6..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,43 +0,0 @@ -'use strict' - -const gulp = require('gulp') -const multiaddr = require('multiaddr') -const pull = require('pull-stream') -const WS = require('libp2p-websockets') -const PeerId = require('peer-id') - -const peerNodeJSON = require('./test/peer-node.json') -const secio = require('./src') - -let listener -const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws') - -gulp.task('test:browser:before', (done) => { - PeerId.createFromJSON(peerNodeJSON, (err, id) => { - if (err) { - throw err - } - - const ws = new WS() - listener = ws.createListener((conn) => { - const encrypted = secio.encrypt(id, id._privKey, conn, (err) => { - if (err) { - throw err - } - }) - - pull( - encrypted, - encrypted - ) - }) - - listener.listen(ma, done) - }) -}) - -gulp.task('test:browser:after', (done) => { - listener.close(done) -}) - -require('aegir/gulp')(gulp) diff --git a/package.json b/package.json index 27e61ce..7a27a52 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,16 @@ "description": "Secio implementation in JavaScript", "main": "src/index.js", "scripts": { - "lint": "aegir-lint", - "build": "aegir-build", - "test": "gulp test", - "test:node": "gulp test:node", - "test:browser": "gulp test:browser", - "release": "gulp release --dom", - "release-minor": "gulp release --type minor", - "release-major": "gulp release --type major", - "coverage": "aegir-coverage", - "coverage-publish": "aegir-coverage publish", + "lint": "aegir lint", + "build": "aegir build", + "test": "aegir test", + "test:node": "aegir test -t node", + "test:browser": "aegir test -t browser", + "release": "aegir release -t node browser", + "release-minor": "aegir release --type minor -t node browser", + "release-major": "aegir release --type major -t node browser", + "coverage": "aegir coverage", + "coverage-publish": "aegir coverage publish", "bench": "node benchmarks/send.js" }, "keywords": [ @@ -25,26 +25,26 @@ "author": "Friedel Ziegelmayer ", "license": "MIT", "dependencies": { - "async": "^2.5.0", - "debug": "^3.0.1", + "async": "^2.6.0", + "debug": "^3.1.0", "interface-connection": "~0.3.2", - "libp2p-crypto": "~0.10.3", - "multihashing-async": "~0.4.6", - "peer-id": "~0.10.0", - "protons": "^1.0.0", + "libp2p-crypto": "~0.11.0", + "multihashing-async": "~0.4.7", + "peer-id": "~0.10.4", + "protons": "^1.0.1", "pull-defer": "^0.2.2", "pull-handshake": "^1.1.4", "pull-length-prefixed": "^1.3.0", - "pull-stream": "^3.6.0" + "pull-stream": "^3.6.1" }, "devDependencies": { - "aegir": "^11.0.2", + "aegir": "^12.3.0", "benchmark": "^2.1.4", "chai": "^4.1.2", "dirty-chai": "^2.0.1", "gulp": "^3.9.1", - "libp2p-websockets": "~0.10.1", - "multistream-select": "^0.13.5", + "libp2p-websockets": "~0.10.4", + "multistream-select": "^0.14.1", "pre-commit": "^1.2.2", "pull-goodbye": "0.0.2", "pull-pair": "^1.1.0" @@ -72,4 +72,4 @@ "Richard Littauer ", "greenkeeperio-bot " ] -} \ No newline at end of file +} diff --git a/test/index.spec.js b/test/index.spec.js index 2ab7610..b4c9c5c 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -24,7 +24,9 @@ describe('libp2p-secio', () => { expect(secio.tag).to.equal('/secio/1.0.0') }) - it('upgrades a connection', (done) => { + it('upgrades a connection', function (done) { + this.timeout(20 * 1000) + const p = pair() createSession(p[0], (err, local) => { expect(err).to.not.exist() @@ -49,7 +51,9 @@ describe('libp2p-secio', () => { }) }) - it('works over multistream', (done) => { + it('works over multistream', function (done) { + this.timeout(20 * 1000) + const p = pair() const listener = new Listener()