v0.3.0 nicer layout plus signalr events push

fearlessfrog · Jun 4, 2024 · 45667f6 · 45667f6
1 parent abd43d4
commit 45667f6
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 10 deletions.
diff --git a/AtcLogWatcher.csproj b/AtcLogWatcher.csproj
@@ -15,6 +15,10 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="filters.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/FileWatcherService.cs b/FileWatcherService.cs
@@ -3,9 +3,11 @@
 using System.Timers;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.SignalR;
 
 public class FileWatcherService
 {
+  private readonly IHubContext<MyHub> _hubContext;
   private string _filePath;
   private string _lastLineFilePath;
   private List<string> _filters;
@@ -15,8 +17,9 @@ public class FileWatcherService
   private string _lastWrittenLine = null;
   private bool _debug = false; // Add a debug flag
 
-  public FileWatcherService(string filePath, string lastLineFilePath, bool debug = false)
+  public FileWatcherService(IHubContext<MyHub> hubContext, string filePath, string lastLineFilePath, bool debug = false)
   {
+    _hubContext = hubContext;
     _filePath = filePath;
     _lastLineFilePath = lastLineFilePath;
     _debug = debug;
@@ -51,9 +54,9 @@ private async void OnTimedEvent(Object source, ElapsedEventArgs e)
         var fileStream = new FileStream(_filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
         reader = new StreamReader(fileStream);
       }
-      catch (IOException)
+      catch (IOException ex)
       {
-        LogDebug("File is being used by another process. Retrying...");
+        LogDebug("File is being used by another process. Retrying..." + ex.Message);
         await Task.Delay(1000); // Wait and retry
       }
     }
@@ -77,6 +80,7 @@ private async void OnTimedEvent(Object source, ElapsedEventArgs e)
         if (_previousLine != _lastWrittenLine)
         {
           await File.WriteAllTextAsync(_lastLineFilePath, _previousLine);
+          await _hubContext.Clients.All.SendAsync("ReceiveUpdate", _previousLine);
           LogDebug($"Last line output: {_previousLine}");
           _lastWrittenLine = _previousLine;
         }

diff --git a/MyHub.cs b/MyHub.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.SignalR;
+using System.Threading.Tasks;
+
+public class MyHub : Hub
+{
+  public async Task SendUpdate(string update)
+  {
+    await Clients.All.SendAsync("ReceiveUpdate", update);
+  }
+}
diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
@@ -19,6 +19,7 @@
       color: #fff;
       margin: 0;
       padding: 20px;
+      overflow-x: hidden;
     }
 
     h1 {
@@ -29,13 +30,13 @@
       margin-top: 20px;
       list-style-type: none;
       padding: 0;
-      height: 900px;
+      height: 85vh;
       overflow-y: scroll;
       background-color: #000033;
     }
 
     #messagesList li {
-      background-color: #800080;
+      background-color: #420042;
       color: #fff;
       padding: 10px 20px;
       margin: 10px 0;
@@ -47,6 +48,7 @@
       background-color: #505050 !important;
     }
   </style>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/microsoft-signalr/3.1.7/signalr.min.js"></script>
 </head>
 
 <body>
@@ -58,8 +60,32 @@
   </div>
 
   <script type="text/javascript">
+    const connection = new signalR.HubConnectionBuilder()
+      .withUrl("/hub")
+      .build();
+
     let lastMessage = '';
 
+    connection.on("ReceiveUpdate", function (update) {
+      const message = update;
+      if (message && message !== lastMessage) {
+        const li = document.createElement("li");
+        if (message.startsWith('> ')) {
+          li.classList.add('dark-background');
+        }
+        li.textContent = message;
+        document.getElementById("messagesList").appendChild(li);
+        // Scroll to the bottom
+        messagesList.scrollTop = messagesList.scrollHeight;
+        // Keep this so we don't repeat messages
+        lastMessage = message;
+      }
+    });
+
+    connection.start().catch(function (err) {
+      return console.error(err.toString());
+    });
+
     document.getElementById("clearButton").addEventListener("click", function () {
       document.getElementById("messagesList").innerHTML = '';
     });
@@ -119,7 +145,7 @@
 
     window.onload = async function () {
       await fetchInitialMessage();
-      setInterval(fetchLatestMessage, 1000); // Poll every second
+      //setInterval(fetchLatestMessage, 1000); // Deprecated: Poll every second
     };
   </script>
 </body>

diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml
@@ -31,15 +31,15 @@
       </div>
     </nav>
   </header>
-  <div class="container">
+  <div class="container" style='max-width:100%;'>
     <main role="main" class="pb-3">
       @RenderBody()
     </main>
   </div>
 
   <footer class="border-top footer text-muted">
     <div class="container">
-      fearlessfrog's ATC Log Viewer v0.2.0
+      fearlessfrog's ATC Log Viewer v0.3.0
     </div>
   </footer>
 

diff --git a/Program.cs b/Program.cs
@@ -3,21 +3,24 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System.IO;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.FileProviders;
 using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages();
+builder.Services.AddSignalR();
 builder.Services.AddSingleton<FileWatcherService>(provider =>
 {
   var userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
   var defaultFilePath = Path.Combine(userProfilePath, "AppData", "LocalLow", "Skirmish Mode Games, Inc", "BeyondATC", "Player.log");
   var logFileLocationPath = Path.Combine(userProfilePath, "logfile_location.txt");
   var filePath = File.Exists(logFileLocationPath) ? File.ReadAllText(logFileLocationPath) : defaultFilePath;
   var lastLineFilePath = Path.Combine(Path.GetTempPath(), "lastline.txt");
-  return new FileWatcherService(filePath, lastLineFilePath, true);
+  var hubContext = provider.GetRequiredService<IHubContext<MyHub>>();
+  return new FileWatcherService(hubContext, filePath, lastLineFilePath, true);
 });
 
 var fileProvider = new ManifestEmbeddedFileProvider(Assembly.GetAssembly(type: typeof(Program))!, "wwwroot");
@@ -39,6 +42,7 @@
 app.UseRouting();
 
 app.MapRazorPages();
+app.MapHub<MyHub>("/hub");
 
 app.MapGet("/lastline", async context =>
 {
@@ -58,7 +62,7 @@
 var fileWatcherService = app.Services.GetRequiredService<FileWatcherService>();
 
 Console.WriteLine("------------------------------------------------------------------");
-Console.WriteLine("Welcome to fearlessfrog's AtcLogWatcher!");
+Console.WriteLine("Welcome to fearlessfrog's AtcLogWatcher! v0.3.0");
 Console.WriteLine("Listening on: http://localhost:41716");
 Console.WriteLine("See filters.txt for the list of filters to exclude.");
 Console.WriteLine("Press Ctrl+C to exit.");