Refresh state areas when devices or areas updated (#110)

* Refresh state areas when devices or areas  updated

* Also refresh all from server too

Author: helto4real

src/App/NetDaemon.App/NetDaemon.App.csproj

@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.3.1-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.3.2-alpha" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
   </ItemGroup>
 

src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs

@@ -213,6 +213,8 @@ public ICamera Cameras(INetDaemonApp app, Func<IEntityProperties, bool> func)
         /// <param name="cancellationToken"></param>
         public async Task Run(string host, short port, bool ssl, string token, CancellationToken cancellationToken)
         {
+            _cancelToken = cancellationToken;
+
             string? hassioToken = Environment.GetEnvironmentVariable("HASSIO_TOKEN");
 
             if (_hassClient == null)
@@ -228,7 +230,7 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                 {
                     // We are running as hassio add-on
                     connectResult = await _hassClient.ConnectAsync(new Uri("ws://supervisor/core/websocket"),
-                        hassioToken, true).ConfigureAwait(false);
+                        hassioToken, false).ConfigureAwait(false);
                 }
                 else
                 {
@@ -244,35 +246,9 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                 // Setup TTS
                 Task handleTextToSpeechMessagesTask = HandleTextToSpeechMessages(cancellationToken);
 
-                await _hassClient.SubscribeToEvents().ConfigureAwait(false);
+                await RefreshInternalStatesAndSetArea().ConfigureAwait(false);
 
-                foreach (var device in await _hassClient.GetDevices().ConfigureAwait(false))
-                {
-                    if (device is object && device.Id is object)
-                        _hassDevices[device.Id] = device;
-                }
-                foreach (var area in await _hassClient.GetAreas().ConfigureAwait(false))
-                {
-                    if (area is object && area.Id is object)
-                        _hassAreas[area.Id] = area;
-                }
-                foreach (var entity in await _hassClient.GetEntities().ConfigureAwait(false))
-                {
-                    if (entity is object && entity.EntityId is object)
-                        _hassEntities[entity.EntityId] = entity;
-                }
-
-                var initialStates = _hassClient.States.Values.Select(n => n.ToDaemonEntityState())
-                    .ToDictionary(n => n.EntityId);
-
-
-
-                foreach (var key in initialStates.Keys)
-                {
-                    var state = initialStates[key];
-                    state.Area = GetAreaForEntityId(state.EntityId);
-                    InternalState[key] = state;
-                }
+                await _hassClient.SubscribeToEvents().ConfigureAwait(false);
 
                 Connected = true;
 
@@ -309,6 +285,36 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
             }
         }
 
+        internal async Task RefreshInternalStatesAndSetArea()
+        {
+            foreach (var device in await _hassClient.GetDevices().ConfigureAwait(false))
+            {
+                if (device is object && device.Id is object)
+                    _hassDevices[device.Id] = device;
+            }
+            foreach (var area in await _hassClient.GetAreas().ConfigureAwait(false))
+            {
+                if (area is object && area.Id is object)
+                    _hassAreas[area.Id] = area;
+            }
+            foreach (var entity in await _hassClient.GetEntities().ConfigureAwait(false))
+            {
+                if (entity is object && entity.EntityId is object)
+                    _hassEntities[entity.EntityId] = entity;
+            }
+            var hassStates = await _hassClient.GetAllStates(_cancelToken).ConfigureAwait(false);
+            var initialStates = hassStates.Select(n => n.ToDaemonEntityState())
+                .ToDictionary(n => n.EntityId);
+
+            InternalState.Clear();
+            foreach (var key in initialStates.Keys)
+            {
+                var state = initialStates[key];
+                state.Area = GetAreaForEntityId(state.EntityId);
+                InternalState[key] = state;
+            }
+        }
+
         internal string? GetAreaForEntityId(string entityId)
         {
             HassEntity? entity;
@@ -352,6 +358,7 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                 if (result != null)
                 {
                     EntityState entityState = result.ToDaemonEntityState();
+                    entityState.Area = GetAreaForEntityId(entityState.EntityId);
                     InternalState[entityState.EntityId] = entityState;
                     return entityState;
                 }
@@ -472,6 +479,10 @@ protected virtual async Task HandleNewEvent(HassEvent hassEvent, CancellationTok
                     throw;
                 }
             }
+            else if (hassEvent.EventType == "device_registry_updated" || hassEvent.EventType == "area_registry_updated")
+            {
+                await RefreshInternalStatesAndSetArea().ConfigureAwait(false);
+            }
             else
             {
                 try
@@ -553,6 +564,7 @@ private async Task HandleTextToSpeechMessages(CancellationToken cancellationToke
         }
 
         private IDictionary<string, object> _dataCache = new Dictionary<string, object>();
+        private CancellationToken _cancelToken;
 
         // Internal for test
         internal readonly ConcurrentDictionary<string, HassDevice> _hassDevices =

src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj

@@ -20,7 +20,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.3.1-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.3.2-alpha" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
   </ItemGroup>
   <ItemGroup>

src/DaemonRunner/DaemonRunner/DaemonRunner.csproj

@@ -21,7 +21,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.3.1-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.3.2-alpha" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
     <PackageReference Include="YamlDotNet" Version="8.1.1" />

tests/NetDaemon.Daemon.Tests/HassClientMock.cs

@@ -29,10 +29,14 @@ public HassClientMock()
             Setup(x => x.ConnectAsync(It.IsAny<string>(), It.IsAny<short>(), It.IsAny<bool>(),
                     It.IsAny<string>(), It.IsAny<bool>()))
                 .ReturnsAsync(true);
-            SetupGet(x => x.States).Returns(FakeStates);
 
             SetupDefaultStates();
 
+            SetupGet(x => x.States).Returns(FakeStates);
+
+            Setup(x => x.GetAllStates(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(() => { return (IEnumerable<HassState>)FakeStates.Values; });
+
             Setup(x => x.ReadEventAsync())
                 .ReturnsAsync(() => { return FakeEvents.TryDequeue(out var ev) ? ev : null; });