mirror of
https://github.com/logos-messaging/nim-sds.git
synced 2026-06-18 23:19:40 +00:00
* feat: make Persistence interface async
The 14 Persistence proc fields now return Future[...] with
{.async: (raises: []), gcsafe.}, allowing real I/O backends (SQLite,
encrypted file, network) to suspend rather than block the Chronos event
loop the manager runs on.
Propagates through:
- ReliabilityManager.lock: system.Lock -> chronos.AsyncLock. Acquired
across awaits cleanly; matches the single-threaded Chronos worker the
FFI uses. Multi-OS-thread use is now explicitly the caller's
responsibility.
- sds_utils + sds.nim public API procs (wrapOutgoingMessage,
unwrapReceivedMessage, markDependenciesMet, setCallbacks,
resetReliabilityManager, cleanup, ensureChannel, removeChannel, the
getter snapshots, etc.) are now async.
- FFI request handlers in library/sds_thread/... await the new API.
- Tests converted via an asyncTest template that wraps each test body
in an async proc; setup/teardown use waitFor for their single async
call (ensureChannel / cleanup).
Lock scope is preserved exactly: the same call sites that held the
kernel Lock today hold AsyncLock now -- no new locking added.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* refactor: drop asyncSpawn, add asyncSetup/asyncTeardown
Three asyncSpawn usages removed:
- sds.nim startPeriodicTasks: stored the periodic-task futures on
ReliabilityManager (new field `periodicTasks: seq[FutureBase]`) so
cleanup can cancel them on shutdown instead of leaking the loops
against a cleared manager.
- library/sds_thread/sds_thread.nim: fireSync moved BEFORE processing,
then `await SdsThreadRequest.process(...)` instead of asyncSpawn'ing
it. Aligns the worker with the SP-channel + lock assumption that
there are no concurrent requests; caller throughput is unchanged
because the caller only waits for receipt (fireSync), not processing.
- tests TestBus repair callback: replaced asyncSpawn(deliverExcept...)
with an explicit pending-delivery queue drained by `bus.drain()`.
Integration tests no longer rely on `sleepAsync(10ms)` to let
spawned deliveries finish — they await drain instead.
Tests also pick up an asyncSetup/asyncTeardown pair (tests/async_unittest.nim)
so suite fixtures can `await` directly. All `waitFor` in setup/teardown
blocks is gone; only the top-level asyncTest wrapper still uses waitFor
(once, to drive the async proc to completion).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* Correctly propagate error hidden by new async move
* Correctly handle future cancellation exceptions, +some housekeeping
* Apply suggestion from @Ivansete-status
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
* Stylistics, async default implication addressed, nph style run
* Remove leaking CancelledFuture from public facing + as a consequence it is tuneled into handling CatchableError everywhere
---------
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
140 lines
5.7 KiB
Nim
140 lines
5.7 KiB
Nim
import std/tables
|
|
import chronos
|
|
import sds
|
|
|
|
## Test-only Persistence backend backed by Nim tables. Lets tests verify the
|
|
## full write → restart → read-back loop without depending on SQLite (or any
|
|
## real storage technology). Exposes the underlying store so tests can assert
|
|
## on what got saved.
|
|
|
|
type InMemoryStore* = ref object
|
|
lamports*: Table[SdsChannelID, int64]
|
|
log*: Table[SdsChannelID, OrderedTable[SdsMessageID, SdsMessage]]
|
|
hints*: Table[SdsMessageID, seq[byte]]
|
|
outgoing*: Table[SdsChannelID, OrderedTable[SdsMessageID, UnacknowledgedMessage]]
|
|
incoming*: Table[SdsChannelID, OrderedTable[SdsMessageID, IncomingMessage]]
|
|
outgoingRepair*: Table[SdsChannelID, OrderedTable[SdsMessageID, OutgoingRepairEntry]]
|
|
incomingRepair*: Table[SdsChannelID, OrderedTable[SdsMessageID, IncomingRepairEntry]]
|
|
dropChannelCalls*: Table[SdsChannelID, int]
|
|
## Per-channel counter; lets tests assert dropChannel is invoked exactly
|
|
## once per logical drop (not N times — see PR #66 review).
|
|
|
|
proc newInMemoryStore*(): InMemoryStore =
|
|
InMemoryStore()
|
|
|
|
proc newInMemoryPersistence*(store: InMemoryStore): Persistence =
|
|
Persistence(
|
|
saveLamport: proc(channelId: SdsChannelID, lamport: int64) {.async: (raises: []).} =
|
|
store.lamports[channelId] = lamport,
|
|
appendLogEntry: proc(
|
|
channelId: SdsChannelID, msg: SdsMessage
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId notin store.log:
|
|
store.log[channelId] = initOrderedTable[SdsMessageID, SdsMessage]()
|
|
store.log[channelId][msg.messageId] = msg,
|
|
removeLogEntry: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId in store.log:
|
|
store.log[channelId].del(msgId)
|
|
,
|
|
setRetrievalHint: proc(
|
|
msgId: SdsMessageID, hint: seq[byte]
|
|
) {.async: (raises: []).} =
|
|
store.hints[msgId] = hint,
|
|
saveOutgoing: proc(
|
|
channelId: SdsChannelID, msg: UnacknowledgedMessage
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId notin store.outgoing:
|
|
store.outgoing[channelId] =
|
|
initOrderedTable[SdsMessageID, UnacknowledgedMessage]()
|
|
store.outgoing[channelId][msg.message.messageId] = msg,
|
|
removeOutgoing: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId in store.outgoing:
|
|
store.outgoing[channelId].del(msgId)
|
|
,
|
|
saveIncoming: proc(
|
|
channelId: SdsChannelID, msg: IncomingMessage
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId notin store.incoming:
|
|
store.incoming[channelId] = initOrderedTable[SdsMessageID, IncomingMessage]()
|
|
store.incoming[channelId][msg.message.messageId] = msg,
|
|
removeIncoming: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId in store.incoming:
|
|
store.incoming[channelId].del(msgId)
|
|
,
|
|
saveOutgoingRepair: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID, entry: OutgoingRepairEntry
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId notin store.outgoingRepair:
|
|
store.outgoingRepair[channelId] =
|
|
initOrderedTable[SdsMessageID, OutgoingRepairEntry]()
|
|
store.outgoingRepair[channelId][msgId] = entry,
|
|
removeOutgoingRepair: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId in store.outgoingRepair:
|
|
store.outgoingRepair[channelId].del(msgId)
|
|
,
|
|
saveIncomingRepair: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID, entry: IncomingRepairEntry
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId notin store.incomingRepair:
|
|
store.incomingRepair[channelId] =
|
|
initOrderedTable[SdsMessageID, IncomingRepairEntry]()
|
|
store.incomingRepair[channelId][msgId] = entry,
|
|
removeIncomingRepair: proc(
|
|
channelId: SdsChannelID, msgId: SdsMessageID
|
|
) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
if channelId in store.incomingRepair:
|
|
store.incomingRepair[channelId].del(msgId)
|
|
,
|
|
dropChannel: proc(channelId: SdsChannelID) {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
store.lamports.del(channelId)
|
|
store.log.del(channelId)
|
|
store.outgoing.del(channelId)
|
|
store.incoming.del(channelId)
|
|
store.outgoingRepair.del(channelId)
|
|
store.incomingRepair.del(channelId)
|
|
store.dropChannelCalls[channelId] =
|
|
store.dropChannelCalls.getOrDefault(channelId) + 1,
|
|
loadAllForChannel: proc(
|
|
channelId: SdsChannelID
|
|
): Future[ChannelSnapshot] {.async: (raises: []).} =
|
|
{.cast(raises: []).}:
|
|
var snap = ChannelSnapshot()
|
|
if channelId in store.lamports:
|
|
snap.lamportTimestamp = store.lamports[channelId]
|
|
if channelId in store.log:
|
|
for msg in store.log[channelId].values:
|
|
snap.messageHistory.add(msg)
|
|
if channelId in store.outgoing:
|
|
for unack in store.outgoing[channelId].values:
|
|
snap.outgoingBuffer.add(unack)
|
|
if channelId in store.incoming:
|
|
for incoming in store.incoming[channelId].values:
|
|
snap.incomingBuffer.add(incoming)
|
|
if channelId in store.outgoingRepair:
|
|
for msgId, entry in store.outgoingRepair[channelId]:
|
|
snap.outgoingRepairBuffer.add((msgId, entry))
|
|
if channelId in store.incomingRepair:
|
|
for msgId, entry in store.incomingRepair[channelId]:
|
|
snap.incomingRepairBuffer.add((msgId, entry))
|
|
return snap,
|
|
)
|