mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-05-18 00:09:52 +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>
230 lines
6.8 KiB
Nim
230 lines
6.8 KiB
Nim
{.push raises: [].}
|
||
|
||
import
|
||
std/[options, net, math],
|
||
results,
|
||
chronicles,
|
||
libp2p/crypto/crypto,
|
||
libp2p/builders,
|
||
libp2p/nameresolving/nameresolver,
|
||
libp2p/transports/wstransport,
|
||
libp2p/protocols/connectivity/relay/relay,
|
||
brokers/broker_context
|
||
|
||
import
|
||
../waku_enr,
|
||
../discovery/waku_discv5,
|
||
../waku_node,
|
||
../node/peer_manager,
|
||
../common/rate_limit/setting,
|
||
../common/utils/parse_size_units
|
||
|
||
type
|
||
WakuNodeBuilder* = object # General
|
||
nodeRng: Option[ref crypto.HmacDrbgContext]
|
||
nodeKey: Option[crypto.PrivateKey]
|
||
netConfig: Option[NetConfig]
|
||
record: Option[enr.Record]
|
||
|
||
# Peer storage and peer manager
|
||
peerStorage: Option[PeerStorage]
|
||
peerStorageCapacity: Option[int]
|
||
|
||
# Peer manager config
|
||
maxRelayPeers: int
|
||
maxServicePeers: int
|
||
colocationLimit: int
|
||
shardAware: bool
|
||
|
||
# Libp2p switch
|
||
switchMaxConnections: Option[int]
|
||
switchNameResolver: Option[NameResolver]
|
||
switchAgentString: Option[string]
|
||
switchSslSecureKey: Option[string]
|
||
switchSslSecureCert: Option[string]
|
||
switchSendSignedPeerRecord: Option[bool]
|
||
circuitRelay: Relay
|
||
|
||
# Rate limit configs for non-relay req-resp protocols
|
||
rateLimitSettings: Option[ProtocolRateLimitSettings]
|
||
|
||
WakuNodeBuilderResult* = Result[void, string]
|
||
|
||
## Init
|
||
|
||
proc init*(T: type WakuNodeBuilder): WakuNodeBuilder =
|
||
WakuNodeBuilder()
|
||
|
||
## General
|
||
|
||
proc withRng*(builder: var WakuNodeBuilder, rng: ref crypto.HmacDrbgContext) =
|
||
builder.nodeRng = some(rng)
|
||
|
||
proc withNodeKey*(builder: var WakuNodeBuilder, nodeKey: crypto.PrivateKey) =
|
||
builder.nodeKey = some(nodeKey)
|
||
|
||
proc withRecord*(builder: var WakuNodeBuilder, record: enr.Record) =
|
||
builder.record = some(record)
|
||
|
||
proc withNetworkConfiguration*(builder: var WakuNodeBuilder, config: NetConfig) =
|
||
builder.netConfig = some(config)
|
||
|
||
proc withNetworkConfigurationDetails*(
|
||
builder: var WakuNodeBuilder,
|
||
bindIp: IpAddress,
|
||
bindPort: Port,
|
||
extIp = none(IpAddress),
|
||
extPort = none(Port),
|
||
extMultiAddrs = newSeq[MultiAddress](),
|
||
wsBindPort: Port = Port(8000),
|
||
wsEnabled: bool = false,
|
||
wssEnabled: bool = false,
|
||
wakuFlags = none(CapabilitiesBitfield),
|
||
dns4DomainName = none(string),
|
||
dnsNameServers = @[parseIpAddress("1.1.1.1"), parseIpAddress("1.0.0.1")],
|
||
): WakuNodeBuilderResult {.
|
||
deprecated: "use 'builder.withNetworkConfiguration()' instead"
|
||
.} =
|
||
let netConfig = ?NetConfig.init(
|
||
bindIp = bindIp,
|
||
bindPort = bindPort,
|
||
extIp = extIp,
|
||
extPort = extPort,
|
||
extMultiAddrs = extMultiAddrs,
|
||
wsBindPort = some(wsBindPort),
|
||
wsEnabled = wsEnabled,
|
||
wssEnabled = wssEnabled,
|
||
wakuFlags = wakuFlags,
|
||
dns4DomainName = dns4DomainName,
|
||
dnsNameServers = dnsNameServers,
|
||
)
|
||
builder.withNetworkConfiguration(netConfig)
|
||
ok()
|
||
|
||
## Peer storage and peer manager
|
||
|
||
proc withPeerStorage*(
|
||
builder: var WakuNodeBuilder, peerStorage: PeerStorage, capacity = none(int)
|
||
) =
|
||
if not peerStorage.isNil():
|
||
builder.peerStorage = some(peerStorage)
|
||
|
||
builder.peerStorageCapacity = capacity
|
||
|
||
proc withPeerManagerConfig*(
|
||
builder: var WakuNodeBuilder,
|
||
maxConnections: int,
|
||
relayServiceRatio: string,
|
||
shardAware = false,
|
||
) =
|
||
let (relayRatio, serviceRatio) = parseRelayServiceRatio(relayServiceRatio).get()
|
||
var relayPeers = int(ceil(float(maxConnections) * relayRatio))
|
||
var servicePeers = int(floor(float(maxConnections) * serviceRatio))
|
||
|
||
builder.maxServicePeers = servicePeers
|
||
builder.maxRelayPeers = relayPeers
|
||
builder.shardAware = shardAware
|
||
|
||
proc withColocationLimit*(builder: var WakuNodeBuilder, colocationLimit: int) =
|
||
builder.colocationLimit = colocationLimit
|
||
|
||
proc withRateLimit*(builder: var WakuNodeBuilder, limits: ProtocolRateLimitSettings) =
|
||
builder.rateLimitSettings = some(limits)
|
||
|
||
proc withCircuitRelay*(builder: var WakuNodeBuilder, circuitRelay: Relay) =
|
||
builder.circuitRelay = circuitRelay
|
||
|
||
## Waku switch
|
||
|
||
proc withSwitchConfiguration*(
|
||
builder: var WakuNodeBuilder,
|
||
maxConnections = none(int),
|
||
nameResolver: NameResolver = nil,
|
||
sendSignedPeerRecord = false,
|
||
secureKey = none(string),
|
||
secureCert = none(string),
|
||
agentString = none(string),
|
||
) =
|
||
builder.switchMaxConnections = maxConnections
|
||
builder.switchSendSignedPeerRecord = some(sendSignedPeerRecord)
|
||
builder.switchSslSecureKey = secureKey
|
||
builder.switchSslSecureCert = secureCert
|
||
builder.switchAgentString = agentString
|
||
|
||
if not nameResolver.isNil():
|
||
builder.switchNameResolver = some(nameResolver)
|
||
|
||
## Build
|
||
|
||
proc build*(builder: WakuNodeBuilder): Result[WakuNode, string] =
|
||
var rng: ref crypto.HmacDrbgContext
|
||
if builder.nodeRng.isNone():
|
||
rng = crypto.newRng()
|
||
else:
|
||
rng = builder.nodeRng.get()
|
||
|
||
if builder.nodeKey.isNone():
|
||
return err("node key is required")
|
||
|
||
if builder.netConfig.isNone():
|
||
return err("network configuration is required")
|
||
|
||
let netConfig = builder.netConfig.get()
|
||
if netConfig.dnsNameServers.len == 0:
|
||
return err("DNS name servers are required for WakuNode")
|
||
|
||
if builder.record.isNone():
|
||
return err("node record is required")
|
||
|
||
let circuitRelay =
|
||
if builder.circuitRelay.isNil():
|
||
Relay.new()
|
||
else:
|
||
builder.circuitRelay
|
||
|
||
var switch: Switch
|
||
try:
|
||
switch = newWakuSwitch(
|
||
privKey = builder.nodekey,
|
||
address = builder.netConfig.get().hostAddress,
|
||
wsAddress = builder.netConfig.get().wsHostAddress,
|
||
transportFlags = {ServerFlags.ReuseAddr, ServerFlags.TcpNoDelay},
|
||
rng = rng,
|
||
maxConnections = builder.switchMaxConnections.get(builders.MaxConnections),
|
||
wssEnabled = builder.netConfig.get().wssEnabled,
|
||
secureKeyPath = builder.switchSslSecureKey.get(""),
|
||
secureCertPath = builder.switchSslSecureCert.get(""),
|
||
nameResolver = builder.switchNameResolver.get(nil),
|
||
sendSignedPeerRecord = builder.switchSendSignedPeerRecord.get(false),
|
||
agentString = builder.switchAgentString,
|
||
peerStoreCapacity = builder.peerStorageCapacity,
|
||
circuitRelay = circuitRelay,
|
||
)
|
||
except CatchableError:
|
||
return err("failed to create switch: " & getCurrentExceptionMsg())
|
||
|
||
let peerManager = PeerManager.new(
|
||
switch = switch,
|
||
storage = builder.peerStorage.get(nil),
|
||
maxRelayPeers = some(builder.maxRelayPeers),
|
||
maxServicePeers = some(builder.maxServicePeers),
|
||
colocationLimit = builder.colocationLimit,
|
||
shardedPeerManagement = builder.shardAware,
|
||
maxConnections = builder.switchMaxConnections.get(builders.MaxConnections),
|
||
)
|
||
|
||
var node: WakuNode
|
||
try:
|
||
node = WakuNode.new(
|
||
netConfig = netConfig,
|
||
enr = builder.record.get(),
|
||
switch = switch,
|
||
peerManager = peerManager,
|
||
rng = rng,
|
||
rateLimitSettings = builder.rateLimitSettings.get(DefaultProtocolRateLimit),
|
||
)
|
||
except Exception:
|
||
return err("failed to build WakuNode instance: " & getCurrentExceptionMsg())
|
||
|
||
ok(node)
|