HassClient bump, better socket close n cleanup

net-daemon · Apr 9, 2020 · 90b0f25 · 90b0f25
1 parent 6a5660d
commit 90b0f25
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/App/NetDaemon.App/NetDaemon.App.csproj b/src/App/NetDaemon.App/NetDaemon.App.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.0.30-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
   </ItemGroup>
 

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -21,7 +21,7 @@ public class NetDaemonHost : INetDaemonHost
         /// <summary>
         /// The intervall used when disconnected
         /// </summary>
-        private const int _reconnectIntervall = 30000;
+        private const int _reconnectIntervall = 40000;
 
         internal readonly Channel<(string, string)> _ttsMessageQueue =
             Channel.CreateBounded<(string, string)>(20);
@@ -132,10 +132,13 @@ public IEntity Entities(Func<IEntityProperties, bool> func)
                 : null;
         }
 
+        /// <inheritdoc/>
         public void ListenEvent(string ev, Func<string, dynamic, Task> action) => _eventActions.Add((ev, action));
 
+        /// <inheritdoc/>
         public void ListenEvent(Func<FluentEventProperty, bool> funcSelector, Func<string, dynamic, Task> func) => _eventFunctionList.Add((funcSelector, func));
 
+        /// <inheritdoc/>
         public void ListenServiceCall(string domain, string service, Func<dynamic?, Task> action)
             => _serviceCallFunctionList.Add((domain.ToLowerInvariant(), service.ToLowerInvariant(), action));
 
@@ -149,6 +152,8 @@ public void ListenServiceCall(string domain, string service, Func<dynamic?, Task
             _stateActions[uniqueId] = (pattern, action);
             return uniqueId.ToString();
         }
+
+        /// <inheritdoc/>
         public void CancelListenState(string id)
         {
             // Remove and ignore if not exist
@@ -240,7 +245,7 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                     if (!connectResult)
                     {
                         Connected = false;
-                        Logger.LogWarning("Home assistant is unavailable, retrying in 30 seconds...");
+                        Logger.LogWarning($"Home assistant is unavailable, retrying in {_reconnectIntervall} seconds...");
                         await _hassClient.CloseAsync().ConfigureAwait(false);
                         await Task.Delay(_reconnectIntervall, cancellationToken).ConfigureAwait(false);
 

diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj
@@ -20,7 +20,7 @@
 
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.0.30-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>

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="0.0.30-alpha" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.0.31-alpha" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
     <!-- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.5.0-beta2-final" /> -->
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />

diff --git a/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs b/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
@@ -116,21 +116,21 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             }
                             else
                             {
-                                _logger.LogWarning("Home assistant still unavailable, retrying in 30 seconds...");
+                                _logger.LogWarning("Home assistant still unavailable, retrying in 40 seconds...");
                             }
                         }
                     }
                     catch (OperationCanceledException)
                     {
                         if (!stoppingToken.IsCancellationRequested)
                         {
-                            _logger.LogWarning("Home assistant disconnected!, retrying in 30 seconds...");
+                            _logger.LogWarning("Home assistant disconnected!, retrying in 40 seconds...");
                         }
                     }
 
                     if (!stoppingToken.IsCancellationRequested)
                         // The service is still running, we have error in connection to hass
-                        await Task.Delay(30000, stoppingToken).ConfigureAwait(false); // Wait 5 seconds
+                        await Task.Delay(40000, stoppingToken).ConfigureAwait(false); // Wait 5 seconds
                 }
             }
             catch (OperationCanceledException)