mara/servicepoint-tanks
Archived
Watch
0
0
Fork
You've already forked servicepoint-tanks
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve ByteChannelWebSocket

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-04-13 12:33:08 +02:00
commit 40eba7a7c7
1 changed files with 79 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

58
TanksServer/Interactivity/ControlsServer.cs
View file

@ -8,6 +8,11 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
{
private readonly List<ControlsServerConnection> _connections = [];
public Task StoppingAsync(CancellationToken cancellationToken)
{
return Task.WhenAll(_connections.Select(c => c.CloseAsync()));
}
public Task HandleClient(WebSocket ws, Player player)
{
logger.LogDebug("control client connected {}", player.Id);
@ -17,10 +22,7 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
return sock.Done;
}
public Task StoppingAsync(CancellationToken cancellationToken)
{
return Task.WhenAll(_connections.Select(c => c.CloseAsync()));
}
private void Remove(ControlsServerConnection connection) => _connections.Remove(connection);
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
@ -28,17 +30,12 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
public Task StartingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
public Task StoppedAsync(CancellationToken cancellationToken) => Task.CompletedTask;
private void Remove(ControlsServerConnection connection)
{
_connections.Remove(connection);
}
private sealed class ControlsServerConnection
{
private readonly ByteChannelWebSocket _binaryWebSocket;
private readonly ILogger<ControlsServerConnection> _logger;
private readonly ControlsServer _server;
private readonly Player _player;
private readonly ControlsServer _server;
public ControlsServerConnection(WebSocket socket, ILogger<ControlsServerConnection> logger,
ControlsServer server, Player player)
@ -46,30 +43,15 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
_logger = logger;
_server = server;
_player = player;
_binaryWebSocket = new(socket, logger, 2);
_binaryWebSocket = new ByteChannelWebSocket(socket, logger, 2);
Done = ReceiveAsync();
}
public Task Done { get; }
private enum MessageType : byte
{
Enable = 0x01,
Disable = 0x02,
}
private enum InputType : byte
{
Forward = 0x01,
Backward = 0x02,
Left = 0x03,
Right = 0x04,
Shoot = 0x05
}
private async Task ReceiveAsync()
{
await foreach (var buffer in _binaryWebSocket.Reader.ReadAllAsync())
await foreach (var buffer in _binaryWebSocket.ReadAllAsync())
{
var type = (MessageType)buffer.Span[0];
var control = (InputType)buffer.Span[1];
@ -84,7 +66,7 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
};
_player.LastInput = DateTime.Now;
switch (control)
{
case InputType.Forward:
@ -110,6 +92,24 @@ internal sealed class ControlsServer(ILogger<ControlsServer> logger, ILoggerFact
_server.Remove(this);
}
public Task CloseAsync() => _binaryWebSocket.CloseAsync();
public Task CloseAsync()
{
return _binaryWebSocket.CloseAsync();
}
private enum MessageType : byte
{
Enable = 0x01,
Disable = 0x02
}
private enum InputType : byte
{
Forward = 0x01,
Backward = 0x02,
Left = 0x03,
Right = 0x04,
Shoot = 0x05
}
}
}