chore: update dependencies, including latest aegir and CI

This commit is contained in:
David Dias 2018-01-07 10:03:34 +00:00
parent a5d10ca0b0
commit 09312b1a87
6 changed files with 70 additions and 69 deletions

39
.aegir.js Normal file
View File

@ -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)
}
}
}
}

View File

@ -8,13 +8,10 @@ matrix:
env: CXX=g++-4.8 env: CXX=g++-4.8
- node_js: 8 - node_js: 8
env: CXX=g++-4.8 env: CXX=g++-4.8
# - node_js: stable
# env: CXX=g++-4.8
script: script:
- npm run lint - npm run lint
- npm run test - npm run test
- npm run coverage
before_script: before_script:
- export DISPLAY=:99.0 - export DISPLAY=:99.0

View File

@ -3,6 +3,10 @@ machine:
node: node:
version: stable version: stable
test:
post:
- npm run coverage -- --upload --providers coveralls
dependencies: dependencies:
pre: pre:
- google-chrome --version - google-chrome --version

View File

@ -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)

View File

@ -4,16 +4,16 @@
"description": "Secio implementation in JavaScript", "description": "Secio implementation in JavaScript",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
"lint": "aegir-lint", "lint": "aegir lint",
"build": "aegir-build", "build": "aegir build",
"test": "gulp test", "test": "aegir test",
"test:node": "gulp test:node", "test:node": "aegir test -t node",
"test:browser": "gulp test:browser", "test:browser": "aegir test -t browser",
"release": "gulp release --dom", "release": "aegir release -t node browser",
"release-minor": "gulp release --type minor", "release-minor": "aegir release --type minor -t node browser",
"release-major": "gulp release --type major", "release-major": "aegir release --type major -t node browser",
"coverage": "aegir-coverage", "coverage": "aegir coverage",
"coverage-publish": "aegir-coverage publish", "coverage-publish": "aegir coverage publish",
"bench": "node benchmarks/send.js" "bench": "node benchmarks/send.js"
}, },
"keywords": [ "keywords": [
@ -25,26 +25,26 @@
"author": "Friedel Ziegelmayer <dignifiedquire@gmail.com>", "author": "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"async": "^2.5.0", "async": "^2.6.0",
"debug": "^3.0.1", "debug": "^3.1.0",
"interface-connection": "~0.3.2", "interface-connection": "~0.3.2",
"libp2p-crypto": "~0.10.3", "libp2p-crypto": "~0.11.0",
"multihashing-async": "~0.4.6", "multihashing-async": "~0.4.7",
"peer-id": "~0.10.0", "peer-id": "~0.10.4",
"protons": "^1.0.0", "protons": "^1.0.1",
"pull-defer": "^0.2.2", "pull-defer": "^0.2.2",
"pull-handshake": "^1.1.4", "pull-handshake": "^1.1.4",
"pull-length-prefixed": "^1.3.0", "pull-length-prefixed": "^1.3.0",
"pull-stream": "^3.6.0" "pull-stream": "^3.6.1"
}, },
"devDependencies": { "devDependencies": {
"aegir": "^11.0.2", "aegir": "^12.3.0",
"benchmark": "^2.1.4", "benchmark": "^2.1.4",
"chai": "^4.1.2", "chai": "^4.1.2",
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"libp2p-websockets": "~0.10.1", "libp2p-websockets": "~0.10.4",
"multistream-select": "^0.13.5", "multistream-select": "^0.14.1",
"pre-commit": "^1.2.2", "pre-commit": "^1.2.2",
"pull-goodbye": "0.0.2", "pull-goodbye": "0.0.2",
"pull-pair": "^1.1.0" "pull-pair": "^1.1.0"

View File

@ -24,7 +24,9 @@ describe('libp2p-secio', () => {
expect(secio.tag).to.equal('/secio/1.0.0') 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() const p = pair()
createSession(p[0], (err, local) => { createSession(p[0], (err, local) => {
expect(err).to.not.exist() 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 p = pair()
const listener = new Listener() const listener = new Listener()