homekit names

6

.woodpecker/build.yml

@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 matrix:
   APP:
@@ -7,6 +10,8 @@ matrix:
     - api
     - abstraction
     - rules
+    - static
+    - homekit
 
 steps:
   build-${APP}:
@@ -21,8 +26,3 @@ steps:
       repo: ${FORGE_NAME}/${CI_REPO}/${APP}
       auto_tag: true
       dockerfile: apps/${APP}/Dockerfile
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange

.woodpecker/config.yml

@@ -1,23 +1,10 @@
 when:
   event: [tag]
 
-steps:
+depends_on:
-  create_namespace:
+  - namespace
-    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
-    environment:
-      KUBE_CONFIG_CONTENT:
-        from_secret: kube_config
-      NAMESPACE: "homea2"
-    commands:
-      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
-      - export KUBECONFIG=/tmp/kubeconfig
-      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
-    when:
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 
+steps:
   apply_configuration:
     image: quay.io/wollud1969/k8s-admin-helper:0.3.4
     environment:
@@ -36,6 +23,4 @@ steps:
         --namespace=$NAMESPACE 
         --dry-run=client -o yaml | kubectl apply -f - 
       - kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
-    when:
-      event: [tag]
 

.woodpecker/deploy.yml

@@ -1,9 +1,13 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 depends_on:
   - build
-  - predeploy
+  - namespace
+  - config
 
 matrix:
   APP:
@@ -11,6 +15,7 @@ matrix:
     - api
     - abstraction
     - rules
+    - static
 
 steps:
   deploy-${APP}:
@@ -25,9 +30,5 @@ steps:
       - export KUBECONFIG=/tmp/kubeconfig
       - echo "Deploying application ${APP} ($IMAGE) to namespace $NAMESPACE"
       - cat deployment/${APP}-deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
-    when:
+    
-      event: [tag]
-      ref:
-        exclude:
-          - refs/tags/*-configchange
 

.woodpecker/ingress.yml

@@ -0,0 +1,21 @@
+when:
+  event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
+
+depends_on:
+  - deploy
+
+steps:
+  apply_ingress:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - kubectl apply -f deployment/ingress.yaml -n $NAMESPACE
+

.woodpecker/namespace.yml

@@ -0,0 +1,15 @@
+when:
+  event: [tag]
+
+steps:
+  create_namespace:
+    image: quay.io/wollud1969/k8s-admin-helper:0.3.4
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
+      NAMESPACE: "homea2"
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
+

apps/abstraction/main.py

@@ -180,17 +180,10 @@ async def handle_abstract_set(
     
     # Transform abstract payload to vendor-specific format
     vendor_payload = transform_abstract_to_vendor(device_type, device_technology, abstract_payload)
-    
+        
-    # For MAX! thermostats and Shelly relays, vendor_payload is a plain string
+    logger.info(f"→ vendor SET {device_id}: {vendor_topic} ← {vendor_payload}")
-    # For other devices, it's a dict that needs JSON encoding
+    logger.debug(f"MQTT message published on {vendor_topic}: {vendor_payload}")
-    if (device_technology == "max" and device_type == "thermostat") or \
+    await mqtt_client.publish(vendor_topic, vendor_payload, qos=1)
-       (device_technology == "shelly" and device_type == "relay"):
-        vendor_message = vendor_payload  # Already a string
-    else:
-        vendor_message = json.dumps(vendor_payload)
-    
-    logger.info(f"→ vendor SET {device_id}: {vendor_topic} ← {vendor_message}")
-    await mqtt_client.publish(vendor_topic, vendor_message, qos=1)
 
 
 async def handle_vendor_state(

apps/abstraction/transformation.py

@@ -17,12 +17,12 @@ logger = logging.getLogger(__name__)
 # HANDLER FUNCTIONS: simulator technology
 # ============================================================================
 
-def _transform_light_simulator_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_light_simulator_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract light payload to simulator format.
     
     Simulator uses same format as abstract protocol (no transformation needed).
     """
-    return payload
+    return json.dumps(payload)
 
 
 def _transform_light_simulator_to_abstract(payload: str) -> dict[str, Any]:
@@ -36,12 +36,12 @@ def _transform_light_simulator_to_abstract(payload: str) -> dict[str, Any]:
     return payload
 
 
-def _transform_thermostat_simulator_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_thermostat_simulator_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract thermostat payload to simulator format.
     
     Simulator uses same format as abstract protocol (no transformation needed).
     """
-    return payload
+    return json.dumps(payload)
 
 
 def _transform_thermostat_simulator_to_abstract(payload: str) -> dict[str, Any]:
@@ -59,7 +59,7 @@ def _transform_thermostat_simulator_to_abstract(payload: str) -> dict[str, Any]:
 # HANDLER FUNCTIONS: zigbee2mqtt technology
 # ============================================================================
 
-def _transform_light_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_light_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract light payload to zigbee2mqtt format.
     
     Transformations:
@@ -84,7 +84,7 @@ def _transform_light_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str,
             # Convert percentage (0-100) to zigbee2mqtt range (0-254)
             vendor_payload["brightness"] = round(abstract_brightness * 254 / 100)
     
-    return vendor_payload
+    return json.dumps(vendor_payload)
 
 
 def _transform_light_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
@@ -115,7 +115,7 @@ def _transform_light_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
     return abstract_payload
 
 
-def _transform_thermostat_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_thermostat_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract thermostat payload to zigbee2mqtt format.
     
     Transformations:
@@ -132,7 +132,7 @@ def _transform_thermostat_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict
         # zigbee2mqtt expects current_heating_setpoint as string
         vendor_payload["current_heating_setpoint"] = str(payload["target"])
     
-    return vendor_payload
+    return json.dumps(vendor_payload)
 
 
 def _transform_thermostat_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
@@ -171,14 +171,14 @@ def _transform_thermostat_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any
 # HANDLER FUNCTIONS: contact_sensor - zigbee2mqtt technology
 # ============================================================================
 
-def _transform_contact_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_contact_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract contact sensor payload to zigbee2mqtt format.
     
     Contact sensors are read-only, so this should not be called for SET commands.
     Returns payload as-is for compatibility.
     """
     logger.warning("Contact sensors are read-only - SET commands should not be used")
-    return payload
+    return json.dumps(payload)
 
 
 def _transform_contact_sensor_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
@@ -225,14 +225,14 @@ def _transform_contact_sensor_zigbee2mqtt_to_abstract(payload: str) -> dict[str,
 # HANDLER FUNCTIONS: contact_sensor - max technology (Homegear MAX!)
 # ============================================================================
 
-def _transform_contact_sensor_max_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_contact_sensor_max_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract contact sensor payload to MAX! format.
     
     Contact sensors are read-only, so this should not be called for SET commands.
     Returns payload as-is for compatibility.
     """
     logger.warning("Contact sensors are read-only - SET commands should not be used")
-    return payload
+    return json.dumps(payload)
 
 
 def _transform_contact_sensor_max_to_abstract(payload: str) -> dict[str, Any]:
@@ -266,13 +266,13 @@ def _transform_contact_sensor_max_to_abstract(payload: str) -> dict[str, Any]:
 # HANDLER FUNCTIONS: temp_humidity_sensor - zigbee2mqtt technology
 # ============================================================================
 
-def _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract temp/humidity sensor payload to zigbee2mqtt format.
     
     Temp/humidity sensors are read-only, so this should not be called for SET commands.
     Returns payload as-is for compatibility.
     """
-    return payload
+    return json.dumps(payload)
 
 
 def _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
@@ -284,36 +284,13 @@ def _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract(payload: str) -> dic
     return payload
 
 
-# ============================================================================
-# HANDLER FUNCTIONS: temp_humidity_sensor - MAX! technology
-# ============================================================================
-
-def _transform_temp_humidity_sensor_max_to_vendor(payload: str) -> dict[str, Any]:
-    """Transform abstract temp/humidity sensor payload to MAX! format.
-    
-    Temp/humidity sensors are read-only, so this should not be called for SET commands.
-    Returns payload as-is for compatibility.
-    """
-
-    payload = json.loads(payload)
-
-    return payload
-
-
-def _transform_temp_humidity_sensor_max_to_abstract(payload: str) -> dict[str, Any]:
-    """Transform MAX! temp/humidity sensor payload to abstract format.
-    
-    Passthrough - MAX! provides temperature, humidity, battery directly.
-    """
-    payload = json.loads(payload)
-    return payload
 
 
 # ============================================================================
 # HANDLER FUNCTIONS: relay - zigbee2mqtt technology
 # ============================================================================
 
-def _transform_relay_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_relay_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract relay payload to zigbee2mqtt format.
     
     Relay only has power on/off, same transformation as light.
@@ -325,7 +302,7 @@ def _transform_relay_zigbee2mqtt_to_vendor(payload: dict[str, Any]) -> dict[str,
         power_value = vendor_payload.pop("power")
         vendor_payload["state"] = power_value.upper() if isinstance(power_value, str) else power_value
     
-    return vendor_payload
+    return json.dumps(vendor_payload)
 
 
 def _transform_relay_zigbee2mqtt_to_abstract(payload: str) -> dict[str, Any]:
@@ -375,10 +352,40 @@ def _transform_relay_shelly_to_abstract(payload: str) -> dict[str, Any]:
     return {"power": payload.strip()}
 
 # ============================================================================
-# HANDLER FUNCTIONS: relay - hottis_modbus technology
+# HANDLER FUNCTIONS: relay - tasmota technology
 # ============================================================================
 
-def _transform_relay_hottis_modbus_to_vendor(payload: dict[str, Any]) -> str:
+def _transform_relay_tasmota_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract relay payload to Tasmota format.
+    
+    Tasmota expects plain text 'on' or 'off' (not JSON).
+    - power: 'on'/'off' -> 'on'/'off' (plain string)
+    
+    Example:
+    - Abstract: {'power': 'on'}
+    - Tasmota: 'on'
+    """
+    power = payload.get("power", "off")
+    return power
+
+
+def _transform_relay_tasmota_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform Tasmota relay payload to abstract format.
+    
+    Tasmota sends plain text 'on' or 'off' (not JSON).
+    - 'on'/'off' -> power: 'on'/'off'
+    
+    Example:
+    - Tasmota: 'ON'
+    - Abstract: {'power': 'on'}
+    """
+    return {"power": payload.strip().lower()}
+
+# ============================================================================
+# HANDLER FUNCTIONS: relay - hottis_pv_modbus technology
+# ============================================================================
+
+def _transform_relay_hottis_pv_modbus_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract relay payload to Hottis Modbus format.
     
     Hottis Modbus expects plain text 'on' or 'off' (not JSON).
@@ -392,26 +399,32 @@ def _transform_relay_hottis_modbus_to_vendor(payload: dict[str, Any]) -> str:
     return power
 
 
-def _transform_relay_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
+def _transform_relay_hottis_pv_modbus_to_abstract(payload: str) -> dict[str, Any]:
-    """Transform Hottis Modbus relay payload to abstract format.
+    def _transform_relay_hottis_pv_modbus_to_abstract(payload: str) -> dict[str, Any]:
+        """Transform Hottis Modbus relay payload to abstract format.
+        
+        Hottis Modbus sends JSON like:
+        {"status": "Ok", "timestamp": "...", "state": false, "cnt": 528}
+        
+        We only care about the 'state' field:
+        - state: true  -> power: 'on'
+        - state: false -> power: 'off'
+        """
+        data = json.loads(payload)
+
+        state = data.get("state", False)
+        power = "on" if bool(state) else "off"
     
-    Hottis Modbus sends plain text 'on' or 'off' (not JSON).
-    - 'on'/'off' -> power: 'on'/'off'
     
-    Example:
-    - Hottis Modbus: 'on'
-    - Abstract: {'power': 'on'}
-    """
     return {"power": payload.strip()}
 
 
 # ============================================================================
-# HANDLER FUNCTIONS: three_phase_powermeter - hottis_modbus technology
+# HANDLER FUNCTIONS: three_phase_powermeter - hottis_pv_modbus technology
 # ============================================================================
 
-def _transform_three_phase_powermeter_hottis_modbus_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
+def _transform_three_phase_powermeter_hottis_pv_modbus_to_vendor(payload: dict[str, Any]) -> str:
-    """Transform abstract three_phase_powermeter payload to hottis_modbus format.
+    """Transform abstract three_phase_powermeter payload to hottis_pv_modbus format.
-
     energy: float = Field(..., description="Total energy in kWh")
     total_power: float = Field(..., description="Total power in W")
     phase1_power: float = Field(..., description="Power for phase 1 in W")
@@ -441,34 +454,55 @@ def _transform_three_phase_powermeter_hottis_modbus_to_vendor(payload: dict[str,
         "phase3_current": payload.get("phase3_current", 0.0),
     }
 
-    return vendor_payload
+    return json.dumps(vendor_payload)
 
 
-def _transform_three_phase_powermeter_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
+def _transform_three_phase_powermeter_hottis_pv_modbus_to_abstract(payload: str) -> dict[str, Any]:
-    """Transform hottis_modbus three_phase_powermeter payload to abstract format.
+    """Transform hottis_pv_modbus three_phase_powermeter payload to abstract format.
     
     Transformations:
-    - Direct mapping of all power meter fields
+    - Map vendor field names to abstract field names
-    
+        - totalImportEnergy        -> energy
-    Example:
+        - powerL1/powerL2/powerL3  -> phase1_power/phase2_power/phase3_power
-    - hottis_modbus: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
+        - voltageL1/voltageL2/voltageL3 -> phase1_voltage/phase2_voltage/phase3_voltage
-    - Abstract: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
+        - currentL1/currentL2/currentL3 -> phase1_current/phase2_current/phase3_current
+        - Sum of powerL1..3        -> total_power
     """
-    payload = json.loads(payload)
+    data = json.loads(payload)
+
+    # Helper to read numeric values uniformly as float
+    def _get_float(key: str, default: float = 0.0) -> float:
+        return float(data.get(key, default))
+
+    # Read all numeric values via helper for consistent error handling
+    phase1_power = _get_float("powerL1")
+    phase2_power = _get_float("powerL2")
+    phase3_power = _get_float("powerL3")
+
+    phase1_voltage = _get_float("voltageL1")
+    phase2_voltage = _get_float("voltageL2")
+    phase3_voltage = _get_float("voltageL3")
+
+    phase1_current = _get_float("currentL1")
+    phase2_current = _get_float("currentL2")
+    phase3_current = _get_float("currentL3")
+
+    energy = _get_float("totalImportEnergy")
+
     abstract_payload = {
-        "energy": payload.get("energy", 0.0),
+        "energy": energy,
-        "total_power": payload.get("total_power", 0.0),
+        "total_power": phase1_power + phase2_power + phase3_power,
-        "phase1_power": payload.get("phase1_power", 0.0),
+        "phase1_power": phase1_power,
-        "phase2_power": payload.get("phase2_power", 0.0),
+        "phase2_power": phase2_power,
-        "phase3_power": payload.get("phase3_power", 0.0),
+        "phase3_power": phase3_power,
-        "phase1_voltage": payload.get("phase1_voltage", 0.0),
+        "phase1_voltage": phase1_voltage,
-        "phase2_voltage": payload.get("phase2_voltage", 0.0),
+        "phase2_voltage": phase2_voltage,
-        "phase3_voltage": payload.get("phase3_voltage", 0.0),
+        "phase3_voltage": phase3_voltage,
-        "phase1_current": payload.get("phase1_current", 0.0),
+        "phase1_current": phase1_current,
-        "phase2_current": payload.get("phase2_current", 0.0),
+        "phase2_current": phase2_current,
-        "phase3_current": payload.get("phase3_current", 0.0),
+        "phase3_current": phase3_current,
     }
-    
+
     return abstract_payload
 
 
@@ -567,24 +601,22 @@ TRANSFORM_HANDLERS: dict[tuple[str, str, str], TransformHandler] = {
     # Temperature & humidity sensor transformations (support both type aliases)
     ("temp_humidity_sensor", "zigbee2mqtt", "to_vendor"): _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor,
     ("temp_humidity_sensor", "zigbee2mqtt", "to_abstract"): _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract,
-    ("temp_humidity_sensor", "max", "to_vendor"): _transform_temp_humidity_sensor_max_to_vendor,
-    ("temp_humidity_sensor", "max", "to_abstract"): _transform_temp_humidity_sensor_max_to_abstract,
     ("temp_humidity", "zigbee2mqtt", "to_vendor"): _transform_temp_humidity_sensor_zigbee2mqtt_to_vendor,
     ("temp_humidity", "zigbee2mqtt", "to_abstract"): _transform_temp_humidity_sensor_zigbee2mqtt_to_abstract,
-    ("temp_humidity", "max", "to_vendor"): _transform_temp_humidity_sensor_max_to_vendor,
-    ("temp_humidity", "max", "to_abstract"): _transform_temp_humidity_sensor_max_to_abstract,
     
     # Relay transformations
     ("relay", "zigbee2mqtt", "to_vendor"): _transform_relay_zigbee2mqtt_to_vendor,
     ("relay", "zigbee2mqtt", "to_abstract"): _transform_relay_zigbee2mqtt_to_abstract,
     ("relay", "shelly", "to_vendor"): _transform_relay_shelly_to_vendor,
     ("relay", "shelly", "to_abstract"): _transform_relay_shelly_to_abstract,
-    ("relay", "hottis_modbus", "to_vendor"): _transform_relay_hottis_modbus_to_vendor,
+    ("relay", "hottis_pv_modbus", "to_vendor"): _transform_relay_hottis_pv_modbus_to_vendor,
-    ("relay", "hottis_modbus", "to_abstract"): _transform_relay_hottis_modbus_to_abstract,
+    ("relay", "hottis_pv_modbus", "to_abstract"): _transform_relay_hottis_pv_modbus_to_abstract,
+    ("relay", "tasmota", "to_vendor"): _transform_relay_tasmota_to_vendor,
+    ("relay", "tasmota", "to_abstract"): _transform_relay_tasmota_to_abstract,
 
     # Three-Phase Powermeter transformations
-    ("three_phase_powermeter", "hottis_modbus", "to_vendor"): _transform_three_phase_powermeter_hottis_modbus_to_vendor,
+    ("three_phase_powermeter", "hottis_pv_modbus", "to_vendor"): _transform_three_phase_powermeter_hottis_pv_modbus_to_vendor,
-    ("three_phase_powermeter", "hottis_modbus", "to_abstract"): _transform_three_phase_powermeter_hottis_modbus_to_abstract,
+    ("three_phase_powermeter", "hottis_pv_modbus", "to_abstract"): _transform_three_phase_powermeter_hottis_pv_modbus_to_abstract,
 }
 
 

apps/homekit/device_registry.py

@@ -87,7 +87,7 @@ class DeviceRegistry:
                 device_id=device_id,
                 type=device_type,
                 name=dev_data.get('name', device_id),
-                friendly_name=title or dev_data.get('name', device_id),
+                friendly_name=dev_data.get('name', device_id),
                 room=room_name,
                 features=dev_data.get('features', {}),
                 read_only=read_only

apps/homekit/docker-compose.yaml

@@ -1,15 +1,13 @@
 services:
   homekit-bridge:
-    build:
+    image: gitea.hottis.de/wn/home-automation/homekit:0.5.0
-      context: ../..
-      dockerfile: apps/homekit/Dockerfile
     container_name: homekit-bridge
 
     # Required for mDNS/Bonjour to work properly
     network_mode: host
 
     environment:
-      - HOMEKIT_NAME=Home Automation Bridge
+      - HOMEKIT_NAME=Hottis Home Automation Bridge
       - HOMEKIT_PIN=031-45-154
       - HOMEKIT_PORT=51826
       

apps/homekit/main.py

@@ -78,7 +78,7 @@ def build_bridge(driver: AccessoryDriver, api_client: ApiClient) -> Bridge:
                     
                 bridge.add_accessory(accessory)
                 accessory_map[device.device_id] = accessory
-                logger.info(f"Added accessory: {device.friendly_name} ({device.type}) in room: {device.room or 'Unknown'}")
+                logger.info(f"Added accessory: {device.friendly_name} ({device.type}, {accessory.__class__.__name__}) in room: {device.room or 'Unknown'}")
             else:
                 logger.warning(f"No accessory mapping for device: {device.name} ({device.type})")
         except Exception as e:
@@ -101,10 +101,10 @@ def get_accessory_name(device) -> str:
     Returns:
         Name string like "Device Name (Room)" or just "Device Name" if no room
     """
-    base_name = device.friendly_name or device.name
+    #base_name = device.friendly_name or device.name
-    if device.room:
+    #if device.room:
-        return f"{base_name} ({device.room})"
+    #    return f"{base_name} - {device.room}"
-    return base_name
+    return device.name
 
 
 def create_accessory_for_device(device, api_client: ApiClient, driver: AccessoryDriver):

apps/static/Dockerfile

@@ -0,0 +1,15 @@
+# Static assets Dockerfile (minimal webserver for /static only)
+
+FROM nginx:1.27-alpine
+
+WORKDIR /usr/share/nginx/html
+
+# Remove default nginx content
+RUN rm -rf ./*
+
+# Copy only static assets from the UI project
+COPY apps/static/static/ ./
+
+EXPOSE 80
+
+# Use default nginx config; caller can mount custom config if needed

apps/static/static/index.html

@@ -0,0 +1 @@
+empty

apps/ui/Dockerfile

@@ -1,49 +1,41 @@
-# UI Service Dockerfile
+# UI Service Dockerfile (Application only, without static files)
-# FastAPI + Jinja2 + HTMX Dashboard
 
 FROM python:3.14-alpine
 
-# Prevent Python from writing .pyc files and enable unbuffered output
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
     UI_PORT=8002 \
     API_BASE=http://api:8001 \
-    BASE_PATH=""
+    BASE_PATH="" \
+    STATIC_BASE=http://static:8080
 
-# Create non-root user
 RUN addgroup -g 10001 -S app && \
     adduser -u 10001 -S app -G app
 
-# Set working directory
 WORKDIR /app
 
-# Install system dependencies
 RUN apk add --no-cache \
     curl \
     gcc \
     musl-dev \
     linux-headers
 
-# Install Python dependencies
 COPY apps/ui/requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy application code
+# Copy only Python code and templates, but exclude static assets
 COPY apps/__init__.py /app/apps/__init__.py
-COPY apps/ui/ /app/apps/ui/
+COPY apps/ui/__init__.py /app/apps/ui/__init__.py
+COPY apps/ui/main.py /app/apps/ui/main.py
+COPY apps/ui/api_client.py /app/apps/ui/api_client.py
+COPY apps/ui/templates/ /app/apps/ui/templates/
 
-# Change ownership to app user
 RUN chown -R app:app /app
-
-# Switch to non-root user
 USER app
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:${UI_PORT}/health || exit 1
 
-# Expose port
 EXPOSE 8002
 
-# Run application
 CMD ["python", "-m", "uvicorn", "apps.ui.main:app", "--host", "0.0.0.0", "--port", "8002"]

apps/ui/main.py

@@ -16,9 +16,11 @@ logger = logging.getLogger(__name__)
 # Read configuration from environment variables
 API_BASE = os.getenv("API_BASE", "http://localhost:8001")
 BASE_PATH = os.getenv("BASE_PATH", "")  # e.g., "/ui" for reverse proxy
+STATIC_BASE = os.getenv("STATIC_BASE", "/static")
 
 print(f"UI using API_BASE: {API_BASE}")
 print(f"UI using BASE_PATH: {BASE_PATH}")
+print(f"UI using STATIC_BASE: {STATIC_BASE}")
 
 def api_url(path: str) -> str:
     """Helper function to construct API URLs.
@@ -43,6 +45,9 @@ app = FastAPI(
 templates_dir = Path(__file__).parent / "templates"
 templates = Jinja2Templates(directory=str(templates_dir))
 
+# Make STATIC_BASE available in all templates
+templates.env.globals["STATIC_BASE"] = STATIC_BASE
+
 # Setup static files
 static_dir = Path(__file__).parent / "static"
 static_dir.mkdir(exist_ok=True)
@@ -98,7 +103,8 @@ async def health() -> JSONResponse:
         "status": "ok",
         "service": "ui",
         "api_base": API_BASE,
-        "base_path": BASE_PATH
+        "base_path": BASE_PATH,
+        "static_base": STATIC_BASE,
     })
 
 
@@ -127,7 +133,7 @@ async def rooms(request: Request) -> HTMLResponse:
     """
     return templates.TemplateResponse("rooms.html", {
         "request": request,
-        "api_base": API_BASE
+        "api_base": API_BASE,
     })
 
 
@@ -145,7 +151,7 @@ async def room_detail(request: Request, room_name: str) -> HTMLResponse:
     return templates.TemplateResponse("room.html", {
         "request": request,
         "api_base": API_BASE,
-        "room_name": room_name
+        "room_name": room_name,
     })
 
 

apps/ui/static/README.md

@@ -1,301 +0,0 @@
-# Home Automation API Client
-
-Wiederverwendbare JavaScript-API-Client-Bibliothek für das Home Automation UI.
-
-## Installation
-
-Füge die folgenden Script-Tags in deine HTML-Seiten ein:
-
-```html
-<script src="/static/types.js"></script>
-<script src="/static/api-client.js"></script>
-```
-
-## Konfiguration
-
-Der API-Client nutzt `window.API_BASE`, das vom Backend gesetzt wird:
-
-```javascript
-window.API_BASE = '{{ api_base }}';  // Jinja2 template
-```
-
-## Verwendung
-
-### Globale Instanz
-
-Der API-Client erstellt automatisch eine globale Instanz `window.apiClient`:
-
-```javascript
-// Layout abrufen
-const layout = await window.apiClient.getLayout();
-
-// Geräte abrufen
-const devices = await window.apiClient.getDevices();
-
-// Gerätestatus abrufen
-const state = await window.apiClient.getDeviceState('kitchen_light');
-
-// Gerätesteuerung
-await window.apiClient.setDeviceState('kitchen_light', 'light', {
-    power: true,
-    brightness: 80
-});
-```
-
-### Verfügbare Methoden
-
-#### `getLayout(): Promise<Layout>`
-Lädt die Layout-Daten (Räume und ihre Geräte).
-
-```javascript
-const layout = await window.apiClient.getLayout();
-// { rooms: [{name: "Küche", devices: ["kitchen_light", ...]}, ...] }
-```
-
-#### `getDevices(): Promise<Device[]>`
-Lädt alle Geräte mit ihren Features.
-
-```javascript
-const devices = await window.apiClient.getDevices();
-// [{device_id: "...", name: "...", type: "light", features: {...}}, ...]
-```
-
-#### `getDeviceState(deviceId): Promise<DeviceState>`
-Lädt den aktuellen Status eines Geräts.
-
-```javascript
-const state = await window.apiClient.getDeviceState('kitchen_light');
-// {power: true, brightness: 80, ...}
-```
-
-#### `getAllStates(): Promise<Object>`
-Lädt alle Gerätestatus auf einmal.
-
-```javascript
-const states = await window.apiClient.getAllStates();
-// {"kitchen_light": {power: true, ...}, "thermostat_1": {...}, ...}
-```
-
-#### `setDeviceState(deviceId, type, payload): Promise<void>`
-Sendet einen Befehl an ein Gerät.
-
-```javascript
-// Licht einschalten
-await window.apiClient.setDeviceState('kitchen_light', 'light', {
-    power: true,
-    brightness: 80
-});
-
-// Thermostat einstellen
-await window.apiClient.setDeviceState('thermostat_1', 'thermostat', {
-    target_temp: 22.5
-});
-
-// Rollladen steuern
-await window.apiClient.setDeviceState('cover_1', 'cover', {
-    position: 50
-});
-```
-
-#### `getDeviceRoom(deviceId): Promise<{room: string}>`
-Ermittelt den Raum eines Geräts.
-
-```javascript
-const { room } = await window.apiClient.getDeviceRoom('kitchen_light');
-// {room: "Küche"}
-```
-
-#### `getScenes(): Promise<Scene[]>`
-Lädt alle verfügbaren Szenen.
-
-```javascript
-const scenes = await window.apiClient.getScenes();
-```
-
-#### `activateScene(sceneId): Promise<void>`
-Aktiviert eine Szene.
-
-```javascript
-await window.apiClient.activateScene('evening');
-```
-
-### Realtime-Updates (SSE)
-
-#### `connectRealtime(onEvent, onError): EventSource`
-Verbindet sich mit dem SSE-Stream für Live-Updates.
-
-```javascript
-window.apiClient.connectRealtime(
-    (event) => {
-        console.log('Update:', event.device_id, event.state);
-        // event = {device_id: "...", type: "state", state: {...}}
-    },
-    (error) => {
-        console.error('Connection error:', error);
-    }
-);
-```
-
-#### `onDeviceUpdate(deviceId, callback): Function`
-Registriert einen Listener für spezifische Geräte-Updates.
-
-```javascript
-// Für ein bestimmtes Gerät
-const unsubscribe = window.apiClient.onDeviceUpdate('kitchen_light', (event) => {
-    console.log('Kitchen light changed:', event.state);
-    updateUI(event.state);
-});
-
-// Für alle Geräte
-const unsubscribeAll = window.apiClient.onDeviceUpdate(null, (event) => {
-    console.log('Any device changed:', event.device_id, event.state);
-});
-
-// Später: Listener entfernen
-unsubscribe();
-```
-
-#### `disconnectRealtime(): void`
-Trennt die SSE-Verbindung und entfernt alle Listener.
-
-```javascript
-window.apiClient.disconnectRealtime();
-```
-
-### Helper-Methoden
-
-#### `findDevice(devices, deviceId): Device|null`
-Findet ein Gerät in einem Array.
-
-```javascript
-const devices = await window.apiClient.getDevices();
-const device = window.apiClient.findDevice(devices, 'kitchen_light');
-```
-
-#### `findRoom(layout, roomName): Room|null`
-Findet einen Raum im Layout.
-
-```javascript
-const layout = await window.apiClient.getLayout();
-const room = window.apiClient.findRoom(layout, 'Küche');
-```
-
-#### `getDevicesForRoom(layout, devices, roomName): Device[]`
-Gibt alle Geräte eines Raums zurück.
-
-```javascript
-const layout = await window.apiClient.getLayout();
-const devices = await window.apiClient.getDevices();
-const kitchenDevices = window.apiClient.getDevicesForRoom(layout, devices, 'Küche');
-```
-
-#### `api(path): string`
-Konstruiert eine vollständige API-URL.
-
-```javascript
-const url = window.apiClient.api('/devices');
-// "http://172.19.1.11:8001/devices"
-```
-
-### Backward Compatibility
-
-Die globale `api()` Funktion ist weiterhin verfügbar:
-
-```javascript
-function api(url) {
-    return window.apiClient.api(url);
-}
-```
-
-## Typen (JSDoc)
-
-Die Datei `types.js` enthält JSDoc-Definitionen für alle API-Typen:
-
-- `Room` - Raum mit Geräten
-- `Layout` - Layout-Struktur
-- `Device` - Gerätedaten
-- `DeviceFeatures` - Geräte-Features
-- `DeviceState` - Gerätestatus (Light, Thermostat, Contact, etc.)
-- `RealtimeEvent` - SSE-Event-Format
-- `Scene` - Szenen-Definition
-- `*Payload` - Command-Payloads für verschiedene Gerätetypen
-
-Diese ermöglichen IDE-Autocomplete und Type-Checking in modernen Editoren (VS Code, WebStorm).
-
-## Beispiel: Vollständige Seite
-
-```html
-<!DOCTYPE html>
-<html lang="de">
-<head>
-    <meta charset="UTF-8">
-    <title>My Page</title>
-    <script src="/static/types.js"></script>
-    <script src="/static/api-client.js"></script>
-</head>
-<body>
-    <div id="status"></div>
-    <button id="toggle">Toggle Light</button>
-
-    <script>
-        window.API_BASE = 'http://172.19.1.11:8001';
-        const deviceId = 'kitchen_light';
-
-        async function init() {
-            // Load initial state
-            const state = await window.apiClient.getDeviceState(deviceId);
-            updateUI(state);
-
-            // Listen for updates
-            window.apiClient.onDeviceUpdate(deviceId, (event) => {
-                updateUI(event.state);
-            });
-
-            // Connect to realtime
-            window.apiClient.connectRealtime((event) => {
-                console.log('Event:', event);
-            });
-
-            // Handle button clicks
-            document.getElementById('toggle').onclick = async () => {
-                const currentState = await window.apiClient.getDeviceState(deviceId);
-                await window.apiClient.setDeviceState(deviceId, 'light', {
-                    power: !currentState.power
-                });
-            };
-        }
-
-        function updateUI(state) {
-            document.getElementById('status').textContent = 
-                state.power ? 'ON' : 'OFF';
-        }
-
-        init();
-    </script>
-</body>
-</html>
-```
-
-## Error Handling
-
-Alle API-Methoden werfen Exceptions bei Fehlern:
-
-```javascript
-try {
-    const state = await window.apiClient.getDeviceState('invalid_id');
-} catch (error) {
-    console.error('API error:', error);
-    showErrorMessage(error.message);
-}
-```
-
-## Auto-Reconnect
-
-Der SSE-Client versucht automatisch, nach 5 Sekunden wieder zu verbinden, wenn die Verbindung abbricht.
-
-## Verwendete Technologien
-
-- **Fetch API** - Für HTTP-Requests
-- **EventSource** - Für Server-Sent Events
-- **JSDoc** - Für Type Definitions
-- **ES6+** - Modern JavaScript (Class, async/await, etc.)

apps/ui/static/manifest.json

@@ -1,43 +0,0 @@
-{
-    "name": "Home Automation",
-    "short_name": "Home",
-    "description": "Smart Home Automation System",
-    "start_url": "/",
-    "display": "standalone",
-    "background_color": "#667eea",
-    "theme_color": "#667eea",
-    "orientation": "portrait",
-    "icons": [
-        {
-            "src": "/static/apple-touch-icon-180x180.png",
-            "sizes": "180x180",
-            "type": "image/png",
-            "purpose": "any maskable"
-        },
-        {
-            "src": "/static/apple-touch-icon-152x152.png",
-            "sizes": "152x152",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-120x120.png",
-            "sizes": "120x120",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-76x76.png",
-            "sizes": "76x76",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-32x32.png",
-            "sizes": "32x32",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/apple-touch-icon-16x16.png",
-            "sizes": "16x16",
-            "type": "image/png"
-        }
-    ]
-}

apps/ui/templates/dashboard.html

@@ -6,17 +6,16 @@
     <title>Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
+    <link rel="icon" type="image/svg+xml" href="{{ STATIC_BASE }}/favicon.svg">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Dashboard">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/static/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/device.html

@@ -6,16 +6,15 @@
     <title>Gerät - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/apple-touch-icon.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Gerät">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/static/manifest.json">
     <style>
         * {
             margin: 0;
@@ -346,8 +345,8 @@
     </script>
     
     <!-- Load API client AFTER API_BASE is set -->
-    <script src="/static/types.js"></script>
+    <script src="{{ STATIC_BASE }}/types.js"></script>
-    <script src="/static/api-client.js"></script>
+    <script src="{{ STATIC_BASE }}/api-client.js"></script>
     
     <script>
         // Get device ID from URL
@@ -359,6 +358,7 @@
         let deviceData = null;
         let deviceState = {};
         let roomName = '';
+        let deviceStateUnknown = false;
 
         // Device type icons
         const deviceIcons = {
@@ -381,8 +381,19 @@
                 // NEW: Use new endpoints for device info and layout
                 deviceData = await window.apiClient.getDevice(deviceId);
                 console.log("Loaded device data:", deviceData);
-                deviceState = await window.apiClient.getDeviceState(deviceId);
+
-                console.log("Loaded device state:", deviceState);
+                try {
+                    deviceState = await window.apiClient.getDeviceState(deviceId);
+                    console.log("Loaded device state:", deviceState);
+                    if (!deviceState || Object.keys(deviceState).length === 0) {
+                        deviceStateUnknown = true;
+                        deviceState = {};
+                    }
+                } catch (stateError) {
+                    console.warn('No state for device, using unknown state:', stateError);
+                    deviceStateUnknown = true;
+                    deviceState = {};
+                }
                 const layoutInfo = await window.apiClient.getDeviceLayout(deviceId);
                 console.log("Loaded layout info:", layoutInfo);
                 roomName = layoutInfo.room;
@@ -518,6 +529,14 @@
                 }, 0);
             }
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 
@@ -553,6 +572,14 @@
             `;
             card.appendChild(sliderGroup);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
 
             setTimeout(() => {
@@ -581,6 +608,14 @@
             powerGroup.appendChild(powerButton);
             card.appendChild(powerGroup);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 
@@ -599,6 +634,14 @@
             `;
             card.appendChild(statusDiv);
 
+            if (deviceStateUnknown) {
+                const hint = document.createElement('div');
+                hint.className = 'device-meta';
+                hint.style.marginTop = '12px';
+                hint.textContent = 'Status unbekannt';
+                card.appendChild(hint);
+            }
+
             container.appendChild(card);
         }
 

apps/ui/templates/garage.html

@@ -6,17 +6,16 @@
     <title>Garage - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/garage-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/garage-icon-180x180.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/garage-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/garage-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/garage-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/garage-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/garage-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="{{ STATIC_BASE }}/garage-icon-76x76.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/garage-icon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/garage-icon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/garage-icon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/garage-icon-16x16.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Garage">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/manifest.json">
     <style>
         * {
             margin: 0;
@@ -306,8 +305,8 @@
     </script>
     
     <!-- Load API client AFTER API_BASE is set -->
-    <script src="/static/types.js"></script>
+    <script src="{{ STATIC_BASE }}/types.js"></script>
-    <script src="/static/api-client.js"></script>
+    <script src="{{ STATIC_BASE }}/api-client.js"></script>
     
     <script>
         // Device IDs for garage devices

apps/ui/templates/index.html

@@ -6,17 +6,16 @@
     <title>Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/apple-touch-icon-180x180.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="{{ STATIC_BASE }}/apple-touch-icon-76x76.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/apple-touch-icon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/apple-touch-icon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/apple-touch-icon-16x16.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Home Automation">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/static/manifest.json">
     <style>
         * {
             margin: 0;

apps/ui/templates/room.html

@@ -6,16 +6,15 @@
     <title>{{ room_name }} - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/apple-touch-icon.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="{{ room_name }}">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/static/manifest.json">
     <style>
         * {
             margin: 0;
@@ -229,8 +228,8 @@
     </script>
     
     <!-- Load API client AFTER API_BASE is set -->
-    <script src="/static/types.js"></script>
+    <script src="{{ STATIC_BASE }}/types.js"></script>
-    <script src="/static/api-client.js"></script>
+    <script src="{{ STATIC_BASE }}/api-client.js"></script>
     
     <script>
         // Get room name from URL

apps/ui/templates/rooms.html

@@ -6,17 +6,16 @@
     <title>Räume - Home Automation</title>
     
     <!-- Apple Touch Icon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_BASE }}/apple-touch-icon-180x180.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/static/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_BASE }}/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/static/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_BASE }}/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/static/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="{{ STATIC_BASE }}/apple-touch-icon-76x76.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/apple-touch-icon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_BASE }}/apple-touch-icon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/apple-touch-icon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_BASE }}/apple-touch-icon-16x16.png">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Räume">
     <meta name="theme-color" content="#667eea">
-    <link rel="manifest" href="/manifest.json">
     <style>
         * {
             margin: 0;
@@ -163,8 +162,8 @@
     </script>
     
     <!-- Load API client AFTER API_BASE is set -->
-    <script src="/static/types.js"></script>
+    <script src="{{ STATIC_BASE }}/types.js"></script>
-    <script src="/static/api-client.js"></script>
+    <script src="{{ STATIC_BASE }}/api-client.js"></script>
     
     <script>
         // Room icon mapping

config/devices.yaml

@@ -241,22 +241,6 @@ devices:
     ieee_address: "0x0017880108a03e45"
     model: "929002241201"
     vendor: "Philips"
-- device_id: haustuer
-  name: Haustür-Lampe
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-  topics:
-    state: "zigbee2mqtt/0xec1bbdfffea6a3da"
-    set: "zigbee2mqtt/0xec1bbdfffea6a3da/set"
-  metadata:
-    friendly_name: "Haustür"
-    ieee_address: "0xec1bbdfffea6a3da"
-    model: "LED1842G3"
-    vendor: "IKEA"
 - device_id: deckenlampe_flur_oben
   name: Deckenlampe oben
   type: light
@@ -730,8 +714,19 @@ devices:
   features:
     power: true
   topics:
-    set: "shellies/LightKitchenSink/relay/0/command"
+    set: "shellies/shellyplug-s-DED4E4/relay/0/command"
-    state: "shellies/LightKitchenSink/relay/0"
+    state: "shellies/shellyplug-s-DED4E4/relay/0"
+- device_id: putzlicht_kueche
+  name: Putzlicht
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xa4c138563834406c"
+    set: "zigbee2mqtt/0xa4c138563834406c/set"
 - device_id: licht_schrank_esszimmer
   name: Schrank
   type: relay
@@ -772,24 +767,118 @@ devices:
   topics:
     set: "shellies/lichtterasse/relay/0/command"
     state: "shellies/lichtterasse/relay/0"
+- device_id: kugellampe_patty
+  name: Kugellampe Patty
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xbc33acfffe21f547"
+    set: "zigbee2mqtt/0xbc33acfffe21f547/set"
+- device_id: kueche_fensterbank_licht
+  name: Fensterbank Küche
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b8000017515d"
+    set: "zigbee2mqtt/0xf0d1b8000017515d/set"
+- device_id: licht_kommode_schlafzimmer
+  name: Kommode Schlafzimmer
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/04/POWER"
+    state: "stat/tasmota/04/POWER"
+- device_id: licht_fensterbank_esszimmer
+  name: Fensterbank Esszimmer
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/02/POWER"
+    state: "stat/tasmota/02/POWER"
+- device_id: licht_schreibtisch_patty
+  name: Schreibtisch Patty
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/03/POWER"
+    state: "stat/tasmota/03/POWER"
+- device_id: kugeln_regal_flur
+  name: Kugeln Regal Flur
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/01/POWER"
+    state: "stat/tasmota/01/POWER"
+- device_id: schrank_flur_haustür
+  name: Schrank Flur Haustür
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/05/POWER"
+    state: "stat/tasmota/05/POWER"
+- device_id: gartenlicht_vorne
+  name: Gartenlicht vorne
+  type: relay
+  cap_version: "relay@1.0.0"
+  technology: tasmota
+  features:
+    power: true
+  topics:
+    set: "cmnd/tasmota/06/POWER"
+    state: "stat/tasmota/06/POWER"
 
 - device_id: power_relay_caroutlet
   name: Car Outlet
   type: relay
   cap_version: "relay@1.0.0"
-  technology: hottis_modbus
+  technology: hottis_pv_modbus
   features:
     power: true
   topics:
-    set: "caroutlet/cmd"
+    set: "IoT/Car/Control"
-    state: "caroutlet/state"
+    state: "IoT/Car/Control/State"
 
 - device_id: powermeter_caroutlet
   name: Car Outlet
   type: three_phase_powermeter
   cap_version: "three_phase_powermeter@1.0.0"
-  technology: hottis_modbus
+  technology: hottis_pv_modbus
   topics:
-    state: "caroutlet/powermeter"
+    state: "IoT/Car/Values"
+
+- device_id: schranklicht_flur_vor_kueche
+  name: Schranklicht Flur vor Küche
+  type: light
+  cap_version: "relay@1.0.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000155a1f"
+    set: "zigbee2mqtt/0xf0d1b80000155a1f/set"
+
 
 

config/layout.yaml

@@ -17,6 +17,10 @@ rooms:
     title: Medusa-Lampe Schlafzimmer
     icon: 💡
     rank: 40
+  - device_id: licht_kommode_schlafzimmer
+    title: Kommode Schlafzimmer
+    icon: 💡
+    rank: 42
   - device_id: thermostat_schlafzimmer
     title: Thermostat Schlafzimmer
     icon: 🌡️
@@ -39,10 +43,10 @@ rooms:
     title: Leselampe Esszimmer
     icon: 💡
     rank: 60
-#  - device_id: standlampe_esszimmer
+  - device_id: licht_fensterbank_esszimmer
-#    title: Standlampe Esszimmer
+    title: Fensterbank Esszimmer
-#    icon: 💡
+    icon: 💡
-#    rank: 70
+    rank: 70
   - device_id: kleine_lampe_links_esszimmer
     title: kleine Lampe links Esszimmer
     icon: 💡
@@ -123,6 +127,14 @@ rooms:
     title: Küche Spüle
     icon: 💡
     rank: 142
+  - device_id: putzlicht_kueche
+    title: Küche Putzlicht
+    icon: 💡
+    rank: 143
+  - device_id: kueche_fensterbank_licht
+    title: Küche Fensterbank
+    icon: 💡
+    rank: 144
   - device_id: thermostat_kueche
     title: Kueche
     icon: 🌡️
@@ -161,6 +173,14 @@ rooms:
     title: Schranklicht vorne Patty
     icon: 💡
     rank: 180
+  - device_id: kugellampe_patty
+    title: Kugellampe Patty
+    icon: 💡
+    rank: 181
+  - device_id: licht_schreibtisch_patty
+    title: Licht Schreibtisch Patty
+    icon: 💡
+    rank: 182
   - device_id: thermostat_patty
     title: Thermostat Patty
     icon: 🌡️
@@ -205,18 +225,22 @@ rooms:
     title: Deckenlampe Flur oben
     icon: 💡
     rank: 210
-  - device_id: haustuer
+  - device_id: kugeln_regal_flur
-    title: Haustür
+    title: Kugeln Regal
-    icon: 💡
-    rank: 220
-  - device_id: licht_flur_schrank
-    title: Schranklicht Flur
     icon: 💡
     rank: 222
   - device_id: licht_flur_oben_am_spiegel
-    title: Licht Flur oben am Spiegel
+    title: Licht oben am Spiegel
     icon: 💡
     rank: 230
+  - device_id: schrank_flur_haustür
+    title: Schranklicht an der Haustür
+    icon: 💡
+    rank: 231
+  - device_id: schranklicht_flur_vor_kueche
+    title: Schranklicht vor Küche
+    icon: 💡
+    rank: 232  
   - device_id: sensor_flur
     title: Temperatur & Luftfeuchte
     icon: 🌡️
@@ -279,6 +303,10 @@ rooms:
     title: Licht Terasse
     icon: 💡
     rank: 290
+  - device_id: gartenlicht_vorne
+    title: Gartenlicht vorne
+    icon: 💡
+    rank: 291
 - name: Garage
   devices:
   - device_id: power_relay_caroutlet

deployment/configmap.yaml

@@ -14,8 +14,9 @@ data:
   # UI specific environment variables
   UI_UI_PORT: "8002"
   UI_API_BASE: "https://homea2-api.hottis.de"
+  UI_STATIC_BASE: "https://homea2-static.hottis.de"
   UI_BASE_PATH: "/"
   
-  
+
   
   

deployment/ingress.yaml

@@ -11,6 +11,7 @@ spec:
   dnsNames:
     - homea2.hottis.de
     - homea2-api.hottis.de
+    - homea2-static.hottis.de
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: TLSOption
@@ -60,6 +61,22 @@ spec:
         - name: api
           port: 80
 ---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: static
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    secretName: homea2-cert
+  routes:
+    - match: Host(`homea2-static.hottis.de`)
+      kind: Rule
+      services:
+        - name: static
+          port: 80
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

deployment/static-deployment.yaml

@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: static
+  namespace: homea2
+  labels:
+    app: static
+    component: home-automation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: static
+  template:
+    metadata:
+      labels:
+        app: static
+        component: home-automation
+    spec:
+      containers:
+      - name: static
+        image: %IMAGE%
+        ports:
+        - containerPort: 80
+          name: http
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 80
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 80
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 200m
+            memory: 128Mi
+          requests:
+            cpu: 50m
+            memory: 64Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: static
+  namespace: homea2
+  labels:
+    app: static
+    component: home-automation
+spec:
+  selector:
+    app: static
+  ports:
+  - port: 80
+    targetPort: 80
+    name: http
+  type: ClusterIP

deployment/ui-deployment.yaml

@@ -37,6 +37,11 @@ spec:
             configMapKeyRef:
               name: home-automation-environment
               key: UI_API_BASE
+        - name: STATIC_BASE
+          valueFrom:
+            configMapKeyRef:
+              name: home-automation-environment
+              key: UI_STATIC_BASE
         - name: BASE_PATH
           valueFrom:
             configMapKeyRef: