2026-04-09 07:17:17 +02:00
|
|
|
import std/[json, strutils, tables]
|
2026-03-03 19:17:54 +01:00
|
|
|
import chronos, chronicles, results, confutils, confutils/std/net, ffi
|
2026-02-17 10:38:35 +01:00
|
|
|
import
|
|
|
|
|
waku/factory/waku,
|
|
|
|
|
waku/node/waku_node,
|
2026-03-03 19:17:54 +01:00
|
|
|
waku/api/[api, types],
|
2026-02-26 17:55:31 +01:00
|
|
|
waku/events/[message_events, health_events],
|
2026-03-03 19:17:54 +01:00
|
|
|
tools/confutils/cli_args,
|
2026-02-17 10:38:35 +01:00
|
|
|
../declare_lib,
|
|
|
|
|
../json_event
|
|
|
|
|
|
|
|
|
|
# Add JSON serialization for RequestId
|
|
|
|
|
proc `%`*(id: RequestId): JsonNode =
|
|
|
|
|
%($id)
|
|
|
|
|
|
|
|
|
|
registerReqFFI(CreateNodeRequest, ctx: ptr FFIContext[Waku]):
|
|
|
|
|
proc(configJson: cstring): Future[Result[string, string]] {.async.} =
|
2026-03-03 19:17:54 +01:00
|
|
|
## Parse the JSON configuration using fieldPairs approach (WakuNodeConf)
|
|
|
|
|
var conf = defaultWakuNodeConf().valueOr:
|
|
|
|
|
return err("Failed creating default conf: " & error)
|
|
|
|
|
|
|
|
|
|
var jsonNode: JsonNode
|
|
|
|
|
try:
|
|
|
|
|
jsonNode = parseJson($configJson)
|
|
|
|
|
except Exception:
|
2026-04-09 07:17:17 +02:00
|
|
|
let exceptionMsg = getCurrentExceptionMsg()
|
|
|
|
|
error "Failed to parse config JSON",
|
|
|
|
|
error = exceptionMsg, configJson = $configJson
|
2026-03-03 19:17:54 +01:00
|
|
|
return err(
|
2026-04-09 07:17:17 +02:00
|
|
|
"Failed to parse config JSON: " & exceptionMsg & " configJson string: " &
|
|
|
|
|
$configJson
|
2026-03-03 19:17:54 +01:00
|
|
|
)
|
|
|
|
|
|
2026-04-09 07:17:17 +02:00
|
|
|
var jsonFields: Table[string, (string, JsonNode)]
|
|
|
|
|
for key, value in jsonNode:
|
|
|
|
|
let lowerKey = key.toLowerAscii()
|
|
|
|
|
|
|
|
|
|
if jsonFields.hasKey(lowerKey):
|
|
|
|
|
error "Duplicate configuration option found when normalized to lowercase",
|
|
|
|
|
key = key
|
|
|
|
|
return err(
|
|
|
|
|
"Duplicate configuration option found when normalized to lowercase: '" & key &
|
|
|
|
|
"'"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
jsonFields[lowerKey] = (key, value)
|
|
|
|
|
|
2026-03-03 19:17:54 +01:00
|
|
|
for confField, confValue in fieldPairs(conf):
|
2026-04-09 07:17:17 +02:00
|
|
|
let lowerField = confField.toLowerAscii()
|
|
|
|
|
if jsonFields.hasKey(lowerField):
|
|
|
|
|
let (jsonKey, jsonValue) = jsonFields[lowerField]
|
|
|
|
|
let formattedString = ($jsonValue).strip(chars = {'\"'})
|
2026-03-03 19:17:54 +01:00
|
|
|
try:
|
|
|
|
|
confValue = parseCmdArg(typeof(confValue), formattedString)
|
|
|
|
|
except Exception:
|
|
|
|
|
return err(
|
2026-04-09 07:17:17 +02:00
|
|
|
"Failed to parse field '" & confField & "' from JSON key '" & jsonKey & "': " &
|
|
|
|
|
getCurrentExceptionMsg() & ". Value: " & formattedString
|
2026-03-03 19:17:54 +01:00
|
|
|
)
|
2026-02-17 10:38:35 +01:00
|
|
|
|
2026-04-09 07:17:17 +02:00
|
|
|
jsonFields.del(lowerField)
|
|
|
|
|
|
|
|
|
|
if jsonFields.len > 0:
|
|
|
|
|
var unknownKeys = newSeq[string]()
|
|
|
|
|
for _, (jsonKey, _) in pairs(jsonFields):
|
|
|
|
|
unknownKeys.add(jsonKey)
|
|
|
|
|
error "Unrecognized configuration option(s) found", option = unknownKeys
|
|
|
|
|
return err("Unrecognized configuration option(s) found: " & $unknownKeys)
|
|
|
|
|
|
2026-02-17 10:38:35 +01:00
|
|
|
# Create the node
|
2026-03-03 19:17:54 +01:00
|
|
|
ctx.myLib[] = (await api.createNode(conf)).valueOr:
|
2026-02-17 10:38:35 +01:00
|
|
|
let errMsg = $error
|
|
|
|
|
chronicles.error "CreateNodeRequest failed", err = errMsg
|
|
|
|
|
return err(errMsg)
|
|
|
|
|
|
|
|
|
|
return ok("")
|
|
|
|
|
|
2026-03-02 18:56:39 +01:00
|
|
|
proc logosdelivery_destroy(
|
|
|
|
|
ctx: ptr FFIContext[Waku], callback: FFICallBack, userData: pointer
|
|
|
|
|
): cint {.dynlib, exportc, cdecl.} =
|
|
|
|
|
initializeLibrary()
|
|
|
|
|
checkParams(ctx, callback, userData)
|
|
|
|
|
|
|
|
|
|
ffi.destroyFFIContext(ctx).isOkOr:
|
|
|
|
|
let msg = "liblogosdelivery error: " & $error
|
|
|
|
|
callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
|
|
|
|
|
return RET_ERR
|
|
|
|
|
|
|
|
|
|
## always need to invoke the callback although we don't retrieve value to the caller
|
|
|
|
|
callback(RET_OK, nil, 0, userData)
|
|
|
|
|
|
|
|
|
|
return RET_OK
|
|
|
|
|
|
2026-02-17 10:38:35 +01:00
|
|
|
proc logosdelivery_create_node(
|
|
|
|
|
configJson: cstring, callback: FFICallback, userData: pointer
|
|
|
|
|
): pointer {.dynlib, exportc, cdecl.} =
|
|
|
|
|
initializeLibrary()
|
|
|
|
|
|
|
|
|
|
if isNil(callback):
|
|
|
|
|
echo "error: missing callback in logosdelivery_create_node"
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
|
|
var ctx = ffi.createFFIContext[Waku]().valueOr:
|
|
|
|
|
let msg = "Error in createFFIContext: " & $error
|
|
|
|
|
callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
|
|
ctx.userData = userData
|
|
|
|
|
|
|
|
|
|
ffi.sendRequestToFFIThread(
|
|
|
|
|
ctx, CreateNodeRequest.ffiNewReq(callback, userData, configJson)
|
|
|
|
|
).isOkOr:
|
|
|
|
|
let msg = "error in sendRequestToFFIThread: " & $error
|
|
|
|
|
callback(RET_ERR, unsafeAddr msg[0], cast[csize_t](len(msg)), userData)
|
2026-03-02 18:56:39 +01:00
|
|
|
# free allocated resources as they won't be available
|
|
|
|
|
ffi.destroyFFIContext(ctx).isOkOr:
|
2026-03-04 09:48:48 +01:00
|
|
|
chronicles.error "Error in destroyFFIContext after sendRequestToFFIThread during creation",
|
|
|
|
|
err = $error
|
2026-02-17 10:38:35 +01:00
|
|
|
return nil
|
|
|
|
|
|
|
|
|
|
return ctx
|
|
|
|
|
|
|
|
|
|
proc logosdelivery_start_node(
|
|
|
|
|
ctx: ptr FFIContext[Waku], callback: FFICallBack, userData: pointer
|
|
|
|
|
) {.ffi.} =
|
|
|
|
|
requireInitializedNode(ctx, "START_NODE"):
|
|
|
|
|
return err(errMsg)
|
|
|
|
|
|
|
|
|
|
# setting up outgoing event listeners
|
|
|
|
|
let sentListener = MessageSentEvent.listen(
|
|
|
|
|
ctx.myLib[].brokerCtx,
|
|
|
|
|
proc(event: MessageSentEvent) {.async: (raises: []).} =
|
|
|
|
|
callEventCallback(ctx, "onMessageSent"):
|
|
|
|
|
$newJsonEvent("message_sent", event),
|
|
|
|
|
).valueOr:
|
|
|
|
|
chronicles.error "MessageSentEvent.listen failed", err = $error
|
|
|
|
|
return err("MessageSentEvent.listen failed: " & $error)
|
|
|
|
|
|
|
|
|
|
let errorListener = MessageErrorEvent.listen(
|
|
|
|
|
ctx.myLib[].brokerCtx,
|
|
|
|
|
proc(event: MessageErrorEvent) {.async: (raises: []).} =
|
|
|
|
|
callEventCallback(ctx, "onMessageError"):
|
|
|
|
|
$newJsonEvent("message_error", event),
|
|
|
|
|
).valueOr:
|
|
|
|
|
chronicles.error "MessageErrorEvent.listen failed", err = $error
|
|
|
|
|
return err("MessageErrorEvent.listen failed: " & $error)
|
|
|
|
|
|
|
|
|
|
let propagatedListener = MessagePropagatedEvent.listen(
|
|
|
|
|
ctx.myLib[].brokerCtx,
|
|
|
|
|
proc(event: MessagePropagatedEvent) {.async: (raises: []).} =
|
|
|
|
|
callEventCallback(ctx, "onMessagePropagated"):
|
|
|
|
|
$newJsonEvent("message_propagated", event),
|
|
|
|
|
).valueOr:
|
|
|
|
|
chronicles.error "MessagePropagatedEvent.listen failed", err = $error
|
|
|
|
|
return err("MessagePropagatedEvent.listen failed: " & $error)
|
|
|
|
|
|
2026-03-04 09:48:48 +01:00
|
|
|
let receivedListener = MessageReceivedEvent.listen(
|
|
|
|
|
ctx.myLib[].brokerCtx,
|
|
|
|
|
proc(event: MessageReceivedEvent) {.async: (raises: []).} =
|
|
|
|
|
callEventCallback(ctx, "onMessageReceived"):
|
|
|
|
|
$newJsonEvent("message_received", event),
|
|
|
|
|
).valueOr:
|
|
|
|
|
chronicles.error "MessageReceivedEvent.listen failed", err = $error
|
|
|
|
|
return err("MessageReceivedEvent.listen failed: " & $error)
|
|
|
|
|
|
2026-02-26 17:55:31 +01:00
|
|
|
let ConnectionStatusChangeListener = EventConnectionStatusChange.listen(
|
|
|
|
|
ctx.myLib[].brokerCtx,
|
|
|
|
|
proc(event: EventConnectionStatusChange) {.async: (raises: []).} =
|
|
|
|
|
callEventCallback(ctx, "onConnectionStatusChange"):
|
|
|
|
|
$newJsonEvent("connection_status_change", event),
|
|
|
|
|
).valueOr:
|
|
|
|
|
chronicles.error "ConnectionStatusChange.listen failed", err = $error
|
|
|
|
|
return err("ConnectionStatusChange.listen failed: " & $error)
|
|
|
|
|
|
2026-02-17 10:38:35 +01:00
|
|
|
(await startWaku(addr ctx.myLib[])).isOkOr:
|
|
|
|
|
let errMsg = $error
|
|
|
|
|
chronicles.error "START_NODE failed", err = errMsg
|
|
|
|
|
return err("failed to start: " & errMsg)
|
|
|
|
|
return ok("")
|
|
|
|
|
|
|
|
|
|
proc logosdelivery_stop_node(
|
|
|
|
|
ctx: ptr FFIContext[Waku], callback: FFICallBack, userData: pointer
|
|
|
|
|
) {.ffi.} =
|
|
|
|
|
requireInitializedNode(ctx, "STOP_NODE"):
|
|
|
|
|
return err(errMsg)
|
|
|
|
|
|
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 MessageErrorEvent.dropAllListeners(ctx.myLib[].brokerCtx)
|
|
|
|
|
await MessageSentEvent.dropAllListeners(ctx.myLib[].brokerCtx)
|
|
|
|
|
await MessagePropagatedEvent.dropAllListeners(ctx.myLib[].brokerCtx)
|
|
|
|
|
await MessageReceivedEvent.dropAllListeners(ctx.myLib[].brokerCtx)
|
|
|
|
|
await EventConnectionStatusChange.dropAllListeners(ctx.myLib[].brokerCtx)
|
2026-02-17 10:38:35 +01:00
|
|
|
|
|
|
|
|
(await ctx.myLib[].stop()).isOkOr:
|
|
|
|
|
let errMsg = $error
|
|
|
|
|
chronicles.error "STOP_NODE failed", err = errMsg
|
|
|
|
|
return err("failed to stop: " & errMsg)
|
|
|
|
|
return ok("")
|