uiprotect 2.1.0__tar.gz → 2.3.0__tar.gz

{uiprotect-2.1.0 → uiprotect-2.3.0}/PKG-INFO

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

{uiprotect-2.1.0 → uiprotect-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "2.1.0"
+version = "2.3.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-2.1.0 → uiprotect-2.3.0}/src/uiprotect/websocket.py

@@ -19,6 +19,8 @@ from aiohttp import (
 )
 from yarl import URL
 
+from .exceptions import NotAuthorized, NvrError
+
 _LOGGER = logging.getLogger(__name__)
 AuthCallbackType = Callable[..., Coroutine[Any, Any, Optional[dict[str, str]]]]
 GetSessionCallbackType = Callable[[], Awaitable[ClientSession]]
@@ -76,33 +78,28 @@ class Websocket:
                 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
+                            level, "Websocket authentication error: %s: %s", url, ex
                         )
+                        await self._attempt_auth(True)
+                    else:
+                        _LOGGER.log(level, "Websocket handshake error: %s: %s", url, ex)
                 else:
-                    _LOGGER.log(
-                        level, "Websocket disconnect error: %s", url, exc_info=True
-                    )
+                    _LOGGER.log(level, "Websocket disconnect error: %s: %s", url, ex)
             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(
-                    "Unexpected error in websocket reconnect loop, backoff: %s",
-                    backoff,
-                    exc_info=True,
-                )
+                _LOGGER.exception("Unexpected error in websocket loop")
 
             if self._running is False:
                 break
+            _LOGGER.debug("Reconnecting websocket in %s seconds", backoff)
             await asyncio.sleep(self.backoff)
 
     async def _websocket_inner_loop(self, url: URL) -> None:
         _LOGGER.debug("Connecting WS to %s", url)
-        self._headers = await self._auth(False)
+        await self._attempt_auth(False)
         ssl = None if self.verify else False
         msg: WSMessage | None = None
         self._seen_non_close_message = False
@@ -145,12 +142,14 @@ class Websocket:
                 await self._ws_connection.close()
             self._ws_connection = None
 
-    async def _attempt_reauth(self) -> None:
-        """Attempt to re-authenticate."""
+    async def _attempt_auth(self, force: bool) -> None:
+        """Attempt to authenticate."""
         try:
-            self._headers = await self._auth(True)
+            self._headers = await self._auth(force)
+        except (NotAuthorized, NvrError) as ex:
+            _LOGGER.debug("Error authenticating websocket: %s", ex)
         except Exception:
-            _LOGGER.exception("Error reauthenticating websocket")
+            _LOGGER.exception("Unknown error authenticating websocket")
 
     def start(self) -> None:
         """Start the websocket."""