Fix HA websocket keepalive fallback
This commit is contained in:
@@ -1,5 +1,12 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.7.8 - 2026-06-15
|
||||||
|
- Home-Assistant-WebSocket-Listener deaktiviert den clientseitigen Keepalive-
|
||||||
|
Ping, damit stabile HA-Verbindungen nicht durch Ping-Timeouts ständig neu
|
||||||
|
aufgebaut werden
|
||||||
|
- Fallback-Auswertung läuft bei getrenntem WebSocket kurzfristig alle 5 Sekunden,
|
||||||
|
damit übernommene Aktoren nicht ohne Steuerung bleiben
|
||||||
|
|
||||||
## 0.7.7 - 2026-06-15
|
## 0.7.7 - 2026-06-15
|
||||||
- WebSocket-State-Changes lesen jetzt das echte Home-Assistant-Eventformat
|
- WebSocket-State-Changes lesen jetzt das echte Home-Assistant-Eventformat
|
||||||
(`event.data.entity_id`), damit Kontextwechsel wie Türsensoren sofort
|
(`event.data.entity_id`), damit Kontextwechsel wie Türsensoren sofort
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
name: SillyHome Next
|
name: SillyHome Next
|
||||||
version: "0.7.7"
|
version: "0.7.8"
|
||||||
slug: sillyhome_next
|
slug: sillyhome_next
|
||||||
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
||||||
url: http://192.168.6.31:3000/pino/sillyhome-next
|
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||||
|
|||||||
12
app/main.py
12
app/main.py
@@ -100,7 +100,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
|||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
title="SillyHome Next API",
|
title="SillyHome Next API",
|
||||||
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
||||||
version="0.7.7",
|
version="0.7.8",
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
)
|
)
|
||||||
app.state.settings = load_settings()
|
app.state.settings = load_settings()
|
||||||
@@ -171,7 +171,7 @@ async def _ha_event_listener(app: FastAPI, client: HaClient) -> None:
|
|||||||
if ws_status is not None:
|
if ws_status is not None:
|
||||||
ws_status.status = "connecting"
|
ws_status.status = "connecting"
|
||||||
try:
|
try:
|
||||||
async with websockets.connect(ws_url) as websocket:
|
async with websockets.connect(ws_url, ping_interval=None) as websocket:
|
||||||
auth_required_msg = await websocket.recv()
|
auth_required_msg = await websocket.recv()
|
||||||
auth_required_data = json.loads(auth_required_msg)
|
auth_required_data = json.loads(auth_required_msg)
|
||||||
if auth_required_data.get("type") != "auth_required":
|
if auth_required_data.get("type") != "auth_required":
|
||||||
@@ -252,7 +252,13 @@ async def _fallback_prediction(app: FastAPI) -> None:
|
|||||||
Dies verhindert kompletten Ausfall der Vorhersagen bei Netzwerkproblemen.
|
Dies verhindert kompletten Ausfall der Vorhersagen bei Netzwerkproblemen.
|
||||||
"""
|
"""
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep(app.state.settings.prediction_interval_seconds)
|
ws_status = getattr(app.state, "ws_status", None)
|
||||||
|
websocket_connected = ws_status is not None and ws_status.status == "connected"
|
||||||
|
await asyncio.sleep(
|
||||||
|
app.state.settings.prediction_interval_seconds
|
||||||
|
if websocket_connected
|
||||||
|
else min(5, app.state.settings.prediction_interval_seconds)
|
||||||
|
)
|
||||||
# Nur ausführen, wenn WebSocket nicht verbunden ist
|
# Nur ausführen, wenn WebSocket nicht verbunden ist
|
||||||
ws_status = getattr(app.state, "ws_status", None)
|
ws_status = getattr(app.state, "ws_status", None)
|
||||||
if ws_status is None or ws_status.status != "connected":
|
if ws_status is None or ws_status.status != "connected":
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "sillyhome-next"
|
name = "sillyhome-next"
|
||||||
version = "0.7.7"
|
version = "0.7.8"
|
||||||
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|||||||
@@ -61,12 +61,16 @@ def test_ha_event_listener_processes_state_change(tmp_path: Path) -> None:
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
with patch("websockets.connect", return_value=fake_ws):
|
with patch("websockets.connect", return_value=fake_ws) as connect:
|
||||||
try:
|
try:
|
||||||
await _ha_event_listener(mock_app, mock_client)
|
await _ha_event_listener(mock_app, mock_client)
|
||||||
except asyncio.CancelledError:
|
except asyncio.CancelledError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
connect.assert_called_once_with(
|
||||||
|
"ws://homeassistant:8123/api/websocket",
|
||||||
|
ping_interval=None,
|
||||||
|
)
|
||||||
assert fake_ws.sent == [
|
assert fake_ws.sent == [
|
||||||
{"type": "auth", "access_token": "test-token"},
|
{"type": "auth", "access_token": "test-token"},
|
||||||
{"id": 1, "type": "subscribe_events", "event_type": "state_changed"},
|
{"id": 1, "type": "subscribe_events", "event_type": "state_changed"},
|
||||||
|
|||||||
Reference in New Issue
Block a user