Implement wait for response CallService

net-daemon · Jan 10, 2021 · 715a55a · 715a55a
1 parent fb2a3dc
commit 715a55a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 19 deletions.
diff --git a/src/App/NetDaemon.App/Common/INetDaemon.cs b/src/App/NetDaemon.App/Common/INetDaemon.cs
@@ -29,7 +29,8 @@ public interface INetDaemon : INetDaemonCommon
         /// <param name="domain">The domain of the service</param>
         /// <param name="service">The service being called</param>
         /// <param name="data">Any data that the service requires</param>
-        void CallService(string domain, string service, dynamic? data = null);
+        /// <param name="waitForResponse">Waits for Home Assistant to return result before returning</param>
+        void CallService(string domain, string service, dynamic? data = null, bool waitForResponse = false);
 
         /// <summary>
         ///     Calls a service

diff --git a/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs b/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs
@@ -68,7 +68,8 @@ public interface INetDaemonRxApp : INetDaemonAppBase, IRxEntity
         /// <param name="domain">Domain of sevice</param>
         /// <param name="service">Service name</param>
         /// <param name="data">Data provided to service. Use anonomous type</param>
-        void CallService(string domain, string service, dynamic? data);
+        /// <param name="waitForResponse">Waits for Home Assistant to return result before returning</param>
+        void CallService(string domain, string service, dynamic? data, bool waitForResponse = false);
 
         /// <summary>
         ///     Calls service in Home Assistant

diff --git a/src/App/NetDaemon.App/Common/Reactive/NetDaemonRxApp.cs b/src/App/NetDaemon.App/Common/Reactive/NetDaemonRxApp.cs
@@ -62,18 +62,17 @@ protected NetDaemonRxApp()
             Daemon?.State ?? new List<EntityState>();
 
         /// <inheritdoc/>
-        public void CallService(string domain, string service, dynamic? data)
+        public void CallService(string domain, string service, dynamic? data, bool waitForResponse = false)
         {
             _ = Daemon ?? throw new NetDaemonNullReferenceException($"{nameof(Daemon)} cant be null!");
-            Daemon.CallService(domain, service, data);
+            Daemon.CallService(domain, service, data, waitForResponse);
         }
 
         /// <inheritdoc/>
         public void Delay(TimeSpan timeout)
         {
             // We use Task.Delay instead of Thread.Sleep so we can stop timers on cancellation tokens
             Task.Delay(timeout, _cancelTimers.Token).Wait(_cancelTimers.Token);
-            Logger.LogError("WE REACHED END OF DELAY!");
         }
 
         /// <inheritdoc/>
@@ -83,7 +82,6 @@ public void Delay(TimeSpan timeout, CancellationToken token)
             using var combinedToken = CancellationTokenSource.CreateLinkedTokenSource(_cancelTimers.Token, token);
             // We use Task.Delay instead of Thread.Sleep so we can stop timers on cancellation tokens
             Task.Delay(timeout, combinedToken.Token).Wait(combinedToken.Token);
-            Logger.LogError("WE REACHED END OF DELAY2!");
         }
 
         /// <summary>

diff --git a/src/App/NetDaemon.App/Common/Reactive/RxEntity.cs b/src/App/NetDaemon.App/Common/Reactive/RxEntity.cs
@@ -19,7 +19,8 @@ public interface IRxEntityBase
         /// </summary>
         /// <param name="state">The state to set, primitives only</param>
         /// <param name="attributes">The attributes to set. Use anonomous type</param>
-        void SetState(dynamic state, dynamic? attributes = null);
+        /// <param name="waitForResponse">Waits for Home Assistant to return result before returning</param>
+        void SetState(dynamic state, dynamic? attributes = null, bool waitForResponse = false);
 
         /// <summary>
         ///     Toggles state on/off on entity
@@ -94,11 +95,11 @@ public RxEntity(INetDaemonRxApp daemon, IEnumerable<string> entityIds)
         }
 
         /// <inheritdoc/>
-        public void SetState(dynamic state, dynamic? attributes = null)
+        public void SetState(dynamic state, dynamic? attributes = null, bool waitForResponse = false)
         {
             foreach (var entityId in EntityIds)
             {
-                DaemonRxApp.SetState(entityId, state, attributes);
+                DaemonRxApp.SetState(entityId, state, attributes, waitForResponse);
             }
         }
 
@@ -125,7 +126,8 @@ internal static string GetDomainFromEntity(string entity)
         /// </summary>
         /// <param name="service">Name of the service to call</param>
         /// <param name="data">Data to provide</param>
-        public void CallService(string service, dynamic? data = null)
+        /// <param name="waitForResponse">Waits for Home Assistant to return result before returning</param>
+        public void CallService(string service, dynamic? data = null, bool waitForResponse = false)
         {
             if (EntityIds?.Any() != true)
                 return;
@@ -153,7 +155,7 @@ public void CallService(string service, dynamic? data = null)
 
                 serviceData["entity_id"] = entityId;
 
-                DaemonRxApp.CallService(domain, service, serviceData);
+                DaemonRxApp.CallService(domain, service, serviceData, waitForResponse);
             }
         }
 

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -159,12 +159,19 @@ public async Task<IEnumerable<HassServiceDomain>> GetAllServices()
             return await _hassClient.GetServices().ConfigureAwait(false);
         }
 
-        public void CallService(string domain, string service, dynamic? data = null)
+        public void CallService(string domain, string service, dynamic? data = null, bool waitForResponse = false)
         {
             _cancelToken.ThrowIfCancellationRequested();
 
-            if (!_serviceCallMessageChannel.Writer.TryWrite((domain, service, data)))
-                throw new NetDaemonException("Servicecall queue full!");
+            if (!waitForResponse)
+            {
+                if (!_serviceCallMessageChannel.Writer.TryWrite((domain, service, data)))
+                    throw new NetDaemonException("Servicecall queue full!");
+            }
+            else
+            {
+                CallServiceAsync(domain, service, data, true).Result();
+            }
         }
 
         [SuppressMessage("", "CA1031")]

diff --git a/src/DevelopmentApps/apps/DebugApp/DebugApp.cs b/src/DevelopmentApps/apps/DebugApp/DebugApp.cs
@@ -21,6 +21,7 @@ public override void Initialize()
         {
             var uid = Guid.NewGuid();
             RunEvery(TimeSpan.FromSeconds(5), () => Log("Hello developer! from instance {instanceId} - {id}", _instanceId, uid));
+            CallService("notify", "persistent_notification", new { message = "Hello", title = "Yay it works!" }, true);
         }
 
         [HomeAssistantServiceCall]

diff --git a/src/Fakes/NetDaemon.Fakes/RxAppMock.cs b/src/Fakes/NetDaemon.Fakes/RxAppMock.cs
@@ -184,7 +184,7 @@ public void VerifyCallService(string? domain = null, string? service = null, dyn
             domain ??= It.IsAny<string>();
             service ??= It.IsAny<string>();
             data ??= It.IsAny<object>();
-            Verify(x => x.CallService(domain, service, It.IsAny<object>()), t);
+            Verify(x => x.CallService(domain, service, It.IsAny<object>(), It.IsAny<bool>()), t);
         }
 
         /// <summary>
@@ -276,14 +276,16 @@ public void VerifyEntityToggle(string entityId, dynamic? attributes = null, Time
                 {
                     Verify(x => x.Entity(entityId).SetState(
                         (object)state,
-                        (object)attributes),
+                        (object)attributes,
+                        It.IsAny<bool>()),
                         t);
                 }
                 else
                 {
                     Verify(x => x.Entity(entityId).SetState(
                         (object)state,
-                        It.IsAny<object>()),
+                        It.IsAny<object>(),
+                        It.IsAny<bool>()),
                         t);
                 }
             }
@@ -293,14 +295,16 @@ public void VerifyEntityToggle(string entityId, dynamic? attributes = null, Time
                 {
                     Verify(x => x.Entity(entityId).SetState(
                         It.IsAny<object>(),
-                        (object)attributes),
+                        (object)attributes,
+                        It.IsAny<bool>()),
                         t);
                 }
                 else
                 {
                     Verify(x => x.Entity(entityId).SetState(
                         It.IsAny<object>(),
-                        It.IsAny<object>()),
+                        It.IsAny<object>(),
+                        It.IsAny<bool>()),
                         t);
                 }
             }