Modified recv_task(): added functionality to restart ws after timeout, modified match msg and added new case to match in case of receiving an error.
parent
3f5dec82ed
commit
a6e921548b
|
@ -23,6 +23,7 @@ from itertools import count
|
||||||
from types import ModuleType
|
from types import ModuleType
|
||||||
from typing import Any, Optional, Callable, AsyncGenerator
|
from typing import Any, Optional, Callable, AsyncGenerator
|
||||||
import json
|
import json
|
||||||
|
import sys
|
||||||
|
|
||||||
import trio
|
import trio
|
||||||
import trio_websocket
|
import trio_websocket
|
||||||
|
@ -139,7 +140,7 @@ class NoBsWs:
|
||||||
async def open_autorecon_ws(
|
async def open_autorecon_ws(
|
||||||
url: str,
|
url: str,
|
||||||
|
|
||||||
# TODO: proper type annot smh
|
# TODO: proper type cannot smh
|
||||||
fixture: Optional[Callable] = None,
|
fixture: Optional[Callable] = None,
|
||||||
|
|
||||||
) -> AsyncGenerator[tuple[...], NoBsWs]:
|
) -> AsyncGenerator[tuple[...], NoBsWs]:
|
||||||
|
@ -169,14 +170,17 @@ class JSONRPCResult(Struct):
|
||||||
result: Optional[dict] = None
|
result: Optional[dict] = None
|
||||||
error: Optional[dict] = None
|
error: Optional[dict] = None
|
||||||
|
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
async def open_jsonrpc_session(
|
async def open_jsonrpc_session(
|
||||||
url: str,
|
url: str,
|
||||||
start_id: int = 0,
|
start_id: int = 0,
|
||||||
response_type: type = JSONRPCResult,
|
response_type: type = JSONRPCResult,
|
||||||
request_type: Optional[type] = None,
|
request_type: Optional[type] = None,
|
||||||
request_hook: Optional[Callable] = None
|
request_hook: Optional[Callable] = None,
|
||||||
|
error_hook: Optional[Callable] = None,
|
||||||
|
timeout: int = 5,
|
||||||
|
timeout_hook: Optional[Callable] = None,
|
||||||
|
timeout_args: list = [],
|
||||||
) -> Callable[[str, dict], dict]:
|
) -> Callable[[str, dict], dict]:
|
||||||
|
|
||||||
async with (
|
async with (
|
||||||
|
@ -221,33 +225,49 @@ async def open_jsonrpc_session(
|
||||||
'''
|
'''
|
||||||
receives every ws message and stores it in its corresponding result
|
receives every ws message and stores it in its corresponding result
|
||||||
field, then sets the event to wakeup original sender tasks.
|
field, then sets the event to wakeup original sender tasks.
|
||||||
also, recieves responses to requests originated from the server side.
|
also recieves responses to requests originated from the server side.
|
||||||
|
reconnects the tasks after timeout.
|
||||||
'''
|
'''
|
||||||
async for msg in ws:
|
with trio.move_on_after(timeout) as cancel_scope:
|
||||||
match msg:
|
async for msg in ws:
|
||||||
case {
|
match msg:
|
||||||
'result': _
|
case {
|
||||||
}:
|
'result': result,
|
||||||
msg = response_type(**msg)
|
'id': mid,
|
||||||
|
} if res_entry := rpc_results.get(mid):
|
||||||
|
|
||||||
if msg.id not in rpc_results:
|
res_entry['result'] = response_type(**msg)
|
||||||
|
res_entry['event'].set()
|
||||||
|
|
||||||
|
case {
|
||||||
|
'result': _,
|
||||||
|
'id': mid,
|
||||||
|
} if not rpc_results.get(mid):
|
||||||
log.warning(f'Wasn\'t expecting ws msg: {json.dumps(msg, indent=4)}')
|
log.warning(f'Wasn\'t expecting ws msg: {json.dumps(msg, indent=4)}')
|
||||||
|
|
||||||
res = rpc_results.setdefault(
|
case {
|
||||||
msg.id,
|
'method': _,
|
||||||
{'result': None, 'event': trio.Event()}
|
'params': _,
|
||||||
)
|
}:
|
||||||
|
log.debug(f'Recieved\n{msg}')
|
||||||
|
if request_hook:
|
||||||
|
await request_hook(request_type(**msg))
|
||||||
|
|
||||||
res['result'] = msg
|
case {
|
||||||
res['event'].set()
|
'error': error
|
||||||
|
}:
|
||||||
|
log.warning(f'Recieved\n{error}')
|
||||||
|
if error_hook:
|
||||||
|
await error_hook(response_type(**msg))
|
||||||
|
|
||||||
case {
|
case _:
|
||||||
'method': _,
|
log.warning(f'Unhandled JSON-RPC msg!?\n{msg}')
|
||||||
'params': _
|
|
||||||
}:
|
|
||||||
|
|
||||||
if request_hook:
|
if cancel_scope.cancelled_caught:
|
||||||
await request_hook(request_type(**msg))
|
await ws._connect()
|
||||||
|
n.start_soon(recv_task)
|
||||||
|
if timeout_hook:
|
||||||
|
n.start_soon(timeout_hook, json_rpc, *timeout_args)
|
||||||
|
|
||||||
|
|
||||||
n.start_soon(recv_task)
|
n.start_soon(recv_task)
|
||||||
|
|
Loading…
Reference in New Issue