fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

fix: dht get options

Browse Source
This commit is contained in:
Vasco Santos 2018-09-20 09:47:55 +01:00 committed by Jacob Heun
parent a63432e24b
commit 4460e8246c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -59,7 +59,7 @@
"dirty-chai": "^2.0.1", "dirty-chai": "^2.0.1",
"electron-webrtc": "~0.3.0", "electron-webrtc": "~0.3.0",
"libp2p-circuit": "~0.2.0", "libp2p-circuit": "~0.2.0",
"libp2p-kad-dht": "~0.10.1", "libp2p-kad-dht": "~0.10.3",
"libp2p-mdns": "~0.12.0", "libp2p-mdns": "~0.12.0",
"libp2p-mplex": "~0.8.0", "libp2p-mplex": "~0.8.0",
"libp2p-railing": "~0.9.2", "libp2p-railing": "~0.9.2",

20
src/dht.js
View File

@ -9,29 +9,29 @@ module.exports = (node) => {
node._dht.put(key, value, callback) node._dht.put(key, value, callback)
}, },
get: (key, maxTimeout, callback) => { get: (key, options, callback) => {
if (typeof maxTimeout === 'function') { if (typeof options === 'function') {
callback = maxTimeout callback = options
maxTimeout = null options = {}
} }
if (!node._dht) { if (!node._dht) {
return callback(new Error('DHT is not available')) return callback(new Error('DHT is not available'))
} }
node._dht.get(key, maxTimeout, callback) node._dht.get(key, options, callback)
}, },
getMany: (key, nVals, maxTimeout, callback) => { getMany: (key, nVals, options, callback) => {
if (typeof maxTimeout === 'function') { if (typeof options === 'function') {
callback = maxTimeout callback = options
maxTimeout = null options = {}
} }
if (!node._dht) { if (!node._dht) {
return callback(new Error('DHT is not available')) return callback(new Error('DHT is not available'))
} }
node._dht.getMany(key, nVals, maxTimeout, callback) node._dht.getMany(key, nVals, options, callback)
} }
} }
} }

12
test/dht.node.js
View File

@ -53,14 +53,14 @@ describe('.dht', () => {
}) })
}) })
it('should be able to dht.get a value from the DHT with a maxTimeout', (done) => { it('should be able to dht.get a value from the DHT with options', (done) => {
const key = Buffer.from('/v/hello') const key = Buffer.from('/v/hello')
const value = Buffer.from('world') const value = Buffer.from('world')
nodeA.dht.put(key, value, (err) => { nodeA.dht.put(key, value, (err) => {
expect(err).to.not.exist() expect(err).to.not.exist()
nodeA.dht.get(key, 3000, (err, res) => { nodeA.dht.get(key, { maxTimeout: 3000 }, (err, res) => {
expect(err).to.not.exist() expect(err).to.not.exist()
expect(res).to.eql(value) expect(res).to.eql(value)
done() done()
@ -68,7 +68,7 @@ describe('.dht', () => {
}) })
}) })
it('should be able to dht.get a value from the DHT with no maxTimeout defined', (done) => { it('should be able to dht.get a value from the DHT with no options defined', (done) => {
const key = Buffer.from('/v/hello') const key = Buffer.from('/v/hello')
const value = Buffer.from('world') const value = Buffer.from('world')
@ -83,14 +83,14 @@ describe('.dht', () => {
}) })
}) })
it('should be able to dht.getMany a value from the DHT with a maxTimeout', (done) => { it('should be able to dht.getMany a value from the DHT with options', (done) => {
const key = Buffer.from('/v/hello') const key = Buffer.from('/v/hello')
const value = Buffer.from('world') const value = Buffer.from('world')
nodeA.dht.put(key, value, (err) => { nodeA.dht.put(key, value, (err) => {
expect(err).to.not.exist() expect(err).to.not.exist()
nodeA.dht.getMany(key, 1, (err, res) => { nodeA.dht.getMany(key, 1, { maxTimeout: 3000 }, (err, res) => {
expect(err).to.not.exist() expect(err).to.not.exist()
expect(res).to.exist() expect(res).to.exist()
done() done()
@ -98,7 +98,7 @@ describe('.dht', () => {
}) })
}) })
it('should be able to dht.getMany a value from the DHT with no maxTimeout defined', (done) => { it('should be able to dht.getMany a value from the DHT with no options defined', (done) => {
const key = Buffer.from('/v/hello') const key = Buffer.from('/v/hello')
const value = Buffer.from('world') const value = Buffer.from('world')