feat v1.3.0 (phase 1): server-side config store (spaces/plans/rooms/overrides/virtual, normalized coords), WS config/get|set + plan/set upload, card resolved-model (server or legacy fallback), one-click migration — executed on dacha

custom_components/houseplan/websocket_api.py

@@ -1,6 +1,10 @@
-"""WS-команды houseplan/layout/get|set|update — серверное хранение раскладки."""
+"""WS-команды House Plan: раскладка, конфигурация пространств, загрузка планов."""
 from __future__ import annotations
 
+import base64
+import binascii
+import re
+from pathlib import Path
 from typing import Any
 
 import voluptuous as vol
@@ -8,11 +12,73 @@ import voluptuous as vol
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
 
-from .const import CONF_ADMIN_ONLY, DOMAIN
+from .const import CONF_ADMIN_ONLY, DEFAULT_CONFIG, DOMAIN, PLANS_DIR, PLANS_URL
 
-POS_SCHEMA = vol.Schema({vol.Required("x"): vol.Coerce(float), vol.Required("y"): vol.Coerce(float)})
+POS_SCHEMA = vol.Schema(
+    {vol.Required("x"): vol.Coerce(float), vol.Required("y"): vol.Coerce(float)},
+    extra=vol.ALLOW_EXTRA,  # v2-записи несут ключ "s" (space id)
+)
 LAYOUT_SCHEMA = vol.Schema({str: POS_SCHEMA})
 
+ROOM_SCHEMA = vol.Schema(
+    {
+        vol.Required("id"): str,
+        vol.Required("name"): str,
+        vol.Optional("area"): vol.Any(str, None),
+        vol.Required("x"): vol.Coerce(float),
+        vol.Required("y"): vol.Coerce(float),
+        vol.Required("w"): vol.Coerce(float),
+        vol.Required("h"): vol.Coerce(float),
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+SPACE_SCHEMA = vol.Schema(
+    {
+        vol.Required("id"): str,
+        vol.Required("title"): str,
+        vol.Optional("plan_url"): vol.Any(str, None),
+        vol.Required("aspect"): vol.All(vol.Coerce(float), vol.Range(min=0.05, max=20)),
+        vol.Required("view_box"): vol.All([vol.Coerce(float)], vol.Length(min=4, max=4)),
+        vol.Required("rooms"): [ROOM_SCHEMA],
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+VIRTUAL_SCHEMA = vol.Schema(
+    {
+        vol.Required("id"): str,
+        vol.Required("space"): str,
+        vol.Required("name"): str,
+        vol.Required("icon"): str,
+        vol.Required("x"): vol.Coerce(float),
+        vol.Required("y"): vol.Coerce(float),
+        vol.Optional("note"): vol.Any(str, None),
+        vol.Optional("entity_id"): vol.Any(str, None),
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+CONFIG_SCHEMA = vol.Schema(
+    {
+        vol.Required("spaces"): [SPACE_SCHEMA],
+        vol.Optional("device_overrides", default=dict): {
+            str: vol.Schema(
+                {
+                    vol.Optional("hidden"): bool,
+                    vol.Optional("icon"): vol.Any(str, None),
+                    vol.Optional("name"): vol.Any(str, None),
+                },
+                extra=vol.ALLOW_EXTRA,
+            )
+        },
+        vol.Optional("virtual_devices", default=list): [VIRTUAL_SCHEMA],
+        vol.Optional("settings", default=dict): vol.Schema({}, extra=vol.ALLOW_EXTRA),
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+SPACE_ID_RE = re.compile(r"^[a-z0-9_-]{1,64}$")
+PLAN_EXTENSIONS = {"svg": "image/svg+xml", "png": "image/png", "jpg": "image/jpeg", "webp": "image/webp"}
+MAX_PLAN_BYTES = 8 * 1024 * 1024
+
 
 @callback
 def async_register(hass: HomeAssistant) -> None:
@@ -20,18 +86,28 @@ def async_register(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, ws_layout_get)
     websocket_api.async_register_command(hass, ws_layout_set)
     websocket_api.async_register_command(hass, ws_layout_update)
+    websocket_api.async_register_command(hass, ws_config_get)
+    websocket_api.async_register_command(hass, ws_config_set)
+    websocket_api.async_register_command(hass, ws_plan_set)
 
 
 def _store(hass: HomeAssistant):
     return hass.data[DOMAIN]["store"]
 
 
+def _config_store(hass: HomeAssistant):
+    return hass.data[DOMAIN]["config_store"]
+
+
 def _check_write(hass: HomeAssistant, connection) -> bool:
     entry = hass.data[DOMAIN].get("entry")
     admin_only = bool(entry and entry.options.get(CONF_ADMIN_ONLY, False))
     return connection.user.is_admin if admin_only else True
 
 
+# ---------------- раскладка ----------------
+
+
 @websocket_api.websocket_command({vol.Required("type"): "houseplan/layout/get"})
 @websocket_api.async_response
 async def ws_layout_get(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
@@ -72,3 +148,77 @@ async def ws_layout_update(hass: HomeAssistant, connection, msg: dict[str, Any])
     layout[msg["device_id"]] = msg["pos"]
     await store.async_save({"layout": layout})
     connection.send_result(msg["id"], {"ok": True})
+
+
+# ---------------- конфигурация пространств ----------------
+
+
+@websocket_api.websocket_command({vol.Required("type"): "houseplan/config/get"})
+@websocket_api.async_response
+async def ws_config_get(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
+    """Вернуть конфигурацию (пространства, оверрайды, виртуальные устройства, настройки)."""
+    data = await _config_store(hass).async_load() or {}
+    config = {**DEFAULT_CONFIG, **data.get("config", {})}
+    connection.send_result(msg["id"], {"config": config})
+
+
+@websocket_api.websocket_command(
+    {vol.Required("type"): "houseplan/config/set", vol.Required("config"): CONFIG_SCHEMA}
+)
+@websocket_api.async_response
+async def ws_config_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
+    """Полностью заменить конфигурацию."""
+    if not _check_write(hass, connection):
+        connection.send_error(msg["id"], "unauthorized", "Правка конфигурации разрешена только администраторам")
+        return
+    await _config_store(hass).async_save({"config": msg["config"]})
+    connection.send_result(msg["id"], {"ok": True})
+
+
+# ---------------- загрузка планов ----------------
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "houseplan/plan/set",
+        vol.Required("space_id"): str,
+        vol.Required("ext"): vol.In(sorted(PLAN_EXTENSIONS)),
+        vol.Required("data"): str,  # base64
+    }
+)
+@websocket_api.async_response
+async def ws_plan_set(hass: HomeAssistant, connection, msg: dict[str, Any]) -> None:
+    """Сохранить файл плана пространства; вернуть URL для карточки."""
+    if not _check_write(hass, connection):
+        connection.send_error(msg["id"], "unauthorized", "Загрузка планов разрешена только администраторам")
+        return
+    space_id = msg["space_id"]
+    if not SPACE_ID_RE.match(space_id):
+        connection.send_error(msg["id"], "invalid_space_id", "space_id: только [a-z0-9_-], до 64 символов")
+        return
+    try:
+        raw = base64.b64decode(msg["data"], validate=True)
+    except (binascii.Error, ValueError):
+        connection.send_error(msg["id"], "invalid_data", "data должен быть корректным base64")
+        return
+    if len(raw) > MAX_PLAN_BYTES:
+        connection.send_error(msg["id"], "too_large", f"План больше {MAX_PLAN_BYTES // 1024 // 1024} МБ")
+        return
+
+    plans_dir = Path(hass.config.path(PLANS_DIR))
+    path = plans_dir / f"{space_id}.{msg['ext']}"
+
+    def _write() -> None:
+        plans_dir.mkdir(parents=True, exist_ok=True)
+        # убрать старые варианты с другим расширением
+        for old_ext in PLAN_EXTENSIONS:
+            old = plans_dir / f"{space_id}.{old_ext}"
+            if old_ext != msg["ext"] and old.exists():
+                old.unlink()
+        path.write_bytes(raw)
+
+    await hass.async_add_executor_job(_write)
+    mtime = int(path.stat().st_mtime)
+    connection.send_result(
+        msg["id"], {"ok": True, "url": f"{PLANS_URL}/{space_id}.{msg['ext']}?v={mtime}"}
+    )