Use latest service info for INKBIRD fallback poll recency check (home-assistant#172041)

Author: bdraco

homeassistant/components/inkbird/coordinator.py

@@ -128,7 +128,18 @@ def _async_on_update(self, service_info: BluetoothServiceInfo) -> SensorUpdate:
     @callback
     def _async_schedule_poll(self, _: datetime) -> None:
         """Schedule a poll of the device."""
-        if self._last_service_info and self._async_needs_poll(
-            self._last_service_info, self._last_poll
-        ):
+        # ``self._last_service_info`` only tracks dispatched events, so when
+        # the device keeps broadcasting the same payload (HA dedupes the
+        # repeats before dispatch) its timestamp stops advancing. Pull the
+        # latest service info from the bluetooth manager instead so the
+        # recency check in ``poll_needed`` sees every observed advertisement.
+        service_info = (
+            async_last_service_info(self.hass, self.address, connectable=False)
+            or self._last_service_info
+        )
+        if service_info and self.needs_poll(service_info):
+            # Seed ``_last_service_info`` so the debounced poll has a service
+            # info to hand to ``_async_poll_data``; the base ``_async_poll``
+            # asserts on it.
+            self._last_service_info = service_info
             self._debounced_poll.async_schedule_call()

tests/components/inkbird/test_sensor.py

@@ -16,6 +16,7 @@
 from inkbird_ble.parser import Model
 from sensor_state_data import SensorDeviceClass
 
+from homeassistant.components.bluetooth import async_last_service_info
 from homeassistant.components.inkbird.const import (
     CONF_DEVICE_DATA,
     CONF_DEVICE_TYPE,
@@ -175,6 +176,40 @@ async def test_polling_sensor(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
 
+async def test_fallback_poll_queries_latest_service_info(hass: HomeAssistant) -> None:
+    """Fallback timer queries the bluetooth manager for the latest service info.
+
+    Regression test for the case where HA dedupes repeat advertisements with the
+    same payload; ``_last_service_info`` then goes stale even though the device
+    is still broadcasting, so the fallback recency check must consult the
+    bluetooth manager's freshest observation instead of the dispatched event.
+    """
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="AA:BB:CC:DD:EE:FF",
+        data={CONF_DEVICE_TYPE: "IBS-TH"},
+    )
+    entry.add_to_hass(hass)
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    inject_bluetooth_service_info(hass, SPS_PASSIVE_SERVICE_INFO)
+    await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.inkbird.coordinator.async_last_service_info",
+        wraps=async_last_service_info,
+    ) as mock_async_last_service_info:
+        async_fire_time_changed(hass, dt_util.utcnow() + FALLBACK_POLL_INTERVAL)
+        await hass.async_block_till_done()
+
+    mock_async_last_service_info.assert_called_once_with(
+        hass, "AA:BB:CC:DD:EE:FF", connectable=False
+    )
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+
 async def test_notify_sensor_no_advertisement(hass: HomeAssistant) -> None:
     """Test setting up a notify sensor that has no advertisement."""
     entry = MockConfigEntry(