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

Wrap RPC exceptions in JSON

Browse Source
This commit is contained in:
coffeepots 2018-07-11 18:27:50 +01:00
parent 279353c0a1
commit 3b8e736f35
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
json_rpc/router.nim
View File

@ -95,7 +95,7 @@ proc checkJsonState*(line: string,
# Json reply wrappers
proc wrapReply*(id: JsonNode, value: JsonNode, error: JsonNode): JsonNode =
return %{jsonRpcField: %"2.0", resultField: value, errorField: error, idField: id}
return %{jsonRpcField: %"2.0", idField: id, resultField: value, errorField: error}
proc wrapError*(code: int, msg: string, id: JsonNode,
data: JsonNode = newJNull()): JsonNode =
@ -119,6 +119,13 @@ proc route*(router: RpcRouter, node: JsonNode): Future[JsonNode] {.async, gcsafe
let
jParams = node[paramsField]
res = await rpcProc(jParams)
errCode = res.getOrDefault(codeField)
errMsg = res.getOrDefault(messageField)
if errCode != nil and errCode.kind == JInt and
errMsg != nil and errMsg.kind == JString:
let error = wrapError(errCode.getInt, methodName & " raised an exception", id, errMsg)
result = wrapReply(id, newJNull(), error)
else:
result = wrapReply(id, res, newJNull())
proc route*(router: RpcRouter, data: string): Future[string] {.async, gcsafe.} =
@ -137,8 +144,11 @@ proc route*(router: RpcRouter, data: string): Future[string] {.async, gcsafe.} =
else:
node["id"]
let
errMsg = jsonErrorMessages[errState.err]
res = wrapError(code = errMsg[0], msg = errMsg[1], id = id)
# fixed error code and message
errKind = jsonErrorMessages[errState.err]
# pass on the actual error message
fullMsg = errKind[1] & " " & errState[1]
res = wrapError(code = errKind[0], msg = fullMsg, id = id)
# return error state as json
result = $res & messageTerminator
else:
@ -203,7 +213,10 @@ macro rpc*(server: RpcRouter, path: string, body: untyped): untyped =
try:
`procBody`
except:
debug "Error occurred within RPC ", path = `path`, errorMessage = getCurrentExceptionMsg()
let msg = getCurrentExceptionMsg()
debug "Error occurred within RPC ", path = `path`, errorMessage = msg
`res` = %*{codeField: SERVER_ERROR, messageField: %msg}
if parameters.hasReturnType:
let returnType = parameters[0]

6
tests/testerrors.nim
View File

@ -38,7 +38,7 @@ proc testMalformed: Future[Response] {.async.} =
else: result = (true, %"Timeout")
proc testRaise: Future[Response] {.async.} =
var fut = client.call("rpcMakeError", %[])
var fut = client.call("makeError", %[])
result = await fut
suite "RPC Errors":
@ -54,14 +54,14 @@ suite "RPC Errors":
except:
echo "Error ", getCurrentExceptionMsg()
test "Incorrect json version":
#[test "Incorrect json version":
#expect ValueError:
try:
let res = waitFor testInvalidJsonVer()
check res.error == true and res.result["message"] == %"JSON 2.0 required"
except:
echo "Error ", getCurrentExceptionMsg()
]#
test "Raising exceptions":
#expect ValueError:
try: