onyx_online/obsws-python
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/obsws-python.git synced 2024-11-21 20:30:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

log and rethrow TimeoutError on connection

Browse Source 
we can just encode challenge here.

shorten opcode != 2 message
This commit is contained in:
onyx-and-iris 2023-08-11 22:31:03 +01:00
parent ca72b92eb3
commit 5db7a705c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
obsws_python/baseclient.py
View File

@ -43,7 +43,7 @@ class ObsClient:
except ValueError as e:
self.logger.error(f"{type(e).__name__}: {e}")
raise
except (ConnectionRefusedError, WebSocketTimeoutException) as e:
except (ConnectionRefusedError, TimeoutError, WebSocketTimeoutException) as e:
self.logger.exception(f"{type(e).__name__}: {e}")
raise
@ -97,9 +97,9 @@ class ObsClient:
auth = base64.b64encode(
hashlib.sha256(
(
secret.decode()
+ self.server_hello["d"]["authentication"]["challenge"]
).encode()
secret
+ self.server_hello["d"]["authentication"]["challenge"].encode()
)
).digest()
).decode()
@ -110,7 +110,7 @@ class ObsClient:
response = json.loads(self.ws.recv())
if response["op"] != 2:
raise OBSSDKError(
"failed to identify client with the server, expected response with OpCode 2 Identified"
"failed to identify client with the server, expected response with OpCode 2"
)
return response["d"]
except json.decoder.JSONDecodeError: