mirror of
https://github.com/logos-messaging/logos-delivery.git
synced 2026-07-24 21:43:19 +00:00
* bump nim-libp2p pin to v2.0.0 tag * bump json_rpc to v0.6.1, lsquic to v0.5.1, boringssl to v0.0.8 (latest tags) * add libp2p_mix dep; repoint libp2p/protocols/mix -> libp2p_mix * pin nimble.lock: websock / protobuf_serialization / npeg / jwt * Makefile: add -d:libp2p_quic_support * regenerate nix/deps.nix (adds libp2p_mix, refreshes pins) * migrate rng ref HmacDrbgContext -> libp2p Rng across prod/channels/tests (interface-only; same DRBG) * waku_switch: TransportConfig factory; unified 2.0.0 connection limits (withMaxInOut, withMaxConnections); local MaxConnections * waku_relay/rendezvous/discv5/kademlia: v2.0.0 API (rng, config, ServiceDiscovery rename) * call Service.setup() on post-build switch services (2.0.0 split setup/start) * drop libp2p/utils/semaphore -> chronos AsyncSemaphore * add logos_delivery/waku/compat/option_valueor shim (Option[T] valueOr/withValue, dropped upstream) * add std/options where a transitive re-export was removed * add newStandardSwitch shim (libp2p removed it in 2.0.0); mounts yamux+mplex to match prod muxer * PeerId.random(rng); common.rng()/crypto.newRng(); hoist shared rng (instantiation cleanup) * update expectations for 2.0.0 defaults: DEFAULT_PROTOCOLS += /ipfs/id/push/1.0.0; agent "nim-libp2p" * drop relay reboot/reconnect test (asserted a Switch restart capability that is simply not supported) * fix up a few tests that were flaking on MacOS (libp2p upgrade may have exposed these)
83 lines
2.4 KiB
Nim
83 lines
2.4 KiB
Nim
import logos_delivery/waku/compat/option_valueor
|
|
{.push raises: [].}
|
|
|
|
import
|
|
std/typetraits,
|
|
std/os,
|
|
results,
|
|
chronicles,
|
|
serialization,
|
|
json_serialization,
|
|
json_serialization/std/options,
|
|
json_serialization/std/net,
|
|
json_serialization/std/sets,
|
|
presto/common
|
|
|
|
import ./serdes, ./responses
|
|
|
|
logScope:
|
|
topics = "waku node rest"
|
|
|
|
proc encodeBytesOf*[T](value: T, contentType: string): RestResult[seq[byte]] =
|
|
let reqContentType = MediaType.init(contentType)
|
|
|
|
if reqContentType != MIMETYPE_JSON:
|
|
error "Unsupported contentType value",
|
|
contentType = contentType, typ = value.type.name
|
|
return err("Unsupported contentType")
|
|
|
|
let encoded = ?encodeIntoJsonBytes(value)
|
|
return ok(encoded)
|
|
|
|
func decodeRequestBody*[T](
|
|
contentBody: Option[ContentBody]
|
|
): Result[T, RestApiResponse] =
|
|
if contentBody.isNone():
|
|
return err(RestApiResponse.badRequest("Missing content body"))
|
|
|
|
let reqBodyContentType = contentBody.get().contentType.mediaType
|
|
|
|
if reqBodyContentType != MIMETYPE_JSON and reqBodyContentType != MIMETYPE_TEXT:
|
|
return err(
|
|
RestApiResponse.badRequest(
|
|
"Wrong Content-Type, expected application/json or text/plain"
|
|
)
|
|
)
|
|
|
|
let reqBodyData = contentBody.get().data
|
|
|
|
let requestResult = decodeFromJsonBytes(T, reqBodyData).valueOr:
|
|
return err(
|
|
RestApiResponse.badRequest("Invalid content body, could not decode: " & $error)
|
|
)
|
|
|
|
return ok(requestResult)
|
|
|
|
proc decodeBytes*(
|
|
t: typedesc[string], value: openarray[byte], contentType: Opt[ContentTypeData]
|
|
): RestResult[string] =
|
|
if MediaType.init($contentType) != MIMETYPE_TEXT:
|
|
error "Unsupported contentType value", contentType = contentType
|
|
return err("Unsupported contentType")
|
|
|
|
var res: string
|
|
if len(value) > 0:
|
|
res = newString(len(value))
|
|
copyMem(addr res[0], unsafeAddr value[0], len(value))
|
|
return ok(res)
|
|
|
|
proc decodeBytes*[T](
|
|
t: typedesc[T], data: openArray[byte], contentType: Opt[ContentTypeData]
|
|
): RestResult[T] =
|
|
let reqContentType = contentType.valueOr:
|
|
error "Unsupported response, missing contentType value"
|
|
return err("Unsupported response, missing contentType")
|
|
|
|
if reqContentType.mediaType != MIMETYPE_JSON and
|
|
reqContentType.mediaType != MIMETYPE_TEXT:
|
|
error "Unsupported response contentType value", contentType = contentType
|
|
return err("Unsupported response contentType")
|
|
|
|
let decoded = ?decodeFromJsonBytes(T, data)
|
|
return ok(decoded)
|