This might actually work

Author: hhvrc

Common/Websocket/SimpleWebsocketCollection.cs

@@ -1,55 +1,49 @@
-using OpenShock.Common.Extensions;
+using System.Collections.Concurrent;
 
 namespace OpenShock.Common.Websocket;
 
 public sealed class SimpleWebsocketCollection<T, TR> where T : class, IWebsocketController<TR>
 {
-    private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
-    private readonly Dictionary<Guid, List<T>> _websockets = [];
+    private readonly ConcurrentDictionary<Guid, List<T>> _websockets = new();
 
-    public async Task RegisterConnection(T controller)
+    public void RegisterConnection(T controller)
     {
-        using (await _semaphore.LockAsyncScoped())
-        {
-            if (!_websockets.TryGetValue(controller.Id, out var list))
-            {
-                list = [controller];
-                _websockets.Add(controller.Id, list);
-            }
+        var list = _websockets.GetOrAdd(controller.Id, [controller]);
 
-            list.Add(controller);
+        lock (list)
+        {
+            if (!list.Contains(controller)) list.Add(controller);
         }
     }
 
-    public async Task<bool> UnregisterConnection(T controller)
+    public bool UnregisterConnection(T controller)
     {
-        using (await _semaphore.LockAsyncScoped())
+        var key = controller.Id;
+        if (!_websockets.TryGetValue(key, out var list)) return false;
+
+        lock (list)
         {
-            if (!_websockets.TryGetValue(controller.Id, out var list)) return false;
             if (!list.Remove(controller)) return false;
             if (list.Count == 0)
             {
-                _websockets.Remove(controller.Id);
+                _websockets.TryRemove(key, out _);
             }
         }
 
         return true;
     }
 
-    public async Task<T[]> GetConnections(Guid id)
+    public bool IsConnected(Guid id) => _websockets.ContainsKey(id);
+
+    public T[] GetConnections(Guid id)
     {
-        using (await _semaphore.LockAsyncScoped())
+        if (!_websockets.TryGetValue(id, out var list)) return [];
+
+        lock (list)
         {
-            if (!_websockets.TryGetValue(id, out var list)) return [];
             return list.ToArray();
         }
     }
 
-    public async Task<uint> GetCount()
-    {
-        using (await _semaphore.LockAsyncScoped())
-        {
-            return (uint)_websockets.Sum(x => x.Value.Count);
-        }
-    }
+    public uint Count => (uint)_websockets.Sum(kvp => { lock (kvp.Value) { return kvp.Value.Count; } });
 }

LiveControlGateway/Controllers/LiveControlController.cs

@@ -85,16 +85,17 @@ public LiveControlController(
     }
 
     /// <inheritdoc />
-    protected override async Task<bool> TryRegisterConnection()
+    protected override Task<bool> TryRegisterConnection()
     {
-        await WebsocketManager.LiveControlUsers.RegisterConnection(this);
-        return true;
+        WebsocketManager.LiveControlUsers.RegisterConnection(this);
+        return Task.FromResult(true);
     }
 
     /// <inheritdoc />
-    protected override async Task UnregisterConnection()
+    protected override Task UnregisterConnection()
     {
-        await WebsocketManager.LiveControlUsers.UnregisterConnection(this);
+        WebsocketManager.LiveControlUsers.UnregisterConnection(this);
+        return Task.CompletedTask;
     }
 
     /// <summary>

LiveControlGateway/LifetimeManager/HubLifetime.cs

@@ -209,7 +209,7 @@ public async Task UpdateDevice()
         await using var db = await _dbContextFactory.CreateDbContextAsync(_cancellationSource.Token);
         await UpdateShockers(db, _cancellationSource.Token);
 
-        foreach (var websocketController in await WebsocketManager.LiveControlUsers.GetConnections(HubController.Id))
+        foreach (var websocketController in WebsocketManager.LiveControlUsers.GetConnections(HubController.Id))
             await websocketController.UpdatePermissions(db);
     }
 

LiveControlGateway/LifetimeManager/HubLifetimeManager.cs

@@ -101,7 +101,7 @@ public async Task<bool> TryAddDeviceConnection(byte tps, IHubController hubContr
                 return false;
             }
 
-            foreach (var websocketController in await WebsocketManager.LiveControlUsers.GetConnections(hubLifetime.HubController.Id))
+            foreach (var websocketController in WebsocketManager.LiveControlUsers.GetConnections(hubLifetime.HubController.Id))
                 await websocketController.UpdateConnectedState(true);
         }
 
@@ -154,7 +154,7 @@ public async Task RemoveDeviceConnection(IHubController hubController, bool noti
 
         if (notifyLiveControlClients)
         {
-            foreach (var websocketController in await WebsocketManager.LiveControlUsers.GetConnections(hubController.Id))
+            foreach (var websocketController in WebsocketManager.LiveControlUsers.GetConnections(hubController.Id))
                 await websocketController.UpdateConnectedState(false);
         }