feat: shared DisplayCoordinator + optional API token
- Introduce DisplayCoordinator polling /api/display/monitors once per cycle and fan out to all per-display entities via CoordinatorEntity. Removes ~9x redundant requests per polling cycle that came from each binary_sensor/number/select/sensor/switch entity calling get_display_monitors() in its own async_update. - Optimistic write-through via coordinator.apply_optimistic(...) keeps sibling entities in sync after slider/select writes without an extra network round-trip. - Make CONF_TOKEN optional. The media server already supports running without auth (auth_enabled() returns False when api_tokens is empty), so the integration omits the Authorization header and ?token= query from REST/WS/album-art URLs when no token is configured. Server-side auth-enabled rejections still surface as invalid_auth in the UI. - Bump manifest version to 0.3.2. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -10,9 +10,10 @@ from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.entity import EntityCategory
|
||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||
|
||||
from .api_client import MediaServerClient, MediaServerError
|
||||
from .const import DOMAIN
|
||||
from .display_coordinator import DisplayCoordinator
|
||||
from .display_device import display_device_info
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
@@ -24,25 +25,26 @@ async def async_setup_entry(
|
||||
async_add_entities: AddEntitiesCallback,
|
||||
) -> None:
|
||||
"""Set up per-display binary sensor entities."""
|
||||
client: MediaServerClient = hass.data[DOMAIN][entry.entry_id]["client"]
|
||||
coordinator: DisplayCoordinator = hass.data[DOMAIN][entry.entry_id][
|
||||
"display_coordinator"
|
||||
]
|
||||
|
||||
try:
|
||||
monitors = await client.get_display_monitors()
|
||||
except MediaServerError as err:
|
||||
_LOGGER.error("Failed to fetch display monitors: %s", err)
|
||||
if not coordinator.data:
|
||||
return
|
||||
|
||||
entities: list[Any] = []
|
||||
for monitor in monitors:
|
||||
entities.append(DisplayPrimaryBinarySensor(client, entry, monitor))
|
||||
entities.append(DisplayPowerControlBinarySensor(client, entry, monitor))
|
||||
for monitor in coordinator.data.values():
|
||||
entities.append(DisplayPrimaryBinarySensor(coordinator, entry, monitor))
|
||||
entities.append(DisplayPowerControlBinarySensor(coordinator, entry, monitor))
|
||||
|
||||
if entities:
|
||||
async_add_entities(entities)
|
||||
_LOGGER.info("Added %d display binary sensor entities", len(entities))
|
||||
|
||||
|
||||
class _DisplayBinarySensorBase(BinarySensorEntity):
|
||||
class _DisplayBinarySensorBase(
|
||||
CoordinatorEntity[DisplayCoordinator], BinarySensorEntity
|
||||
):
|
||||
"""Common boilerplate for per-display diagnostic binary sensors."""
|
||||
|
||||
_attr_has_entity_name = True
|
||||
@@ -50,14 +52,20 @@ class _DisplayBinarySensorBase(BinarySensorEntity):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
client: MediaServerClient,
|
||||
coordinator: DisplayCoordinator,
|
||||
entry: ConfigEntry,
|
||||
monitor: dict[str, Any],
|
||||
) -> None:
|
||||
self._client = client
|
||||
super().__init__(coordinator)
|
||||
self._monitor_id: int = monitor["id"]
|
||||
self._attr_device_info = display_device_info(entry, monitor)
|
||||
|
||||
@property
|
||||
def _monitor(self) -> dict[str, Any]:
|
||||
if self.coordinator.data is None:
|
||||
return {}
|
||||
return self.coordinator.data.get(self._monitor_id, {})
|
||||
|
||||
|
||||
class DisplayPrimaryBinarySensor(_DisplayBinarySensorBase):
|
||||
"""Indicates whether the display is the OS primary monitor."""
|
||||
@@ -67,23 +75,16 @@ class DisplayPrimaryBinarySensor(_DisplayBinarySensorBase):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
client: MediaServerClient,
|
||||
coordinator: DisplayCoordinator,
|
||||
entry: ConfigEntry,
|
||||
monitor: dict[str, Any],
|
||||
) -> None:
|
||||
super().__init__(client, entry, monitor)
|
||||
super().__init__(coordinator, entry, monitor)
|
||||
self._attr_unique_id = f"{entry.entry_id}_display_primary_{self._monitor_id}"
|
||||
self._attr_is_on = bool(monitor.get("is_primary"))
|
||||
|
||||
async def async_update(self) -> None:
|
||||
try:
|
||||
monitors = await self._client.get_display_monitors()
|
||||
for monitor in monitors:
|
||||
if monitor["id"] == self._monitor_id:
|
||||
self._attr_is_on = bool(monitor.get("is_primary"))
|
||||
break
|
||||
except MediaServerError as err:
|
||||
_LOGGER.error("Failed to refresh primary flag for monitor %d: %s", self._monitor_id, err)
|
||||
@property
|
||||
def is_on(self) -> bool:
|
||||
return bool(self._monitor.get("is_primary"))
|
||||
|
||||
|
||||
class DisplayPowerControlBinarySensor(_DisplayBinarySensorBase):
|
||||
@@ -94,23 +95,15 @@ class DisplayPowerControlBinarySensor(_DisplayBinarySensorBase):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
client: MediaServerClient,
|
||||
coordinator: DisplayCoordinator,
|
||||
entry: ConfigEntry,
|
||||
monitor: dict[str, Any],
|
||||
) -> None:
|
||||
super().__init__(client, entry, monitor)
|
||||
self._attr_unique_id = f"{entry.entry_id}_display_power_supported_{self._monitor_id}"
|
||||
self._attr_is_on = bool(monitor.get("power_supported"))
|
||||
super().__init__(coordinator, entry, monitor)
|
||||
self._attr_unique_id = (
|
||||
f"{entry.entry_id}_display_power_supported_{self._monitor_id}"
|
||||
)
|
||||
|
||||
async def async_update(self) -> None:
|
||||
try:
|
||||
monitors = await self._client.get_display_monitors()
|
||||
for monitor in monitors:
|
||||
if monitor["id"] == self._monitor_id:
|
||||
self._attr_is_on = bool(monitor.get("power_supported"))
|
||||
break
|
||||
except MediaServerError as err:
|
||||
_LOGGER.error(
|
||||
"Failed to refresh power_supported flag for monitor %d: %s",
|
||||
self._monitor_id, err,
|
||||
)
|
||||
@property
|
||||
def is_on(self) -> bool:
|
||||
return bool(self._monitor.get("power_supported"))
|
||||
|
||||
Reference in New Issue
Block a user