Merge pull request #6 from Simyon264/remove-web-sockets

Remove web sockets for rework (someday)

Author: Simyon264

Client/Components/App.razor

@@ -23,45 +23,6 @@
 
 <Routes/>
 <script src="_framework/blazor.web.js"></script>
-<script>
-    // This script handles the web socket connection to the server.
-    const websocketUrl = "@Configuration["WebSocketUrl"]";
-    const ws = new WebSocket(websocketUrl);
-    ws.onopen = () => {
-        console.log("WebSocket connection established.");
-        ws.send("count");
-    };
-    ws.onclose = () => {
-        console.log("WebSocket connection closed.");
-    };
-    ws.onerror = (error) => {
-        console.error("WebSocket error: ", error);
-    };
-    ws.onmessage = (message) => {
-        //console.log("WebSocket message: ", message.data);
-        // The only message i can currently recieve are the amount of users online. TODO: JSON messages
-        //if (message.data == "1") {
-        //    $("#activeUsers").html("There is currently <em>one user</em> here.");
-        //} else {
-        //    $("#activeUsers").html("There are currently <em>" + message.data + " users</em> here.");
-        //}
-    };
-    window.ws = ws;
-    
-    // Every 5 seconds, send a "ping" message to the server.
-    setInterval(() => {
-        if (ws.readyState !== WebSocket.OPEN) {
-            console.error("WebSocket connection is not open.");
-            return;
-        }
-        ws.send("count");
-    }, 1500);
-    
-    // When the user navigates to a new page, close the web socket connection.
-    window.addEventListener("beforeunload", () => {
-        ws.close();
-    });
-</script>
 </body>
 
-</html>
+</html>

Server/Api/DataController.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
-using System.Net.WebSockets;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
@@ -26,13 +25,9 @@ public class DataController : ControllerBase
     private readonly ReplayDbContext _context;
     private readonly IMemoryCache _cache;
 
-    public static readonly Dictionary<Guid, WebSocket> ConnectedUsers = new();
-    private Timer _timer;
-    
     public DataController(ReplayDbContext context, IMemoryCache cache)
     {
         _context = context;
-        _timer = new Timer(CheckInactiveConnections, null, TimeSpan.Zero, TimeSpan.FromSeconds(5));
         _cache = cache;
     }
 
@@ -392,47 +387,6 @@ public async Task<LeaderboardData> GetLeaderboard(
 
         return leaderboardResult;
     }
-    
-    [HttpGet] // this is kind of stupid? swagger does not work without having a method identifier or something
-    [Route("/ws")]
-    public async Task Connect()
-    {
-        if (HttpContext.WebSockets.IsWebSocketRequest)
-        {
-            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
-            var userId = Guid.NewGuid();
-            ConnectedUsers.Add(userId, webSocket);
-            Log.Information("User connected with ID {UserId}", userId);
-            await Echo(webSocket, userId);
-        }
-        else
-        {
-            HttpContext.Response.StatusCode = 400;
-        }
-    }
-    
-    private async Task Echo(WebSocket webSocket, Guid userId)
-    {
-        var buffer = new byte[1024 * 4];
-        var result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
-
-        while (!result.CloseStatus.HasValue)
-        {
-            result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
-            
-            if (Encoding.UTF8.GetString(buffer).Contains("count"))
-            {
-                var count = ConnectedUsers.Count;
-                var countBytes = Encoding.UTF8.GetBytes(count.ToString());
-                await webSocket.SendAsync(new ArraySegment<byte>(countBytes), WebSocketMessageType.Text, true, CancellationToken.None);
-            }
-
-            buffer = new byte[1024 * 4];
-        }
-
-        ConnectedUsers.Remove(userId, out _);
-        await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
-    }
 
     private async Task<PlayerData?> FetchPlayerDataFromGuid(Guid guid)
     {
@@ -473,15 +427,4 @@ private async Task Echo(WebSocket webSocket, Guid userId)
 
         return playerKey;
     }
-    
-    private void CheckInactiveConnections(object state)
-    {
-        foreach (var user in ConnectedUsers)
-        {
-            if (user.Value.State == WebSocketState.Open) continue;
-            
-            ConnectedUsers.Remove(user.Key, out _);
-            Log.Information("User disconnected with ID {UserId}", user.Key);
-        }
-    }
-}
+}

Server/Program.cs

@@ -144,13 +144,6 @@
     });
 
     var app = builder.Build();
-
-    var webSocketOptions = new WebSocketOptions()
-    {
-        KeepAliveInterval = TimeSpan.FromSeconds(10),
-    };
-    
-    app.UseWebSockets(webSocketOptions);
 
     // Configure the HTTP request pipeline.
     if (app.Environment.IsDevelopment())
@@ -198,4 +191,4 @@
 finally
 {
     Log.CloseAndFlush();
-}
+}