Fix avaliable

custom_components/teslemetry/binary_sensor.py

@@ -396,11 +396,8 @@ def __init__(
     def _async_update_attrs(self) -> None:
         """Update the attributes of the binary sensor."""
 
-        if self._value is None:
-            self._attr_available = False
-            self._attr_is_on = None
-        else:
-            self._attr_available = True
+        self._attr_available = self._value is not None
+        if self._attr_available:
             self._attr_is_on = self.entity_description.polling_value_fn(self._value)
 
 
@@ -429,7 +426,9 @@ async def async_added_to_hass(self) -> None:
 
     def _async_value_from_stream(self, value) -> None:
         """Update the value of the entity."""
-        self._attr_is_on = self.entity_description.streaming_value_fn(value)
+        self._attr_avaliable = value is not None
+        if self._attr_avaliable:
+            self._attr_is_on = self.entity_description.streaming_value_fn(value)
 
 
 class TeslemetryEnergyLiveBinarySensorEntity(

custom_components/teslemetry/entity.py

@@ -74,7 +74,6 @@ async def async_added_to_hass(self) -> None:
 
     def _handle_stream_update(self, data: dict[str, Any]) -> None:
         """Handle updated data from the stream."""
-
         try:
             self._async_value_from_stream(data["data"][self.streaming_key])
         except Exception as e:
@@ -93,7 +92,7 @@ async def wake_up_if_asleep(self) -> None:
     @cached_property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return self.stream.connected
+        return self.stream.connected and self._attr_available
 
 class TeslemetryVehicleComplexStreamEntity(TeslemetryEntity):
     """Parent class for Teslemetry Vehicle Stream entities with multiple keys."""

custom_components/teslemetry/sensor.py

@@ -1479,7 +1479,7 @@ def _async_update_attrs(self) -> None:
             if seconds == self._last_value:
                 return
             self._last_value = seconds
-            self._attr_native_value = self._time_value(seconds)
+            self._attr_native_value = self._time_value(value)
 
 
 class TeslemetryVehicleTimeStreamSensorEntity(TeslemetryVehicleStreamEntity, SensorEntity):