nim-sds/sds/protobufutil.nim
Ivan FB e2ec4d55b3
feat: replace nim-libp2p protobuf with nim-protobuf-serialization
libp2p was pulled in solely for its `minprotobuf` field codec, dragging
in its full transitive tree (secp256k1, nimcrypto, websock, etc.). Swap
it for nim-protobuf-serialization, whose low-level `codec` module gives
the same protobuf wire primitives without the networking stack.

The wire/snapshot codecs build messages by hand at the field level and
rely on a backward-compatible decode path the type-driven
`Protobuf.encode/decode` API cannot express. To keep that code intact,
`protobufutil.nim` is a thin `ProtoBuffer` shim over the new `codec`
module, preserving the exact field-level behaviour the codecs depend on
(plain varints, length-delimited bytes/strings with no UTF-8 validation,
unknown-wire-type fields skipped as protoc does).

Dependency closure (nimble.lock, nix/deps.nix) regenerated accordingly:
libp2p and its 8 exclusive transitive deps dropped, protobuf_serialization
and its npeg dependency added.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-10 15:46:14 +02:00

176 lines
6.4 KiB
Nim

# Minimal hand-rolled protobuf field codec, a thin shim over
# `nim-protobuf-serialization`'s low-level wire `codec` module.
#
# `sds/protobuf.nim` and `sds/snapshot_codec.nim` build messages by hand at the
# field level — including a backward-compatible decode path the type-driven
# `Protobuf.encode/decode` API cannot express — so this exposes a small
# accumulating `ProtoBuffer` with `write`/`getField`/`getRepeatedField`/`finish`:
# * unsigned integers encode as plain varints (last value wins on decode);
# * strings and byte seqs encode length-delimited, with no UTF-8 validation
# (strings are treated as opaque bytes — message ids may be binary);
# * a field whose stored wire type differs from the requested one is skipped,
# as `protoc` does; only a malformed buffer yields an error.
{.push raises: [].}
import results
import faststreams/inputs
from protobuf_serialization/codec import
FieldHeader, WireKind, init, number, kind, toBytes, readHeader, readValue,
puint64, pbytes, fixed64, fixed32
import ./types/protobuf_error
export results, protobuf_error
type ProtoBuffer* = object ## Accumulating protobuf field buffer.
buffer*: seq[byte]
converter toProtobufError*(err: ProtoError): ProtobufError =
case err
of ProtoError.RequiredFieldMissing:
return ProtobufError(kind: ProtobufErrorKind.MissingRequiredField, field: "unknown")
else:
return ProtobufError(kind: ProtobufErrorKind.DecodeFailure, error: err)
proc missingRequiredField*(T: type ProtobufError, field: string): T =
return ProtobufError.init(field)
# ---------------------------------------------------------------------------
# Construction
# ---------------------------------------------------------------------------
proc init*(T: type ProtoBuffer): T =
return T(buffer: @[])
proc init*(T: type ProtoBuffer, data: seq[byte]): T =
return T(buffer: data)
proc finish*(pb: var ProtoBuffer) =
## No length prefix is used, so finishing only asserts the invariant that a
## top-level buffer is never empty.
doAssert(pb.buffer.len > 0)
# ---------------------------------------------------------------------------
# Writing
# ---------------------------------------------------------------------------
proc writeVarint(pb: var ProtoBuffer, field: int, value: uint64) =
pb.buffer.add(toBytes(FieldHeader.init(field, WireKind.Varint)))
pb.buffer.add(toBytes(puint64(value)))
proc write*(pb: var ProtoBuffer, field: int, value: uint64) =
pb.writeVarint(field, value)
proc write*(pb: var ProtoBuffer, field: int, value: uint32) =
pb.writeVarint(field, uint64(value))
proc writeLengthDelim(pb: var ProtoBuffer, field: int, data: openArray[byte]) =
pb.buffer.add(toBytes(FieldHeader.init(field, WireKind.LengthDelim)))
pb.buffer.add(toBytes(puint64(uint64(data.len))))
if data.len > 0:
pb.buffer.add(data)
proc write*(pb: var ProtoBuffer, field: int, value: openArray[byte]) =
pb.writeLengthDelim(field, value)
proc write*(pb: var ProtoBuffer, field: int, value: string) =
pb.writeLengthDelim(field, value.toOpenArrayByte(0, value.high))
# ---------------------------------------------------------------------------
# Reading
# ---------------------------------------------------------------------------
proc bytesToString(b: seq[byte]): string =
## Copy raw bytes into a string without UTF-8 validation — protobuf strings
## are opaque bytes here, and message ids may not be valid UTF-8.
var s = newString(b.len)
if b.len > 0:
copyMem(addr s[0], unsafeAddr b[0], b.len)
return s
proc collectVarints(buffer: seq[byte], field: int): ProtoResult[seq[uint64]] =
## All varint values stored at `field`, in order. Mismatched wire types at
## the same field number are skipped, as protoc does.
var values: seq[uint64]
var sh = memoryInput(buffer)
try:
let stream = sh.s
while stream.readable:
let hdr = readHeader(stream)
if hdr.number == field and hdr.kind == WireKind.Varint:
values.add(uint64(readValue(stream, puint64)))
else:
case hdr.kind
of WireKind.Varint: discard readValue(stream, puint64)
of WireKind.Fixed64: discard readValue(stream, fixed64)
of WireKind.Fixed32: discard readValue(stream, fixed32)
of WireKind.LengthDelim: discard readValue(stream, pbytes)
except CatchableError:
return err(ProtoError.VarintDecode)
return ok(values)
proc collectLengthDelims(buffer: seq[byte], field: int): ProtoResult[seq[seq[byte]]] =
## All length-delimited values stored at `field`, in order.
var values: seq[seq[byte]]
var sh = memoryInput(buffer)
try:
let stream = sh.s
while stream.readable:
let hdr = readHeader(stream)
if hdr.number == field and hdr.kind == WireKind.LengthDelim:
values.add(seq[byte](readValue(stream, pbytes)))
else:
case hdr.kind
of WireKind.Varint: discard readValue(stream, puint64)
of WireKind.Fixed64: discard readValue(stream, fixed64)
of WireKind.Fixed32: discard readValue(stream, fixed32)
of WireKind.LengthDelim: discard readValue(stream, pbytes)
except CatchableError:
return err(ProtoError.VarintDecode)
return ok(values)
proc getField*(pb: ProtoBuffer, field: int, output: var uint64): ProtoResult[bool] =
let values = ?collectVarints(pb.buffer, field)
if values.len > 0:
output = values[^1]
return ok(true)
return ok(false)
proc getField*(pb: ProtoBuffer, field: int, output: var uint32): ProtoResult[bool] =
let values = ?collectVarints(pb.buffer, field)
if values.len > 0:
output = uint32(values[^1])
return ok(true)
return ok(false)
proc getField*(pb: ProtoBuffer, field: int, output: var seq[byte]): ProtoResult[bool] =
let values = ?collectLengthDelims(pb.buffer, field)
if values.len > 0:
output = values[^1]
return ok(true)
return ok(false)
proc getField*(pb: ProtoBuffer, field: int, output: var string): ProtoResult[bool] =
let values = ?collectLengthDelims(pb.buffer, field)
if values.len > 0:
output = bytesToString(values[^1])
return ok(true)
return ok(false)
proc getRepeatedField*(
pb: ProtoBuffer, field: int, output: var seq[seq[byte]]
): ProtoResult[bool] =
output = ?collectLengthDelims(pb.buffer, field)
return ok(output.len > 0)
proc getRepeatedField*(
pb: ProtoBuffer, field: int, output: var seq[string]
): ProtoResult[bool] =
let values = ?collectLengthDelims(pb.buffer, field)
output.setLen(0)
for v in values:
output.add(bytesToString(v))
return ok(output.len > 0)
{.pop.}