fix(river2): mark telemetry unavailable offline

Author: Komzpa

custom_components/ecoflow_cloud/devices/data_holder.py

@@ -36,8 +36,11 @@ def on_data_received(self) -> None: ...
 
 
 class _NoOpStatusCallback:
-    def on_explicit_status(self, online: bool) -> None: pass
-    def on_data_received(self) -> None: pass
+    def on_explicit_status(self, online: bool) -> None:
+        pass
+
+    def on_data_received(self) -> None:
+        pass
 
 
 class EcoflowDataHolder:
@@ -66,10 +69,12 @@ def __init__(
 
         self.set_status = BoundFifoList[dict[str, Any]]()
         self.set_status_time = dt.utcnow().replace(year=2000, month=1, day=1, hour=0, minute=0, second=0)
+        self.status_change_time = dt.utcnow().replace(year=2000, month=1, day=1, hour=0, minute=0, second=0)
 
     def last_received_time(self):
         return max(
             self.set_status_time,
+            self.status_change_time,
             self.set_params_time,
             # 1. get_reply can receive '"message": "The device is not online"'
             # 2. if device is online - get_reply message will update params, so param_time will be updated as well
@@ -120,6 +125,7 @@ def __update_params(self, params: dict[str, Any]):
     def __accept_prepared_data(self, data: PreparedData, raw_data_acceptor: Callable[[dict[str, Any]], None]):
         if data.online is not None:
             self._status_callback.on_explicit_status(data.online)
+            self.status_change_time = dt.utcnow()
 
         if data.params is not None:
             self.__update_params(data.params)

custom_components/ecoflow_cloud/entities/__init__.py

@@ -123,6 +123,10 @@ def _adopt_json_key(self, key: str):
         else:
             return key
 
+    @property
+    def available(self) -> bool:
+        return bool(self._attr_available) and not self._device.status_tracker.is_offline
+
     @property
     def mqtt_key(self):
         return self.__mqtt_key
@@ -141,13 +145,19 @@ async def async_added_to_hass(self):
         # self.async_on_remove(d.dispose)
 
     def _handle_coordinator_update(self) -> None:
+        if self._device.status_tracker.is_offline:
+            self._mark_unavailable()
+            return
+
         if self.coordinator.data.changed:
             self._updated(self.coordinator.data.data_holder.params)
-        elif self._device.status_tracker.is_offline:  # Device is offline
-            # Reset sensors that should reset to default values
-            if isinstance(self, BaseSensorEntity) and self._attr_default_value is not None:
-                self._mqtt_key_expr.update(self.coordinator.data.data_holder.params, self._attr_default_value)
-                self._updated(self.coordinator.data.data_holder.params)
+
+    def _mark_unavailable(self) -> None:
+        if not self._attr_available:
+            return
+
+        self._attr_available = False
+        self.schedule_update_ha_state()
 
     def _updated(self, data: dict[str, Any]):
         # update attributes

custom_components/ecoflow_cloud/sensor.py

@@ -45,6 +45,7 @@
     ECOFLOW_DOMAIN,
 )
 from .api import EcoflowApiClient
+from .devices.data_coordinator import EcoflowBroadcastDataHolder
 from .devices import BaseDevice, const
 from .entities import (
     BaseSensorEntity,
@@ -688,6 +689,8 @@ def _handle_coordinator_update(self) -> None:
                 self._attr_native_value = status.label
                 self._actualize_attributes()
                 self.schedule_update_ha_state()
+            if status.online is not True:
+                self.coordinator.async_set_updated_data(EcoflowBroadcastDataHolder(self._device.data, False))
 
     def _format_age(self, timestamp: datetime | None) -> str | None:
         if timestamp is None: