Merge pull request #1546 from CCOSTAN:HomeKit-Bridges

Fixing Homekit issues with more bridges. closes #785 ; closes #1076

.gitignore

@@ -62,6 +62,7 @@ llmvision
 backups
 deps
 config/backups
+panel-notes/
 icloud
 __pycache__
 hacs

config/.HA_VERSION

@@ -1 +1 @@
-2025.12.0
+2025.12.1

config/blueprints/template/homeassistant/inverted_binary_sensor.yaml

@@ -1,27 +0,0 @@
-blueprint:
-  name: Invert a binary sensor
-  description: Creates a binary_sensor which holds the inverted value of a reference binary_sensor
-  domain: template
-  source_url: https://github.com/home-assistant/core/blob/dev/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml
-  input:
-    reference_entity:
-      name: Binary sensor to be inverted
-      description: The binary_sensor which needs to have its value inverted
-      selector:
-        entity:
-          domain: binary_sensor
-variables:
-  reference_entity: !input reference_entity
-binary_sensor:
-  state: >
-    {% if states(reference_entity) == 'on' %}
-      off
-    {% elif states(reference_entity) == 'off' %}
-      on
-    {% else %}
-      {{ states(reference_entity) }}
-    {% endif %}
-  # delay_on: not_used in this example
-  # delay_off: not_used in this example
-  # auto_off: not_used in this example
-  availability: "{{ states(reference_entity) not in ('unknown', 'unavailable') }}"

config/homekit.yaml

@@ -1,13 +1,18 @@
-#-------------------------------------------
+######################################################################
-# HomeKit Configuration for Home Assistant
+# @CCOSTAN - Follow Me on X
-#
+# For more info visit https://www.vcloudinfo.com/click-here
-# Description: This file controls the HomeKit integration settings,
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-# defining which entities are exposed to Apple HomeKit.
+# -------------------------------------------------------------------
-#
+# HomeKit Configuration - Multi-bridge for stability + Alexa-friendly streams
-# Follow me on https://www.vcloudinfo.com/click-here
+#  Main bridge for lights/locks/climate; cameras/lock split to accessory bridges.
-# Original Repository: https://github.com/CCOSTAN/Home-AssistantConfig
+#  Camera streams use go2rtc substreams/restreams for faster Echo Show playback.
-##-------------------------------------------
+# -------------------------------------------------------------------
+######################################################################
 
+# Main bridge (everything except cameras + front door lock)
+- name: Home Assistant Bridge
+  mode: bridge
+  port: 21063
   filter:
     include_domains:
       - climate
@@ -18,18 +23,10 @@ filter:
       - media_player
       - sensor
       - script
-    - sensor
       - switch
       - scene
       - light
     include_entities:
-    - camera.bedroomgate
-    - camera.driveway
-    - camera.filtergate
-    - camera.frontdoorbell
-    - camera.poolcam
-    - camera.frontlawn
-    - camera.garagecam
       - light.bedroom
       - light.bedroom_lights
       - light.den_lights
@@ -48,28 +45,42 @@ filter:
       - light.sink
       - switch.lr_amp
     exclude_entities:
+      - lock.front_door
       - lock.spaceship_door_lock
       - lock.spaceship_charger_door_lock
       - lock.spaceship_trunk_lock
       - lock.spaceship_frunk_lock
       - climate.spaceship_hvac_climate_system
 
+# Cameras in accessory mode (better performance/reliability)
+- name: HomeKit Cameras
+  mode: accessory
+  port: 21064
+  filter:
+    include_entities:
+      - camera.bedroomgate
+      - camera.driveway
+      - camera.filtergate
+      - camera.frontdoorbell
+      - camera.poolcam
+      - camera.frontlawn
+      - camera.garagecam
   entity_config:
     camera.frontdoorbell:
       video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/frontdoorbell?mp4
+      stream_source: rtsp://192.168.10.14:8554/frontdoorbell_alexa
     camera.poolcam:
       linked_motion_sensor: binary_sensor.poolcam_motion_sensor
       video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/poolcam?mp4
+      stream_source: rtsp://192.168.10.14:8554/poolcam_sub
     camera.frontlawn:
       linked_motion_sensor: binary_sensor.frontlawn_motion_sensor
       video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/frontlawn?mp4
+      stream_source: rtsp://192.168.10.14:8554/frontlawn_sub
     camera.garagecam:
       linked_motion_sensor: binary_sensor.garagecam_motion_sensor
       video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/garagecam?mp4
+      stream_source: rtsp://192.168.10.14:8554/garagecam_sub
     camera.bedroomgate:
       linked_motion_sensor: binary_sensor.bedroomgate_motion_sensor
       video_codec: copy
@@ -77,8 +88,16 @@ entity_config:
     camera.driveway:
       linked_motion_sensor: binary_sensor.driveway_motion_sensor
       video_codec: copy
-    stream_source: rtsp://192.168.10.14:8554/driveway?mp4
+      stream_source: rtsp://192.168.10.14:8554/driveway_sub
     camera.filtergate:
       linked_motion_sensor: binary_sensor.filtergate_motion_sensor
       video_codec: copy
       stream_source: rtsp://192.168.10.14:8554/filtergate?mp4
+
+# Front door lock in accessory mode (keeps lock responsive/available)
+- name: HomeKit Front Door Lock
+  mode: accessory
+  port: 21065
+  filter:
+    include_entities:
+      - lock.front_door