fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-06-10 16:01:19 +00:00
Code Issues Projects Releases Wiki Activity

chore: update per feedback

Browse Source
This commit is contained in:
Jacob Heun
2019-12-04 23:22:30 +01:00
parent 98e82df5e1
commit 466b4dfd70
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/DIALER.md
View File

@ -5,7 +5,7 @@
* The number of tokens requested should be between 1 and the MAX_PER_PEER_DIALS max set in the Dialer.
* If the number of available tokens is less than requested, the Dialer may return less than requested.
* The number of tokens a DialRequest obtains reflects the maximum number of parallel Multiaddr Dials it can make.
* If no tokens are available a DialRequest should immediately end and throw. This deviates from the existing queue system to avoid queue congestion.
* If no tokens are available a DialRequest should immediately end and throw.
* As tokens are limited, DialRequests should be given a prioritized list of Multiaddrs to minimize the potential request time.
* Once a Multiaddr Dial has succeeded, all pending dials in that Dial Request should be aborted.
* If DIAL_TIMEOUT time has elapsed before any one Multiaddr Dial succeeds, all remaining dials in the DialRequest should be aborted.

1
src/dialer/index.js
View File

@ -72,6 +72,7 @@ class Dialer {
try {
const dialResult = await dialRequest.run({ ...options, signal })
clearTimeout(timeoutId)
log('dial succeeded to %s', dialResult.remoteAddr)
return dialResult
} catch (err) {
// Error is a timeout

7
test/dialing/direct.node.js
View File

@ -27,6 +27,7 @@ const Protector = require('../../src/pnet')
const swarmKeyBuffer = Buffer.from(require('../fixtures/swarm.key'))
const mockUpgrader = require('../utils/mockUpgrader')
const createMockConnection = require('../utils/mockConnection')
const Peers = require('../fixtures/peers')
const listenAddr = multiaddr('/ip4/127.0.0.1/tcp/0')
@ -160,9 +161,7 @@ describe('Dialing (direct, TCP)', () => {
expect(dialer.tokens).to.have.length(2)
const deferredDial = pDefer()
sinon.stub(localTM, 'dial').callsFake(async () => {
await deferredDial.promise
})
sinon.stub(localTM, 'dial').callsFake(() => deferredDial.promise)
// Perform 3 multiaddr dials
dialer.connectToMultiaddr([remoteAddr, remoteAddr, remoteAddr])
@ -173,7 +172,7 @@ describe('Dialing (direct, TCP)', () => {
// We should have 2 in progress, and 1 waiting
expect(dialer.tokens).to.have.length(0)
deferredDial.resolve()
deferredDial.resolve(await createMockConnection())
// Let the call stack run
await delay(0)

7
test/dialing/direct.spec.js
View File

@ -27,6 +27,7 @@ const Libp2p = require('../../src')
const Peers = require('../fixtures/peers')
const { MULTIADDRS_WEBSOCKETS } = require('../fixtures/browser')
const mockUpgrader = require('../utils/mockUpgrader')
const createMockConnection = require('../utils/mockConnection')
const unsupportedAddr = multiaddr('/ip4/127.0.0.1/tcp/9999/ws')
const remoteAddr = MULTIADDRS_WEBSOCKETS[0]
@ -158,9 +159,7 @@ describe('Dialing (direct, WebSockets)', () => {
expect(dialer.tokens).to.have.length(2)
const deferredDial = pDefer()
sinon.stub(localTM, 'dial').callsFake(async () => {
await deferredDial.promise
})
sinon.stub(localTM, 'dial').callsFake(() => deferredDial.promise)
// Perform 3 multiaddr dials
dialer.connectToMultiaddr([remoteAddr, remoteAddr, remoteAddr])
@ -171,7 +170,7 @@ describe('Dialing (direct, WebSockets)', () => {
// We should have 2 in progress, and 1 waiting
expect(dialer.tokens).to.have.length(0)
deferredDial.resolve()
deferredDial.resolve(await createMockConnection())
// Let the call stack run
await delay(0)