Connect on state RUNNING

net-daemon · Aug 15, 2020 · e6c7d50 · e6c7d50
1 parent 7b46e6e
commit e6c7d50
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ RUN wget -qO /s6 \
     \
     && git clone https://github.com/net-daemon/admin.git /admin \
     && cd /admin \
-    && git checkout tags/1.2.3 \
+    && git checkout tags/1.2.4 \
     && make deploy \
     \
     && rm -fr /var/lib/apt/lists/* \ 

diff --git a/src/App/NetDaemon.App/Common/Reactive/AppDaemonRxApp.cs b/src/App/NetDaemon.App/Common/Reactive/AppDaemonRxApp.cs
@@ -81,7 +81,7 @@ public async override ValueTask DisposeAsync()
             _reactiveState = null;
 
             await base.DisposeAsync().ConfigureAwait(false);
-            Log("RxApp {app} is Disposed", Id!);
+            LogDebug("RxApp {app} is Disposed", Id!);
         }
 
         /// <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="0.6.2-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.7.0-beta" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.7" />
     <PackageReference Include="System.Reactive" Version="4.4.1" />
   </ItemGroup>

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -419,6 +419,15 @@ public async Task Run(string host, short port, bool ssl, string token, Cancellat
                 if (!connectResult)
                 {
                     Connected = false;
+                    await _hassClient.CloseAsync().ConfigureAwait(false);
+                    return;
+                }
+
+                var hassConfig = await _hassClient.GetConfig().ConfigureAwait(false);
+                if (hassConfig.State != "RUNNING")
+                {
+                    Logger.LogInformation("Home Assistant is not ready yet, state: {state} ..", hassConfig.State);
+                    await _hassClient.CloseAsync();
                     return;
                 }
 
@@ -567,7 +576,7 @@ public async Task Stop()
                 {
                     return;
                 }
-                Logger.LogInformation("Try stopping Instance NetDaemonHost");
+                Logger.LogDebug("Try stopping Instance NetDaemonHost");
 
                 await UnloadAllApps().ConfigureAwait(false);
 
@@ -579,6 +588,8 @@ public async Task Stop()
 
                 _stopped = true;
 
+                Connected = false;
+
                 Logger.LogInformation("Stopped Instance NetDaemonHost");
             }
             catch (Exception e)

diff --git a/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj b/src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JoySoftware.HassClient" Version="0.6.2-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.7.0-beta" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.7" />
     <PackageReference Include="YamlDotNet" Version="8.1.2" />

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.6.2-beta" />
+    <PackageReference Include="JoySoftware.HassClient" Version="0.7.0-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/DaemonRunner/DaemonRunner/Service/RunnerService.cs b/src/DaemonRunner/DaemonRunner/Service/RunnerService.cs
@@ -19,7 +19,7 @@ public class RunnerService : BackgroundService
         /// <summary>
         /// The interval used when disconnected
         /// </summary>
-        private const int ReconnectInterval = 40000;
+        private const int ReconnectInterval = 10000;
         private const string Version = "dev";
 
         private readonly HomeAssistantSettings _homeAssistantSettings;
@@ -102,7 +102,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                             stoppingToken
                         );
 
-                        await WaitForDaemonToConnect(daemonHost, stoppingToken).ConfigureAwait(false);
+                        if (await WaitForDaemonToConnect(daemonHost, stoppingToken).ConfigureAwait(false) == false)
+                        {
+                            continue;
+                        }
 
                         if (!stoppingToken.IsCancellationRequested)
                         {
@@ -132,7 +135,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                                     if (!stoppingToken.IsCancellationRequested)
                                     {
                                         // It is disconnected, wait
-                                        _logger.LogWarning($"Home assistant is unavailable, retrying in {ReconnectInterval / 1000} seconds...");
+                                        // _logger.LogWarning($"Home assistant is unavailable, retrying in {ReconnectInterval / 1000} seconds...");
                                     }
                                 }
                                 catch (TaskCanceledException)
@@ -230,16 +233,17 @@ private void EnsureApplicationDirectoryExists(NetDaemonSettings settings)
             Directory.CreateDirectory(appDirectory);
         }
 
-        private async Task WaitForDaemonToConnect(NetDaemonHost daemonHost, CancellationToken stoppingToken)
+        private async Task<bool> WaitForDaemonToConnect(NetDaemonHost daemonHost, CancellationToken stoppingToken)
         {
             var nrOfTimesCheckForConnectedState = 0;
 
             while (!daemonHost.Connected && !stoppingToken.IsCancellationRequested)
             {
-                await Task.Delay(1000, stoppingToken).ConfigureAwait(false);
+                await Task.Delay(500, stoppingToken).ConfigureAwait(false);
                 if (nrOfTimesCheckForConnectedState++ > 5)
                     break;
             }
+            return daemonHost.Connected;
         }
     }
 }