Compare commits

...

36 Commits

Author SHA1 Message Date
0edc487b23 chore: release version v0.9.4 2017-03-21 14:27:22 +00:00
c3ad8ce47a chore: update contributors 2017-03-21 14:27:22 +00:00
665b755922 chore: update aegir 2017-03-21 14:27:16 +00:00
1a550bac26 chore: release version v0.9.3 2017-02-09 09:01:06 -08:00
51c5594d49 chore: update contributors 2017-02-09 09:01:05 -08:00
d5476caee1 missing dep 2017-02-09 09:00:58 -08:00
4b211f5cd6 chore: release version v0.9.2 2017-02-09 08:34:54 -08:00
433188f182 chore: update contributors 2017-02-09 08:34:54 -08:00
f3de45d198 chore: ^ to ~ 2017-02-09 08:33:48 -08:00
2afaed5f2a chore(package): update multiaddr to version 2.1.3 (#62)
https://greenkeeper.io/
2017-01-19 11:05:56 +01:00
308dead134 chore(package): update mafmt to version 2.1.4 (#63)
https://greenkeeper.io/
2017-01-16 17:05:57 +01:00
1c8603b721 chore(package): update mafmt to version 2.1.3 (#61)
https://greenkeeper.io/
2017-01-16 16:18:52 +01:00
c883475a4f chore(package): update aegir to version 9.3.0 (#57)
https://greenkeeper.io/
2016-12-18 11:44:36 +00:00
515c6a32ec chore(package): update ip-address to version 5.8.6 (#60)
https://greenkeeper.io/
2016-12-18 11:38:42 +00:00
a107e1da57 chore(package): update pre-commit to version 1.2.2 (#58)
https://greenkeeper.io/
2016-12-18 11:37:15 +00:00
2ec97b3c8c chore(package): update pre-commit to version 1.2.0 (#53)
https://greenkeeper.io/
2016-12-10 12:02:44 -08:00
cb449a6c5c chore(package): update aegir to version 9.2.1 (#54)
https://greenkeeper.io/
2016-12-10 12:01:37 -08:00
1773efecdf chore(package): update ip-address to version 5.8.4 (#52)
https://greenkeeper.io/
2016-12-08 19:19:52 -08:00
49e23f1961 refactor: use lodash.includes instead of lodash.contains
As `loadash.contains` is deprecated.
2016-12-04 13:28:18 +01:00
10b35b22f6 chore(package): update multiaddr to version 2.1.1 (#47)
https://greenkeeper.io/
2016-11-28 12:02:56 +00:00
5677e12592 Merge pull request #44 from libp2p/greenkeeper-aegir-9.1.1
aegir@9.1.1 breaks build ⚠️
2016-11-07 16:12:35 +01:00
9524e8670a chore(package): update aegir to version 9.1.1
https://greenkeeper.io/
2016-11-04 16:07:36 +01:00
32dc4fa5c6 chore: release version v0.9.1 2016-11-03 08:29:14 +00:00
9d697f66a4 chore: update contributors 2016-11-03 08:29:14 +00:00
fb6c61abe9 chore: update deps 2016-11-03 08:29:09 +00:00
114998db1c chore: release version v0.9.0 2016-11-03 08:23:38 +00:00
4a94e3ca01 chore: update contributors 2016-11-03 08:23:38 +00:00
e451201848 Async Crypto Endeavour (#40) 2016-11-03 08:22:32 +00:00
e7524e1747 docs(readme): fix coverage badge 2016-09-09 12:13:14 +02:00
06689e3ff0 fix(deps): remove unused pull dep 2016-09-09 11:49:11 +02:00
376f938cc0 Merge pull request #34 from libp2p/greenkeeper-aegir-8.0.1
aegir@8.0.1 breaks build ⚠️
2016-09-08 20:07:25 -04:00
a2958b9bca chore(package): update aegir to version 8.0.1
https://greenkeeper.io/
2016-09-09 01:34:28 +02:00
7b7e521e57 Merge pull request #33 from libp2p/greenkeeper-multiaddr-2.0.3
multiaddr@2.0.3 breaks build ⚠️
2016-09-07 20:21:13 -04:00
2330732ed5 chore(package): update multiaddr to version 2.0.3
https://greenkeeper.io/
2016-09-08 01:20:22 +02:00
7b7e7f6344 Merge pull request #31 from libp2p/greenkeeper-aegir-8.0.0
Update aegir to version 8.0.0 🚀
2016-09-07 14:13:02 -04:00
48708ac4d2 chore(package): update aegir to version 8.0.0
https://greenkeeper.io/
2016-09-06 15:11:49 +02:00
7 changed files with 85 additions and 79 deletions

3
.gitignore vendored
View File

@ -25,6 +25,3 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
lib
dist

View File

@ -1,9 +1,13 @@
sudo: false
language: node_js
node_js:
- 4
- 5
- stable
matrix:
include:
- node_js: 4
env: CXX=g++-4.8
- node_js: 6
env: CXX=g++-4.8
- node_js: stable
env: CXX=g++-4.8
# Make sure we have new NPM.
before_install:
@ -14,12 +18,16 @@ script:
- npm test
- npm run coverage
addons:
firefox: 'latest'
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
after_success:
- npm run coverage-publish
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8

View File

@ -3,9 +3,11 @@
[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
[![Build Status](https://travis-ci.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://travis-ci.org/libp2p/js-libp2p-tcp)
![](https://img.shields.io/badge/coverage-%3F-yellow.svg?style=flat-square)
[![Coverage Status](https://coveralls.io/repos/github/libp2p/js-libp2p-tcp/badge.svg?branch=master)](https://coveralls.io/github/libp2p/js-libp2p-tcp?branch=master)
[![Dependency Status](https://david-dm.org/libp2p/js-libp2p-tcp.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-tcp)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
![](https://raw.githubusercontent.com/libp2p/interface-connection/master/img/badge.png)
![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)
@ -105,7 +107,7 @@ To learn more about this utility, visit https://pull-stream.github.io/#pull-stre
## API
[![](https://raw.githubusercontent.com/diasdavid/interface-transport/master/img/badge.png)](https://github.com/diasdavid/interface-transport)
[![](https://raw.githubusercontent.com/libp2p/interface-transport/master/img/badge.png)](https://github.com/libp2p/interface-transport)
`libp2p-tcp` accepts TCP addresses both IPFS and non IPFS encapsulated addresses, i.e:

View File

@ -1,16 +1,14 @@
{
"name": "libp2p-tcp",
"version": "0.8.1",
"version": "0.9.4",
"description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
"main": "lib/index.js",
"jsnext:main": "src/index.js",
"main": "src/index.js",
"scripts": {
"lint": "aegir-lint",
"build": "aegir-build --env node",
"test": "aegir-test --env node",
"release": "aegir-release --env node",
"release-minor": "aegir-release --type minor --env node",
"release-major": "aegir-release --type major --env node",
"release": "aegir-release --env no-build",
"release-minor": "aegir-release --type minor --env no-build",
"release-major": "aegir-release --type major --env no-build",
"coverage": "aegir-coverage",
"coverage-publish": "aegir-coverage publish"
},
@ -20,7 +18,7 @@
],
"repository": {
"type": "git",
"url": "https://github.com/diasdavid/js-libp2p-tcp.git"
"url": "https://github.com/libp2p/js-libp2p-tcp.git"
},
"keywords": [
"IPFS"
@ -28,32 +26,38 @@
"author": "David Dias <daviddias@ipfs.io>",
"license": "MIT",
"bugs": {
"url": "https://github.com/diasdavid/js-libp2p-tcp/issues"
"url": "https://github.com/libp2p/js-libp2p-tcp/issues"
},
"homepage": "https://github.com/libp2p/js-libp2p-tcp",
"engines": {
"node": ">=4.0.0"
},
"homepage": "https://github.com/diasdavid/js-libp2p-tcp",
"devDependencies": {
"aegir": "^6.0.1",
"aegir": "^11.0.0",
"chai": "^3.5.0",
"interface-transport": "^0.3.3",
"dirty-chai": "^1.2.2",
"interface-transport": "~0.3.5",
"lodash.isfunction": "^3.0.8",
"pre-commit": "^1.1.2"
"pre-commit": "^1.2.2",
"pull-stream": "^3.5.0"
},
"dependencies": {
"interface-connection": "0.2.1",
"ip-address": "^5.8.0",
"lodash.contains": "^2.4.3",
"mafmt": "^2.1.2",
"multiaddr": "^2.0.2",
"pull": "^2.1.1",
"stream-to-pull-stream": "^1.7.0"
"interface-connection": "~0.3.2",
"ip-address": "^5.8.6",
"lodash.includes": "^4.3.0",
"lodash.isfunction": "^3.0.8",
"mafmt": "^2.1.6",
"multiaddr": "^2.2.2",
"stream-to-pull-stream": "^1.7.2"
},
"contributors": [
"David Dias <daviddias.p@gmail.com>",
"Evan Schwartz <evan.mark.schwartz@gmail.com>",
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"Greenkeeper <support@greenkeeper.io>",
"João Antunes <j.goncalo.antunes@gmail.com>",
"Prashanth Chandra <coolshanth94@gmail.com>",
"Richard Littauer <richard.littauer@gmail.com>",
"Stephen Whitmore <stephen.whitmore@gmail.com>",
"dignifiedquire <dignifiedquire@gmail.com>",
"greenkeeperio-bot <support@greenkeeper.io>"
"Stephen Whitmore <stephen.whitmore@gmail.com>"
]
}

View File

@ -3,7 +3,7 @@
const net = require('net')
const toPull = require('stream-to-pull-stream')
const mafmt = require('mafmt')
const contains = require('lodash.contains')
const includes = require('lodash.includes')
const isFunction = require('lodash.isfunction')
const Connection = require('interface-connection').Connection
const debug = require('debug')
@ -59,7 +59,7 @@ module.exports = class TCP {
multiaddrs = [multiaddrs]
}
return multiaddrs.filter((ma) => {
if (contains(ma.protoNames(), 'ipfs')) {
if (includes(ma.protoNames(), 'ipfs')) {
ma = ma.decapsulate('ipfs')
}
return mafmt.TCP.matches(ma)

View File

@ -3,7 +3,7 @@
const multiaddr = require('multiaddr')
const Connection = require('interface-connection').Connection
const os = require('os')
const contains = require('lodash.contains')
const includes = require('lodash.includes')
const net = require('net')
const toPull = require('stream-to-pull-stream')
const EventEmitter = require('events').EventEmitter
@ -78,7 +78,7 @@ module.exports = (handler) => {
listener.listen = (ma, cb) => {
listeningAddr = ma
if (contains(ma.protoNames(), 'ipfs')) {
if (includes(ma.protoNames(), 'ipfs')) {
ipfsId = getIpfsId(ma)
listeningAddr = ma.decapsulate('ipfs')
}

View File

@ -2,7 +2,10 @@
'use strict'
const pull = require('pull-stream')
const expect = require('chai').expect
const chai = require('chai')
const dirtyChai = require('dirty-chai')
const expect = chai.expect
chai.use(dirtyChai)
const TCP = require('../src')
const net = require('net')
const multiaddr = require('multiaddr')
@ -11,7 +14,7 @@ const Connection = require('interface-connection').Connection
describe('instantiate the transport', () => {
it('create', () => {
const tcp = new TCP()
expect(tcp).to.exist
expect(tcp).to.exist()
})
})
@ -71,7 +74,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh)
listener.close(done)
@ -84,7 +87,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1)
listener.close(done)
})
@ -96,7 +99,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(multiaddrs.length > 0).to.equal(true)
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
listener.close(done)
@ -109,7 +112,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(multiaddrs.length > 0).to.equal(true)
expect(multiaddrs[0].toString().indexOf('0.0.0.0')).to.equal(-1)
listener.close(done)
@ -122,7 +125,7 @@ describe('listen', () => {
const listener = tcp.createListener((conn) => {})
listener.listen(mh, () => {
listener.getAddrs((err, multiaddrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(multiaddrs.length).to.equal(1)
expect(multiaddrs[0]).to.deep.equal(mh)
listener.close(done)
@ -157,12 +160,8 @@ describe('dial', () => {
pull.values(['hey']),
tcp.dial(ma),
pull.collect((err, values) => {
expect(err).to.not.exist
expect(
values
).to.be.eql(
[new Buffer('hey!')]
)
expect(err).to.not.exist()
expect(values).to.eql([new Buffer('hey!')])
done()
})
)
@ -173,7 +172,7 @@ describe('dial', () => {
pull(
tcp.dial(ma),
pull.onEnd((err) => {
expect(err).to.exist
expect(err).to.exist()
done()
})
)
@ -189,13 +188,9 @@ describe('dial', () => {
pull.values(['hey']),
tcp.dial(ma),
pull.collect((err, values) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(
values
).to.be.eql([
new Buffer('hey')
])
expect(values).to.be.eql([new Buffer('hey')])
listener.close(done)
})
@ -258,7 +253,7 @@ describe('dial', () => {
pull.values(['hey']),
conn,
pull.collect((err, res) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(res).to.be.eql([new Buffer('hey!')])
done()
})
@ -307,9 +302,9 @@ describe('valid Connection', () => {
let dialerObsAddrs
const listener = tcp.createListener((conn) => {
expect(conn).to.exist
expect(conn).to.exist()
conn.getObservedAddrs((err, addrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
dialerObsAddrs = addrs
pull(pull.empty(), conn)
})
@ -324,7 +319,7 @@ describe('valid Connection', () => {
function endHandler () {
conn.getObservedAddrs((err, addrs) => {
expect(err).to.not.exist
expect(err).to.not.exist()
pull(pull.empty(), conn)
closeAndAssert(listener, addrs)
})
@ -342,10 +337,10 @@ describe('valid Connection', () => {
it('get Peer Info', (done) => {
const listener = tcp.createListener((conn) => {
expect(conn).to.exist
expect(conn).to.exist()
conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist
expect(peerInfo).to.not.exist
expect(err).to.exist()
expect(peerInfo).to.not.exist()
pull(pull.empty(), conn)
})
})
@ -356,8 +351,8 @@ describe('valid Connection', () => {
pull(conn, pull.onEnd(endHandler))
function endHandler () {
conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist
expect(peerInfo).to.not.exist
expect(err).to.exist()
expect(peerInfo).to.not.exist()
listener.close(done)
})
@ -367,10 +362,10 @@ describe('valid Connection', () => {
it('set Peer Info', (done) => {
const listener = tcp.createListener((conn) => {
expect(conn).to.exist
expect(conn).to.exist()
conn.setPeerInfo('batatas')
conn.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(peerInfo).to.equal('batatas')
pull(pull.empty(), conn)
})
@ -383,7 +378,7 @@ describe('valid Connection', () => {
function endHandler () {
conn.setPeerInfo('arroz')
conn.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(peerInfo).to.equal('arroz')
listener.close(done)
@ -424,11 +419,11 @@ describe('Connection wrap', () => {
pull.values(['hey']),
connWrap,
pull.collect((err, chunks) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')])
connWrap.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(peerInfo).to.equal('peerInfo')
done()
})
@ -443,7 +438,7 @@ describe('Connection wrap', () => {
pull.values(['hey']),
connWrap,
pull.collect((err, chunks) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')])
done()
})
@ -459,17 +454,17 @@ describe('Connection wrap', () => {
callback(null, 'none')
}
conn.getPeerInfo((err, peerInfo) => {
expect(err).to.exist
expect(err).to.exist()
})
connWrap.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(peerInfo).to.equal('none')
})
pull(
pull.values(['hey']),
connWrap,
pull.collect((err, chunks) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')])
done()
})
@ -489,10 +484,10 @@ describe('Connection wrap', () => {
pull.values(['hey']),
connWrap3,
pull.collect((err, chunks) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(chunks).to.be.eql([new Buffer('hey')])
connWrap3.getPeerInfo((err, peerInfo) => {
expect(err).to.not.exist
expect(err).to.not.exist()
expect(peerInfo).to.equal('inner doll')
done()
})