From 59ee3c69c8fb1733bda2875d1c2b771e2b87b02d Mon Sep 17 00:00:00 2001 From: gabrielmer <101006718+gabrielmer@users.noreply.github.com> Date: Wed, 22 Nov 2023 10:56:23 +0200 Subject: [PATCH] chore(REST): returning lightpush support and updated filter protocol (#2219) --- waku/waku_api/rest/admin/handlers.nim | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/waku/waku_api/rest/admin/handlers.nim b/waku/waku_api/rest/admin/handlers.nim index 4e47b47ba..bf4b5ebed 100644 --- a/waku/waku_api/rest/admin/handlers.nim +++ b/waku/waku_api/rest/admin/handlers.nim @@ -16,6 +16,8 @@ import ../../../waku_core, ../../../waku_store, ../../../waku_filter, + ../../../waku_filter_v2, + ../../../waku_lightpush, ../../../waku_relay, ../../../waku_node, ../../../node/peer_manager, @@ -61,6 +63,14 @@ proc installAdminV1GetPeersHandler(router: var RestRouter, node: WakuNode) = connected: it.connectedness == Connectedness.Connected)) tuplesToWakuPeers(peers, filterPeers) + if not node.wakuFilter.isNil(): + # Map WakuFilter peers to WakuPeers and add to return list + let filterV2Peers = node.peerManager.peerStore.peers(WakuFilterSubscribeCodec) + .mapIt((multiaddr: constructMultiaddrStr(it), + protocol: WakuFilterSubscribeCodec, + connected: it.connectedness == Connectedness.Connected)) + tuplesToWakuPeers(peers, filterV2Peers) + if not node.wakuStore.isNil(): # Map WakuStore peers to WakuPeers and add to return list let storePeers = node.peerManager.peerStore @@ -70,6 +80,15 @@ proc installAdminV1GetPeersHandler(router: var RestRouter, node: WakuNode) = connected: it.connectedness == Connectedness.Connected)) tuplesToWakuPeers(peers, storePeers) + if not node.wakuLightPush.isNil(): + # Map WakuStore peers to WakuPeers and add to return list + let lightpushPeers = node.peerManager.peerStore + .peers(WakuLightPushCodec) + .mapIt((multiaddr: constructMultiaddrStr(it), + protocol: WakuLightPushCodec, + connected: it.connectedness == Connectedness.Connected)) + tuplesToWakuPeers(peers, lightpushPeers) + let resp = RestApiResponse.jsonResponse(peers, status=Http200) if resp.isErr(): error "An error ocurred while building the json respose: ", error=resp.error