Michal
/
SWS-12500-custom-component
mirror of https://github.com/schizza/SWS-12500-custom-component
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use configured WSLink add-on port for health/status endpoints.

ecowitt_support v2.0.0pre0
SchiZzA 2026-03-23 18:32:02 +01:00
parent 159d465db5
commit e737fb16d3
No known key found for this signature in database
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
custom_components/sws12500/health_coordinator.py
View File

@ -40,6 +40,7 @@ from .const import (
POCASI_CZ_ENABLED, POCASI_CZ_ENABLED,
WINDY_ENABLED, WINDY_ENABLED,
WSLINK, WSLINK,
WSLINK_ADDON_PORT,
WSLINK_URL, WSLINK_URL,
) )
from .data import ENTRY_HEALTH_DATA from .data import ENTRY_HEALTH_DATA
@ -78,9 +79,7 @@ def _empty_forwarding_state(enabled: bool) -> dict[str, Any]:
def _default_health_data(config: ConfigEntry) -> dict[str, Any]: def _default_health_data(config: ConfigEntry) -> dict[str, Any]:
"""Build the default health/debug payload for this config entry.""" """Build the default health/debug payload for this config entry."""
configured_protocol = _protocol_name( configured_protocol = _protocol_name(checked_or(config.options.get(WSLINK), bool, False))
checked_or(config.options.get(WSLINK), bool, False)
)
return { return {
"integration_status": f"online_{configured_protocol}", "integration_status": f"online_{configured_protocol}",
"configured_protocol": configured_protocol, "configured_protocol": configured_protocol,
@ -117,12 +116,8 @@ def _default_health_data(config: ConfigEntry) -> dict[str, Any]:
"reason": "no_data", "reason": "no_data",
}, },
"forwarding": { "forwarding": {
"windy": _empty_forwarding_state( "windy": _empty_forwarding_state(checked_or(config.options.get(WINDY_ENABLED), bool, False)),
checked_or(config.options.get(WINDY_ENABLED), bool, False) "pocasi": _empty_forwarding_state(checked_or(config.options.get(POCASI_CZ_ENABLED), bool, False)),
),
"pocasi": _empty_forwarding_state(
checked_or(config.options.get(POCASI_CZ_ENABLED), bool, False)
),
}, },
} }
@ -190,9 +185,7 @@ class HealthCoordinator(DataUpdateCoordinator):
data["integration_status"] = integration_status data["integration_status"] = integration_status
data["active_protocol"] = ( data["active_protocol"] = (
last_protocol last_protocol if accepted and last_protocol in {"wu", "wslink"} else configured_protocol
if accepted and last_protocol in {"wu", "wslink"}
else configured_protocol
) )
async def _async_update_data(self) -> dict[str, Any]: async def _async_update_data(self) -> dict[str, Any]:
@ -201,8 +194,10 @@ class HealthCoordinator(DataUpdateCoordinator):
url = get_url(self.hass) url = get_url(self.hass)
ip = await async_get_source_ip(self.hass) ip = await async_get_source_ip(self.hass)
health_url = f"https://{ip}/healthz" port = checked_or(self.config_entry.options.get(WSLINK_ADDON_PORT), int, 443)
info_url = f"https://{ip}/status/internal"
health_url = f"https://{ip}:{port}/healthz"
info_url = f"https://{ip}:{port}/status/internal"
data = deepcopy(self.data) data = deepcopy(self.data)
addon = data["addon"] addon = data["addon"]
@ -245,9 +240,7 @@ class HealthCoordinator(DataUpdateCoordinator):
def update_routing(self, routes: Routes | None) -> None: def update_routing(self, routes: Routes | None) -> None:
"""Store the currently enabled routes for diagnostics.""" """Store the currently enabled routes for diagnostics."""
data = deepcopy(self.data) data = deepcopy(self.data)
data["configured_protocol"] = _protocol_name( data["configured_protocol"] = _protocol_name(checked_or(self.config.options.get(WSLINK), bool, False))
checked_or(self.config.options.get(WSLINK), bool, False)
)
if routes is not None: if routes is not None:
data["routes"] = { data["routes"] = {
"wu_enabled": routes.path_enabled(DEFAULT_URL), "wu_enabled": routes.path_enabled(DEFAULT_URL),
@ -258,9 +251,7 @@ class HealthCoordinator(DataUpdateCoordinator):
self._refresh_summary(data) self._refresh_summary(data)
self._commit(data) self._commit(data)
def record_dispatch( def record_dispatch(self, request: aiohttp.web.Request, route_enabled: bool, reason: str | None) -> None:
self, request: aiohttp.web.Request, route_enabled: bool, reason: str | None
) -> None:
"""Record every ingress observed by the dispatcher. """Record every ingress observed by the dispatcher.
This runs before the actual webhook handler. It lets diagnostics answer: This runs before the actual webhook handler. It lets diagnostics answer: