Skip to content

feat: State sync system #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mkg20001 wants to merge 7 commits into from
Closed

feat: State sync system #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5192b8f
feat: New state-based system
mkg20001 May 19, 2018
f39b428
Fixes for state system
mkg20001 May 19, 2018
f2c3a00
Fix a race cond in dial
mkg20001 May 19, 2018
bccd5f5
Add discover function
mkg20001 May 19, 2018
3a1ef5b
misc: lint
mkg20001 May 19, 2018
8862704
test: Fix browser tests
mkg20001 May 19, 2018
a468042
chore: upgrade deps
mkg20001 Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix a race cond in dial
  • Loading branch information
@mkg20001
mkg20001 committed May 19, 2018
commit f2c3a005a1ea20ad0c16be25c3b05c4d8963e137
6 changes: 5 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class RendezvousDiscovery {
this.swarm = swarm
this.rpc = []
this.rpcById = {}
this.rpcRace = {}
this.swarm.on('peer:connect', peer => {
this._dial(peer)
})
Expand All @@ -29,10 +30,11 @@ class RendezvousDiscovery {
cb = once(cb)
if (!this.state) return cb()
this._cleanPeers()
if (this.rpcById[pi.id.toB58String()]) {
if (this.rpcById[pi.id.toB58String()] || this.rpcRace[pi.id.toB58String()]) {
log('skip reconnecting %s', pi.id.toB58String())
return cb()
}
this.rpcRace[pi.id.toB58String()] = true
this.swarm.dialProtocol(pi, '/rendezvous/1.0.0', (err, conn) => {
if (err) return cb(err)
const rpc = new RPC()
Expand All @@ -46,6 +48,7 @@ class RendezvousDiscovery {
rpc.registrations = {}

log('add new peer %s', rpc.id)
delete this.rpcRace[pi.id.toB58String()]
this._syncAll(cb)
})
})
Expand Down Expand Up @@ -120,6 +123,7 @@ class RendezvousDiscovery {
this.state = null
this.rpc = []
this.rpcById = {}
this.rpcRace = {}
cb()
}
}
Expand Down