Upload run-space.py

scripts/run-space.py

@@ -1,5 +1,6 @@
 """Prepare HA configuration and supervise the three Space services."""
 import os
+import json
 from pathlib import Path
 import yaml
 import shutil
@@ -66,6 +67,43 @@ def validate_http(text):
         raise ValueError("HTTP proxy configuration must trust local Nginx")
 
 
+def prepare_http_storage(config_dir):
+    """Sync migrated HA HTTP storage before HA starts; preserve all other settings."""
+    path = config_dir / ".storage" / "http"
+    if not path.exists():
+        print("No stored HTTP configuration; HA will import YAML settings.", flush=True)
+        return
+    document = json.loads(path.read_text(encoding="utf-8"))
+    version = document.get("version")
+    data = document.get("data")
+    if not isinstance(data, dict):
+        raise ValueError("Invalid .storage/http payload; refusing to start")
+    settings = {
+        "server_port": 8123,
+        "use_x_forwarded_for": True,
+        "trusted_proxies": ["127.0.0.1/32", "::1/128", "10.0.0.0/8"],
+    }
+    if version == 1:
+        data.update(settings)
+    elif version == 2:
+        if not isinstance(data.get("stable"), dict):
+            raise ValueError("Invalid stable HTTP storage configuration")
+        data["stable"].update(settings)
+        data["stable"]["error"] = None
+        data["stable"]["error_message"] = None
+        # Remove an unconfirmed trial so it cannot override the stable config.
+        data["pending"] = None
+    else:
+        raise ValueError(f"Unsupported HTTP storage version {version}; review before migrating")
+    original = path.with_name("http.before-space-proxy.json")
+    if not original.exists():
+        shutil.copy2(path, original)
+    pending = path.with_name("http.space.tmp")
+    pending.write_text(json.dumps(document, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
+    pending.replace(path)
+    print(f"HA HTTP storage v{version} verified: port=8123, use_x_forwarded_for=true, trusted_proxy=127.0.0.1", flush=True)
+
+
 def backup(action):
     result = subprocess.run(["python3", BACKUP, action, "--config", str(CONFIG)], timeout=120)
     if result.returncode:
@@ -84,6 +122,7 @@ def main():
     pending.replace(config_file)
     validate_http(config_file.read_text(encoding="utf-8"))
     print("HA HTTP configuration verified: port=8123, use_x_forwarded_for=true, trusted_proxy=127.0.0.1", flush=True)
+    prepare_http_storage(CONFIG)
     components = CONFIG / "custom_components"
     components.mkdir(exist_ok=True)
     for source in Path("/opt/ha-custom-components").iterdir():