mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-07-24 05:23:16 +00:00
* bump nim-libp2p pin to v2.0.0 tag * bump json_rpc to v0.6.1, lsquic to v0.5.1, boringssl to v0.0.8 (latest tags) * add libp2p_mix dep; repoint libp2p/protocols/mix -> libp2p_mix * pin nimble.lock: websock / protobuf_serialization / npeg / jwt * Makefile: add -d:libp2p_quic_support * regenerate nix/deps.nix (adds libp2p_mix, refreshes pins) * migrate rng ref HmacDrbgContext -> libp2p Rng across prod/channels/tests (interface-only; same DRBG) * waku_switch: TransportConfig factory; unified 2.0.0 connection limits (withMaxInOut, withMaxConnections); local MaxConnections * waku_relay/rendezvous/discv5/kademlia: v2.0.0 API (rng, config, ServiceDiscovery rename) * call Service.setup() on post-build switch services (2.0.0 split setup/start) * drop libp2p/utils/semaphore -> chronos AsyncSemaphore * add logos_delivery/waku/compat/option_valueor shim (Option[T] valueOr/withValue, dropped upstream) * add std/options where a transitive re-export was removed * add newStandardSwitch shim (libp2p removed it in 2.0.0); mounts yamux+mplex to match prod muxer * PeerId.random(rng); common.rng()/crypto.newRng(); hoist shared rng (instantiation cleanup) * update expectations for 2.0.0 defaults: DEFAULT_PROTOCOLS += /ipfs/id/push/1.0.0; agent "nim-libp2p" * drop relay reboot/reconnect test (asserted a Switch restart capability that is simply not supported) * fix up a few tests that were flaking on MacOS (libp2p upgrade may have exposed these)
39 lines
1.2 KiB
Nim
39 lines
1.2 KiB
Nim
import logos_delivery/waku/compat/option_valueor
|
|
{.push raises: [].}
|
|
|
|
import chronos, std/[options, sequtils], results
|
|
import ../discovery/waku_discv5, ../waku_relay, ../waku_core, ./message_cache
|
|
|
|
### Discovery
|
|
|
|
type DiscoveryHandler* =
|
|
proc(): Future[Result[Option[RemotePeerInfo], string]] {.async, closure.}
|
|
|
|
proc defaultDiscoveryHandler*(
|
|
discv5: WakuDiscoveryV5, cap: Capabilities
|
|
): DiscoveryHandler =
|
|
proc(): Future[Result[Option[RemotePeerInfo], string]] {.async, closure.} =
|
|
#Discv5 is already filtering peers by shards no need to pass a predicate.
|
|
let findPeers = discv5.findRandomPeers()
|
|
|
|
if not await findPeers.withTimeout(60.seconds):
|
|
return err("discovery process timed out!")
|
|
|
|
var peers = findPeers.read()
|
|
|
|
peers.keepItIf(it.supportsCapability(cap))
|
|
|
|
if peers.len == 0:
|
|
return ok(none(RemotePeerInfo))
|
|
|
|
let remotePeerInfo = peers[0].toRemotePeerInfo().valueOr:
|
|
return err($error)
|
|
|
|
return ok(some(remotePeerInfo))
|
|
|
|
### Message Cache
|
|
|
|
proc messageCacheHandler*(cache: MessageCache): WakuRelayHandler =
|
|
return proc(pubsubTopic: string, msg: WakuMessage): Future[void] {.async, closure.} =
|
|
cache.addMessage(pubsubTopic, msg)
|