uiprotect 1.12.0__tar.gz → 1.12.1__tar.gz

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

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

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

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

{uiprotect-1.12.0 → uiprotect-1.12.1}/src/uiprotect/data/base.py

@@ -61,6 +61,9 @@ RECENT_EVENT_MAX = timedelta(seconds=30)
 EVENT_PING_INTERVAL = timedelta(seconds=3)
 EVENT_PING_INTERVAL_SECONDS = EVENT_PING_INTERVAL.total_seconds()
 
+_EMPTY_EVENT_PING_BACK: dict[Any, Any] = {}
+
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -788,7 +791,7 @@ class ProtectModelWithId(ProtectModel):
 
     def _emit_message(self, updated: dict[str, Any]) -> None:
         """Emits fake WS message for ProtectApiClient to process."""
-        if updated == {}:
+        if _is_ping_back := updated is _EMPTY_EVENT_PING_BACK:
             _LOGGER.debug("Event ping callback started for %s", self.id)
 
         if self.model is None:
@@ -817,7 +820,9 @@ class ProtectModelWithId(ProtectModel):
 
         message = self._api.bootstrap.process_ws_packet(
             WSPacket(action_frame.packed + data_frame.packed),
+            is_ping_back=_is_ping_back,
         )
+
         if message is not None:
             self._api.emit_message(message)
 
@@ -876,7 +881,7 @@ class ProtectDeviceModel(ProtectModelWithId):
         self._callback_ping = loop.call_later(
             EVENT_PING_INTERVAL_SECONDS,
             self._emit_message,
-            {},
+            _EMPTY_EVENT_PING_BACK,
         )
 
     async def set_name(self, name: str | None) -> None:

{uiprotect-1.12.0 → uiprotect-1.12.1}/src/uiprotect/data/bootstrap.py

@@ -451,7 +451,15 @@ class Bootstrap(ProtectBaseObject):
         action: dict[str, Any],
         data: dict[str, Any],
         ignore_stats: bool,
+        is_ping_back: bool,
     ) -> WSSubscriptionMessage | None:
+        """
+        Process a device update packet.
+
+        If is_ping_back is True, the packet is an empty packet
+        that was generated internally as a result of an event
+        that will expire and result in a state change.
+        """
         remove_keys = (
             STATS_AND_IGNORE_DEVICE_KEYS if ignore_stats else IGNORE_DEVICE_KEYS
         )
@@ -462,7 +470,7 @@ class Bootstrap(ProtectBaseObject):
         if model_type is ModelType.CAMERA and "lastMotion" in data:
             del data["lastMotion"]
         # nothing left to process
-        if not data:
+        if not data and not is_ping_back:
             self._create_stat(packet, None, True)
             return None
 
@@ -476,6 +484,12 @@ class Bootstrap(ProtectBaseObject):
 
         obj = devices[action_id]
         data = obj.unifi_dict_to_dict(data)
+
+        if not data and not is_ping_back:
+            # nothing left to process
+            self._create_stat(packet, None, True)
+            return None
+
         old_obj = obj.copy()
         obj = obj.update_from_dict(deepcopy(data))
 
@@ -513,6 +527,7 @@ class Bootstrap(ProtectBaseObject):
         packet: WSPacket,
         models: set[ModelType] | None = None,
         ignore_stats: bool = False,
+        is_ping_back: bool = False,
     ) -> WSSubscriptionMessage | None:
         """Process a WS packet."""
         action = packet.action_frame.data
@@ -521,17 +536,16 @@ class Bootstrap(ProtectBaseObject):
             action = deepcopy(action)
             data = deepcopy(data)
 
-        new_update_id: str = action["newUpdateId"]
+        new_update_id: str | None = action["newUpdateId"]
         if new_update_id is not None:
             self.last_update_id = new_update_id
 
         model_key: str = action["modelKey"]
-        if model_key not in ModelType.values_set():
+        if (model_type := ModelType.from_string(model_key)) is ModelType.UNKNOWN:
             _LOGGER.debug("Unknown model type: %s", model_key)
             self._create_stat(packet, None, True)
             return None
 
-        model_type = ModelType.from_string(model_key)
         if models and model_type not in models:
             self._create_stat(packet, None, True)
             return None
@@ -540,7 +554,7 @@ class Bootstrap(ProtectBaseObject):
         if action_action == "remove":
             return self._process_remove_packet(model_type, packet)
 
-        if not data:
+        if not data and not is_ping_back:
             self._create_stat(packet, None, True)
             return None
 
@@ -552,11 +566,7 @@ class Bootstrap(ProtectBaseObject):
                     return self._process_nvr_update(packet, data, ignore_stats)
                 if model_type in ModelType.bootstrap_models_types_and_event_set:
                     return self._process_device_update(
-                        model_type,
-                        packet,
-                        action,
-                        data,
-                        ignore_stats,
+                        model_type, packet, action, data, ignore_stats, is_ping_back
                     )
         except (ValidationError, ValueError) as err:
             self._handle_ws_error(action, err)