WIP

Source/Caches/HACacheKeyStates.swift

@@ -9,7 +9,10 @@ internal struct HACacheKeyStates: HACacheKey {
             .init(
                 subscription: .subscribeEntities(),
                 transform: { info in
-                    .replace(processUpdates(info: info))
+                    .replace(processUpdates(
+                        info: info,
+                        shouldResetEntities: info.operationType == .secondary
+                    ))
                 }
             )
         )
@@ -19,10 +22,17 @@ internal struct HACacheKeyStates: HACacheKey {
     /// - Parameter info: The compressed state update and the current cached states
     /// - Returns: HAEntity cached states
     /// Logic from: https://github.com/home-assistant/home-assistant-js-websocket/blob/master/lib/entities.ts
-    static func processUpdates(info: HACacheTransformInfo<HACompressedStatesUpdates, HACachedStates?>)
+    static func processUpdates(
+        info: HACacheTransformInfo<HACompressedStatesUpdates, HACachedStates?>,
+        shouldResetEntities: Bool
+    )
         -> HACachedStates {
-        var states: HACachedStates = info.current ?? .init(entities: [])
-
+        var states: HACachedStates
+        if shouldResetEntities {
+            states = .init(entities: [])
+        } else {
+            states = info.current ?? .init(entities: [])
+        }
         if let additions = info.incoming.add {
             for (entityId, updates) in additions {
                 if var currentState = states[entityId] {

Source/Caches/HACacheSubscribeInfo.swift

@@ -36,9 +36,16 @@ public struct HACacheSubscribeInfo<OutgoingType> {
 
                 return transform(value)
             }, start: { connection, perform in
-                connection.subscribe(to: nonRetrySubscription, handler: { _, incoming in
+                var operationType: HACacheTransformInfoOperationType = .primary
+                return connection.subscribe(to: nonRetrySubscription, handler: { _, incoming in
                     perform { current in
-                        transform(.init(incoming: incoming, current: current))
+                        let transform = transform(.init(
+                            incoming: incoming,
+                            current: current,
+                            operationType: operationType
+                        ))
+                        operationType = .secondary
+                        return transform
                     }
                 })
             }

Source/Caches/HACacheTransformInfo.swift

@@ -9,4 +9,11 @@ public struct HACacheTransformInfo<IncomingType, OutgoingType> {
     /// For populate transforms, this is nil if an initial request hasn't been sent yet and the cache not reset.
     /// For subscribe transforms, this is nil if the populate did not produce results (or does not exist).
     public var current: OutgoingType
+
+    public var operationType: HACacheTransformInfoOperationType = .primary
+}
+
+public enum HACacheTransformInfoOperationType {
+    case primary
+    case secondary
 }

Tests/HACacheKeyStates.test.swift

@@ -57,7 +57,7 @@ internal final class HACacheKeyStates_test: XCTestCase {
                 current: .init(
                     entities: []
                 )
-            )
+            ), shouldResetEntities: false
         )
 
         XCTAssertEqual(result.all.count, 2)
@@ -137,7 +137,7 @@ internal final class HACacheKeyStates_test: XCTestCase {
                         existentEntity,
                     ]
                 )
-            )
+            ), shouldResetEntities: false
         )
 
         XCTAssertEqual(result.all.count, 1)
@@ -206,7 +206,7 @@ internal final class HACacheKeyStates_test: XCTestCase {
                         existentEntity,
                     ]
                 )
-            )
+            ), shouldResetEntities: false
         )
 
         XCTAssertEqual(result.all.count, 1)
@@ -254,7 +254,7 @@ internal final class HACacheKeyStates_test: XCTestCase {
                 current: .init(
                     entities: []
                 )
-            )
+            ), shouldResetEntities: false
         )
 
         XCTAssertEqual(result.all.count, 0)