Remove redundant interfaces and classes

OpenShock · Feb 3, 2025 · 6a172bf · 6a172bf
1 parent a506759
commit 6a172bf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 36 deletions.
diff --git a/API/Utils/IWebsocketController.cs b/API/Utils/IWebsocketController.cs
diff --git a/Common/Models/WebSocket/IBaseResponse.cs b/Common/Models/WebSocket/IBaseResponse.cs
diff --git a/Common/Models/WebSocket/BaseResponse.cs → ...n/Models/WebSocket/LiveControlResponse.cs b/Common/Models/WebSocket/BaseResponse.cs → ...n/Models/WebSocket/LiveControlResponse.cs
@@ -2,7 +2,7 @@
 
 namespace OpenShock.Common.Models.WebSocket;
 
-public sealed class BaseResponse<T> : IBaseResponse<T> where T : Enum
+public sealed class LiveControlResponse<T> where T : Enum
 {
     public required T ResponseType { get; set; }
     public object? Data { get; set; }

diff --git a/LiveControlGateway/Controllers/LiveControlController.cs b/LiveControlGateway/Controllers/LiveControlController.cs
@@ -34,7 +34,7 @@ namespace OpenShock.LiveControlGateway.Controllers;
 [Route("/{version:apiVersion}/ws/live/{hubId:guid}")]
 [TokenPermission(PermissionType.Shockers_Use)]
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemas.UserSessionApiTokenCombo)]
-public sealed class LiveControlController : WebsocketBaseController<IBaseResponse<LiveResponseType>>, IActionFilter
+public sealed class LiveControlController : WebsocketBaseController<LiveControlResponse<LiveResponseType>>, IActionFilter
 {
     private readonly OpenShockContext _db;
     private readonly HubLifetimeManager _hubLifetimeManager;
@@ -206,7 +206,7 @@ public void OnActionExecuted(ActionExecutedContext context)
     /// <inheritdoc />
     protected override async Task SendInitialData()
     {
-        await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+        await QueueMessage(new LiveControlResponse<LiveResponseType>
         {
             ResponseType = LiveResponseType.TPS,
             Data = new TpsData
@@ -234,7 +234,7 @@ public async Task UpdateConnectedState(bool isConnected, bool force = false)
         _lastIsConnected = isConnected;
         try
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = _lastIsConnected
                     ? LiveResponseType.DeviceConnected
@@ -317,7 +317,7 @@ private Task ProcessResult(BaseRequest<LiveRequestType> request)
             LiveRequestType.Pong => IntakePong(request.Data),
             LiveRequestType.Frame => IntakeFrame(request.Data),
             LiveRequestType.BulkFrame => IntakeBulkFrame(request.Data),
-            _ => QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
+            _ => QueueMessage(new LiveControlResponse<LiveResponseType>()
             {
                 ResponseType = LiveResponseType.RequestTypeNotFound
             }).AsTask()
@@ -344,7 +344,7 @@ private async Task IntakePong(JsonDocument? requestData)
         if (Logger.IsEnabled(LogLevel.Trace))
             Logger.LogTrace("Latency: {Latency}ms", _latencyMs);
 
-        await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+        await QueueMessage(new LiveControlResponse<LiveResponseType>
         {
             ResponseType = LiveResponseType.LatencyAnnounce,
             Data = new LatencyAnnounceData
@@ -370,7 +370,7 @@ private async Task IntakeBulkFrame(JsonDocument? requestData)
             if (frames is not { Length: > 0 })
             {
                 Logger.LogWarning("Error while deserializing bulk frame");
-                await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+                await QueueMessage(new LiveControlResponse<LiveResponseType>
                 {
                     ResponseType = LiveResponseType.InvalidData
                 });
@@ -380,7 +380,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
         catch (Exception e)
         {
             Logger.LogWarning(e, "Error while deserializing frame");
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.InvalidData
             });
@@ -414,7 +414,7 @@ private async Task IntakeFrame(JsonDocument? requestData)
             if (frame == null)
             {
                 Logger.LogWarning("Error while deserializing frame");
-                await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+                await QueueMessage(new LiveControlResponse<LiveResponseType>
                 {
                     ResponseType = LiveResponseType.InvalidData
                 });
@@ -424,7 +424,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
         catch (Exception e)
         {
             Logger.LogWarning(e, "Error while deserializing frame");
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.InvalidData
             });
@@ -441,7 +441,7 @@ private async Task ProcessFrameInternal(ClientLiveFrame frame)
         var permCheck = CheckFramePermissions(frame.Shocker, frame.Type);
         if (permCheck.IsT1)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.ShockerNotFound
             });
@@ -450,7 +450,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
 
         if (permCheck.IsT2)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.ShockerMissingLivePermission
             });
@@ -459,7 +459,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
 
         if (permCheck.IsT3)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.ShockerMissingPermission
             });
@@ -468,7 +468,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
 
         if (permCheck.IsT4)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
+            await QueueMessage(new LiveControlResponse<LiveResponseType>()
             {
                 ResponseType = LiveResponseType.ShockerPaused
             });
@@ -489,7 +489,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
 
         if (result.IsT1)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.DeviceNotConnected
             });
@@ -498,7 +498,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
 
         if (result.IsT2)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.ShockerNotFound
             });
@@ -507,7 +507,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
 
         if (result.IsT3)
         {
-            await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+            await QueueMessage(new LiveControlResponse<LiveResponseType>
             {
                 ResponseType = LiveResponseType.ShockerExclusive,
                 Data = result.AsT3.Until
@@ -554,7 +554,7 @@ private async Task SendPing()
                 Id);
 
         _pingTimestamp = Stopwatch.GetTimestamp();
-        await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
+        await QueueMessage(new LiveControlResponse<LiveResponseType>
         {
             ResponseType = LiveResponseType.Ping,
             Data = new LcgLiveControlPing

diff --git a/LiveControlGateway/Websocket/WebsocketManager.cs b/LiveControlGateway/Websocket/WebsocketManager.cs
@@ -14,5 +14,5 @@ public static class WebsocketManager
     /// <summary>
     /// Live control users
     /// </summary>
-    public static readonly SimpleWebsocketCollection<LiveControlController, IBaseResponse<LiveResponseType>> LiveControlUsers = new();
+    public static readonly SimpleWebsocketCollection<LiveControlController, LiveControlResponse<LiveResponseType>> LiveControlUsers = new();
 }