waku-org/js-waku
1
0
Fork 0
mirror of https://github.com/waku-org/js-waku.git synced 2025-02-22 09:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: trimming down BaseProtocolCore

Browse Source
This commit is contained in:
Danish Arora 2024-09-23 10:14:50 +05:30
parent 692081e2be
commit 6117593d72
No known key found for this signature in database
GPG Key ID: 1C6EF37CDAE1426E
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/core/src/lib/base_protocol.ts
View File

@ -1,5 +1,5 @@
import type { Libp2p } from "@libp2p/interface";
import type { Peer, PeerStore, Stream } from "@libp2p/interface";
import type { Peer, Stream } from "@libp2p/interface";
import type {
IBaseProtocolCore,
Libp2pComponents,
@ -8,7 +8,6 @@ import type {
import { Logger, pubsubTopicsToShardInfo } from "@waku/utils";
import {
getConnectedPeersForProtocolAndShard,
getPeersForProtocol,
sortPeersByLatency
} from "@waku/utils/libp2p";
@ -50,30 +49,27 @@ export class BaseProtocol implements IBaseProtocolCore {
return this.streamManager.getStream(peer);
}
public get peerStore(): PeerStore {
return this.components.peerStore;
}
//TODO: move to SDK
/**
* Returns known peers from the address book (`libp2p.peerStore`) that support
* the class protocol. Waku may or may not be currently connected to these
* peers.
*/
public async allPeers(): Promise<Peer[]> {
return getPeersForProtocol(this.peerStore, [this.multicodec]);
}
// public async allPeers(): Promise<Peer[]> {
// return getPeersForProtocol(this.peerStore, [this.multicodec]);
// }
public async connectedPeers(): Promise<Peer[]> {
const peers = await this.allPeers();
return peers.filter((peer) => {
const connections = this.components.connectionManager.getConnections(
peer.id
);
return connections.some((c) =>
c.streams.some((s) => s.protocol === this.multicodec)
);
});
}
// public async connectedPeers(): Promise<Peer[]> {
// const peers = await this.allPeers();
// return peers.filter((peer) => {
// const connections = this.components.connectionManager.getConnections(
// peer.id
// );
// return connections.some((c) =>
// c.streams.some((s) => s.protocol === this.multicodec)
// );
// });
// }
/**
* Retrieves a list of connected peers that support the protocol. The list is sorted by latency.
@ -99,7 +95,7 @@ export class BaseProtocol implements IBaseProtocolCore {
const connectedPeersForProtocolAndShard =
await getConnectedPeersForProtocolAndShard(
this.components.connectionManager.getConnections(),
this.peerStore,
this.components.peerStore,
[this.multicodec],
pubsubTopicsToShardInfo(this.pubsubTopics)
);
@ -113,7 +109,7 @@ export class BaseProtocol implements IBaseProtocolCore {
// Sort the peers by latency
const sortedFilteredPeers = await sortPeersByLatency(
this.peerStore,
this.components.peerStore,
filteredPeers
);

5
packages/interfaces/src/protocols.ts
View File

@ -1,6 +1,6 @@
import type { Libp2p } from "@libp2p/interface";
import type { PeerId } from "@libp2p/interface";
import type { Peer, PeerStore } from "@libp2p/interface";
import type { Peer } from "@libp2p/interface";
import type { CreateLibp2pOptions } from "./libp2p.js";
import type { IDecodedMessage } from "./message.js";
@ -16,9 +16,6 @@ export enum Protocols {
export type IBaseProtocolCore = {
multicodec: string;
peerStore: PeerStore;
allPeers: () => Promise<Peer[]>;
connectedPeers: () => Promise<Peer[]>;
addLibp2pEventListener: Libp2p["addEventListener"];
removeLibp2pEventListener: Libp2p["removeEventListener"];
};