Implement status summary polling from worker

Author: webprofusion-chrisc

src/Certify.Core/Management/CertifyManager/CertifyManager.ManagedCertificates.cs

@@ -158,7 +158,7 @@ public async Task<ManagedCertificateSearchResult> GetManagedCertificateResults(M
             summary.Error = ms.Count(c => c.Health == ManagedCertificateHealth.Error);
             summary.Warning = ms.Count(c => c.Health == ManagedCertificateHealth.Warning);
             summary.AwaitingUser = ms.Count(c => c.Health == ManagedCertificateHealth.AwaitingUser);
-            summary.NoCertificate = ms.Count(c => c.CertificatePath == null);
+            summary.NoCertificate = ms.Count(c => c.DateStart == null);
 
             // count items with invalid config (e.g. multiple primary domains)
             summary.InvalidConfig = ms.Count(c => c.DomainOptions.Count(d => d.IsPrimaryDomain) > 1);

src/Certify.Server/Certify.Server.Hub.Api/Controllers/internal/HubController.cs

@@ -87,7 +87,7 @@ public async Task<IActionResult> GetHubManagedItems(string? instanceId, string?
                                 DateRenewed = i.DateRenewed,
                                 DateExpiry = i.DateExpiry,
                                 Comments = i.Comments ?? "",
-                                Status = i.LastRenewalStatus?.ToString() ?? "",
+                                Status = i.Health.ToString(),
                                 DateRetrieved = i.DateRetrieved,
                                 HasCertificate = !string.IsNullOrEmpty(i.CertificatePath)
                             };

src/Certify.Server/Certify.Server.Hub.Api/Controllers/v1/CertificateController.cs

@@ -204,7 +204,7 @@ public async Task<IActionResult> GetManagedCertificates(string? keyword, int? pa
                 DateRenewed = i.DateRenewed,
                 DateExpiry = i.DateExpiry,
                 Comments = i.Comments ?? "",
-                Status = i.LastRenewalStatus?.ToString() ?? "",
+                Status = i.Health.ToString(),
                 HasCertificate = !string.IsNullOrEmpty(i.CertificatePath)
             }).OrderBy(a => a.Title);
 

src/Certify.Server/Certify.Server.Hub.Api/Services/ManagementAPI.cs

@@ -146,6 +146,22 @@ private async Task SendCommandWithNoResult(string instanceId, InstanceCommandReq
             return await PerformInstanceCommandTaskWithResult<ManagedCertificate?>(instanceId, args, ManagementHubCommands.GetManagedItem);
         }
 
+        /// <summary>
+        /// Issue request for updated status summary from this instance
+        /// </summary>
+        /// <param name="instanceId"></param>
+        /// <param name="currentAuthContext"></param>
+        /// <returns></returns>
+        public async Task RefreshManagedCertificateSummary(string instanceId, AuthContext? currentAuthContext)
+        {
+            var args = new KeyValuePair<string, string>[] {
+                 new("instanceId", instanceId)
+             };
+
+            var result = await PerformInstanceCommandTaskWithResult<StatusSummary?>(instanceId, args, ManagementHubCommands.GetStatusSummary);
+            _mgmtStateProvider.UpdateInstanceStatusSummary(instanceId, result);
+        }
+
         /// <summary>
         /// Exports a managed certificate from the target instance in the specified format.
         /// </summary>

src/Certify.Server/Certify.Server.Hub.Api/Services/ManagementWorker.cs

@@ -13,6 +13,9 @@ public class ManagementWorker : IHostedService, IDisposable
         private Timer? _timer = null;
         IHubContext<InstanceManagementHub> _hubContext;
         IInstanceManagementStateProvider _stateProvider;
+
+        private ManagementAPI _mgmtAPI;
+
         private int _updateFrequency = 10;
         private string _serviceName = "[Management Worker]";
 
@@ -22,11 +25,12 @@ public class ManagementWorker : IHostedService, IDisposable
         /// <param name="logger"></param>
         /// <param name="hubContext"></param>
         /// <param name="stateProvider"></param>
-        public ManagementWorker(ILogger<ManagementWorker> logger, IHubContext<InstanceManagementHub> hubContext, IInstanceManagementStateProvider stateProvider)
+        public ManagementWorker(ILogger<ManagementWorker> logger, IHubContext<InstanceManagementHub> hubContext, IInstanceManagementStateProvider stateProvider, ManagementAPI mgmtAPI)
         {
             _logger = logger;
             _hubContext = hubContext;
             _stateProvider = stateProvider;
+            _mgmtAPI = mgmtAPI;
         }
 
         /// <summary>
@@ -69,6 +73,11 @@ private void DoWork(object? state)
         {
             var instances = _stateProvider.GetConnectedInstances();
             _logger.LogInformation("{svc} connected instances: {count}", _serviceName, instances.Count());
+
+            foreach (var instance in instances)
+            {
+                _mgmtAPI.RefreshManagedCertificateSummary(instance.InstanceId, null);
+            }
         }
 
         /// <summary>

src/Certify.Server/Certify.Server.HubService/Services/DirectInstanceManagementHub.cs

@@ -1,20 +1,32 @@
 using Certify.Management;
 using Certify.Models.Hub;
 using Certify.Models.Reporting;
+using Certify.Server.Hub.Api.Services;
+using Certify.Server.Hub.Api.SignalR;
 using Certify.Server.Hub.Api.SignalR.ManagementHub;
+using Microsoft.AspNetCore.SignalR;
 
 namespace Certify.Server.HubService.Services
 {
+
+    /// <summary>
+    /// Instance mgmt hub which talks directly to the in process backend certify core service, skipping HTTP API layer and signalr
+    /// </summary>
     public class DirectInstanceManagementHub : IInstanceManagementHub
     {
         private IInstanceManagementStateProvider _stateProvider;
         private ILogger<DirectInstanceManagementHub> _logger;
         private ICertifyManager _certifyManager;
-        public DirectInstanceManagementHub(ILogger<DirectInstanceManagementHub> logger, IInstanceManagementStateProvider stateProvider, ICertifyManager certifyManager)
+        private IHubContext<UserInterfaceStatusHub> _uiStatusHub;
+        private ManagementAPI _mgmtAPI;
+        public DirectInstanceManagementHub(ILogger<DirectInstanceManagementHub> logger, IInstanceManagementStateProvider stateProvider, ICertifyManager certifyManager, IHubContext<UserInterfaceStatusHub> uiStatusHub, Server.Hub.Api.Services.ManagementAPI mgmtAPI)
         {
             _stateProvider = stateProvider;
             _logger = logger;
             _certifyManager = certifyManager;
+            _uiStatusHub = uiStatusHub;
+            _mgmtAPI = mgmtAPI;
+
         }
 
         /// <summary>
@@ -114,16 +126,16 @@ public Task ReceiveCommandResult(InstanceCommandResult result)
                                 // item was not requested, queue for processing
                                 if (result.CommandType == ManagementHubCommands.NotificationUpdatedManagedItem)
                                 {
-                                    //_uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendManagedCertificateUpdateMsg, System.Text.Json.JsonSerializer.Deserialize<Models.ManagedCertificate>(result.Value));
+                                    _uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendManagedCertificateUpdateMsg, System.Text.Json.JsonSerializer.Deserialize<Models.ManagedCertificate>(result.Value));
                                 }
                                 else if (result.CommandType == ManagementHubCommands.NotificationManagedItemRequestProgress)
                                 {
-                                    //_uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendProgressStateMsg, System.Text.Json.JsonSerializer.Deserialize<Models.RequestProgressState>(result.Value));
+                                    _uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendProgressStateMsg, System.Text.Json.JsonSerializer.Deserialize<Models.RequestProgressState>(result.Value));
                                 }
                                 else if (result.CommandType == ManagementHubCommands.NotificationRemovedManagedItem)
                                 {
                                     // deleted :TODO
-                                    //_uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendMsg, $"Deleted item {result.Value}");
+                                    _uiStatusHub.Clients.All.SendAsync(Providers.StatusHubMessages.SendMsg, $"Deleted item {result.Value}");
                                 }
                             }
                         }