From af189952cbd691f3cb9df3e2702b1ba79d4564bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?rich=CE=9Brd?= <info@richardramos.me>
Date: Mon, 28 Oct 2024 15:51:07 -0400
Subject: [PATCH] chore: support ping with multiple multiaddresses and close
 stream (#3154)

---
 .../requests/ping_request.nim                 |  7 +++-
 waku/waku_core/peers.nim                      | 41 ++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/library/waku_thread/inter_thread_communication/requests/ping_request.nim b/library/waku_thread/inter_thread_communication/requests/ping_request.nim
index d9361b2c7..4467f9659 100644
--- a/library/waku_thread/inter_thread_communication/requests/ping_request.nim
+++ b/library/waku_thread/inter_thread_communication/requests/ping_request.nim
@@ -1,4 +1,4 @@
-import std/json
+import std/[json, strutils]
 import chronos, results
 import libp2p/[protocols/ping, switch, multiaddress, multicodec]
 import ../../../../waku/[factory/waku, waku_core/peers, node/waku_node], ../../../alloc
@@ -25,12 +25,15 @@ proc process*(
   defer:
     destroyShared(self)
 
-  let peerInfo = peers.parsePeerInfo($self[].peerAddr).valueOr:
+  let peerInfo = peers.parsePeerInfo(($self[].peerAddr).split(",")).valueOr:
     return err("PingRequest failed to parse peer addr: " & $error)
 
   proc ping(): Future[Result[Duration, string]] {.async, gcsafe.} =
     try:
       let conn = await waku.node.switch.dial(peerInfo.peerId, peerInfo.addrs, PingCodec)
+      defer:
+        await conn.close()
+
       let pingRTT = await waku.node.libp2pPing.ping(conn)
       if pingRTT == 0.nanos:
         return err("could not ping peer: rtt-0")
diff --git a/waku/waku_core/peers.nim b/waku/waku_core/peers.nim
index 6b828cd0a..77ebc9abe 100644
--- a/waku/waku_core/peers.nim
+++ b/waku/waku_core/peers.nim
@@ -199,26 +199,37 @@ proc parsePeerInfoFromRegularAddr(peer: MultiAddress): Result[RemotePeerInfo, st
 
   return ok(RemotePeerInfo.init(peerId, @[wireAddr]))
 
-proc parsePeerInfo*(peer: MultiAddress): Result[RemotePeerInfo, string] =
+proc parsePeerInfo*(maddrs: varargs[MultiAddress]): Result[RemotePeerInfo, string] =
   ## Parses a fully qualified peer multiaddr into dialable RemotePeerInfo
+  var peerID: PeerID
+  var addrs = newSeq[MultiAddress]()
+  for i in 0 ..< maddrs.len:
+    let peerAddrStr = $maddrs[i]
+    let peerInfo =
+      if "p2p-circuit" in peerAddrStr:
+        ?parsePeerInfoFromCircuitRelayAddr(peerAddrStr)
+      else:
+        ?parsePeerInfoFromRegularAddr(maddrs[i])
+    if i == 0:
+      peerID = peerInfo.peerID
+    elif peerID.cmp(peerInfo.peerID) != 0:
+      return err("Error in parsePeerInfo: multiple peerIds received")
+    addrs.add(peerInfo.addrs[0])
+  return ok(RemotePeerInfo.init(peerID, addrs))
 
-  let peerAddrStr = $peer
-
-  if "p2p-circuit" in peerAddrStr:
-    return parsePeerInfoFromCircuitRelayAddr(peerAddrStr)
-
-  return parsePeerInfoFromRegularAddr(peer)
-
-proc parsePeerInfo*(peer: string): Result[RemotePeerInfo, string] =
+proc parsePeerInfo*(maddrs: varargs[string]): Result[RemotePeerInfo, string] =
   ## Parses a fully qualified peer multiaddr, in the
   ## format `(ip4|ip6)/tcp/p2p`, into dialable PeerInfo
-  let multiAddr =
-    ?MultiAddress.init(peer).mapErr(
-      proc(err: string): string =
-        "MultiAddress.init [" & err & "]"
-    )
+  var multiAddresses = newSeq[MultiAddress]()
+  for maddr in maddrs:
+    let multiAddr =
+      ?MultiAddress.init(maddr).mapErr(
+        proc(err: string): string =
+          "MultiAddress.init [" & err & "]"
+      )
+    multiAddresses.add(multiAddr)
 
-  parsePeerInfo(multiAddr)
+  parsePeerInfo(multiAddresses)
 
 func getTransportProtocol(typedR: TypedRecord): Option[IpTransportProtocol] =
   if typedR.tcp6.isSome() or typedR.tcp.isSome():