uiprotect 1.12.1__tar.gz → 1.13.0__tar.gz

{uiprotect-1.12.1 → uiprotect-1.13.0}/PKG-INFO

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

{uiprotect-1.12.1 → uiprotect-1.13.0}/pyproject.toml

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

{uiprotect-1.12.1 → uiprotect-1.13.0}/src/uiprotect/api.py

@@ -228,6 +228,7 @@ class BaseApiClient:
 
     @property
     def ws_url(self) -> str:
+        """Get Websocket URL."""
         url = f"wss://{self._host}"
         if self._port != 443:
             url += f":{self._port}"
@@ -267,7 +268,7 @@ class BaseApiClient:
 
         if self._websocket is None:
             self._websocket = Websocket(
-                self.ws_url,
+                self.get_websocket_url,
                 _auth,
                 verify=self._verify_ssl,
                 timeout=self._ws_timeout,
@@ -626,9 +627,6 @@ class BaseApiClient:
             self._websocket = None
 
         websocket = await self.get_websocket()
-        # important to make sure WS URL is always current
-        websocket.url = self.ws_url
-
         if not websocket.is_connected:
             self._last_ws_status = False
             with contextlib.suppress(
@@ -638,6 +636,10 @@ class BaseApiClient:
             ):
                 await websocket.connect()
 
+    def get_websocket_url(self) -> str:
+        """Get Websocket URL."""
+        return self.ws_url
+
     async def async_disconnect_ws(self) -> None:
         """Disconnect from Websocket."""
         if self._websocket is None:
@@ -861,10 +863,6 @@ class ProtectApiClient(BaseApiClient):
             models=self._subscribed_models,
             ignore_stats=self._ignore_stats,
         )
-        # update websocket URL after every message to ensure the latest last_update_id
-        if self._websocket is not None:
-            self._websocket.url = self.ws_url
-
         if processed_message is None:
             return
 

{uiprotect-1.12.1 → uiprotect-1.13.0}/src/uiprotect/websocket.py

@@ -45,7 +45,7 @@ class Websocket:
 
     def __init__(
         self,
-        url: str,
+        get_url: Callable[[], str],
         auth_callback: CALLBACK_TYPE,
         *,
         timeout: int = 30,
@@ -53,7 +53,7 @@ class Websocket:
         verify: bool = True,
     ) -> None:
         """Init Websocket."""
-        self.url = url
+        self.get_url = get_url
         self.timeout_interval = timeout
         self.backoff = backoff
         self.verify = verify
@@ -85,14 +85,15 @@ class Websocket:
         return True
 
     async def _websocket_loop(self, start_event: asyncio.Event) -> None:
-        _LOGGER.debug("Connecting WS to %s", self.url)
+        url = self.get_url()
+        _LOGGER.debug("Connecting WS to %s", url)
         self._headers = await self._auth(self._should_reset_auth)
 
         session = self._get_session()
         # catch any and all errors for Websocket so we can clean up correctly
         try:
             self._ws_connection = await session.ws_connect(
-                self.url,
+                url,
                 ssl=None if self.verify else False,
                 headers=self._headers,
             )
@@ -104,7 +105,7 @@ class Websocket:
                     break
                 self._reset_timeout()
         except ClientError:
-            _LOGGER.exception("Websocket disconnect error: %s", self.url)
+            _LOGGER.exception("Websocket disconnect error: %s", url)
         finally:
             _LOGGER.debug("Websocket disconnected")
             self._increase_failure()