Subscribe only to domains that the app has usage for

Sources/App/AppEntitiesObserver.swift

@@ -29,7 +29,7 @@ enum AppEntitiesObserver {
         func start() {
             container = .init { server in
                 .init(
-                    Current.api(for: server).connection.caches.states.subscribe({ [weak self] _, states in
+                    Current.api(for: server).connection.caches.states().subscribe({ [weak self] _, states in
                         guard let self, UIApplication.shared.applicationState == .active else { return }
                         let appRelatedEntities = states.all.filter { self.domainsAppUse.contains($0.domain) }
                         handle(appRelatedEntities: appRelatedEntities, server: server)

Sources/App/Scenes/CarPlaySceneDelegate.swift

@@ -87,7 +87,7 @@ class CarPlaySceneDelegate: UIResponder {
         let server = Current.servers.server(forServerIdentifier: preferredServerId) ?? Current.servers.all.first
 
         guard let server, entitiesSubscriptionToken == nil else { return }
-        entities = Current.api(for: server).connection.caches.states
+        entities = Current.api(for: server).connection.caches.states()
         entitiesSubscriptionToken?.cancel()
         entitiesSubscriptionToken = entities?.subscribe { [weak self] _, states in
             self?.allTemplates.forEach {

Sources/App/Settings/Eureka/AccountRow.swift

@@ -200,7 +200,7 @@ final class HomeAssistantAccountRow: Row<AccountCell>, RowType {
                 }
             }
 
-            avatarSubscription = connection.caches.states.subscribe { [weak self] _, states in
+            avatarSubscription = connection.caches.states().subscribe { [weak self] _, states in
                 firstly { () -> Guarantee<Set<HAEntity>> in
                     Guarantee.value(states.all)
                 }.map { states throws -> HAEntity in

Sources/CarPlay/Templates/Areas/CarPlayAreasViewModel.swift

@@ -111,7 +111,7 @@ final class CarPlayAreasViewModel {
     // swiftlint:enable cyclomatic_complexity
 
     private func listItemHandler(area: HAAreaResponse, entityIdsForAreaId: [String], server: Server) {
-        guard let entitiesCachedStates = Current.api(for: server).connection.caches.states.value else { return }
+        guard let entitiesCachedStates = Current.api(for: server).connection.caches.states().value else { return }
         entitiesListTemplate = CarPlayEntitiesListTemplate.build(
             title: area.name,
             filterType: .areaId(entityIds: entityIdsForAreaId),

Sources/CarPlay/Templates/HAEntity+CarPlay.swift

@@ -60,7 +60,7 @@ extension HAEntity {
             default:
                 break
             }
-        case .none, .sensor:
+        case .none, .sensor, .binarySensor, .zone:
             break
         }
         if let request {
@@ -98,7 +98,11 @@ extension HAEntity {
             case .switch:
                 image = getSwitchIcon()
             case .sensor:
-                image = MaterialDesignIcons.thermometerIcon
+                image = MaterialDesignIcons.eyeIcon
+            case .binarySensor:
+                image = MaterialDesignIcons.eyeIcon
+            case .zone:
+                image = MaterialDesignIcons.mapIcon
             }
         }
 

Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift

@@ -102,7 +102,7 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
             case .entity:
                 guard let server = Current.servers.server(forServerIdentifier: preferredServerId) ?? Current.servers.all
                     .first,
-                    let item = Current.api(for: server).connection.caches.states.value?.all.first(where: {
+                    let item = Current.api(for: server).connection.caches.states().value?.all.first(where: {
                         $0.entityId == magicItem.id
                     }) else { return .init(text: "", detailText: "") }
 

Sources/Shared/API/Models/ModelManager.swift

@@ -9,6 +9,37 @@ public class ModelManager: ServerObserver {
     private var subscribedSubscriptions = [SubscribeDefinition]()
     private var cleanupDefinitions = [CleanupDefinition]()
 
+    private static var includedDomains: [Domain] = {
+        // Mac does not need all domains given it does not have all features as iOS (CarPlay, Watch)
+        #if targetEnvironment(macCatalyst)
+        [
+            .cover,
+            .light,
+            .scene,
+            .script,
+            .switch,
+            .sensor,
+            .binarySensor,
+            .zone,
+        ]
+        #else
+        [
+            .button,
+            .cover,
+            .inputBoolean,
+            .inputButton,
+            .light,
+            .lock,
+            .scene,
+            .script,
+            .switch,
+            .sensor,
+            .binarySensor,
+            .zone,
+        ]
+        #endif
+    }()
+
     public var workQueue: DispatchQueue = .global(qos: .userInitiated)
 
     deinit {
@@ -211,7 +242,15 @@ public class ModelManager: ServerObserver {
                 var lastEntities = Set<HAEntity>()
 
                 return [
-                    connection.caches.states.subscribe { [weak someManager] token, value in
+                    // Since here is where the app first initializes the cache, we need to make sure
+                    // we define the correct domains to include in the subscription
+                    connection.caches.states(
+                        [
+                            "include": [
+                                "domains": ModelManager.includedDomains.map(\.rawValue),
+                            ],
+                        ]
+                    ).subscribe { [weak someManager] token, value in
                         queue.async {
                             guard let manager = someManager else {
                                 token.cancel()

Sources/Shared/API/WebSocket/HAPanel.swift

@@ -117,8 +117,8 @@
     }
 }
 
 private struct HAPanelsCacheKey: HACacheKey {
-    static func create(connection: HAConnection) -> HACache<HAPanels> {
+    static func create(connection: HAConnection, data: [String: Any]) -> HACache<HAPanels> {
         HACache(
             connection: connection,
             populate: .init(

Sources/Shared/Domain/Domain.swift

@@ -12,6 +12,8 @@ public enum Domain: String, CaseIterable {
     case script
     case `switch`
     case sensor
+    case binarySensor = "binary_sensor"
+    case zone
     // TODO: Map more domains
 
     public enum State: String {
@@ -36,25 +38,15 @@ public enum Domain: String, CaseIterable {
     public var states: [State] {
         var states: [State] = []
         switch self {
-        case .button:
-            states = []
         case .cover:
             states = [.open, .closed, .opening, .closing]
-        case .inputBoolean:
-            states = []
-        case .inputButton:
-            states = []
         case .light:
             states = [.on, .off]
         case .lock:
             states = [.locked, .unlocked, .jammed, .locking, .unlocking]
-        case .scene:
-            states = []
-        case .script:
-            states = []
         case .switch:
             states = [.on, .off]
-        case .sensor:
+        default:
             states = []
         }
 
@@ -84,7 +76,11 @@ public enum Domain: String, CaseIterable {
         case .switch:
             image = MaterialDesignIcons.lightSwitchIcon
         case .sensor:
-            image = MaterialDesignIcons.thermometerIcon
+            image = MaterialDesignIcons.eyeIcon
+        case .binarySensor:
+            image = MaterialDesignIcons.eyeIcon
+        case .zone:
+            image = MaterialDesignIcons.mapIcon
         }
         return image
     }

Sources/Shared/Intents/GetCameraImageIntentHandler.swift

@@ -48,7 +48,7 @@ class GetCameraImageIntentHandler: NSObject, GetCameraImageIntentHandling {
             return
         }
 
-        Current.api(for: server).connection.caches.states.once().promise.map(\.all)
+        Current.api(for: server).connection.caches.states().once().promise.map(\.all)
             .filterValues { $0.domain == "camera" }
             .mapValues(\.entityId)
             .sortedValues()