Skip to content
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

Jump to bottom

State: events and query changes #100

Merged
merged 6 commits into from
Jul 7, 2017
Merged

State: events and query changes #100

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b9bf40
emit online event once online
pgte Jun 30, 2017
2960861
isOn -> isStarted + start and stop events
pgte Jul 6, 2017
8c9973b
emit online event once online
pgte Jun 30, 2017
6d3c95b
isOn -> isStarted + start and stop events
pgte Jul 6, 2017
422513a
Merge branch 'feat/emit-online' of github.com:libp2p/js-libp2p into f…
pgte Jul 6, 2017
da9bff4
corrected isStarted
pgte Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const multiaddr = require('multiaddr')

exports = module.exports

const OFFLINE_ERROR_MESSAGE = 'The libp2p node is not started yet'
const NOT_STARTED_ERROR_MESSAGE = 'The libp2p node is not started yet'

class Node extends EventEmitter {
constructor (_modules, _peerInfo, _peerBook, _options) {
Expand All @@ -28,7 +28,7 @@ class Node extends EventEmitter {
this.modules = _modules
this.peerInfo = _peerInfo
this.peerBook = _peerBook || new PeerBook()
this.isOnline = false
this._isStarted = false

this.swarm = new Swarm(this.peerInfo, this.peerBook)

Expand Down Expand Up @@ -156,7 +156,6 @@ class Node extends EventEmitter {
}
})
this.peerInfo.multiaddrs.replace(maOld, maNew)

const multiaddrs = this.peerInfo.multiaddrs.toArray()

transports.forEach((transport) => {
Expand All @@ -174,9 +173,6 @@ class Node extends EventEmitter {
series([
(cb) => this.swarm.listen(cb),
(cb) => {
// listeners on, libp2p is on
this.isOnline = true

if (ws) {
// always add dialing on websockets
this.swarm.transport.add(ws.tag || ws.constructor.name, ws)
Expand All @@ -189,10 +185,17 @@ class Node extends EventEmitter {
cb()
},
(cb) => {
// TODO: chicken-and-egg problem:
// have to set started here because DHT requires libp2p is already started
this._isStarted = true
if (this._dht) {
return this._dht.start(cb)
}
cb()
},
(cb) => {
this.emit('start')
cb()
}
], callback)
}
Expand All @@ -201,7 +204,7 @@ class Node extends EventEmitter {
* Stop the libp2p node by closing its listeners and open connections
*/
stop (callback) {
this.isOnline = false
this._isStarted = false

if (this.modules.discovery) {
this.modules.discovery.forEach((discovery) => {
Expand All @@ -216,16 +219,20 @@ class Node extends EventEmitter {
}
cb()
},
(cb) => this.swarm.close(cb)
(cb) => this.swarm.close(cb),
(cb) => {
this.emit('stop')
cb()
}
], callback)
}

isOn () {
return this.isOnline
isStarted () {
return this._isStarted
}

ping (peer, callback) {
assert(this.isOn(), OFFLINE_ERROR_MESSAGE)
assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)
this._getPeerInfo(peer, (err, peerInfo) => {
if (err) {
return callback(err)
Expand All @@ -236,7 +243,7 @@ class Node extends EventEmitter {
}

dial (peer, protocol, callback) {
assert(this.isOn(), OFFLINE_ERROR_MESSAGE)
assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)

if (typeof protocol === 'function') {
callback = protocol
Expand All @@ -259,7 +266,7 @@ class Node extends EventEmitter {
}

hangUp (peer, callback) {
assert(this.isOn(), OFFLINE_ERROR_MESSAGE)
assert(this.isStarted(), NOT_STARTED_ERROR_MESSAGE)

this._getPeerInfo(peer, (err, peerInfo) => {
if (err) {
Expand Down