mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-01-07 16:33:08 +00:00
* Separate new lightpush protocol New RPC defined Rename al occurence of old lightpush to legacy lightpush, fix rest tests of lightpush New lightpush protocol added back Setup new lightpush protocol, mounting and rest api for it modified: apps/chat2/chat2.nim modified: tests/node/test_wakunode_lightpush.nim modified: tests/node/test_wakunode_sharding.nim modified: tests/test_peer_manager.nim modified: tests/test_wakunode_lightpush.nim renamed: tests/waku_lightpush/lightpush_utils.nim -> tests/waku_lightpush_legacy/lightpush_utils.nim renamed: tests/waku_lightpush/test_all.nim -> tests/waku_lightpush_legacy/test_all.nim renamed: tests/waku_lightpush/test_client.nim -> tests/waku_lightpush_legacy/test_client.nim renamed: tests/waku_lightpush/test_ratelimit.nim -> tests/waku_lightpush_legacy/test_ratelimit.nim modified: tests/wakunode_rest/test_all.nim renamed: tests/wakunode_rest/test_rest_lightpush.nim -> tests/wakunode_rest/test_rest_lightpush_legacy.nim modified: waku/factory/node_factory.nim modified: waku/node/waku_node.nim modified: waku/waku_api/rest/admin/handlers.nim modified: waku/waku_api/rest/builder.nim new file: waku/waku_api/rest/legacy_lightpush/client.nim new file: waku/waku_api/rest/legacy_lightpush/handlers.nim new file: waku/waku_api/rest/legacy_lightpush/types.nim modified: waku/waku_api/rest/lightpush/client.nim modified: waku/waku_api/rest/lightpush/handlers.nim modified: waku/waku_api/rest/lightpush/types.nim modified: waku/waku_core/codecs.nim modified: waku/waku_lightpush.nim modified: waku/waku_lightpush/callbacks.nim modified: waku/waku_lightpush/client.nim modified: waku/waku_lightpush/common.nim modified: waku/waku_lightpush/protocol.nim modified: waku/waku_lightpush/rpc.nim modified: waku/waku_lightpush/rpc_codec.nim modified: waku/waku_lightpush/self_req_handler.nim new file: waku/waku_lightpush_legacy.nim renamed: waku/waku_lightpush/README.md -> waku/waku_lightpush_legacy/README.md new file: waku/waku_lightpush_legacy/callbacks.nim new file: waku/waku_lightpush_legacy/client.nim new file: waku/waku_lightpush_legacy/common.nim new file: waku/waku_lightpush_legacy/protocol.nim new file: waku/waku_lightpush_legacy/protocol_metrics.nim new file: waku/waku_lightpush_legacy/rpc.nim new file: waku/waku_lightpush_legacy/rpc_codec.nim new file: waku/waku_lightpush_legacy/self_req_handler.nim Adapt to non-invasive libp2p observers cherry pick latest lightpush (v1) changes into legacy lightpush code after rebase to latest master Fix vendor dependencies from origin/master after failed rebase of them Adjust examples, test to new lightpush - keep using of legacy Fixup error code mappings Fix REST admin interface with distinct legacy and new lightpush Fix lightpush v2 tests * Utilize new publishEx interface of pubsub libp2p * Adapt to latest libp2p pubslih design changes. publish returns an outcome as Result error. * Fix review findings * Fix tests, re-added lost one * Fix rebase * Apply suggestions from code review Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com> * Addressing review comments * Fix incentivization tests * Fix build failed on libwaku * Change new lightpush endpoint version to 3 instead of 2. Noticed that old and new lightpush metrics can cause trouble in monitoring dashboards so decided to give new name as v3 for the new lightpush metrics and change legacy ones back - temporarly till old lightpush will be decommissioned * Fixing flaky test with rate limit timing * Fixing logscope of lightpush and legacy lightpush --------- Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
181 lines
5.9 KiB
Nim
181 lines
5.9 KiB
Nim
{.push raises: [].}
|
|
|
|
import
|
|
std/[strformat, sequtils, tables],
|
|
chronicles,
|
|
json_serialization,
|
|
presto/route,
|
|
libp2p/[peerinfo, switch]
|
|
|
|
import
|
|
../../../waku_core,
|
|
../../../waku_store_legacy/common,
|
|
../../../waku_store/common,
|
|
../../../waku_filter_v2,
|
|
../../../waku_lightpush_legacy/common,
|
|
../../../waku_relay,
|
|
../../../waku_peer_exchange,
|
|
../../../waku_node,
|
|
../../../node/peer_manager,
|
|
../responses,
|
|
../serdes,
|
|
../rest_serdes,
|
|
./types
|
|
|
|
export types
|
|
|
|
logScope:
|
|
topics = "waku node rest admin api"
|
|
|
|
const ROUTE_ADMIN_V1_PEERS* = "/admin/v1/peers"
|
|
const ROUTE_ADMIN_V1_FILTER_SUBS* = "/admin/v1/filter/subscriptions"
|
|
|
|
type PeerProtocolTuple =
|
|
tuple[multiaddr: string, protocol: string, connected: bool, origin: PeerOrigin]
|
|
|
|
proc tuplesToWakuPeers(peers: var WakuPeers, peersTup: seq[PeerProtocolTuple]) =
|
|
for peer in peersTup:
|
|
peers.add(peer.multiaddr, peer.protocol, peer.connected, peer.origin)
|
|
|
|
proc installAdminV1GetPeersHandler(router: var RestRouter, node: WakuNode) =
|
|
router.api(MethodGet, ROUTE_ADMIN_V1_PEERS) do() -> RestApiResponse:
|
|
var peers: WakuPeers = @[]
|
|
|
|
let relayPeers = node.peerManager.wakuPeerStore.peers(WakuRelayCodec).mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuRelayCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, relayPeers)
|
|
|
|
let filterV2Peers = node.peerManager.wakuPeerStore
|
|
.peers(WakuFilterSubscribeCodec)
|
|
.mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuFilterSubscribeCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, filterV2Peers)
|
|
|
|
let storePeers = node.peerManager.wakuPeerStore.peers(WakuStoreCodec).mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuStoreCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, storePeers)
|
|
|
|
let legacyStorePeers = node.peerManager.wakuPeerStore
|
|
.peers(WakuLegacyStoreCodec)
|
|
.mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuLegacyStoreCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, legacyStorePeers)
|
|
|
|
let legacyLightpushPeers = node.peerManager.wakuPeerStore
|
|
.peers(WakuLegacyLightPushCodec)
|
|
.mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuLegacyLightPushCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, legacyLightpushPeers)
|
|
|
|
let lightpushPeers = node.peerManager.wakuPeerStore.peers(WakuLightPushCodec).mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuLightPushCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, lightpushPeers)
|
|
|
|
let pxPeers = node.peerManager.wakuPeerStore.peers(WakuPeerExchangeCodec).mapIt(
|
|
(
|
|
multiaddr: constructMultiaddrStr(it),
|
|
protocol: WakuPeerExchangeCodec,
|
|
connected: it.connectedness == Connectedness.Connected,
|
|
origin: it.origin,
|
|
)
|
|
)
|
|
tuplesToWakuPeers(peers, pxPeers)
|
|
|
|
let resp = RestApiResponse.jsonResponse(peers, status = Http200)
|
|
if resp.isErr():
|
|
error "An error ocurred while building the json respose: ", error = resp.error
|
|
return RestApiResponse.internalServerError(
|
|
fmt("An error ocurred while building the json respose: {resp.error}")
|
|
)
|
|
|
|
return resp.get()
|
|
|
|
proc installAdminV1PostPeersHandler(router: var RestRouter, node: WakuNode) =
|
|
router.api(MethodPost, ROUTE_ADMIN_V1_PEERS) do(
|
|
contentBody: Option[ContentBody]
|
|
) -> RestApiResponse:
|
|
let peers: seq[string] = decodeRequestBody[seq[string]](contentBody).valueOr:
|
|
let e = $error
|
|
return RestApiResponse.badRequest(fmt("Failed to decode request: {e}"))
|
|
|
|
for i, peer in peers:
|
|
let peerInfo = parsePeerInfo(peer).valueOr:
|
|
let e = $error
|
|
return RestApiResponse.badRequest(fmt("Couldn't parse remote peer info: {e}"))
|
|
|
|
if not (await node.peerManager.connectPeer(peerInfo, source = "rest")):
|
|
return RestApiResponse.badRequest(
|
|
fmt("Failed to connect to peer at index: {i} - {peer}")
|
|
)
|
|
|
|
return RestApiResponse.ok()
|
|
|
|
proc installAdminV1GetFilterSubsHandler(router: var RestRouter, node: WakuNode) =
|
|
router.api(MethodGet, ROUTE_ADMIN_V1_FILTER_SUBS) do() -> RestApiResponse:
|
|
if node.wakuFilter.isNil():
|
|
return
|
|
RestApiResponse.badRequest("Error: Filter Protocol is not mounted to the node")
|
|
|
|
var
|
|
subscriptions: seq[FilterSubscription] = @[]
|
|
filterCriteria: seq[FilterTopic]
|
|
|
|
for peerId in node.wakuFilter.subscriptions.peersSubscribed.keys:
|
|
filterCriteria = node.wakuFilter.subscriptions.getPeerSubscriptions(peerId).mapIt(
|
|
FilterTopic(pubsubTopic: it[0], contentTopic: it[1])
|
|
)
|
|
|
|
subscriptions.add(
|
|
FilterSubscription(peerId: $peerId, filterCriteria: filterCriteria)
|
|
)
|
|
|
|
let resp = RestApiResponse.jsonResponse(subscriptions, status = Http200)
|
|
if resp.isErr():
|
|
error "An error ocurred while building the json respose: ", error = resp.error
|
|
return RestApiResponse.internalServerError(
|
|
fmt("An error ocurred while building the json respose: {resp.error}")
|
|
)
|
|
|
|
return resp.get()
|
|
|
|
proc installAdminApiHandlers*(router: var RestRouter, node: WakuNode) =
|
|
installAdminV1GetPeersHandler(router, node)
|
|
installAdminV1PostPeersHandler(router, node)
|
|
installAdminV1GetFilterSubsHandler(router, node)
|