logos-storage/nim-json-rpc
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-json-rpc.git synced 2026-05-28 05:19:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from status-im/fixes

Browse Source 
Fixes
This commit is contained in:
Yuriy Glukhov 2019-06-26 17:11:21 +03:00 committed by GitHub
commit af33cb9fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
json_rpc/client.nim
View File

@ -62,7 +62,7 @@ proc processMessage*(self: RpcClient, line: string) =
if not self.awaiting.hasKey(id): if not self.awaiting.hasKey(id):
raise newException(ValueError, raise newException(ValueError,
"Cannot find message id \"" & node["id"].str & "\"") "Cannot find message id \"" & $node["id"].getInt & "\"")
let version = checkGet(node, "jsonrpc", JString) let version = checkGet(node, "jsonrpc", JString)
if version != "2.0": if version != "2.0":

8
json_rpc/clients/socketclient.nim
View File

@ -21,14 +21,16 @@ method call*(self: RpcSocketClient, name: string,
if self.transport.isNil: if self.transport.isNil:
raise newException(ValueError, raise newException(ValueError,
"Transport is not initialised (missing a call to connect?)") "Transport is not initialised (missing a call to connect?)")
let res = await self.transport.write(value)
# TODO: Add actions when not full packet was send, e.g. disconnect peer.
doAssert(res == len(value))
# completed by processMessage. # completed by processMessage.
var newFut = newFuture[Response]() var newFut = newFuture[Response]()
# add to awaiting responses # add to awaiting responses
self.awaiting[id] = newFut self.awaiting[id] = newFut
let res = await self.transport.write(value)
# TODO: Add actions when not full packet was send, e.g. disconnect peer.
doAssert(res == len(value))
result = await newFut result = await newFut
proc processData(client: RpcSocketClient) {.async.} = proc processData(client: RpcSocketClient) {.async.} =

3
json_rpc/clients/websocketclient.nim
View File

@ -23,12 +23,13 @@ method call*(self: RpcWebSocketClient, name: string,
raise newException(ValueError, raise newException(ValueError,
"Transport is not initialised (missing a call to connect?)") "Transport is not initialised (missing a call to connect?)")
# echo "Sent msg: ", value # echo "Sent msg: ", value
await self.transport.send(value)
# completed by processMessage. # completed by processMessage.
var newFut = newFuture[Response]() var newFut = newFuture[Response]()
# add to awaiting responses # add to awaiting responses
self.awaiting[id] = newFut self.awaiting[id] = newFut
await self.transport.send(value)
result = await newFut result = await newFut
proc processData(client: RpcWebSocketClient) {.async.} = proc processData(client: RpcWebSocketClient) {.async.} =