uiprotect 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

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]]
@@ -79,7 +81,7 @@ class Websocket:
                         _LOGGER.log(
                             level, "Websocket authentication error: %s: %s", url, ex
                         )
-                        await self._attempt_reauth()
+                        await self._attempt_auth(True)
                     else:
                         _LOGGER.log(level, "Websocket handshake error: %s: %s", url, ex)
                 else:
@@ -97,7 +99,7 @@ class Websocket:
 
     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
@@ -140,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."""

{uiprotect-2.2.0.dist-info → uiprotect-2.3.0.dist-info}/METADATA

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

{uiprotect-2.2.0.dist-info → uiprotect-2.3.0.dist-info}/RECORD

@@ -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=Ufm1WLOeKCffXvSl8pWT11Q_t8tNpGHZWgeAL7Ao4mc,6799
-uiprotect-2.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-2.2.0.dist-info/METADATA,sha256=8TmCakZrF5cw4pKa7xLQzt-fyQFDMDKp1iCl4zUNl04,10982
-uiprotect-2.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-2.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-2.2.0.dist-info/RECORD,,
+uiprotect/websocket.py,sha256=wWcVhMST_hFamOIUQogUytMqwpsvKwKN73BYErYTrJU,6973
+uiprotect-2.3.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-2.3.0.dist-info/METADATA,sha256=xDsK9L2Z2AUNMES1nvIPYIuPJO6mrGzvgL45540h3Zs,10982
+uiprotect-2.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-2.3.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-2.3.0.dist-info/RECORD,,