uiprotect 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

uiprotect/api.py

@@ -12,6 +12,7 @@ import time
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from functools import cached_property, partial
+from http import HTTPStatus
 from http.cookies import Morsel, SimpleCookie
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
@@ -222,23 +223,24 @@ class BaseApiClient:
         """Updates the url after changing _host or _port."""
         if self._port != 443:
             self._url = URL(f"https://{self._host}:{self._port}")
+            self._ws_url = URL(f"wss://{self._host}:{self._port}{self.ws_path}")
         else:
             self._url = URL(f"https://{self._host}")
+            self._ws_url = URL(f"wss://{self._host}{self.ws_path}")
 
         self.base_url = str(self._url)
 
     @property
-    def ws_url(self) -> str:
+    def _ws_url_object(self) -> URL:
         """Get Websocket URL."""
-        url = f"wss://{self._host}"
-        if self._port != 443:
-            url += f":{self._port}"
+        if last_update_id := self._get_last_update_id():
+            return self._ws_url.with_query(lastUpdateId=last_update_id)
+        return self._ws_url
 
-        url += self.ws_path
-        last_update_id = self._get_last_update_id()
-        if last_update_id is None:
-            return url
-        return f"{url}?lastUpdateId={last_update_id}"
+    @property
+    def ws_url(self) -> str:
+        """Get Websocket URL."""
+        return str(self._ws_url_object)
 
     @property
     def config_file(self) -> Path:
@@ -270,7 +272,7 @@ class BaseApiClient:
         """Gets or creates current Websocket."""
         if self._websocket is None:
             self._websocket = Websocket(
-                self.get_websocket_url,
+                self._get_websocket_url,
                 self._auth_websocket,
                 self._update_bootstrap_soon,
                 self.get_session,
@@ -395,15 +397,7 @@ class BaseApiClient:
 
         try:
             if response.status != 200:
-                reason = await get_response_reason(response)
-                msg = "Request failed: %s - Status: %s - Reason: %s"
-                if raise_exception:
-                    if response.status in {401, 403}:
-                        raise NotAuthorized(msg % (url, response.status, reason))
-                    if response.status >= 400 and response.status < 500:
-                        raise BadRequest(msg % (url, response.status, reason))
-                    raise NvrError(msg % (url, response.status, reason))
-                _LOGGER.debug(msg, url, response.status, reason)
+                await self._raise_for_status(response, raise_exception)
                 return None
 
             data: bytes | None = await response.read()
@@ -416,6 +410,30 @@ class BaseApiClient:
             # re-raise exception
             raise
 
+    async def _raise_for_status(
+        self, response: aiohttp.ClientResponse, raise_exception: bool = True
+    ) -> None:
+        url = response.url
+        reason = await get_response_reason(response)
+        msg = "Request failed: %s - Status: %s - Reason: %s"
+        if raise_exception:
+            status = response.status
+            if status in {
+                HTTPStatus.UNAUTHORIZED.value,
+                HTTPStatus.FORBIDDEN.value,
+            }:
+                raise NotAuthorized(msg % (url, status, reason))
+            elif status == HTTPStatus.TOO_MANY_REQUESTS.value:
+                _LOGGER.debug("Too many requests - Login is rate limited: %s", response)
+                raise NvrError(msg % (url, status, reason))
+            elif (
+                status >= HTTPStatus.BAD_REQUEST.value
+                and status < HTTPStatus.INTERNAL_SERVER_ERROR.value
+            ):
+                raise BadRequest(msg % (url, status, reason))
+            raise NvrError(msg % (url, status, reason))
+        _LOGGER.debug(msg, url, status, reason)
+
     async def api_request(
         self,
         url: str,
@@ -512,6 +530,8 @@ class BaseApiClient:
             }
 
             response = await self.request("post", url=url, json=auth)
+            if response.status != 200:
+                await self._raise_for_status(response, True)
             self.set_header("cookie", response.headers.get("set-cookie", ""))
             self._is_authenticated = True
             _LOGGER.debug("Authenticated successfully!")
@@ -645,9 +665,9 @@ class BaseApiClient:
 
         return token_expires_at >= max_expire_time
 
-    def get_websocket_url(self) -> str:
+    def _get_websocket_url(self) -> URL:
         """Get Websocket URL."""
-        return self.ws_url
+        return self._ws_url_object
 
     async def async_disconnect_ws(self) -> None:
         """Disconnect from Websocket."""

uiprotect/websocket.py

@@ -17,6 +17,7 @@ from aiohttp import (
     WSMsgType,
     WSServerHandshakeError,
 )
+from yarl import URL
 
 _LOGGER = logging.getLogger(__name__)
 AuthCallbackType = Callable[..., Coroutine[Any, Any, Optional[dict[str, str]]]]
@@ -36,9 +37,9 @@ class Websocket:
 
     def __init__(
         self,
-        get_url: Callable[[], str],
+        get_url: Callable[[], URL],
         auth_callback: AuthCallbackType,
-        update_bootstrap_callback: UpdateBootstrapCallbackType,
+        update_bootstrap: UpdateBootstrapCallbackType,
         get_session: GetSessionCallbackType,
         subscription: Callable[[WSMessage], None],
         *,
@@ -53,29 +54,44 @@ class Websocket:
         self.verify = verify
         self._get_session = get_session
         self._auth = auth_callback
-        self._update_bootstrap_callback = update_bootstrap_callback
-        self._connect_lock = asyncio.Lock()
+        self._update_bootstrap = update_bootstrap
         self._subscription = subscription
-        self._last_ws_connect_ok = False
+        self._seen_non_close_message = False
 
     @property
     def is_connected(self) -> bool:
         """Return if the websocket is connected."""
         return self._ws_connection is not None and not self._ws_connection.closed
 
-    async def _websocket_reconnect_loop(self) -> None:
-        """Reconnect loop for websocket."""
+    async def _websocket_loop(self) -> None:
+        """Running loop for websocket."""
         await self.wait_closed()
         backoff = self.backoff
 
         while True:
+            url = self.get_url()
             try:
-                await self._websocket_loop()
-            except ClientError:
-                _LOGGER.debug("Error in websocket reconnect loop, backoff: %s", backoff)
+                await self._websocket_inner_loop(url)
+            except ClientError as ex:
+                level = logging.ERROR if self._seen_non_close_message else logging.DEBUG
+                if isinstance(ex, WSServerHandshakeError):
+                    if ex.status == HTTPStatus.UNAUTHORIZED.value:
+                        _LOGGER.log(level, "Websocket authentication error: %s", url)
+                        await self._attempt_reauth()
+                    else:
+                        _LOGGER.log(
+                            level, "Websocket handshake error: %s", url, exc_info=True
+                        )
+                else:
+                    _LOGGER.log(
+                        level, "Websocket disconnect error: %s", url, exc_info=True
+                    )
+            except asyncio.TimeoutError:
+                level = logging.ERROR if self._seen_non_close_message else logging.DEBUG
+                _LOGGER.log(level, "Websocket timeout: %s", url)
             except Exception:
                 _LOGGER.debug(
-                    "Error in websocket reconnect loop, backoff: %s",
+                    "Unexpected error in websocket reconnect loop, backoff: %s",
                     backoff,
                     exc_info=True,
                 )
@@ -84,20 +100,18 @@ class Websocket:
                 break
             await asyncio.sleep(self.backoff)
 
-    async def _websocket_loop(self) -> None:
-        url = self.get_url()
+    async def _websocket_inner_loop(self, url: URL) -> None:
         _LOGGER.debug("Connecting WS to %s", url)
         self._headers = await self._auth(False)
         ssl = None if self.verify else False
         msg: WSMessage | None = None
-        seen_non_close_message = False
+        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:
-            session = await self._get_session()
             self._ws_connection = await session.ws_connect(
                 url, ssl=ssl, headers=self._headers, timeout=self.timeout
             )
-            self._last_ws_connect_ok = True
             while True:
                 msg = await self._ws_connection.receive(self.timeout)
                 msg_type = msg.type
@@ -108,27 +122,11 @@ class Websocket:
                     _LOGGER.debug("Websocket closed: %s", msg)
                     break
 
-                seen_non_close_message = True
+                self._seen_non_close_message = True
                 try:
                     self._subscription(msg)
                 except Exception:
                     _LOGGER.exception("Error processing websocket message")
-        except asyncio.TimeoutError:
-            _LOGGER.debug("Websocket timeout: %s", url)
-        except WSServerHandshakeError as ex:
-            level = logging.ERROR if self._last_ws_connect_ok else logging.DEBUG
-            self._last_ws_connect_ok = False
-            if ex.status == HTTPStatus.UNAUTHORIZED.value:
-                _LOGGER.log(level, "Websocket authentication error: %s", url)
-                self._headers = await self._auth(True)
-            else:
-                _LOGGER.log(level, "Websocket handshake error: %s", url, exc_info=True)
-            raise
-        except ClientError:
-            level = logging.ERROR if self._last_ws_connect_ok else logging.DEBUG
-            self._last_ws_connect_ok = False
-            _LOGGER.log(level, "Websocket disconnect error: %s", url, exc_info=True)
-            raise
         finally:
             if (
                 msg is not None
@@ -137,24 +135,29 @@ class Websocket:
                 # its an indication that we should update the bootstrap
                 # since lastUpdateId is invalid
                 and (
-                    not seen_non_close_message
+                    not self._seen_non_close_message
                     or (msg.extra and "lastUpdateId" in msg.extra)
                 )
             ):
-                self._update_bootstrap_callback()
+                self._update_bootstrap()
             _LOGGER.debug("Websocket disconnected: last message: %s", msg)
             if self._ws_connection is not None and not self._ws_connection.closed:
                 await self._ws_connection.close()
             self._ws_connection = None
 
+    async def _attempt_reauth(self) -> None:
+        """Attempt to re-authenticate."""
+        try:
+            self._headers = await self._auth(True)
+        except Exception:
+            _LOGGER.exception("Error reauthenticating websocket")
+
     def start(self) -> None:
         """Start the websocket."""
         if self._running:
             return
         self._running = True
-        self._websocket_loop_task = asyncio.create_task(
-            self._websocket_reconnect_loop()
-        )
+        self._websocket_loop_task = asyncio.create_task(self._websocket_loop())
 
     def stop(self) -> None:
         """Disconnect the websocket."""
@@ -171,6 +174,7 @@ class Websocket:
         if self._stop_task:
             with contextlib.suppress(asyncio.CancelledError):
                 await self._stop_task
+            self._stop_task = None
 
     async def _stop(self) -> None:
         """Stop the websocket."""

{uiprotect-2.0.0.dist-info → uiprotect-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 2.0.0
+Version: 2.1.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-2.0.0.dist-info → uiprotect-2.1.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=UdpRSSLSy7pdDfTKf0zRIfy6KRGt_Jv-fMzYWgibbG4,686
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=gNTK6fU3Z7PQBfs6YNTXENFxXA6RL-ayaj7XiBTDeFg,66560
+uiprotect/api.py,sha256=P_iS5nIxc4sAYp4ISBS_X7wUGIPV2c96xhUkj6kGleg,67379
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=k-_qGuNT7br0iV0KE5F4wYXF75iyLLjBEckTqxC71xM,7591
@@ -29,9 +29,9 @@ uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
 uiprotect/test_util/__init__.py,sha256=whiOUb5LfDLNT3AQG6ISiKtAqO2JnhCIdFavhWDK46M,18718
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=3SJFF8qs1Jz8t3mD8qwc1hFSocolFjdXI_v4yVlC7o4,20088
-uiprotect/websocket.py,sha256=enGQoS-Li9iIxcYK3KrMYtCQ4kcR1lQugiSYwROIBkU,6742
-uiprotect-2.0.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-2.0.0.dist-info/METADATA,sha256=6yuY6tDONbYf7jA3k0DDDzy2pj1LqewxXEcGGi_0mX0,10982
-uiprotect-2.0.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-2.0.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-2.0.0.dist-info/RECORD,,
+uiprotect/websocket.py,sha256=qVx2ZXOacnvyipiPy76i19Rpu596hFxGHhYWuMJVOtg,6898
+uiprotect-2.1.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-2.1.0.dist-info/METADATA,sha256=2ObhpC8nRihfVKuDZlBYh84HQX93a9FkHPRswCTcn44,10982
+uiprotect-2.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-2.1.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-2.1.0.dist-info/RECORD,,