New integration and async fix

net-daemon · Jan 3, 2021 · fc22cee · fc22cee
1 parent 1a55d75
commit fc22cee
Show file tree

Hide file tree

Showing 10 changed files with 183 additions and 61 deletions.
diff --git a/src/App/NetDaemon.App/Common/INetDaemon.cs b/src/App/NetDaemon.App/Common/INetDaemon.cs
@@ -142,7 +142,9 @@ public interface INetDaemon : INetDaemonCommon
         /// <param name="entityId">Entity unique id</param>
         /// <param name="state">The state that being set, only primitives are supported</param>
         /// <param name="attributes">Attributes, use anonomous types and lowercase letters</param>
-        void SetState(string entityId, dynamic state, dynamic? attributes = null);
+        /// <param name="waitForResponse">If true, waits for object to set and returns the new EntityState else returns null</param>
+        /// <returns>Returns entitystate if waitForResponse is true</returns>
+        EntityState? SetState(string entityId, dynamic state, dynamic? attributes = null, bool waitForResponse = false);
 
         /// <summary>
         ///     Access the underlying service provider for IOT access to services

diff --git a/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs b/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs
@@ -53,7 +53,8 @@ public interface INetDaemonRxApp : INetDaemonAppBase, IRxEntity
         /// <param name="entityId">EntityId</param>
         /// <param name="state">The state to set</param>
         /// <param name="attributes">The attributes, use anonomous type like new {attr="someattr", attr2=25}</param>
-        void SetState(string entityId, dynamic state, dynamic? attributes);
+        /// <param name="waitForResponse">If true it waits for response and returns new state</param>
+        EntityState? SetState(string entityId, dynamic state, dynamic? attributes, bool waitForResponse = false);
 
         /// <summary>
         ///     Get state for a single entity

diff --git a/src/App/NetDaemon.App/Common/Reactive/NetDaemonRxApp.cs b/src/App/NetDaemon.App/Common/Reactive/NetDaemonRxApp.cs
@@ -282,10 +282,10 @@ public void SaveData<T>(string id, T data)
         }
 
         /// <inheritdoc/>
-        public void SetState(string entityId, dynamic state, dynamic? attributes = null)
+        public EntityState? SetState(string entityId, dynamic state, dynamic? attributes = null, bool waitForResponse = false)
         {
             _ = Daemon ?? throw new NetDaemonNullReferenceException($"{nameof(Daemon)} cant be null!");
-            Daemon.SetState(entityId, state, attributes);
+            return Daemon.SetState(entityId, state, attributes, waitForResponse);
         }
 
         /// <inheritdoc/>

diff --git a/src/App/NetDaemon.App/NetDaemon.App.csproj b/src/App/NetDaemon.App/NetDaemon.App.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="20.52.1-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.00.1-beta" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Roslynator.Analyzers" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/INetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/INetDaemonHost.cs
@@ -48,7 +48,6 @@ public interface INetDaemonHost : INetDaemon
         /// </summary>
         /// <param name="numberOfLoadedApps"> The number of loaded apps. </param>
         /// <param name="numberOfRunningApps"> The number of running apps. </param>
-        /// <returns></returns>
         Task SetDaemonStateAsync(int numberOfLoadedApps, int numberOfRunningApps);
 
         /// <summary>
@@ -66,5 +65,10 @@ public interface INetDaemonHost : INetDaemon
         /// </summary>
         /// <param name="func">callback function</param>
         void SubscribeToExternalEvents(Func<ExternalEventBase, Task> func);
+
+        /// <summary>
+        ///     Returns true of the NetDaemon custom component is installed
+        /// </summary>
+        bool HomeAssistantHasNetDaemonIntegration();
     }
 }
diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj
@@ -20,7 +20,7 @@
     <tags>Home Assistant</tags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="20.52.1-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.00.1-beta" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="YamlDotNet" Version="9.1.0" />

diff --git a/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj b/src/DaemonRunner/DaemonRunner/DaemonRunner.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="20.52.1-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="21.00.1-beta" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />

diff --git a/src/Fakes/NetDaemon.Fakes/RxAppMock.cs b/src/Fakes/NetDaemon.Fakes/RxAppMock.cs
@@ -330,15 +330,15 @@ public void VerifySetState(string entityId, dynamic? state = null, dynamic? attr
                     Verify(x => x.SetState(
                         entityId,
                         (object)state,
-                        (object)attributes),
+                        (object)attributes, false),
                         t);
                 }
                 else
                 {
                     Verify(x => x.SetState(
                         entityId,
                         (object)state,
-                        It.IsAny<object>()),
+                        It.IsAny<object>(), false),
                         t);
                 }
             }
@@ -349,15 +349,15 @@ public void VerifySetState(string entityId, dynamic? state = null, dynamic? attr
                     Verify(x => x.SetState(
                         entityId,
                         It.IsAny<object>(),
-                        (object)attributes),
+                        (object)attributes, false),
                         t);
                 }
                 else
                 {
                     Verify(x => x.SetState(
                         entityId,
                         It.IsAny<object>(),
-                        It.IsAny<object>()),
+                        It.IsAny<object>(), false),
                         t);
                 }
             }

diff --git a/tests/NetDaemon.Daemon.Tests/Daemon/NetDaemonHostTests.cs b/tests/NetDaemon.Daemon.Tests/Daemon/NetDaemonHostTests.cs
@@ -642,6 +642,20 @@ public async Task SetStateShouldKeepSameArea()
             Assert.Equal("Area", state?.Area);
         }
 
+        [Fact]
+        public async Task ConnectToHAIntegrationShouldCallCorrectFunction()
+        {
+            // ARRANGE
+            await InitializeFakeDaemon().ConfigureAwait(false);
+            await DefaultDaemonHost.ConnectToHAIntegration().ConfigureAwait(false);
+
+            // ACT
+            await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
+
+            // ASSERT
+            DefaultHassClientMock.Verify(n => n.GetApiCall<object>("netdaemon/info"));
+        }
+
         [Theory]
         [InlineData(false, null, null, null, null)]
         [InlineData(true, null, 10, null, 10)]