Compare commits

...

29 Commits

Author SHA1 Message Date
58e18dd01b chore: release version v0.12.5 2016-05-05 00:44:53 +01:00
fb017ebb07 chore: update contributors 2016-05-05 00:44:53 +01:00
08c4c169d6 remove unnecessary console.log 2016-05-05 00:13:48 +01:00
de927e8052 chore: release version v0.12.4 2016-05-04 20:13:00 +01:00
df8e61632b chore: update contributors 2016-05-04 20:13:00 +01:00
b453bd4f83 Merge pull request #46 from diasdavid/feat/improve-identify
Freeze handling conns till identify is finished on the incomming multiplexed streams
2016-05-04 21:11:22 +02:00
0143ab6449 freeze handling conns till identify is finished on the incomming multiplexed streams 2016-05-04 19:42:53 +01:00
02dd32e7df chore: release version v0.12.3 2016-05-04 16:57:00 +01:00
4fe91796cd chore: update contributors 2016-05-04 16:57:00 +01:00
352876cade Merge pull request #45 from diasdavid/feat/id-on-conns
attach peerId to the conn
2016-05-04 17:11:50 +02:00
41b700f509 attach peerId to the conn 2016-05-04 14:55:40 +01:00
eea7e91b15 chore: release version v0.12.2 2016-04-27 10:09:24 +01:00
b11a7972f5 chore: update contributors 2016-04-27 10:09:24 +01:00
15d5bc53fb update deps and npm scripts 2016-04-27 10:08:02 +01:00
9d911af8e0 Merge pull request #44 from diasdavid/feature/events
feature/events
2016-04-27 10:03:29 +01:00
9f1f3c82dc add peer-mux-closed event 2016-04-27 09:44:16 +01:00
d6a1f52962 add peer-mux-established event 2016-04-26 20:47:31 +01:00
7b536819b1 chore: update contributors 2016-04-25 02:29:18 +01:00
7158aaf702 chore: release version v0.12.1 2016-04-25 02:29:18 +01:00
bc87fad5f9 update deps 2016-04-25 02:27:34 +01:00
c9418399a7 bump version manually 2016-04-25 00:20:23 +01:00
2cac123405 chore: update contributors 2016-04-25 00:18:30 +01:00
ff47a9c228 chore: release version v0.11.8 2016-04-25 00:18:30 +01:00
f86a981eb2 update npm scripts 2016-04-25 00:17:07 +01:00
674d68000b chore: update contributors 2016-04-24 23:29:15 +01:00
ae371085c1 chore: release version v0.10.7 2016-04-24 23:29:15 +01:00
770bee3c66 Merge pull request #42 from diasdavid/fix/multiaddr
fix(identify): convert all addresses to multiaddr
2016-04-24 23:19:34 +01:00
6943e3e90b fix(identify): convert all addresses to multiaddr
Fixes #37
2016-04-24 18:39:35 +02:00
a008ebd5b9 chore: update contributors 2016-04-20 13:25:16 +01:00
6 changed files with 105 additions and 25 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "libp2p-swarm", "name": "libp2p-swarm",
"version": "0.10.6", "version": "0.12.5",
"description": "libp2p swarm implementation in JavaScript", "description": "libp2p swarm implementation in JavaScript",
"main": "lib/index.js", "main": "lib/index.js",
"jsnext:main": "src/index.js", "jsnext:main": "src/index.js",
@ -11,8 +11,8 @@
"test:node": "gulp test:node", "test:node": "gulp test:node",
"test:browser": "gulp test:browser", "test:browser": "gulp test:browser",
"release": "gulp release", "release": "gulp release",
"release-minor": "gulp release --minor", "release-minor": "gulp release --type minor",
"release-major": "gulp release --major", "release-major": "gulp release --type major",
"coverage": "gulp coverage", "coverage": "gulp coverage",
"coverage-publish": "aegir-coverage publish" "coverage-publish": "aegir-coverage publish"
}, },
@ -40,13 +40,13 @@
"bl": "^1.1.2", "bl": "^1.1.2",
"buffer-loader": "0.0.1", "buffer-loader": "0.0.1",
"chai": "^3.5.0", "chai": "^3.5.0",
"aegir": "^2.1.1", "aegir": "^3.0.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"istanbul": "^0.4.3", "istanbul": "^0.4.3",
"libp2p-multiplex": "^0.2.1", "libp2p-multiplex": "^0.2.1",
"libp2p-spdy": "^0.3.1", "libp2p-spdy": "^0.3.1",
"libp2p-tcp": "^0.4.0", "libp2p-tcp": "^0.5.0",
"libp2p-websockets": "^0.3.2", "libp2p-websockets": "^0.4.1",
"multiaddr": "^1.4.0", "multiaddr": "^1.4.0",
"peer-id": "^0.6.6", "peer-id": "^0.6.6",
"peer-info": "^0.6.2", "peer-info": "^0.6.2",
@ -78,4 +78,4 @@
"Richard Littauer <richard.littauer@gmail.com>", "Richard Littauer <richard.littauer@gmail.com>",
"dignifiedquire <dignifiedquire@gmail.com>" "dignifiedquire <dignifiedquire@gmail.com>"
] ]
} }

View File

@ -41,7 +41,7 @@ exports.exec = (rawConn, muxer, peerInfo, callback) => {
pbs.on('identify', (msg) => { pbs.on('identify', (msg) => {
if (msg.observedAddr.length > 0) { if (msg.observedAddr.length > 0) {
peerInfo.multiaddr.addSafe(msg.observedAddr) peerInfo.multiaddr.addSafe(multiaddr(msg.observedAddr))
} }
const peerId = Id.createFromPubKey(msg.publicKey) const peerId = Id.createFromPubKey(msg.publicKey)
@ -59,7 +59,7 @@ exports.exec = (rawConn, muxer, peerInfo, callback) => {
protocolVersion: 'na', protocolVersion: 'na',
agentVersion: 'na', agentVersion: 'na',
publicKey: peerInfo.id.pubKey, publicKey: peerInfo.id.pubKey,
listenAddrs: peerInfo.multiaddrs.map((mh) => { return mh.buffer }), listenAddrs: peerInfo.multiaddrs.map((mh) => mh.buffer),
observedAddr: obsMultiaddr ? obsMultiaddr.buffer : new Buffer('') observedAddr: obsMultiaddr ? obsMultiaddr.buffer : new Buffer('')
}) })
@ -70,15 +70,15 @@ exports.exec = (rawConn, muxer, peerInfo, callback) => {
} }
exports.handler = (peerInfo, swarm) => { exports.handler = (peerInfo, swarm) => {
return function (conn) { return (conn) => {
// 1. receive incoming observed info about me // 1. receive incoming observed info about me
// 2. update my own information (on peerInfo) // 2. update my own information (on peerInfo)
// 3. send back what I see from the other (get from swarm.muxedConns[incPeerID].conn.getObservedAddrs() // 3. send back what I see from the other (get from swarm.muxedConns[incPeerID].conn.getObservedAddrs()
var pbs = pbStream() var pbs = pbStream()
pbs.on('identify', function (msg) { pbs.on('identify', (msg) => {
if (msg.observedAddr.length > 0) { if (msg.observedAddr.length > 0) {
peerInfo.multiaddr.addSafe(msg.observedAddr) peerInfo.multiaddr.addSafe(multiaddr(msg.observedAddr))
} }
const peerId = Id.createFromPubKey(msg.publicKey) const peerId = Id.createFromPubKey(msg.publicKey)
@ -89,9 +89,7 @@ exports.handler = (peerInfo, swarm) => {
protocolVersion: 'na', protocolVersion: 'na',
agentVersion: 'na', agentVersion: 'na',
publicKey: peerInfo.id.pubKey, publicKey: peerInfo.id.pubKey,
listenAddrs: peerInfo.multiaddrs.map(function (ma) { listenAddrs: peerInfo.multiaddrs.map((ma) => ma.buffer),
return ma.buffer
}),
observedAddr: obsMultiaddr ? obsMultiaddr.buffer : new Buffer('') observedAddr: obsMultiaddr ? obsMultiaddr.buffer : new Buffer('')
}) })
pbs.finalize() pbs.finalize()

View File

@ -4,9 +4,13 @@ const multistream = require('multistream-select')
const identify = require('./identify') const identify = require('./identify')
const DuplexPassThrough = require('duplex-passthrough') const DuplexPassThrough = require('duplex-passthrough')
const contains = require('lodash.contains') const contains = require('lodash.contains')
const util = require('util')
const EE = require('events').EventEmitter
exports = module.exports = Swarm exports = module.exports = Swarm
util.inherits(Swarm, EE)
function Swarm (peerInfo) { function Swarm (peerInfo) {
if (!(this instanceof Swarm)) { if (!(this instanceof Swarm)) {
return new Swarm(peerInfo) return new Swarm(peerInfo)
@ -144,7 +148,23 @@ function Swarm (peerInfo) {
// for listening // for listening
this.handle(muxer.multicodec, (conn) => { this.handle(muxer.multicodec, (conn) => {
const muxedConn = muxer(conn, true) const muxedConn = muxer(conn, true)
var peerIdForConn
muxedConn.on('stream', (conn) => { muxedConn.on('stream', (conn) => {
function gotId () {
if (peerIdForConn) {
conn.peerId = peerIdForConn
connHandler(conn)
} else {
setTimeout(gotId, 100)
}
}
if (this.identify) {
return gotId()
}
connHandler(conn) connHandler(conn)
}) })
@ -154,9 +174,18 @@ function Swarm (peerInfo) {
if (err) { if (err) {
return console.log('Identify exec failed', err) return console.log('Identify exec failed', err)
} }
peerIdForConn = pi.id
this.muxedConns[pi.id.toB58String()] = {} this.muxedConns[pi.id.toB58String()] = {}
this.muxedConns[pi.id.toB58String()].muxer = muxedConn this.muxedConns[pi.id.toB58String()].muxer = muxedConn
this.muxedConns[pi.id.toB58String()].conn = conn // to be able to extract addrs this.muxedConns[pi.id.toB58String()].conn = conn // to be able to extract addrs
self.emit('peer-mux-established', pi)
muxedConn.on('close', () => {
delete self.muxedConns[pi.id.toB58String()]
self.emit('peer-mux-closed', pi)
})
}) })
} }
}) })
@ -183,15 +212,19 @@ function Swarm (peerInfo) {
// higher level (public) API // higher level (public) API
this.dial = (pi, protocol, callback) => { this.dial = (pi, protocol, callback) => {
var pt = null
if (typeof protocol === 'function') { if (typeof protocol === 'function') {
callback = protocol callback = protocol
protocol = null protocol = null
} else {
pt = new DuplexPassThrough()
} }
if (!callback) {
callback = function noop () {}
}
const pt = new DuplexPassThrough()
const b58Id = pi.id.toB58String() const b58Id = pi.id.toB58String()
if (!this.muxedConns[b58Id]) { if (!this.muxedConns[b58Id]) {
if (!this.conns[b58Id]) { if (!this.conns[b58Id]) {
attemptDial(pi, (err, conn) => { attemptDial(pi, (err, conn) => {
@ -284,14 +317,25 @@ function Swarm (peerInfo) {
self.muxedConns[b58Id].muxer = muxedConn self.muxedConns[b58Id].muxer = muxedConn
self.muxedConns[b58Id].conn = conn self.muxedConns[b58Id].conn = conn
self.emit('peer-mux-established', pi)
muxedConn.on('close', () => {
delete self.muxedConns[pi.id.toB58String()]
self.emit('peer-mux-closed', pi)
})
// in case identify is on // in case identify is on
muxedConn.on('stream', connHandler) muxedConn.on('stream', (conn) => {
conn.peerId = pi.id
connHandler(conn)
})
cb(null, muxedConn) cb(null, muxedConn)
}) })
}) })
} }
} }
function openConnInMuxedConn (muxer, cb) { function openConnInMuxedConn (muxer, cb) {
cb(muxer.newStream()) cb(muxer.newStream())
} }
@ -305,6 +349,7 @@ function Swarm (peerInfo) {
} }
pt.wrapStream(conn) pt.wrapStream(conn)
pt.peerId = pi.id
callback(null, pt) callback(null, pt)
}) })
}) })

View File

@ -46,9 +46,17 @@ describe('transport - tcp', function () {
function ready () { function ready () {
if (++count === 2) { if (++count === 2) {
expect(peerA.multiaddrs.length).to.equal(1) expect(peerA.multiaddrs.length).to.equal(1)
expect(peerA.multiaddrs[0]).to.deep.equal(multiaddr('/ip4/127.0.0.1/tcp/9888')) expect(
peerA.multiaddrs[0].equals(multiaddr('/ip4/127.0.0.1/tcp/9888'))
).to.be.equal(
true
)
expect(peerB.multiaddrs.length).to.equal(1) expect(peerB.multiaddrs.length).to.equal(1)
expect(peerB.multiaddrs[0]).to.deep.equal(multiaddr('/ip4/127.0.0.1/tcp/9999')) expect(
peerB.multiaddrs[0].equals(multiaddr('/ip4/127.0.0.1/tcp/9999'))
).to.be.equal(
true
)
done() done()
} }
} }
@ -124,7 +132,11 @@ describe('transport - tcp', function () {
function ready () { function ready () {
expect(peer.multiaddrs.length).to.equal(1) expect(peer.multiaddrs.length).to.equal(1)
expect(peer.multiaddrs[0]).to.deep.equal(multiaddr('/ip4/0.0.0.0/tcp/9050')) expect(
peer.multiaddrs[0].equals(multiaddr('/ip4/0.0.0.0/tcp/9050'))
).to.be.equal(
true
)
swarm.close(done) swarm.close(done)
} }
}) })

View File

@ -46,9 +46,17 @@ describe('transport - websockets', function () {
function ready () { function ready () {
if (++count === 2) { if (++count === 2) {
expect(peerA.multiaddrs.length).to.equal(1) expect(peerA.multiaddrs.length).to.equal(1)
expect(peerA.multiaddrs[0]).to.deep.equal(multiaddr('/ip4/127.0.0.1/tcp/9888/websockets')) expect(
peerA.multiaddrs[0].equals(multiaddr('/ip4/127.0.0.1/tcp/9888/websockets'))
).to.be.equal(
true
)
expect(peerB.multiaddrs.length).to.equal(1) expect(peerB.multiaddrs.length).to.equal(1)
expect(peerB.multiaddrs[0]).to.deep.equal(multiaddr('/ip4/127.0.0.1/tcp/9999/websockets')) expect(
peerB.multiaddrs[0].equals(multiaddr('/ip4/127.0.0.1/tcp/9999/websockets'))
).to.equal(
true
)
done() done()
} }
} }

View File

@ -49,7 +49,7 @@ describe('high level API - with everything mixed all together!', function () {
swarmA.close(closed) swarmA.close(closed)
swarmB.close(closed) swarmB.close(closed)
swarmC.close(closed) // swarmC.close(closed)
swarmD.close(closed) swarmD.close(closed)
swarmE.close(closed) swarmE.close(closed)
@ -135,6 +135,14 @@ describe('high level API - with everything mixed all together!', function () {
conn.pipe(conn) conn.pipe(conn)
}) })
swarmB.once('peer-mux-established', (peerInfo) => {
expect(peerInfo.id.toB58String()).to.equal(peerA.id.toB58String())
})
swarmA.once('peer-mux-established', (peerInfo) => {
expect(peerInfo.id.toB58String()).to.equal(peerB.id.toB58String())
})
swarmA.dial(peerB, '/anona/1.0.0', (err, conn) => { swarmA.dial(peerB, '/anona/1.0.0', (err, conn) => {
expect(err).to.not.exist expect(err).to.not.exist
expect(Object.keys(swarmA.muxedConns).length).to.equal(1) expect(Object.keys(swarmA.muxedConns).length).to.equal(1)
@ -182,11 +190,13 @@ describe('high level API - with everything mixed all together!', function () {
it('dial from tcp+ws to tcp+ws', (done) => { it('dial from tcp+ws to tcp+ws', (done) => {
swarmC.handle('/mamao/1.0.0', (conn) => { swarmC.handle('/mamao/1.0.0', (conn) => {
expect(conn.peerId).to.exist
conn.pipe(conn) conn.pipe(conn)
}) })
swarmA.dial(peerC, '/mamao/1.0.0', (err, conn) => { swarmA.dial(peerC, '/mamao/1.0.0', (err, conn) => {
expect(err).to.not.exist expect(err).to.not.exist
expect(conn.peerId).to.exist
expect(Object.keys(swarmA.muxedConns).length).to.equal(2) expect(Object.keys(swarmA.muxedConns).length).to.equal(2)
conn.end() conn.end()
@ -194,4 +204,11 @@ describe('high level API - with everything mixed all together!', function () {
conn.on('end', done) conn.on('end', done)
}) })
}) })
it('close a muxer emits event', (done) => {
swarmC.close(() => {})
swarmA.once('peer-mux-closed', (peerInfo) => {
done()
})
})
}) })