mirror of
https://github.com/fluencelabs/js-libp2p
synced 2025-07-09 13:51:34 +00:00
Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
f686a3a010 | |||
92946a59c3 | |||
65e8fd5f24 | |||
f07b35f4d4 | |||
85f601f809 | |||
bb6d3dfc36 | |||
4312acf49a | |||
45c0e957c3 | |||
7d4294b279 | |||
228c2b09de | |||
faa5433f8d | |||
de53a00e4d | |||
cf45341754 |
17
package.json
17
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libp2p-identify",
|
"name": "libp2p-identify",
|
||||||
"version": "0.3.2",
|
"version": "0.4.2",
|
||||||
"description": "libp2p Identify Protocol",
|
"description": "libp2p Identify Protocol",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -37,18 +37,19 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/libp2p/js-libp2p-identify#readme",
|
"homepage": "https://github.com/libp2p/js-libp2p-identify#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"aegir": "^10.0.0",
|
"aegir": "^11.0.2",
|
||||||
"chai": "^3.5.0",
|
"chai": "^4.0.2",
|
||||||
|
"dirty-chai": "^2.0.0",
|
||||||
"pre-commit": "^1.2.2",
|
"pre-commit": "^1.2.2",
|
||||||
"pull-pair": "^1.1.0"
|
"pull-pair": "^1.1.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"multiaddr": "^2.2.1",
|
"multiaddr": "^2.3.0",
|
||||||
"peer-id": "~0.8.2",
|
"peer-id": "~0.8.7",
|
||||||
"peer-info": "~0.8.3",
|
"peer-info": "~0.9.2",
|
||||||
"protocol-buffers": "^3.2.1",
|
"protocol-buffers": "^3.2.1",
|
||||||
"pull-length-prefixed": "^1.2.0",
|
"pull-length-prefixed": "^1.3.0",
|
||||||
"pull-stream": "^3.5.0"
|
"pull-stream": "^3.6.0"
|
||||||
},
|
},
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"David Dias <daviddias.p@gmail.com>",
|
"David Dias <daviddias.p@gmail.com>",
|
||||||
|
@ -17,6 +17,11 @@ module.exports = (conn, callback) => {
|
|||||||
return callback(err)
|
return callback(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// connection got closed graciously
|
||||||
|
if (data.length === 0) {
|
||||||
|
return callback(new Error('conn was closed, did not receive data'))
|
||||||
|
}
|
||||||
|
|
||||||
const input = msg.decode(data[0])
|
const input = msg.decode(data[0])
|
||||||
|
|
||||||
PeerId.createFromPubKey(input.publicKey, (err, id) => {
|
PeerId.createFromPubKey(input.publicKey, (err, id) => {
|
||||||
@ -24,12 +29,12 @@ module.exports = (conn, callback) => {
|
|||||||
return callback(err)
|
return callback(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
const info = new PeerInfo(id)
|
const peerInfo = new PeerInfo(id)
|
||||||
input.listenAddrs
|
input.listenAddrs
|
||||||
.map(multiaddr)
|
.map(multiaddr)
|
||||||
.forEach((ma) => info.multiaddr.add(ma))
|
.forEach((ma) => peerInfo.multiaddrs.add(ma))
|
||||||
|
|
||||||
callback(null, info, getObservedAddrs(input))
|
callback(null, peerInfo, getObservedAddrs(input))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@ module.exports = (conn, pInfoSelf) => {
|
|||||||
protocolVersion: 'ipfs/0.1.0',
|
protocolVersion: 'ipfs/0.1.0',
|
||||||
agentVersion: 'na',
|
agentVersion: 'na',
|
||||||
publicKey: publicKey,
|
publicKey: publicKey,
|
||||||
listenAddrs: pInfoSelf.multiaddrs.map((ma) => ma.buffer),
|
listenAddrs: pInfoSelf.multiaddrs.toArray().map((ma) => ma.buffer),
|
||||||
observedAddr: observedAddrs ? observedAddrs.buffer : new Buffer('')
|
observedAddr: observedAddrs ? observedAddrs.buffer : new Buffer('')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -2,7 +2,10 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const pull = require('pull-stream')
|
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 pair = require('pull-pair/duplex')
|
const pair = require('pull-pair/duplex')
|
||||||
const PeerInfo = require('peer-info')
|
const PeerInfo = require('peer-info')
|
||||||
const lp = require('pull-length-prefixed')
|
const lp = require('pull-length-prefixed')
|
||||||
@ -26,7 +29,7 @@ describe('identify.dialer', () => {
|
|||||||
|
|
||||||
it('works', (done) => {
|
it('works', (done) => {
|
||||||
const p = pair()
|
const p = pair()
|
||||||
original.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/5002'))
|
original.multiaddrs.add(multiaddr('/ip4/127.0.0.1/tcp/5002'))
|
||||||
const input = msg.encode({
|
const input = msg.encode({
|
||||||
protocolVersion: 'ipfs/0.1.0',
|
protocolVersion: 'ipfs/0.1.0',
|
||||||
agentVersion: 'na',
|
agentVersion: 'na',
|
||||||
@ -42,24 +45,15 @@ describe('identify.dialer', () => {
|
|||||||
)
|
)
|
||||||
|
|
||||||
identify.dialer(p[1], (err, info, observedAddrs) => {
|
identify.dialer(p[1], (err, info, observedAddrs) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
expect(
|
expect(info.id.pubKey.bytes)
|
||||||
info.id.pubKey.bytes
|
.to.eql(original.id.pubKey.bytes)
|
||||||
).to.be.eql(
|
|
||||||
original.id.pubKey.bytes
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(
|
expect(info.multiaddrs.toArray())
|
||||||
info.multiaddrs
|
.to.eql(original.multiaddrs.toArray())
|
||||||
).to.be.eql(
|
|
||||||
original.multiaddrs
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(
|
expect(observedAddrs)
|
||||||
observedAddrs
|
.to.eql([multiaddr('/ip4/127.0.0.1/tcp/5001')])
|
||||||
).to.be.eql(
|
|
||||||
[multiaddr('/ip4/127.0.0.1/tcp/5001')]
|
|
||||||
)
|
|
||||||
|
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
|
@ -1,16 +1,15 @@
|
|||||||
/* eslint-env mocha */
|
/* eslint-env mocha */
|
||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const expect = require('chai').expect
|
const chai = require('chai')
|
||||||
|
const dirtyChai = require('dirty-chai')
|
||||||
|
const expect = chai.expect
|
||||||
|
chai.use(dirtyChai)
|
||||||
|
|
||||||
const identify = require('../src')
|
const identify = require('../src')
|
||||||
|
|
||||||
describe('identify', () => {
|
describe('identify', () => {
|
||||||
it('multicodec', () => {
|
it('multicodec', () => {
|
||||||
expect(
|
expect(identify.multicodec).to.eql('/ipfs/id/1.0.0')
|
||||||
identify.multicodec
|
|
||||||
).to.be.eql(
|
|
||||||
'/ipfs/id/1.0.0'
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -2,7 +2,10 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
|
|
||||||
const pull = require('pull-stream')
|
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 pair = require('pull-pair/duplex')
|
const pair = require('pull-pair/duplex')
|
||||||
const PeerInfo = require('peer-info')
|
const PeerInfo = require('peer-info')
|
||||||
const lp = require('pull-length-prefixed')
|
const lp = require('pull-length-prefixed')
|
||||||
@ -13,6 +16,7 @@ const identify = require('../src')
|
|||||||
|
|
||||||
describe('identify.listener', () => {
|
describe('identify.listener', () => {
|
||||||
let info
|
let info
|
||||||
|
|
||||||
beforeEach((done) => {
|
beforeEach((done) => {
|
||||||
PeerInfo.create((err, _info) => {
|
PeerInfo.create((err, _info) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
@ -26,12 +30,12 @@ describe('identify.listener', () => {
|
|||||||
|
|
||||||
it('works', (done) => {
|
it('works', (done) => {
|
||||||
const p = pair()
|
const p = pair()
|
||||||
info.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/5002'))
|
info.multiaddrs.add(multiaddr('/ip4/127.0.0.1/tcp/5002'))
|
||||||
pull(
|
pull(
|
||||||
p[1],
|
p[1],
|
||||||
lp.decode(),
|
lp.decode(),
|
||||||
pull.collect((err, result) => {
|
pull.collect((err, result) => {
|
||||||
expect(err).to.not.exist
|
expect(err).to.not.exist()
|
||||||
|
|
||||||
const input = msg.decode(result[0])
|
const input = msg.decode(result[0])
|
||||||
expect(
|
expect(
|
||||||
|
Reference in New Issue
Block a user