chore: refactor conn mgr and registrar #611
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
from
7432d59
to
d7bbde6
Compare
vasco-santos
commented
Apr 19, 2020
5 tasks
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
3 times, most recently
from
880b2fa
to
8d6e211
Compare
vasco-santos
commented
Apr 24, 2020
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
3 times, most recently
from
64b9115
to
a3cdc08
Compare
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
from
a3cdc08
to
49bfb49
Compare
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
from
49bfb49
to
fdf31c9
Compare
2 tasks
jacobheun
suggested changes
Apr 27, 2020
src/connection-manager/index.js
Outdated
| @@ -122,21 +172,63 @@ class ConnectionManager { | |||
| * @param {Connection} connection | |||
| */ | |||
| onConnect (connection) { | |||
| if (!Connection.isConnection(connection)) { | |||
| throw errcode(new Error('conn must be an instance of interface-connection'), ERR_INVALID_PARAMETERS) | |||
| } | |||
There was a problem hiding this comment.
onConnect is an internal handler, we should avoid throwing errors as this is going to be fatal. Log and return instead.
| @@ -45,16 +45,28 @@ class IdentifyService { | |||
| /** | |||
| * @constructor | |||
| * @param {object} options | |||
| * @param {Registrar} options.registrar | |||
| * @param {PeerStore} options.peerStore | |||
| * @param {ConnectionManager} options.connectionManager | |||
There was a problem hiding this comment.
This should probably just take libp2p, similar to the direction we're going with other services
There was a problem hiding this comment.
I am doing it in #612 . Can we wait for it instead?
Co-Authored-By: Jacob Heun <[email protected]>
vasco-santos
force-pushed
the
chore/refactor-conn-mgr-and-registrar
branch
from
1ac45cc
to
fb5252f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the
connectionManagerandregistrar, as both were keeping a record of the connection without a need for it.Briefly, except for having connection kept only in the
connectionManager, this PR moves the connection based events to into theconnectionManagerand adds theconnectionManagerAPI to the docs.Previously,
js-libp2pwas emittingpeer:connectandpeer:disconnectwith false positives. We could get cases where we have 2 connections to the same peer and both events where emitted as well for those cases. Moreover, as this PRs moves the events to theconnectionManager, we can simplify a lot theupgraderhandlers.Instead of
registrar,identify,metrics(and others in the future), need to keep track of the connections on the upgraders handler, now they can just rely on listening events of theconnectionManager, making thinks simpler and more clear. In addition, when we support protocols such as QUIC (with a built in "upgrader"), the connections should need to be added to theconnectionManager, in the same way as the upgrader does, without any need to provide the connection to the other components/subsystems (registrar.identify,metrics, ...).Needs