logos-messaging/logos-messaging-js
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-js.git synced 2026-03-22 14:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle local discovery for events

Browse Source
This commit is contained in:
danisharora099 2024-02-19 18:38:15 +05:30
parent 199f6ab2ff
commit f8213e425f
No known key found for this signature in database
GPG Key ID: FBD2BF500037F135
3 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
packages/core/src/lib/connection_manager.ts
View File

@ -395,11 +395,26 @@ export class ConnectionManager
this.libp2p.peerStore this.libp2p.peerStore
); );
const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes( // const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes(
Tags.BOOTSTRAP // Tags.BOOTSTRAP
); // );
const tags = await this.getTagNamesForPeer(peerId);
if (isBootstrap) { let tag: Tags;
if (tags.includes(Tags.BOOTSTRAP)) {
tag = Tags.BOOTSTRAP;
} else if (tags.includes(Tags.PEER_EXCHANGE)) {
tag = Tags.PEER_EXCHANGE;
} else if (tags.includes(Tags.LOCAL)) {
tag = Tags.LOCAL;
} else {
log.warn(
`Peer ${peerId.toString()} has no discovery tag. Not dispatching discovery event`
);
return;
}
if (tag === Tags.BOOTSTRAP) {
const bootstrapConnections = this.libp2p const bootstrapConnections = this.libp2p
.getConnections() .getConnections()
.filter((conn) => conn.tags.includes(Tags.BOOTSTRAP)); .filter((conn) => conn.tags.includes(Tags.BOOTSTRAP));
@ -420,13 +435,23 @@ export class ConnectionManager
); );
} }
} else { } else {
let discoveryTagName: EPeersByDiscoveryEvents;
if (tag === Tags.PEER_EXCHANGE) {
discoveryTagName =
EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE;
} else if (tag === Tags.LOCAL) {
discoveryTagName = EPeersByDiscoveryEvents.PEER_CONNECT_LOCAL;
} else {
log.warn(
`Peer ${peerId.toString()} has no discovery tag. Not dispatching discovery event`
);
return;
}
this.dispatchEvent( this.dispatchEvent(
new CustomEvent<PeerId>( new CustomEvent<PeerId>(discoveryTagName, {
EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE, detail: peerId
{ })
detail: peerId
}
)
); );
} }
this.toggleOnline(); this.toggleOnline();
@ -518,19 +543,26 @@ export class ConnectionManager
} }
private async dispatchDiscoveryEvent(peerId: PeerId): Promise<void> { private async dispatchDiscoveryEvent(peerId: PeerId): Promise<void> {
const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes( const tags = await this.getTagNamesForPeer(peerId);
Tags.BOOTSTRAP
); let tag: Tags;
if (tags.includes(Tags.BOOTSTRAP)) {
tag = Tags.BOOTSTRAP;
} else if (tags.includes(Tags.PEER_EXCHANGE)) {
tag = Tags.PEER_EXCHANGE;
} else if (tags.includes(Tags.LOCAL)) {
tag = Tags.LOCAL;
} else {
log.warn(
`Peer ${peerId.toString()} has no discovery tag. Not dispatching discovery event`
);
return;
}
this.dispatchEvent( this.dispatchEvent(
new CustomEvent<PeerId>( new CustomEvent<PeerId>(tag, {
isBootstrap detail: peerId
? EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP })
: EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE,
{
detail: peerId
}
)
); );
} }

6
packages/interfaces/src/connection_manager.ts
View File

@ -26,15 +26,19 @@ export interface ConnectionManagerOptions {
export enum EPeersByDiscoveryEvents { export enum EPeersByDiscoveryEvents {
PEER_DISCOVERY_BOOTSTRAP = "peer:discovery:bootstrap", PEER_DISCOVERY_BOOTSTRAP = "peer:discovery:bootstrap",
PEER_DISCOVERY_PEER_EXCHANGE = "peer:discovery:peer-exchange", PEER_DISCOVERY_PEER_EXCHANGE = "peer:discovery:peer-exchange",
PEER_DISCOVERY_LOCAL = "peer:discovery:local",
PEER_CONNECT_BOOTSTRAP = "peer:connected:bootstrap", PEER_CONNECT_BOOTSTRAP = "peer:connected:bootstrap",
PEER_CONNECT_PEER_EXCHANGE = "peer:connected:peer-exchange" PEER_CONNECT_PEER_EXCHANGE = "peer:connected:peer-exchange",
PEER_CONNECT_LOCAL = "peer:connected:local"
} }
export interface IPeersByDiscoveryEvents { export interface IPeersByDiscoveryEvents {
[EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP]: CustomEvent<PeerId>; [EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP]: CustomEvent<PeerId>;
[EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE]: CustomEvent<PeerId>; [EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE]: CustomEvent<PeerId>;
[EPeersByDiscoveryEvents.PEER_DISCOVERY_LOCAL]: CustomEvent<PeerId>;
[EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP]: CustomEvent<PeerId>; [EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP]: CustomEvent<PeerId>;
[EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE]: CustomEvent<PeerId>; [EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE]: CustomEvent<PeerId>;
[EPeersByDiscoveryEvents.PEER_CONNECT_LOCAL]: CustomEvent<PeerId>;
} }
export interface PeersByDiscoveryResult { export interface PeersByDiscoveryResult {

1
packages/tests/tests/connection-mananger/events.spec.ts
View File

@ -26,6 +26,7 @@ describe("Events", function () {
await tearDownNodes([], waku); await tearDownNodes([], waku);
}); });
//TODO: add tests for local discovery
describe("peer:discovery", () => { describe("peer:discovery", () => {
it("should emit `peer:discovery:bootstrap` event when a peer is discovered", async function () { it("should emit `peer:discovery:bootstrap` event when a peer is discovered", async function () {
const peerIdBootstrap = await createSecp256k1PeerId(); const peerIdBootstrap = await createSecp256k1PeerId();