mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-05-18 08:19:26 +00:00
* persistency: per-job SQLite-backed storage layer (singleton, brokered)
Adds a backend-neutral CRUD library at waku/persistency/, plus the
nim-brokers dependency swap that enables it.
Architecture (ports-and-adapters):
* Persistency: process-wide singleton, one root directory.
* Job: one tenant, one DB file, one worker thread, one BrokerContext.
* Backend: SQLite via waku/common/databases/db_sqlite. Uniform schema
kv(category BLOB, key BLOB, payload BLOB) PRIMARY KEY (category, key)
WITHOUT ROWID, WAL mode.
* Writes are fire-and-forget via EventBroker(mt) PersistEvent.
* Reads are async via five RequestBroker(mt) shapes (KvGet, KvExists,
KvScan, KvCount, KvDelete). Reads return Result[T, PersistencyError].
* One storage thread per job; tenants isolated by BrokerContext.
Public surface (waku/persistency/persistency.nim):
Persistency.instance(rootDir) / Persistency.instance() / Persistency.reset()
p.openJob(id) / p.closeJob(id) / p.dropJob(id) / p.close()
p.job(id) / p[id] / p.hasJob(id)
Writes (Job form & string-id form, fire-and-forget):
persist / persistPut / persistDelete / persistEncoded
Reads (Job form & string-id form, async Result):
get / exists / scan / scanPrefix / count / deleteAcked
Key & payload encoding (keys.nim, payload.nim):
* encodePart family + variadic key(...) / payload(...) macros +
single-value toKey / toPayload.
* Primitives: string and openArray[byte] are 2-byte BE length + bytes;
int{8..64} are sign-flipped 8-byte BE; uint{16..64} are 8-byte BE;
bool/byte/char are 1 byte; enums are int64(ord(v)).
* Generic encodePart[T: tuple | object] recurses through fields() so
any composite Nim type is encodable without ceremony.
* Stable across Nim/C compiler upgrades: no sizeof, no memcpy, no
cast on pointers, no host-endianness dependency.
* `rawKey(bytes)` + `persistPut(..., openArray[byte])` let callers
bypass the built-in encoder with their own format (CBOR, protobuf...).
Lifecycle:
* Persistency.new is private; Persistency.instance is the only public
constructor. Same rootDir is idempotent; conflicting rootDir is
peInvalidArgument. Persistency.reset for test/restart paths.
* openJob opens-or-creates the per-job SQLite file; an existing file
is reused with its data preserved.
* Teardown integration: Persistency.instance registers a Teardown
MultiRequestBroker provider that closes all jobs and clears the
singleton slot when Waku.stop() issues Teardown.request.
Internal layering:
types.nim pure value types (Key, KeyRange, KvRow, TxOp,
PersistencyError)
keys.nim encodePart primitives + key(...) macro
payload.nim toPayload + payload(...) macro
schema.nim CREATE TABLE + connection pragmas + user_version
backend_sqlite.nim KvBackend, applyOps (single source of write SQL),
getOne/existsOne/deleteOne, scanRange (asc/desc,
half-open ranges, open-ended stop), countRange
backend_comm.nim EventBroker(mt) PersistEvent + 5 RequestBroker(mt)
declarations; encodeErr/decodeErr boundary helpers
backend_thread.nim startStorageThread / stopStorageThread (shared
allocShared0 arg, cstring dbPath, atomic
ready/shutdown flags); per-thread provider
registration
persistency.nim Persistency + Job types, singleton state, public
facade
../requests/lifecycle_requests.nim
Teardown MultiRequestBroker
Tests (69 cases, all passing):
test_keys.nim sort-order invariants (length-prefix strings,
sign-flipped ints, composite tuples, prefix
range)
test_backend.nim round-trip / replace / delete-return-value /
batched atomicity / asc-desc-half-open-open-
ended scans / category isolation / batch
txDelete
test_lifecycle.nim open-or-create rootDir / non-dir collision /
reopen across sessions / idempotent openJob /
two-tenant parallel isolation / closeJob joins
worker / dropJob removes file / acked delete
test_facade.nim put-then-get / atomic batch / scanPrefix
asc/desc / deleteAcked hit-miss /
fire-and-forget delete / two-tenant facade
isolation
test_encoding.nim tuple/named-tuple/object keys, embedded Key,
enum encoding, field-major composite sort,
payload struct encoding, end-to-end struct
round-trip through SQLite
test_string_lookup.nim peJobNotFound semantics / hasJob / subscript /
persistPut+get via id / reads short-circuit /
writes drop+warn / persistEncoded via id /
scan parity Job-ref vs id
test_singleton.nim idempotent same-rootDir / different-rootDir
rejection / no-arg instance lifecycle / reset
retargets / reset idempotence / Teardown.request
end-to-end
Prerequisite delivered in the same series: replace the in-tree broker
implementation with the external nim-brokers package; update all
broker call-sites (waku_filter_v2, waku_relay, waku_rln_relay,
delivery_service, peer_manager, requests/*, factory/*, api tests, etc.)
to the new package API; chat2 made to compile again.
Note: SDS adapter (Phase 5 of the design) is deferred -- nim-sds is
still developed side-by-side and the persistency layer is intentionally
SDS-agnostic.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* persistency: pin nim-brokers by URL+commit (workaround for stale registry)
The bare `brokers >= 2.0.1` form cannot resolve on machines where the
local nimble SAT solver enumerates only the registry-recorded 0.1.0 for
brokers. The nim-lang/packages entry for `brokers` carries no per-tag
metadata (only the URL), so until that registry entry is refreshed the
SAT solver clamps the available-versions list to 0.1.0 and rejects the
>= 2.0.1 constraint -- even though pkgs2 and pkgcache both have v2.0.1
cloned locally.
Pinning by URL+commit bypasses the registry path entirely. Inline
comment in waku.nimble documents the situation and the path back to
the bare form once nim-lang/packages is updated.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* persistency: nph format pass
Run `nph` on all 57 Nim files touched by this PR. Pure formatting:
17 files re-styled, no semantic change. Suite still 69/69.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* Fix build, add local-storage-path config, lazy init of Persistency from Waku start
* fix: fix nix deps
* fixes for nix build, regenerate deps
* reverting accidental dependency changes
* Fixing deps
* Apply suggestions from code review
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
* persistency tests: migrate to suite / asyncTest / await
Match the in-tree test convention (procSuite -> suite, sync test +
waitFor -> asyncTest + await):
- procSuite "X": -> suite "X":
- For tests doing async work: test -> asyncTest, waitFor -> await.
- Poll helpers (proc waitFor(t: Job, ...) in test_lifecycle.nim,
proc waitUntilExists(...) in test_facade.nim and
test_string_lookup.nim) -> Future[bool] {.async.}, internal
`waitFor X` -> `await X`, internal `sleep(N)` ->
`await sleepAsync(chronos.milliseconds(N))`.
- Renamed test_lifecycle.nim's helper proc from `waitFor(t: Job, ...)`
-> `pollExists(t: Job, ...)`; the previous name shadowed
chronos.waitFor in the chronos macro expansion.
- `chronos.milliseconds(N)` explicitly qualified because `std/times`
also exports `milliseconds` (returning TimeInterval, not Duration).
- `check await x` -> `let okN = await x; check okN` to dodge chronos's
"yield in expr not lowered" with await-as-macro-argument.
- `(await x).foo()` -> `let awN = await x; ... awN.foo() ...` for the
same reason.
waku/persistency/persistency.nim: nph also pulled the proc signatures
across multiple lines; restored explicit `Future[void] {.async.}`
return types after the colon (an intermediate nph pass had elided them).
Suite: 71 / 71 OK against the new async write surface.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* use idiomatic valueOr instead of ifs
* Reworked persistency shutdown, remove not necessary teardown mechanism
* Use const for DefaultStoragePath
* format to follow coding guidelines - no use of result and explicit returns - no functional change
---------
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
296 lines
9.9 KiB
Nim
296 lines
9.9 KiB
Nim
{.used.}
|
|
|
|
import std/[options, sequtils, times]
|
|
import chronos, testutils/unittests, stew/byteutils, libp2p/[switch, peerinfo]
|
|
import brokers/broker_context
|
|
import ../testlib/[common, wakucore, wakunode, testasync]
|
|
|
|
import
|
|
waku,
|
|
waku/[waku_node, waku_core, waku_relay/protocol],
|
|
waku/node/health_monitor/[topic_health, health_status, protocol_health, health_report],
|
|
waku/requests/health_requests,
|
|
waku/requests/node_requests,
|
|
waku/events/health_events,
|
|
waku/common/waku_protocol,
|
|
waku/factory/waku_conf
|
|
import tools/confutils/cli_args
|
|
|
|
const TestTimeout = chronos.seconds(10)
|
|
const DefaultShard = PubsubTopic("/waku/2/rs/3/0")
|
|
const TestContentTopic = ContentTopic("/waku/2/default-content/proto")
|
|
|
|
proc dummyHandler(
|
|
topic: PubsubTopic, msg: WakuMessage
|
|
): Future[void] {.async, gcsafe.} =
|
|
discard
|
|
|
|
proc waitForConnectionStatus(
|
|
brokerCtx: BrokerContext, expected: ConnectionStatus
|
|
) {.async.} =
|
|
var future = newFuture[void]("waitForConnectionStatus")
|
|
|
|
let handler: EventConnectionStatusChangeListenerProc = proc(
|
|
e: EventConnectionStatusChange
|
|
) {.async: (raises: []), gcsafe.} =
|
|
if not future.finished:
|
|
if e.connectionStatus == expected:
|
|
future.complete()
|
|
|
|
let handle = EventConnectionStatusChange.listen(brokerCtx, handler).valueOr:
|
|
raiseAssert error
|
|
|
|
try:
|
|
if not await future.withTimeout(TestTimeout):
|
|
raiseAssert "Timeout waiting for status: " & $expected
|
|
finally:
|
|
await EventConnectionStatusChange.dropListener(brokerCtx, handle)
|
|
|
|
proc waitForShardHealthy(
|
|
brokerCtx: BrokerContext
|
|
): Future[EventShardTopicHealthChange] {.async.} =
|
|
var future = newFuture[EventShardTopicHealthChange]("waitForShardHealthy")
|
|
|
|
let handler: EventShardTopicHealthChangeListenerProc = proc(
|
|
e: EventShardTopicHealthChange
|
|
) {.async: (raises: []), gcsafe.} =
|
|
if not future.finished:
|
|
if e.health == TopicHealth.MINIMALLY_HEALTHY or
|
|
e.health == TopicHealth.SUFFICIENTLY_HEALTHY:
|
|
future.complete(e)
|
|
|
|
let handle = EventShardTopicHealthChange.listen(brokerCtx, handler).valueOr:
|
|
raiseAssert error
|
|
|
|
try:
|
|
if await future.withTimeout(TestTimeout):
|
|
return future.read()
|
|
else:
|
|
raiseAssert "Timeout waiting for shard health event"
|
|
finally:
|
|
await EventShardTopicHealthChange.dropListener(brokerCtx, handle)
|
|
|
|
suite "LM API health checking":
|
|
var
|
|
serviceNode {.threadvar.}: WakuNode
|
|
client {.threadvar.}: Waku
|
|
servicePeerInfo {.threadvar.}: RemotePeerInfo
|
|
|
|
asyncSetup:
|
|
lockNewGlobalBrokerContext:
|
|
serviceNode =
|
|
newTestWakuNode(generateSecp256k1Key(), parseIpAddress("0.0.0.0"), Port(0))
|
|
(await serviceNode.mountRelay()).isOkOr:
|
|
raiseAssert error
|
|
serviceNode.mountMetadata(3, @[0'u16]).isOkOr:
|
|
raiseAssert error
|
|
await serviceNode.mountLibp2pPing()
|
|
await serviceNode.start()
|
|
|
|
servicePeerInfo = serviceNode.peerInfo.toRemotePeerInfo()
|
|
serviceNode.wakuRelay.subscribe(DefaultShard, dummyHandler)
|
|
|
|
lockNewGlobalBrokerContext:
|
|
var conf = defaultWakuNodeConf().valueOr:
|
|
raiseAssert error
|
|
conf.mode = Core
|
|
conf.listenAddress = parseIpAddress("0.0.0.0")
|
|
conf.tcpPort = Port(0)
|
|
conf.discv5UdpPort = Port(0)
|
|
conf.clusterId = 3'u16
|
|
conf.numShardsInNetwork = 1
|
|
conf.rest = false
|
|
|
|
client = (await createNode(conf)).valueOr:
|
|
raiseAssert error
|
|
(await startWaku(addr client)).isOkOr:
|
|
raiseAssert error
|
|
|
|
asyncTeardown:
|
|
discard await client.stop()
|
|
await serviceNode.stop()
|
|
|
|
asyncTest "RequestShardTopicsHealth, check PubsubTopic health":
|
|
client.node.wakuRelay.subscribe(DefaultShard, dummyHandler)
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
|
|
var isHealthy = false
|
|
let start = Moment.now()
|
|
while Moment.now() - start < TestTimeout:
|
|
let req = RequestShardTopicsHealth.request(client.brokerCtx, @[DefaultShard]).valueOr:
|
|
raiseAssert "RequestShardTopicsHealth failed"
|
|
|
|
if req.topicHealth.len > 0:
|
|
let h = req.topicHealth[0].health
|
|
if h == TopicHealth.MINIMALLY_HEALTHY or h == TopicHealth.SUFFICIENTLY_HEALTHY:
|
|
isHealthy = true
|
|
break
|
|
await sleepAsync(chronos.milliseconds(100))
|
|
|
|
check isHealthy == true
|
|
|
|
asyncTest "RequestShardTopicsHealth, check disconnected PubsubTopic":
|
|
const GhostShard = PubsubTopic("/waku/2/rs/1/666")
|
|
client.node.wakuRelay.subscribe(GhostShard, dummyHandler)
|
|
|
|
let req = RequestShardTopicsHealth.request(client.brokerCtx, @[GhostShard]).valueOr:
|
|
raiseAssert "Request failed"
|
|
|
|
check req.topicHealth.len > 0
|
|
check req.topicHealth[0].health == TopicHealth.UNHEALTHY
|
|
|
|
asyncTest "RequestProtocolHealth, check relay status":
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
|
|
var isReady = false
|
|
let start = Moment.now()
|
|
while Moment.now() - start < TestTimeout:
|
|
let relayReq = await RequestProtocolHealth.request(
|
|
client.brokerCtx, WakuProtocol.RelayProtocol
|
|
)
|
|
if relayReq.isOk() and relayReq.get().healthStatus.health == HealthStatus.READY:
|
|
isReady = true
|
|
break
|
|
await sleepAsync(chronos.milliseconds(100))
|
|
|
|
check isReady == true
|
|
|
|
let storeReq =
|
|
await RequestProtocolHealth.request(client.brokerCtx, WakuProtocol.StoreProtocol)
|
|
if storeReq.isOk():
|
|
check storeReq.get().healthStatus.health != HealthStatus.READY
|
|
|
|
asyncTest "RequestProtocolHealth, check unmounted protocol":
|
|
let req =
|
|
await RequestProtocolHealth.request(client.brokerCtx, WakuProtocol.StoreProtocol)
|
|
check req.isOk()
|
|
|
|
let status = req.get().healthStatus
|
|
check status.health == HealthStatus.NOT_MOUNTED
|
|
check status.desc.isNone()
|
|
|
|
asyncTest "RequestConnectionStatus, check connectivity state":
|
|
let initialReq = RequestConnectionStatus.request(client.brokerCtx).valueOr:
|
|
raiseAssert "RequestConnectionStatus failed"
|
|
check initialReq.connectionStatus == ConnectionStatus.Disconnected
|
|
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
|
|
var isConnected = false
|
|
let start = Moment.now()
|
|
while Moment.now() - start < TestTimeout:
|
|
let req = RequestConnectionStatus.request(client.brokerCtx).valueOr:
|
|
raiseAssert "RequestConnectionStatus failed"
|
|
|
|
if req.connectionStatus == ConnectionStatus.PartiallyConnected or
|
|
req.connectionStatus == ConnectionStatus.Connected:
|
|
isConnected = true
|
|
break
|
|
await sleepAsync(chronos.milliseconds(100))
|
|
|
|
check isConnected == true
|
|
|
|
asyncTest "EventConnectionStatusChange, detect connect and disconnect":
|
|
let connectFuture =
|
|
waitForConnectionStatus(client.brokerCtx, ConnectionStatus.PartiallyConnected)
|
|
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
await connectFuture
|
|
|
|
let disconnectFuture =
|
|
waitForConnectionStatus(client.brokerCtx, ConnectionStatus.Disconnected)
|
|
await client.node.disconnectNode(servicePeerInfo)
|
|
await disconnectFuture
|
|
|
|
asyncTest "EventShardTopicHealthChange, detect health improvement":
|
|
client.node.wakuRelay.subscribe(DefaultShard, dummyHandler)
|
|
|
|
let healthEventFuture = waitForShardHealthy(client.brokerCtx)
|
|
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
|
|
let event = await healthEventFuture
|
|
check event.topic == DefaultShard
|
|
|
|
asyncTest "RequestHealthReport, check aggregate report":
|
|
let req = await RequestHealthReport.request(client.brokerCtx)
|
|
|
|
check req.isOk()
|
|
|
|
let report = req.get().healthReport
|
|
check report.nodeHealth == HealthStatus.READY
|
|
check report.protocolsHealth.len > 0
|
|
check report.protocolsHealth.anyIt(it.protocol == $WakuProtocol.RelayProtocol)
|
|
|
|
asyncTest "RequestContentTopicsHealth, smoke test":
|
|
let fictionalTopic = ContentTopic("/waku/2/this-does-not-exist/proto")
|
|
|
|
let req = RequestContentTopicsHealth.request(client.brokerCtx, @[fictionalTopic])
|
|
|
|
check req.isOk()
|
|
|
|
let res = req.get()
|
|
check res.contentTopicHealth.len == 1
|
|
check res.contentTopicHealth[0].topic == fictionalTopic
|
|
check res.contentTopicHealth[0].health == TopicHealth.NOT_SUBSCRIBED
|
|
|
|
asyncTest "RequestContentTopicsHealth, core mode trivial 1-shard autosharding":
|
|
let cTopic = ContentTopic("/waku/2/my-content-topic/proto")
|
|
|
|
let shardReq =
|
|
RequestRelayShard.request(client.brokerCtx, none(PubsubTopic), cTopic)
|
|
|
|
check shardReq.isOk()
|
|
let targetShard = $shardReq.get().relayShard
|
|
|
|
client.node.wakuRelay.subscribe(targetShard, dummyHandler)
|
|
serviceNode.wakuRelay.subscribe(targetShard, dummyHandler)
|
|
|
|
await client.node.connectToNodes(@[servicePeerInfo])
|
|
|
|
var isHealthy = false
|
|
let start = Moment.now()
|
|
while Moment.now() - start < TestTimeout:
|
|
let req = RequestContentTopicsHealth.request(client.brokerCtx, @[cTopic]).valueOr:
|
|
raiseAssert "Request failed"
|
|
|
|
if req.contentTopicHealth.len > 0:
|
|
let h = req.contentTopicHealth[0].health
|
|
if h == TopicHealth.MINIMALLY_HEALTHY or h == TopicHealth.SUFFICIENTLY_HEALTHY:
|
|
isHealthy = true
|
|
break
|
|
|
|
await sleepAsync(chronos.milliseconds(100))
|
|
|
|
check isHealthy == true
|
|
|
|
asyncTest "RequestProtocolHealth, edge mode smoke test":
|
|
var edgeWaku: Waku
|
|
|
|
lockNewGlobalBrokerContext:
|
|
var edgeConf = defaultWakuNodeConf().valueOr:
|
|
raiseAssert error
|
|
edgeConf.mode = Edge
|
|
edgeConf.listenAddress = parseIpAddress("0.0.0.0")
|
|
edgeConf.tcpPort = Port(0)
|
|
edgeConf.discv5UdpPort = Port(0)
|
|
edgeConf.clusterId = 3'u16
|
|
edgeConf.maxMessageSize = "150 KiB"
|
|
edgeConf.rest = false
|
|
|
|
edgeWaku = (await createNode(edgeConf)).valueOr:
|
|
raiseAssert "Failed to create edge node: " & error
|
|
|
|
(await startWaku(addr edgeWaku)).isOkOr:
|
|
raiseAssert "Failed to start edge waku: " & error
|
|
|
|
let relayReq = await RequestProtocolHealth.request(
|
|
edgeWaku.brokerCtx, WakuProtocol.RelayProtocol
|
|
)
|
|
check relayReq.isOk()
|
|
check relayReq.get().healthStatus.health == HealthStatus.NOT_MOUNTED
|
|
|
|
check not edgeWaku.node.wakuFilterClient.isNil()
|
|
|
|
discard await edgeWaku.stop()
|