emlove / jsonrpc-websocket / 38816647508

100%

push

github

Forward ws_connect() kwargs to aiohttp, keep timeout for responses (#24)

* Forward ws_connect() kwargs to aiohttp, keep timeout for responses

The timeout given to Server was used both for waiting on responses and,
through the connect kwargs, as the timeout of aiohttp's ws_connect().
Since aiohttp 3.11 a float timeout there is deprecated (it becomes
ClientWSTimeout(ws_close=...)), so every connect of a Server created
with timeout emitted a DeprecationWarning. See #22.

Use timeout only for waiting on responses, and let ws_connect() take
keyword arguments that are passed on to aiohttp's ws_connect() on top
of the constructor ones. Headers given to ws_connect() are merged into
the constructor headers case-insensitively; constructor duplicates of
names the call does not override are kept. multidict, which aiohttp
already depends on, is now listed as a direct dependency.

Callers that want their own websocket timeouts pass
timeout=aiohttp.ClientWSTimeout(...) to ws_connect(). For callers that
passed timeout to Server, aiohttp's default now applies, so ws_close
goes from that timeout to 10 seconds.

* Small style adjustment

---------

Co-authored-by: Emily Love Watson <emily@emlove.me>

7 of 7 new or added lines in 1 file covered. (100.0%)

123 of 123 relevant lines covered (100.0%)

4.96 hits per line