mirror of
https://github.com/codex-storage/nim-codex.git
synced 2025-01-09 12:35:51 +00:00
de88fd2c53
* implement a logging proxy The logging proxy: - prevents the need to import chronicles (as well as export except toJson), - prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization, - and handles json formatting correctly in chronicles json sinks * Rename logging -> logutils to avoid ambiguity with common names * clean up * add setProperty for JsonRecord, remove nim-json-serialization conflict * Allow specifying textlines and json format separately Not specifying a LogFormat will apply the formatting to both textlines and json sinks. Specifying a LogFormat will apply the formatting to only that sink. * remove unneeded usages of std/json We only need to import utils/json instead of std/json * move serialization from rest/json to utils/json so it can be shared * fix NoColors ambiguity Was causing unit tests to fail on Windows. * Remove nre usage to fix Windows error Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :) * Add logutils module doc * Shorten logutils.formatIt for `NBytes` Both json and textlines formatIt were not needed, and could be combined into one formatIt * remove debug integration test config debug output and logformat of json for integration test logs * Use ## module doc to support docgen * bump nim-poseidon2 to export fromBytes Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening. * fixes to get compiling after rebasing master * Add support for Result types being logged using formatIt
115 lines
2.9 KiB
Nim
115 lines
2.9 KiB
Nim
import pkg/questionable
|
|
import pkg/stew/byteutils
|
|
import pkg/libp2p
|
|
import pkg/codexdht/discv5/node as dn
|
|
import pkg/codexdht/discv5/routing_table as rt
|
|
import ../sales
|
|
import ../purchasing
|
|
import ../utils/json
|
|
import ../manifest
|
|
|
|
export json
|
|
|
|
type
|
|
StorageRequestParams* = object
|
|
duration* {.serialize.}: UInt256
|
|
proofProbability* {.serialize.}: UInt256
|
|
reward* {.serialize.}: UInt256
|
|
collateral* {.serialize.}: UInt256
|
|
expiry* {.serialize.}: ?UInt256
|
|
nodes* {.serialize.}: ?uint
|
|
tolerance* {.serialize.}: ?uint
|
|
|
|
RestPurchase* = object
|
|
requestId* {.serialize.}: RequestId
|
|
request* {.serialize.}: ?StorageRequest
|
|
state* {.serialize.}: string
|
|
error* {.serialize.}: ?string
|
|
|
|
RestAvailability* = object
|
|
size* {.serialize.}: UInt256
|
|
duration* {.serialize.}: UInt256
|
|
minPrice* {.serialize.}: UInt256
|
|
maxCollateral* {.serialize.}: UInt256
|
|
|
|
RestSalesAgent* = object
|
|
state* {.serialize.}: string
|
|
requestId* {.serialize.}: RequestId
|
|
slotIndex* {.serialize.}: UInt256
|
|
|
|
RestContent* = object
|
|
cid* {.serialize.}: Cid
|
|
manifest* {.serialize.}: Manifest
|
|
|
|
RestNode* = object
|
|
nodeId* {.serialize.}: RestNodeId
|
|
peerId* {.serialize.}: PeerId
|
|
record* {.serialize.}: SignedPeerRecord
|
|
address* {.serialize.}: Option[dn.Address]
|
|
seen* {.serialize.}: bool
|
|
|
|
RestRoutingTable* = object
|
|
localNode* {.serialize.}: RestNode
|
|
nodes* {.serialize.}: seq[RestNode]
|
|
|
|
RestPeerRecord* = object
|
|
peerId* {.serialize.}: PeerId
|
|
seqNo* {.serialize.}: uint64
|
|
addresses* {.serialize.}: seq[AddressInfo]
|
|
|
|
RestNodeId* = object
|
|
id*: NodeId
|
|
|
|
RestRepoStore* = object
|
|
totalBlocks* {.serialize.}: uint
|
|
quotaMaxBytes* {.serialize.}: uint
|
|
quotaUsedBytes* {.serialize.}: uint
|
|
quotaReservedBytes* {.serialize.}: uint
|
|
|
|
proc init*(_: type RestContent, cid: Cid, manifest: Manifest): RestContent =
|
|
RestContent(
|
|
cid: cid,
|
|
manifest: manifest
|
|
)
|
|
|
|
proc init*(_: type RestNode, node: dn.Node): RestNode =
|
|
RestNode(
|
|
nodeId: RestNodeId.init(node.id),
|
|
peerId: node.record.data.peerId,
|
|
record: node.record,
|
|
address: node.address,
|
|
seen: node.seen
|
|
)
|
|
|
|
proc init*(_: type RestRoutingTable, routingTable: rt.RoutingTable): RestRoutingTable =
|
|
var nodes: seq[RestNode] = @[]
|
|
for bucket in routingTable.buckets:
|
|
for node in bucket.nodes:
|
|
nodes.add(RestNode.init(node))
|
|
|
|
RestRoutingTable(
|
|
localNode: RestNode.init(routingTable.localNode),
|
|
nodes: nodes
|
|
)
|
|
|
|
proc init*(_: type RestPeerRecord, peerRecord: PeerRecord): RestPeerRecord =
|
|
RestPeerRecord(
|
|
peerId: peerRecord.peerId,
|
|
seqNo: peerRecord.seqNo,
|
|
addresses: peerRecord.addresses
|
|
)
|
|
|
|
proc init*(_: type RestNodeId, id: NodeId): RestNodeId =
|
|
RestNodeId(
|
|
id: id
|
|
)
|
|
|
|
func `%`*(obj: StorageRequest | Slot): JsonNode =
|
|
let jsonObj = newJObject()
|
|
for k, v in obj.fieldPairs: jsonObj[k] = %v
|
|
jsonObj["id"] = %(obj.id)
|
|
|
|
return jsonObj
|
|
|
|
func `%`*(obj: RestNodeId): JsonNode = % $obj.id
|