2026-04-09 14:29:17 -03:00
|
|
|
{.used.}
|
|
|
|
|
|
|
|
|
|
import std/[options, sequtils, net, sets]
|
|
|
|
|
import chronos, testutils/unittests, stew/byteutils
|
|
|
|
|
import libp2p/[peerid, peerinfo, crypto/crypto]
|
feat: persistency (#3880)
* 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>
2026-05-16 00:09:07 +02:00
|
|
|
import brokers/broker_context
|
2026-04-09 14:29:17 -03:00
|
|
|
import ../testlib/[common, wakucore, wakunode, testasync]
|
|
|
|
|
import ../waku_archive/archive_utils
|
|
|
|
|
|
|
|
|
|
import
|
|
|
|
|
waku,
|
|
|
|
|
waku/[
|
|
|
|
|
waku_node,
|
|
|
|
|
waku_core,
|
|
|
|
|
events/message_events,
|
|
|
|
|
waku_relay/protocol,
|
|
|
|
|
waku_archive,
|
|
|
|
|
waku_archive/common as archive_common,
|
|
|
|
|
node/delivery_service/delivery_service,
|
|
|
|
|
node/delivery_service/recv_service,
|
|
|
|
|
]
|
|
|
|
|
import waku/factory/waku_conf
|
|
|
|
|
import tools/confutils/cli_args
|
|
|
|
|
|
|
|
|
|
const TestTimeout = chronos.seconds(60)
|
|
|
|
|
|
|
|
|
|
type ReceiveEventListenerManager = ref object
|
|
|
|
|
brokerCtx: BrokerContext
|
|
|
|
|
receivedListener: MessageReceivedEventListener
|
|
|
|
|
receivedEvent: AsyncEvent
|
|
|
|
|
receivedMessages: seq[WakuMessage]
|
|
|
|
|
targetCount: int
|
|
|
|
|
|
|
|
|
|
proc newReceiveEventListenerManager(
|
|
|
|
|
brokerCtx: BrokerContext, expectedCount: int = 1
|
|
|
|
|
): ReceiveEventListenerManager =
|
|
|
|
|
let manager = ReceiveEventListenerManager(
|
|
|
|
|
brokerCtx: brokerCtx, receivedMessages: @[], targetCount: expectedCount
|
|
|
|
|
)
|
|
|
|
|
manager.receivedEvent = newAsyncEvent()
|
|
|
|
|
|
|
|
|
|
manager.receivedListener = MessageReceivedEvent
|
|
|
|
|
.listen(
|
|
|
|
|
brokerCtx,
|
|
|
|
|
proc(event: MessageReceivedEvent) {.async: (raises: []).} =
|
|
|
|
|
manager.receivedMessages.add(event.message)
|
|
|
|
|
if manager.receivedMessages.len >= manager.targetCount:
|
|
|
|
|
manager.receivedEvent.fire()
|
|
|
|
|
,
|
|
|
|
|
)
|
|
|
|
|
.expect("Failed to listen to MessageReceivedEvent")
|
|
|
|
|
|
|
|
|
|
return manager
|
|
|
|
|
|
feat: persistency (#3880)
* 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>
2026-05-16 00:09:07 +02:00
|
|
|
proc teardown(manager: ReceiveEventListenerManager) {.async.} =
|
|
|
|
|
await MessageReceivedEvent.dropListener(manager.brokerCtx, manager.receivedListener)
|
2026-04-09 14:29:17 -03:00
|
|
|
|
|
|
|
|
proc waitForEvents(
|
|
|
|
|
manager: ReceiveEventListenerManager, timeout: Duration
|
|
|
|
|
): Future[bool] {.async.} =
|
|
|
|
|
return await manager.receivedEvent.wait().withTimeout(timeout)
|
|
|
|
|
|
|
|
|
|
proc createApiNodeConf(numShards: uint16 = 1): WakuNodeConf =
|
|
|
|
|
var conf = defaultWakuNodeConf().valueOr:
|
|
|
|
|
raiseAssert error
|
|
|
|
|
conf.mode = cli_args.WakuMode.Core
|
|
|
|
|
conf.listenAddress = parseIpAddress("0.0.0.0")
|
|
|
|
|
conf.tcpPort = Port(0)
|
|
|
|
|
conf.discv5UdpPort = Port(0)
|
|
|
|
|
conf.clusterId = 3'u16
|
|
|
|
|
conf.numShardsInNetwork = numShards
|
|
|
|
|
conf.reliabilityEnabled = true
|
|
|
|
|
conf.rest = false
|
|
|
|
|
result = conf
|
|
|
|
|
|
|
|
|
|
suite "Messaging API, Receive Service (store recovery)":
|
|
|
|
|
asyncTest "recv_service delivers store-recovered messages via MessageReceivedEvent":
|
|
|
|
|
## Message gets archived before subscriber exists, checkStore() recovers it.
|
|
|
|
|
## This is a regression test: it proves that messages recovered via store by
|
|
|
|
|
## the RecvService (instead of receiving via a live relay sub) are actually
|
|
|
|
|
## delivered via the MessageReceivedEvent API.
|
|
|
|
|
|
|
|
|
|
let numShards: uint16 = 1
|
|
|
|
|
let shards = @[PubsubTopic("/waku/2/rs/3/0")]
|
|
|
|
|
let shard = shards[0]
|
|
|
|
|
let testTopic = ContentTopic("/waku/2/recv-test/proto")
|
|
|
|
|
|
|
|
|
|
proc dummyHandler(topic: PubsubTopic, msg: WakuMessage) {.async, gcsafe.} =
|
|
|
|
|
discard
|
|
|
|
|
|
|
|
|
|
# store node has archive, store, relay
|
|
|
|
|
# it archives messages from relay and serves them to the
|
|
|
|
|
# subscriber's store client when it comes up (later)
|
|
|
|
|
var storeNode: WakuNode
|
|
|
|
|
lockNewGlobalBrokerContext:
|
|
|
|
|
storeNode =
|
|
|
|
|
newTestWakuNode(generateSecp256k1Key(), parseIpAddress("0.0.0.0"), Port(0))
|
|
|
|
|
storeNode.mountMetadata(3, toSeq(0'u16 ..< numShards)).expect(
|
|
|
|
|
"Failed to mount metadata on storeNode"
|
|
|
|
|
)
|
|
|
|
|
(await storeNode.mountRelay()).expect("Failed to mount relay on storeNode")
|
|
|
|
|
let archiveDriver = newSqliteArchiveDriver()
|
|
|
|
|
storeNode.mountArchive(archiveDriver).expect("Failed to mount archive")
|
|
|
|
|
await storeNode.mountStore()
|
|
|
|
|
await storeNode.mountLibp2pPing()
|
|
|
|
|
await storeNode.start()
|
|
|
|
|
|
|
|
|
|
for s in shards:
|
|
|
|
|
storeNode.subscribe((kind: PubsubSub, topic: s), dummyHandler).expect(
|
|
|
|
|
"Failed to sub storeNode"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
let storeNodePeerInfo = storeNode.peerInfo.toRemotePeerInfo()
|
|
|
|
|
|
|
|
|
|
# publisher node (relay)
|
|
|
|
|
var publisher: WakuNode
|
|
|
|
|
lockNewGlobalBrokerContext:
|
|
|
|
|
publisher =
|
|
|
|
|
newTestWakuNode(generateSecp256k1Key(), parseIpAddress("0.0.0.0"), Port(0))
|
|
|
|
|
publisher.mountMetadata(3, toSeq(0'u16 ..< numShards)).expect(
|
|
|
|
|
"Failed to mount metadata on publisher"
|
|
|
|
|
)
|
|
|
|
|
(await publisher.mountRelay()).expect("Failed to mount relay on publisher")
|
|
|
|
|
await publisher.mountLibp2pPing()
|
|
|
|
|
await publisher.start()
|
|
|
|
|
|
|
|
|
|
for s in shards:
|
|
|
|
|
publisher.subscribe((kind: PubsubSub, topic: s), dummyHandler).expect(
|
|
|
|
|
"Failed to sub publisher"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# connect publisher to store so messages get archived
|
|
|
|
|
await publisher.connectToNodes(@[storeNodePeerInfo])
|
|
|
|
|
|
|
|
|
|
# wait for relay mesh
|
|
|
|
|
for _ in 0 ..< 50:
|
|
|
|
|
if publisher.wakuRelay.getNumPeersInMesh(shard).valueOr(0) > 0:
|
|
|
|
|
break
|
|
|
|
|
await sleepAsync(100.milliseconds)
|
|
|
|
|
|
2026-05-13 12:09:56 -03:00
|
|
|
# create the subscriber before publishing.
|
|
|
|
|
# RecvService captures startTimeToCheck at construction time; the
|
|
|
|
|
# message's timestamp must land after that point to fall inside
|
|
|
|
|
# checkStore's time window.
|
|
|
|
|
var subscriber: Waku
|
|
|
|
|
lockNewGlobalBrokerContext:
|
|
|
|
|
subscriber = (await createNode(createApiNodeConf(numShards))).expect(
|
|
|
|
|
"Failed to create subscriber"
|
|
|
|
|
)
|
|
|
|
|
(await startWaku(addr subscriber)).expect("Failed to start subscriber")
|
|
|
|
|
|
|
|
|
|
# publish after the subscriber exists but before it connects to the
|
|
|
|
|
# store; the message reaches the archive but the subscriber doesn't
|
|
|
|
|
# see it via live relay.
|
2026-04-09 14:29:17 -03:00
|
|
|
let missedPayload = "This message was missed".toBytes()
|
|
|
|
|
let missedMsg = WakuMessage(
|
|
|
|
|
payload: missedPayload, contentTopic: testTopic, version: 0, timestamp: now()
|
|
|
|
|
)
|
|
|
|
|
discard (await publisher.publish(some(shard), missedMsg)).expect(
|
|
|
|
|
"Publish missed msg failed"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# wait for archive
|
|
|
|
|
block waitArchive:
|
|
|
|
|
for _ in 0 ..< 50:
|
|
|
|
|
let query = archive_common.ArchiveQuery(
|
|
|
|
|
includeData: false, contentTopics: @[testTopic], pubsubTopic: some(shard)
|
|
|
|
|
)
|
|
|
|
|
let res = await storeNode.wakuArchive.findMessages(query)
|
|
|
|
|
if res.isOk() and res.get().hashes.len > 0:
|
|
|
|
|
break waitArchive
|
|
|
|
|
await sleepAsync(100.milliseconds)
|
|
|
|
|
raiseAssert "Message was not archived in time"
|
|
|
|
|
|
2026-05-13 12:09:56 -03:00
|
|
|
# connect subscriber to store after the message is already archived so
|
|
|
|
|
# gossipsub doesn't replay it via the live path
|
2026-04-09 14:29:17 -03:00
|
|
|
await subscriber.node.connectToNodes(@[storeNodePeerInfo])
|
|
|
|
|
|
|
|
|
|
# subscribe to content topic
|
|
|
|
|
(await subscriber.subscribe(testTopic)).expect("Failed to subscribe")
|
|
|
|
|
|
|
|
|
|
# listen before triggering store check
|
|
|
|
|
let eventManager = newReceiveEventListenerManager(subscriber.brokerCtx, 1)
|
|
|
|
|
defer:
|
feat: persistency (#3880)
* 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>
2026-05-16 00:09:07 +02:00
|
|
|
await eventManager.teardown()
|
2026-04-09 14:29:17 -03:00
|
|
|
|
|
|
|
|
# trigger store check, should recover and deliver via MessageReceivedEvent
|
|
|
|
|
await subscriber.deliveryService.recvService.checkStore()
|
|
|
|
|
|
|
|
|
|
let received = await eventManager.waitForEvents(TestTimeout)
|
|
|
|
|
check received
|
|
|
|
|
check eventManager.receivedMessages.len == 1
|
|
|
|
|
if eventManager.receivedMessages.len > 0:
|
|
|
|
|
check eventManager.receivedMessages[0].payload == missedPayload
|
|
|
|
|
|
|
|
|
|
# cleanup
|
|
|
|
|
(await subscriber.stop()).expect("Failed to stop subscriber")
|
|
|
|
|
await publisher.stop()
|
|
|
|
|
await storeNode.stop()
|