From 252a3aaccd73b46926fad7b3f3ec83b026c4a67c Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Sat, 13 Jan 2024 22:33:39 -0500
Subject: [PATCH] Tweak SignalR

---
 Environment/Service/MessageHandler.cs | 11 +++++------
 Hub/Service/Hubs/EnvironmentHub.cs    |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Environment/Service/MessageHandler.cs b/Environment/Service/MessageHandler.cs
index 29e361d..d3cb85e 100644
--- a/Environment/Service/MessageHandler.cs
+++ b/Environment/Service/MessageHandler.cs
@@ -1,9 +1,8 @@
 using System.Text.Json;
 using ChrisKaczor.HomeMonitor.Environment.Service.Data;
+using Microsoft.AspNetCore.SignalR.Client;
 using MQTTnet;
 using MQTTnet.Client;
-using Microsoft.AspNetCore.SignalR.Client;
-using System.Threading;
 
 namespace ChrisKaczor.HomeMonitor.Environment.Service;
 
@@ -12,10 +11,10 @@ public class MessageHandler : IHostedService
     private readonly IConfiguration _configuration;
     private readonly Database _database;
     private readonly IMqttClient _mqttClient;
-    private HubConnection _hubConnection;
 
     private readonly MqttFactory _mqttFactory;
     private readonly string _topic;
+    private readonly HubConnection _hubConnection;
 
     public MessageHandler(IConfiguration configuration, Database database)
     {
@@ -69,10 +68,10 @@ public class MessageHandler : IHostedService
 
         await _database.StoreMessageAsync(message);
 
-        await SendLatestReading(message);
+        await SendMessage(message);
     }
 
-    private async Task SendLatestReading(Message message)
+    private async Task SendMessage(Message message)
     {
         try
         {
@@ -81,7 +80,7 @@ public class MessageHandler : IHostedService
 
             var json = JsonSerializer.Serialize(message);
 
-            await _hubConnection.InvokeAsync("SendLatestReading", json);
+            await _hubConnection.InvokeAsync("SendMessage", json);
         }
         catch (Exception exception)
         {
diff --git a/Hub/Service/Hubs/EnvironmentHub.cs b/Hub/Service/Hubs/EnvironmentHub.cs
index 3bc108c..9dc86e9 100644
--- a/Hub/Service/Hubs/EnvironmentHub.cs
+++ b/Hub/Service/Hubs/EnvironmentHub.cs
@@ -9,11 +9,11 @@ namespace ChrisKaczor.HomeMonitor.Hub.Service.Hubs
     public class EnvironmentHub : Microsoft.AspNetCore.SignalR.Hub
     {
         [UsedImplicitly]
-        public async Task SendLatestReading(string message)
+        public async Task SendMessage(string message)
         {
             Console.WriteLine(message);
 
-            await Clients.Others.SendAsync("LatestReading", message);
+            await Clients.Others.SendAsync("Message", message);
         }
     }
 }
\ No newline at end of file