peer pings: pass the hashmap in args instead of the function

Author: danisharora099

packages/core/src/lib/base_protocol.ts

@@ -55,11 +55,10 @@ export class BaseProtocol implements IBaseProtocol {
   }
 
   protected async getPeer(peerId?: PeerId): Promise<Peer> {
+    const { peerPings } = KeepAliveManager.getInstance();
     const { peer } = await selectPeerForProtocol(
       this.peerStore,
-      KeepAliveManager.getInstance().getPing.bind(
-        KeepAliveManager.getInstance()
-      ),
+      peerPings,
       [this.multicodec],
       peerId
     );

packages/core/src/lib/keep_alive_manager.ts

@@ -17,7 +17,7 @@ export class KeepAliveManager {
   private options: KeepAliveOptions;
   private relay?: IRelay;
   private libp2pPing: PingService;
-  private peerPings: Map<string, number>;
+  public peerPings: Map<string, number>;
 
   private constructor(
     libp2pPing: PingService,
@@ -56,14 +56,6 @@ export class KeepAliveManager {
     return KeepAliveManager.instance;
   }
 
-  public async getPing(peerId: PeerId): Promise<number> {
-    const ping = this.peerPings.get(peerId.toString());
-    if (!ping) {
-      return await this.libp2pPing.ping(peerId);
-    }
-    return ping;
-  }
-
   public start(peerId: PeerId): void {
     // Just in case a timer already exist for this peer
     this.stop(peerId);

packages/utils/src/libp2p/index.ts

@@ -23,19 +23,15 @@ export function selectRandomPeer(peers: Peer[]): Peer | undefined {
  * @returns The peer with the lowest latency, or undefined if no peer could be reached
  */
 export async function selectLowestLatencyPeer(
-  getPing: (peerId: PeerId) => Promise<number>,
+  peerPings: Map<string, number>,
   peers: Peer[]
 ): Promise<Peer | undefined> {
   if (peers.length === 0) return;
 
   const results = await Promise.all(
-    peers.map(async (peer) => {
-      try {
-        const ping = await getPing(peer.id);
-        return { peer, ping };
-      } catch (error) {
-        return { peer, ping: Infinity };
-      }
+    peers.map((peer) => {
+      const ping = peerPings.get(peer.id.toString()) ?? Infinity;
+      return { peer, ping };
     })
   );
 
@@ -73,7 +69,7 @@ export async function getPeersForProtocol(
  */
 export async function selectPeerForProtocol(
   peerStore: PeerStore,
-  getPing: (peerId: PeerId) => Promise<number>,
+  peerPings: Map<string, number>,
   protocols: string[],
   peerId?: PeerId
 ): Promise<{ peer: Peer; protocol: string }> {
@@ -87,7 +83,7 @@ export async function selectPeerForProtocol(
     }
   } else {
     const peers = await getPeersForProtocol(peerStore, protocols);
-    peer = await selectLowestLatencyPeer(getPing, peers);
+    peer = await selectLowestLatencyPeer(peerPings, peers);
     if (!peer) {
       peer = selectRandomPeer(peers);
       if (!peer)