Merge branch 'feat/utec-last-push-sensor'

Author: geofffranks

custom_components/u_tec/coordinator.py

@@ -1,6 +1,6 @@
 """Data coordinator for Uhome integration."""
 
-from datetime import timedelta
+from datetime import datetime, timedelta
 import logging
 
 from custom_components.u_tec.const import (
@@ -16,6 +16,7 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
 from utec_py.api import UHomeApi
 from utec_py.devices.device import BaseDevice
 from utec_py.devices.light import Light
@@ -78,6 +79,7 @@ def __init__(
         self.added_sensor_entities = set()
         self.push_devices = []
         self.blacklisted_devices = []
+        self.last_push_received: datetime | None = None
         self._discovery_interval = timedelta(seconds=discovery_interval)
         self._cancel_discovery: callable | None = None
         _LOGGER.info(
@@ -203,6 +205,10 @@ async def _async_update_data(self) -> dict[str, dict]:
 
     async def update_push_data(self, push_data):
         """Process push update from webhook."""
+        # Reaching here means the handler already passed Bearer-token auth, so a
+        # genuine push was delivered. Stamp before payload guards so even an empty
+        # keepalive counts as "push channel alive".
+        self.last_push_received = dt_util.utcnow()
 
         _LOGGER.debug("Processing push update: %s", push_data)
 

custom_components/u_tec/sensor.py

@@ -8,7 +8,7 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import PERCENTAGE
+from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import DeviceInfo
@@ -32,6 +32,7 @@ async def async_setup_entry(
     ]
 
     entities = _create_battery_entities(coordinator)
+    entities.append(UhomeLastPushSensor(coordinator))
     async_add_entities(entities)
 
     @callback
@@ -119,3 +120,32 @@ async def async_added_to_hass(self):
     def _handle_push_update(self, push_data):
         """Update device from push data."""
         self.async_write_ha_state()
+
+
+class UhomeLastPushSensor(CoordinatorEntity, SensorEntity):
+    """Diagnostic sensor: timestamp of the most recent webhook push received.
+
+    Coordinator-level (not per-device): there is no physical device, so it ties
+    its device_info to the config entry. A stale value here while locks are still
+    changing state (caught by the 30s poll) is the signal that U-Tec push delivery
+    has died — surfaced by the ha-configs push-health-monitor automation.
+    """
+
+    _attr_has_entity_name = False
+    _attr_device_class = SensorDeviceClass.TIMESTAMP
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    def __init__(self, coordinator: UhomeDataUpdateCoordinator) -> None:
+        super().__init__(coordinator)
+        entry_id = coordinator.config_entry.entry_id
+        self._attr_unique_id = f"{DOMAIN}_last_push_{entry_id}"
+        self._attr_name = "Utec Last Push"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{entry_id}_service")},
+            name="U-Tec Integration",
+            manufacturer="U-Tec",
+        )
+
+    @property
+    def native_value(self):
+        return self.coordinator.last_push_received

tests/test_coordinator.py

@@ -117,6 +117,21 @@ async def test_update_push_data_unrecognised_top_level_type_is_noop(coordinator)
     sw.update_state_data.assert_not_awaited()
 
 
+async def test_update_push_data_stamps_last_push_received(coordinator):
+    """Any authenticated push arrival records a recent UTC timestamp."""
+    from homeassistant.util import dt as dt_util
+
+    assert coordinator.last_push_received is None  # nothing received yet
+
+    before = dt_util.utcnow()
+    # Minimal valid push payload shape (devices list); content irrelevant to the stamp.
+    await coordinator.update_push_data({"payload": {"devices": []}})
+    after = dt_util.utcnow()
+
+    assert coordinator.last_push_received is not None
+    assert before <= coordinator.last_push_received <= after
+
+
 # --- _async_update_data ---
 
 from homeassistant.exceptions import ConfigEntryAuthFailed

tests/test_sensor.py

@@ -37,8 +37,8 @@ def test_battery_sensor_unique_id(coord_with_locks):
 
 
 async def test_async_setup_entry_adds_one_per_lock(hass, coord_with_locks):
-    """Initial setup should add battery sensors for all locks."""
-    from custom_components.u_tec.sensor import async_setup_entry
+    """Initial setup should add battery sensors for all locks plus one last-push sensor."""
+    from custom_components.u_tec.sensor import UhomeBatterySensorEntity, async_setup_entry
 
     coord, entry = coord_with_locks
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {"coordinator": coord}
@@ -48,7 +48,9 @@ def _add(entities):
         added.extend(list(entities))
 
     await async_setup_entry(hass, entry, _add)
-    assert len(added) == 2
+    battery_sensors = [e for e in added if isinstance(e, UhomeBatterySensorEntity)]
+    assert len(battery_sensors) == 2
+    assert len(added) == 3  # 2 battery + 1 last-push
     assert coord.added_sensor_entities == {"u_tec_battery_lock-1", "u_tec_battery_lock-2"}
 
 
@@ -97,3 +99,34 @@ def _add(entities):
 
     # Same devices -> no additions
     assert len(added) == initial
+
+
+async def test_last_push_sensor_added_once(hass, coord_with_locks):
+    """async_setup_entry adds exactly one coordinator-level last-push sensor."""
+    from custom_components.u_tec.sensor import UhomeLastPushSensor, async_setup_entry
+
+    coord, entry = coord_with_locks
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {"coordinator": coord}
+    added = []
+    await async_setup_entry(hass, entry, lambda ents: added.extend(list(ents)))
+
+    last_push = [e for e in added if isinstance(e, UhomeLastPushSensor)]
+    assert len(last_push) == 1
+
+
+async def test_last_push_sensor_native_value_and_class(hass, coord_with_locks):
+    """The sensor reports the coordinator's last_push_received as a timestamp."""
+    from homeassistant.components.sensor import SensorDeviceClass
+    from homeassistant.util import dt as dt_util
+
+    from custom_components.u_tec.sensor import UhomeLastPushSensor
+
+    coord, _ = coord_with_locks
+    coord.last_push_received = None
+    sensor = UhomeLastPushSensor(coord)
+    assert sensor.device_class == SensorDeviceClass.TIMESTAMP
+
+    assert sensor.native_value is None  # no push yet
+    stamp = dt_util.utcnow()
+    coord.last_push_received = stamp
+    assert sensor.native_value == stamp