onyx_online/obsws-python
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/obsws-python.git synced 2024-11-22 12:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added 'timeout' option for baseclient. bumped version

Browse Source
This commit is contained in:
Adem 2023-05-29 10:34:40 +00:00
parent 9c41f2bb59
commit 3adf094481
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
obsws_python/baseclient.py
View File

@ -15,7 +15,7 @@ class ObsClient:
logger = logging.getLogger("baseclient.obsclient") logger = logging.getLogger("baseclient.obsclient")
def __init__(self, **kwargs): def __init__(self, **kwargs):
defaultkwargs = {"host": "localhost", "port": 4455, "password": "", "subs": 0} defaultkwargs = {"host": "localhost", "port": 4455, "password": "", "subs": 0, "timeout":3}
if not any(key in kwargs for key in ("host", "port", "password")): if not any(key in kwargs for key in ("host", "port", "password")):
kwargs |= self._conn_from_toml() kwargs |= self._conn_from_toml()
kwargs = defaultkwargs | kwargs kwargs = defaultkwargs | kwargs
@ -29,7 +29,7 @@ class ObsClient:
) )
self.ws = websocket.WebSocket() self.ws = websocket.WebSocket()
self.ws.connect(f"ws://{self.host}:{self.port}") self.ws.connect(f"ws://{self.host}:{self.port}", timeout=self.timeout)
self.server_hello = json.loads(self.ws.recv()) self.server_hello = json.loads(self.ws.recv())
def _conn_from_toml(self) -> dict: def _conn_from_toml(self) -> dict:
@ -105,7 +105,10 @@ class ObsClient:
if req_data: if req_data:
payload["d"]["requestData"] = req_data payload["d"]["requestData"] = req_data
self.logger.debug(f"Sending request {payload}") self.logger.debug(f"Sending request {payload}")
self.ws.send(json.dumps(payload)) try:
self.ws.send(json.dumps(payload))
except TimeoutError:
raise OBSSDKError("Timeout while trying to send the request")
response = json.loads(self.ws.recv()) response = json.loads(self.ws.recv())
self.logger.debug(f"Response received {response}") self.logger.debug(f"Response received {response}")
return response["d"] return response["d"]

2
obsws_python/version.py
View File

@ -1 +1 @@
version = "1.4.2" version = "1.4.3"