uiprotect 5.4.0__tar.gz → 6.0.1__tar.gz

{uiprotect-5.4.0 → uiprotect-6.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 5.4.0
+Version: 6.0.1
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiofiles (>=23)
-Requires-Dist: aiohttp (>=3.9.0)
+Requires-Dist: aiohttp (>=3.10.0)
 Requires-Dist: aioshutil (>=1.3)
 Requires-Dist: async-timeout (>=3.0.1)
 Requires-Dist: convertertools (>=0.5.0)

{uiprotect-5.4.0 → uiprotect-6.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "5.4.0"
+version = "6.0.1"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"
@@ -34,7 +34,7 @@ python = ">=3.10"
 rich = ">=10"
 async-timeout = ">=3.0.1"
 aiofiles = ">=23"
-aiohttp = ">=3.9.0"
+aiohttp = ">=3.10.0"
 aioshutil = ">=1.3"
 dateparser = ">=1.1.0"
 orjson = ">=3.9.15"

{uiprotect-5.4.0 → uiprotect-6.0.1}/src/uiprotect/api.py

@@ -191,6 +191,7 @@ class BaseApiClient:
         cache_dir: Path | None = None,
         config_dir: Path | None = None,
         store_sessions: bool = True,
+        ws_receive_timeout: int | None = None,
     ) -> None:
         self._auth_lock = asyncio.Lock()
         self._host = host
@@ -200,6 +201,7 @@ class BaseApiClient:
         self._password = password
         self._verify_ssl = verify_ssl
         self._ws_timeout = ws_timeout
+        self._ws_receive_timeout = ws_receive_timeout
         self._loaded_session = False
         self._update_task: asyncio.Task[Bootstrap | None] | None = None
 
@@ -277,6 +279,7 @@ class BaseApiClient:
                 self._on_websocket_state_change,
                 verify=self._verify_ssl,
                 timeout=self._ws_timeout,
+                receive_timeout=self._ws_receive_timeout,
             )
         return self._websocket
 
@@ -752,6 +755,7 @@ class ProtectApiClient(BaseApiClient):
         ignore_stats: bool = False,
         ignore_unadopted: bool = True,
         debug: bool = False,
+        ws_receive_timeout: int | None = None,
     ) -> None:
         super().__init__(
             host=host,
@@ -761,6 +765,7 @@ class ProtectApiClient(BaseApiClient):
             verify_ssl=verify_ssl,
             session=session,
             ws_timeout=ws_timeout,
+            ws_receive_timeout=ws_receive_timeout,
             cache_dir=cache_dir,
             config_dir=config_dir,
             store_sessions=store_sessions,

{uiprotect-5.4.0 → uiprotect-6.0.1}/src/uiprotect/websocket.py

@@ -55,10 +55,12 @@ class Websocket:
         timeout: float = 30.0,
         backoff: int = 10,
         verify: bool = True,
+        receive_timeout: float | None = None,
     ) -> None:
         """Init Websocket."""
         self.get_url = get_url
         self.timeout = timeout
+        self.receive_timeout = receive_timeout
         self.backoff = backoff
         self.verify = verify
         self._get_session = get_session
@@ -117,17 +119,16 @@ class Websocket:
     async def _websocket_inner_loop(self, url: URL) -> None:
         _LOGGER.debug("Connecting WS to %s", url)
         await self._attempt_auth(False)
-        ssl = None if self.verify else False
         msg: WSMessage | None = None
         self._seen_non_close_message = False
         session = await self._get_session()
         # catch any and all errors for Websocket so we can clean up correctly
         try:
             self._ws_connection = await session.ws_connect(
-                url, ssl=ssl, headers=self._headers, timeout=self.timeout
+                url, ssl=self.verify, headers=self._headers, timeout=self.timeout
             )
             while True:
-                msg = await self._ws_connection.receive(self.timeout)
+                msg = await self._ws_connection.receive(self.receive_timeout)
                 msg_type = msg.type
                 if msg_type is WSMsgType.ERROR:
                     _LOGGER.exception("Error from Websocket: %s", msg.data)