-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
feat: track node connection state #1719
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,8 +6,10 @@ import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events"; | |
import { decodeRelayShard } from "@waku/enr"; | ||
import { | ||
ConnectionManagerOptions, | ||
EConnectionStateEvents, | ||
EPeersByDiscoveryEvents, | ||
IConnectionManager, | ||
IConnectionStateEvents, | ||
IPeersByDiscoveryEvents, | ||
IRelay, | ||
KeepAliveOptions, | ||
|
@@ -28,7 +30,7 @@ export const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3; | |
export const DEFAULT_MAX_PARALLEL_DIALS = 3; | ||
|
||
export class ConnectionManager | ||
extends EventEmitter<IPeersByDiscoveryEvents> | ||
extends EventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents> | ||
implements IConnectionManager | ||
{ | ||
private static instances = new Map<string, ConnectionManager>(); | ||
|
@@ -40,6 +42,33 @@ export class ConnectionManager | |
|
||
private currentActiveParallelDialCount = 0; | ||
private pendingPeerDialQueue: Array<PeerId> = []; | ||
private online: boolean = false; | ||
|
||
public isConnected(): boolean { | ||
return this.online; | ||
} | ||
|
||
private toggleOnline(): void { | ||
if (!this.online) { | ||
this.online = true; | ||
this.dispatchEvent( | ||
new CustomEvent<boolean>(EConnectionStateEvents.CONNECTION_STATUS, { | ||
detail: this.online | ||
}) | ||
); | ||
} | ||
} | ||
|
||
private toggleOffline(): void { | ||
if (this.online && this.libp2p.getConnections().length == 0) { | ||
this.online = false; | ||
this.dispatchEvent( | ||
new CustomEvent<boolean>(EConnectionStateEvents.CONNECTION_STATUS, { | ||
detail: this.online | ||
}) | ||
); | ||
} | ||
} | ||
|
||
public static create( | ||
peerId: string, | ||
|
@@ -393,12 +422,14 @@ export class ConnectionManager | |
) | ||
); | ||
} | ||
this.toggleOnline(); | ||
})(); | ||
}, | ||
"peer:disconnect": () => { | ||
return (evt: CustomEvent<PeerId>): void => { | ||
"peer:disconnect": (evt: CustomEvent<PeerId>): void => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When I tested locally, this event handler was not being called at all until I changed it to use the same pattern as the two above |
||
void (async () => { | ||
this.keepAliveManager.stop(evt.detail); | ||
}; | ||
this.toggleOffline(); | ||
})(); | ||
} | ||
}; | ||
|
||
|
@@ -427,7 +458,7 @@ export class ConnectionManager | |
log.warn( | ||
`Discovered peer ${peerId.toString()} with ShardInfo ${shardInfo} is not part of any of the configured pubsub topics (${ | ||
this.configuredPubsubTopics | ||
}). | ||
}). | ||
Not dialing.` | ||
); | ||
return false; | ||
|
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: maybe this particular dispatch event can be written as a private function for the class:
dispatchConnectionStatus()
since it's being reused twice.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a usual concern with these type of functions. I like current one as it is explicitly mentions when it becomes
online
and whenoffline
.@adklempner can follow up if thinks it is necessary