uiprotect 0.3.10__tar.gz → 0.4.1__tar.gz

{uiprotect-0.3.10 → uiprotect-0.4.1}/PKG-INFO

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

{uiprotect-0.3.10 → uiprotect-0.4.1}/pyproject.toml

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

{uiprotect-0.3.10 → uiprotect-0.4.1}/src/uiprotect/api.py

@@ -16,7 +16,6 @@ from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from typing import Any, Literal, cast
 from urllib.parse import urljoin
-from uuid import UUID
 
 import aiofiles
 import aiohttp
@@ -162,6 +161,7 @@ class BaseApiClient:
     _last_token_cookie_decode: dict[str, Any] | None = None
     _session: aiohttp.ClientSession | None = None
     _loaded_session: bool = False
+    _cookiename = "TOKEN"
 
     headers: dict[str, str] | None = None
     _websocket: Websocket | None = None
@@ -205,6 +205,10 @@ class BaseApiClient:
 
         self._update_url()
 
+    def _update_cookiename(self, cookie: SimpleCookie) -> None:
+        if "UOS_TOKEN" in cookie:
+            self._cookiename = "UOS_TOKEN"
+
     def _update_url(self) -> None:
         """Updates the url after changing _host or _port."""
         if self._port != 443:
@@ -476,7 +480,6 @@ class BaseApiClient:
             response = await self.request("post", url=url, json=auth)
             self.set_header("cookie", response.headers.get("set-cookie", ""))
             self._is_authenticated = True
-            await self._update_last_token_cookie(response)
             _LOGGER.debug("Authenticated successfully!")
 
     async def _update_last_token_cookie(self, response: aiohttp.ClientResponse) -> None:
@@ -489,9 +492,10 @@ class BaseApiClient:
         ):
             self.set_header("x-csrf-token", csrf_token)
             await self._update_last_token_cookie(response)
+            self._update_cookiename(response.cookies)
 
         if (
-            token_cookie := response.cookies.get("TOKEN")
+            token_cookie := response.cookies.get(self._cookiename)
         ) and token_cookie != self._last_token_cookie:
             self._last_token_cookie = token_cookie
             if self.store_sessions:
@@ -521,6 +525,7 @@ class BaseApiClient:
         config["sessions"] = config.get("sessions", {})
         config["sessions"][session_hash] = {
             "metadata": dict(cookie),
+            "cookiename": self._cookiename,
             "value": cookie.value,
             "csrf": self.headers.get("x-csrf-token") if self.headers else None,
         }
@@ -562,12 +567,15 @@ class BaseApiClient:
             return None
 
         cookie = SimpleCookie()
-        cookie["TOKEN"] = session.get("value")
+        cookie_name = session.get("cookiename")
+        if cookie_name is None:
+            return None
+        cookie[cookie_name] = session.get("value")
         for key, value in session.get("metadata", {}).items():
-            cookie["TOKEN"][key] = value
+            cookie[cookie_name][key] = value
 
-        cookie_value = _COOKIE_RE.sub("", str(cookie["TOKEN"]))
-        self._last_token_cookie = cookie["TOKEN"]
+        cookie_value = _COOKIE_RE.sub("", str(cookie[cookie_name]))
+        self._last_token_cookie = cookie[cookie_name]
         self._last_token_cookie_decode = None
         self._is_authenticated = True
         self.set_header("cookie", cookie_value)
@@ -647,7 +655,7 @@ class BaseApiClient:
     def _process_ws_message(self, msg: aiohttp.WSMessage) -> None:
         raise NotImplementedError
 
-    def _get_last_update_id(self) -> UUID | None:
+    def _get_last_update_id(self) -> str | None:
         raise NotImplementedError
 
 
@@ -833,7 +841,7 @@ class ProtectApiClient(BaseApiClient):
             except Exception:
                 _LOGGER.exception("Exception while running subscription handler")
 
-    def _get_last_update_id(self) -> UUID | None:
+    def _get_last_update_id(self) -> str | None:
         if self._bootstrap is None:
             return None
         return self._bootstrap.last_update_id

{uiprotect-0.3.10 → uiprotect-0.4.1}/src/uiprotect/data/bootstrap.py

@@ -8,7 +8,6 @@ from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, cast
-from uuid import UUID
 
 from aiohttp.client_exceptions import ServerDisconnectedError
 
@@ -179,7 +178,7 @@ class Bootstrap(ProtectBaseObject):
     sensors: dict[str, Sensor]
     doorlocks: dict[str, Doorlock]
     chimes: dict[str, Chime]
-    last_update_id: UUID
+    last_update_id: str
 
     # TODO:
     # schedules
@@ -546,7 +545,7 @@ class Bootstrap(ProtectBaseObject):
 
         action, data = self._get_frame_data(packet)
         if action["newUpdateId"] is not None:
-            self.last_update_id = UUID(action["newUpdateId"])
+            self.last_update_id = action["newUpdateId"]
 
         if action["modelKey"] not in ModelType.values():
             _LOGGER.debug("Unknown model type: %s", action["modelKey"])

{uiprotect-0.3.10 → uiprotect-0.4.1}/src/uiprotect/data/websocket.py

@@ -8,7 +8,6 @@ import struct
 import zlib
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
-from uuid import UUID
 
 import orjson
 
@@ -40,7 +39,7 @@ class WSAction(str, enum.Enum):
 @dataclass
 class WSSubscriptionMessage:
     action: WSAction
-    new_update_id: UUID
+    new_update_id: str
     changed_data: dict[str, Any]
     new_obj: ProtectModelWithId | None = None
     old_obj: ProtectModelWithId | None = None