Compare commits

...

4 Commits

Author SHA1 Message Date
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
4 changed files with 33 additions and 15 deletions

View File

@ -1,6 +1,6 @@
{
"name": "libp2p-swarm",
"version": "0.10.6",
"version": "0.10.7",
"description": "libp2p swarm implementation in JavaScript",
"main": "lib/index.js",
"jsnext:main": "src/index.js",
@ -78,4 +78,4 @@
"Richard Littauer <richard.littauer@gmail.com>",
"dignifiedquire <dignifiedquire@gmail.com>"
]
}
}

View File

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

View File

@ -46,9 +46,17 @@ describe('transport - tcp', function () {
function ready () {
if (++count === 2) {
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[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()
}
}
@ -124,7 +132,11 @@ describe('transport - tcp', function () {
function ready () {
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)
}
})

View File

@ -46,9 +46,17 @@ describe('transport - websockets', function () {
function ready () {
if (++count === 2) {
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[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()
}
}