Merge branch 'SHANA-61-Output-api-info'

Author: Bas Visscher

Config/Gateway/Manager.yaml

@@ -36,6 +36,7 @@ profiles:
           2: Cooling
           3: Heating
           4: Off
+          5: VacantAutoHeat
         includeLogs:
           SoftwareId: SmarthomeGateway
           LogCode: HeatmanagerStateChanged

LogViewer/Config/Loaders/RecursiveConfigLoader.cs

@@ -4,6 +4,7 @@
 using LogViewer.Config.Cache;
 using LogViewer.Config.Helpers;
 using LogViewer.Serializers.Yaml;
+using System.Diagnostics;
 
 namespace LogViewer.Config.Loaders
 {
@@ -40,7 +41,10 @@ private async Task LoadRecursiveAsync(string path, LogViewerConfig target, HashS
                 : path;
 
             if (!File.Exists(filePath))
+            {
+                Debug.WriteLine($"File not found: {filePath}");
                 return;
+            }
 
             if (!YamlSerializer.LoadYaml(new FileInfo(filePath), out LogViewerConfig config))
                 throw new Exception($"Failed to load configuration from: {filePath}");

LogViewer/Controls/ApiSourceControl.Designer.cs

@@ -5,6 +5,7 @@
 using LogViewer.Controls.Helpers;
 using LogViewer.Providers.API;
 using Microsoft.Extensions.Caching.Hybrid;
+using System.Security.Cryptography;
 
 namespace LogViewer.Controls
 {
@@ -141,8 +142,8 @@ private async void LoadObjectItemsForResort(Resort? resort, string? searchField)
             await RunWithDisabledControlsAsync(async token =>
             {
                 var builder = new ApiObjectItemProviderBuilder(apiClient)
-                .ForResort(resort.Id.Value)
-                .WithSortByName();
+                    .ForResort(resort.Id.Value)
+                    .WithSortByName();
 
                 if (checkBoxRequireGateways.Checked)
                     builder.WithRequireGateway();
@@ -195,6 +196,13 @@ await RunWithDisabledControlsAsync(async token =>
             {
                 var logProvider = new ApiGatewayLogProvider(apiClient, gateway.Id.Value, dateTimePickerFrom.Value, dateTimePickerUntill.Value);
 
+
+                infoViewManager.ClearApiStatsInfo();
+                logProvider.OnResponseTimeReported += (s, responseTime) =>
+                {
+                    infoViewManager.ReportApiCall(responseTime);
+                };
+
                 DataSource.ScopeViewContext.StartDate = dateTimePickerFrom.Value;
                 DataSource.ScopeViewContext.EndDate = dateTimePickerUntill.Value;
 
@@ -223,7 +231,7 @@ private async Task RunWithDisabledControlsAsync(Func<CancellationToken, Task> ta
             {
                 progressBarManager.Reset();
                 controlStateManager.EnableAll();
-                cancellationTokenSource.Dispose();
+                cancellationTokenSource?.Dispose();
                 cancellationTokenSource = null;
             }
         }

LogViewer/Controls/ApiSourceControl.cs

@@ -15,6 +15,12 @@ public class InfoViewManager
         private string dEVID = "";
         private string apiUrl = "";
 
+        private int completedRequests = 0;
+        private TimeSpan minResponseTime = TimeSpan.MaxValue;
+        private TimeSpan maxResponseTime = TimeSpan.Zero;
+        private TimeSpan totalResponseTime = TimeSpan.Zero;
+        private TimeSpan avgResponseTime = TimeSpan.Zero;
+
         public InfoViewManager(RichTextBox textBox)
         {
             this.textBox = textBox;
@@ -43,6 +49,32 @@ public void Update(Gateway? gateway)
             Print();
         }
 
+        public void ReportApiCall(TimeSpan elapsed)
+        {
+            completedRequests++;
+            totalResponseTime += elapsed;
+
+            if (elapsed < minResponseTime)
+                minResponseTime = elapsed;
+
+            if (elapsed > maxResponseTime)
+                maxResponseTime = elapsed;
+
+            avgResponseTime = totalResponseTime / completedRequests;
+
+            Print();
+        }
+
+        public void ClearApiStatsInfo()
+        {
+            completedRequests = 0;
+            minResponseTime = TimeSpan.MaxValue;
+            maxResponseTime = TimeSpan.Zero;
+            totalResponseTime = TimeSpan.Zero;
+            avgResponseTime = TimeSpan.Zero;
+            Print();
+        }
+
         public void ClearOrganisationInfo()
         {
             apiUrl = "";
@@ -71,11 +103,19 @@ public void ClearGatewayInfo()
 
         private void Print()
         {
+            string compl = this.completedRequests.ToString();
+            string min = minResponseTime != TimeSpan.MaxValue ? $"{minResponseTime.TotalMilliseconds:F0} ms" : "-";
+            string max = maxResponseTime != TimeSpan.Zero ? $"{maxResponseTime.TotalMilliseconds:F0} ms" : "-";
+            string avg = completedRequests > 0 ? $"{avgResponseTime.TotalMilliseconds:F0} ms" : "-";
+
             textBox.Text = @$"Api  {apiUrl}
 Host {host}
 IST     COM     TRG     SID     DEVID
 {iST.PadRight(7)} {cOM.PadRight(7)} {tRG.PadRight(7)} {sID.PadRight(7)} {dEVID.PadRight(7)}
+Calls   Min     Max     Avg
+{compl.PadRight(7)} {min.PadRight(7)} {max.PadRight(7)} {avg.PadRight(7)}
 ";
+
         }
     }
 }

LogViewer/Controls/Helpers/InfoViewManager.cs

@@ -15,6 +15,8 @@ public class ApiGatewayLogProvider
         private readonly DateTime from;
         private readonly DateTime until;
 
+        public event EventHandler<TimeSpan>? OnResponseTimeReported;
+
         public ApiGatewayLogProvider(InternalApiClient client, int gatewayId, DateTime from, DateTime until)
         {
             this.client = client;
@@ -50,8 +52,7 @@ public async Task<LogCollection> GetData(CancellationToken token = default, IPro
                 {
                     var apiResult = await client.GatewayLogApi.GetAllAsync(page, 25, filters, null, token);
                     stopwatch.Stop();
-                    Debug.WriteLine($"Call took {stopwatch.ElapsedMilliseconds} ms");
-
+                    OnResponseTimeReported?.Invoke(this, stopwatch.Elapsed);
                     token.ThrowIfCancellationRequested();
 
                     // Exit the loop when no more data is returned
@@ -80,6 +81,11 @@ public async Task<LogCollection> GetData(CancellationToken token = default, IPro
 
                     page++; // Move to the next page
                 }
+                catch (OperationCanceledException)
+                {
+                    Debug.WriteLine("Operation was canceled.");
+                    return log; // Return the log collected so far if the operation is canceled
+                }
                 catch (Exception ex) when (!(ex is OperationCanceledException))
                 {
                     Debug.WriteLine($"Error occurred during API call: {ex.Message}");

LogViewer/Providers/Api/ApiGatewayLogProvider.cs

@@ -84,10 +84,12 @@ public class WebApiLogItemConverter
 
 
                 default:
-                    builder.WithSegment(LogKeys.RawData, logItem.Data);
                     break;
             }
 
+
+            builder.WithSegment(LogKeys.RawData, logItem.Data);
+
             return builder.Build();
         }
     }