Skip to content

Commit 6a172bf

Browse files
hhvrchhvrc
committed
Remove redundant interfaces and classes
1 parent a506759 commit 6a172bf

File tree

5 files changed

+19
-36
lines changed

5 files changed

+19
-36
lines changed

‎API/Utils/IWebsocketController.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Common/Models/WebSocket/IBaseResponse.cs‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

Common/Models/WebSocket/BaseResponse.cs renamed to Common/Models/WebSocket/LiveControlResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace OpenShock.Common.Models.WebSocket;
44

5-
public sealed class BaseResponse<T> : IBaseResponse<T> where T : Enum
5+
public sealed class LiveControlResponse<T> where T : Enum
66
{
77
public required T ResponseType { get; set; }
88
public object? Data { get; set; }

‎LiveControlGateway/Controllers/LiveControlController.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace OpenShock.LiveControlGateway.Controllers;
3434
[Route("/{version:apiVersion}/ws/live/{hubId:guid}")]
3535
[TokenPermission(PermissionType.Shockers_Use)]
3636
[Authorize(AuthenticationSchemes = OpenShockAuthSchemas.UserSessionApiTokenCombo)]
37-
public sealed class LiveControlController : WebsocketBaseController<IBaseResponse<LiveResponseType>>, IActionFilter
37+
public sealed class LiveControlController : WebsocketBaseController<LiveControlResponse<LiveResponseType>>, IActionFilter
3838
{
3939
private readonly OpenShockContext _db;
4040
private readonly HubLifetimeManager _hubLifetimeManager;
@@ -206,7 +206,7 @@ public void OnActionExecuted(ActionExecutedContext context)
206206
/// <inheritdoc />
207207
protected override async Task SendInitialData()
208208
{
209-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
209+
await QueueMessage(new LiveControlResponse<LiveResponseType>
210210
{
211211
ResponseType = LiveResponseType.TPS,
212212
Data = new TpsData
@@ -234,7 +234,7 @@ public async Task UpdateConnectedState(bool isConnected, bool force = false)
234234
_lastIsConnected = isConnected;
235235
try
236236
{
237-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
237+
await QueueMessage(new LiveControlResponse<LiveResponseType>
238238
{
239239
ResponseType = _lastIsConnected
240240
? LiveResponseType.DeviceConnected
@@ -317,7 +317,7 @@ private Task ProcessResult(BaseRequest<LiveRequestType> request)
317317
LiveRequestType.Pong => IntakePong(request.Data),
318318
LiveRequestType.Frame => IntakeFrame(request.Data),
319319
LiveRequestType.BulkFrame => IntakeBulkFrame(request.Data),
320-
_ => QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
320+
_ => QueueMessage(new LiveControlResponse<LiveResponseType>()
321321
{
322322
ResponseType = LiveResponseType.RequestTypeNotFound
323323
}).AsTask()
@@ -344,7 +344,7 @@ private async Task IntakePong(JsonDocument? requestData)
344344
if (Logger.IsEnabled(LogLevel.Trace))
345345
Logger.LogTrace("Latency: {Latency}ms", _latencyMs);
346346

347-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
347+
await QueueMessage(new LiveControlResponse<LiveResponseType>
348348
{
349349
ResponseType = LiveResponseType.LatencyAnnounce,
350350
Data = new LatencyAnnounceData
@@ -370,7 +370,7 @@ private async Task IntakeBulkFrame(JsonDocument? requestData)
370370
if (frames is not { Length: > 0 })
371371
{
372372
Logger.LogWarning("Error while deserializing bulk frame");
373-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
373+
await QueueMessage(new LiveControlResponse<LiveResponseType>
374374
{
375375
ResponseType = LiveResponseType.InvalidData
376376
});
@@ -380,7 +380,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
380380
catch (Exception e)
381381
{
382382
Logger.LogWarning(e, "Error while deserializing frame");
383-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
383+
await QueueMessage(new LiveControlResponse<LiveResponseType>
384384
{
385385
ResponseType = LiveResponseType.InvalidData
386386
});
@@ -414,7 +414,7 @@ private async Task IntakeFrame(JsonDocument? requestData)
414414
if (frame == null)
415415
{
416416
Logger.LogWarning("Error while deserializing frame");
417-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
417+
await QueueMessage(new LiveControlResponse<LiveResponseType>
418418
{
419419
ResponseType = LiveResponseType.InvalidData
420420
});
@@ -424,7 +424,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
424424
catch (Exception e)
425425
{
426426
Logger.LogWarning(e, "Error while deserializing frame");
427-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
427+
await QueueMessage(new LiveControlResponse<LiveResponseType>
428428
{
429429
ResponseType = LiveResponseType.InvalidData
430430
});
@@ -441,7 +441,7 @@ private async Task ProcessFrameInternal(ClientLiveFrame frame)
441441
var permCheck = CheckFramePermissions(frame.Shocker, frame.Type);
442442
if (permCheck.IsT1)
443443
{
444-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
444+
await QueueMessage(new LiveControlResponse<LiveResponseType>
445445
{
446446
ResponseType = LiveResponseType.ShockerNotFound
447447
});
@@ -450,7 +450,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
450450

451451
if (permCheck.IsT2)
452452
{
453-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
453+
await QueueMessage(new LiveControlResponse<LiveResponseType>
454454
{
455455
ResponseType = LiveResponseType.ShockerMissingLivePermission
456456
});
@@ -459,7 +459,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
459459

460460
if (permCheck.IsT3)
461461
{
462-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
462+
await QueueMessage(new LiveControlResponse<LiveResponseType>
463463
{
464464
ResponseType = LiveResponseType.ShockerMissingPermission
465465
});
@@ -468,7 +468,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
468468

469469
if (permCheck.IsT4)
470470
{
471-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
471+
await QueueMessage(new LiveControlResponse<LiveResponseType>()
472472
{
473473
ResponseType = LiveResponseType.ShockerPaused
474474
});
@@ -489,7 +489,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>()
489489

490490
if (result.IsT1)
491491
{
492-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
492+
await QueueMessage(new LiveControlResponse<LiveResponseType>
493493
{
494494
ResponseType = LiveResponseType.DeviceNotConnected
495495
});
@@ -498,7 +498,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
498498

499499
if (result.IsT2)
500500
{
501-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
501+
await QueueMessage(new LiveControlResponse<LiveResponseType>
502502
{
503503
ResponseType = LiveResponseType.ShockerNotFound
504504
});
@@ -507,7 +507,7 @@ await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
507507

508508
if (result.IsT3)
509509
{
510-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
510+
await QueueMessage(new LiveControlResponse<LiveResponseType>
511511
{
512512
ResponseType = LiveResponseType.ShockerExclusive,
513513
Data = result.AsT3.Until
@@ -554,7 +554,7 @@ private async Task SendPing()
554554
Id);
555555

556556
_pingTimestamp = Stopwatch.GetTimestamp();
557-
await QueueMessage(new Common.Models.WebSocket.BaseResponse<LiveResponseType>
557+
await QueueMessage(new LiveControlResponse<LiveResponseType>
558558
{
559559
ResponseType = LiveResponseType.Ping,
560560
Data = new LcgLiveControlPing

‎LiveControlGateway/Websocket/WebsocketManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ public static class WebsocketManager
1414
/// <summary>
1515
/// Live control users
1616
/// </summary>
17-
public static readonly SimpleWebsocketCollection<LiveControlController, IBaseResponse<LiveResponseType>> LiveControlUsers = new();
17+
public static readonly SimpleWebsocketCollection<LiveControlController, LiveControlResponse<LiveResponseType>> LiveControlUsers = new();
1818
}

0 commit comments

Comments
 (0)