status-im/nim-json-rpc
2
0
Fork 0
mirror of https://github.com/status-im/nim-json-rpc.git synced 2025-02-24 10:18:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix incompatibility between returning JSON errors and fixed types

Browse Source
This commit is contained in:
coffeepots 2018-07-11 19:16:11 +01:00
parent 3b8e736f35
commit f09aeffd65
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
json_rpc/router.nim
View File

@ -206,6 +206,7 @@ macro rpc*(server: RpcRouter, path: string, body: untyped): untyped =
doMain = newIdentNode(procNameStr & "DoMain")
# async result
res = newIdentNode("result")
errJson = newIdentNode("errJson")
var
setup = jsonToNim(parameters, paramsIdent)
procBody = if body.kind == nnkStmtList: body else: body.body
@ -215,14 +216,14 @@ macro rpc*(server: RpcRouter, path: string, body: untyped): untyped =
except:
let msg = getCurrentExceptionMsg()
debug "Error occurred within RPC ", path = `path`, errorMessage = msg
`res` = %*{codeField: SERVER_ERROR, messageField: %msg}
`errJson` = %*{codeField: %SERVER_ERROR, messageField: %msg}
if parameters.hasReturnType:
let returnType = parameters[0]
# delegate async proc allows return and setting of result as native type
result.add(quote do:
proc `doMain`(`paramsIdent`: JsonNode): Future[`returnType`] {.async.} =
proc `doMain`(`paramsIdent`: JsonNode, `errJson`: var JsonNode): `returnType` =
`setup`
`errTrappedBody`
)
@ -231,19 +232,25 @@ macro rpc*(server: RpcRouter, path: string, body: untyped): untyped =
# `JsonNode` results don't need conversion
result.add( quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
`res` = await `doMain`(`paramsIdent`)
var `errJson`: JsonNode
`res` = `doMain`(`paramsIdent`, `errJson`)
if `errJson` != nil: `res` = `errJson`
)
else:
result.add(quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
`res` = %await `doMain`(`paramsIdent`)
var `errJson`: JsonNode
`res` = %`doMain`(`paramsIdent`, `errJson`)
if `errJson` != nil: `res` = `errJson`
)
else:
# no return types, inline contents
result.add(quote do:
proc `procName`(`paramsIdent`: JsonNode): Future[JsonNode] {.async.} =
`setup`
var `errJson`: JsonNode
`errTrappedBody`
if `errJson` != nil: `res` = `errJson`
)
result.add( quote do:
`server`.register(`path`, `procName`)