Added room functionality
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System.Net.WebSockets;
|
||||
using System.Text;
|
||||
using MauMau_Server.Websockets;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace MauMau_Server.Controllers;
|
||||
@@ -9,10 +10,13 @@ namespace MauMau_Server.Controllers;
|
||||
public class WebSocketsController : ControllerBase
|
||||
{
|
||||
private readonly ILogger<WebSocketsController> _logger;
|
||||
private readonly IWebsocketManager _websocketManager;
|
||||
private string _id = string.Empty;
|
||||
|
||||
public WebSocketsController(ILogger<WebSocketsController> logger)
|
||||
public WebSocketsController(ILogger<WebSocketsController> logger, IWebsocketManager websocketManager)
|
||||
{
|
||||
_logger = logger;
|
||||
_websocketManager = websocketManager;
|
||||
}
|
||||
|
||||
[HttpGet("/ws")]
|
||||
@@ -21,7 +25,8 @@ public class WebSocketsController : ControllerBase
|
||||
if (HttpContext.WebSockets.IsWebSocketRequest)
|
||||
{
|
||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||
_logger.Log(LogLevel.Information, "WebSocket connection established");
|
||||
_id = _websocketManager.AddConnection(webSocket);
|
||||
_logger.Log(LogLevel.Information, $"WebSocket connection {_id} established");
|
||||
await Echo(webSocket);
|
||||
}
|
||||
else
|
||||
@@ -32,22 +37,43 @@ public class WebSocketsController : ControllerBase
|
||||
|
||||
private async Task Echo(WebSocket webSocket)
|
||||
{
|
||||
var buffer = new byte[1024 * 4];
|
||||
var result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, "Message received from Client");
|
||||
var buffer = EmptyBuffer();
|
||||
var result = await ReceiveAsync(webSocket, buffer);
|
||||
|
||||
while (!result.CloseStatus.HasValue)
|
||||
{
|
||||
var serverMsg = Encoding.UTF8.GetBytes($"Server: Hello. You said: {Encoding.UTF8.GetString(buffer)}");
|
||||
await webSocket.SendAsync(new ArraySegment<byte>(serverMsg, 0, serverMsg.Length), result.MessageType, result.EndOfMessage, CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, "Message sent to Client");
|
||||
var message = Encoding.UTF8.GetString(buffer);
|
||||
BroadcastAsync(message);
|
||||
|
||||
buffer = new byte[1024 * 4];
|
||||
result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, "Message received from Client");
|
||||
|
||||
buffer = EmptyBuffer();
|
||||
result = await ReceiveAsync(webSocket, buffer);
|
||||
}
|
||||
await webSocket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, "WebSocket connection closed");
|
||||
_websocketManager.RemoveConnection(_id);
|
||||
_logger.Log(LogLevel.Information, $"WebSocket connection {_id} closed");
|
||||
}
|
||||
|
||||
private async Task<WebSocketReceiveResult?> ReceiveAsync(WebSocket webSocket, byte[] buffer)
|
||||
{
|
||||
var arraySegment = new ArraySegment<byte>(buffer);
|
||||
var result = await webSocket.ReceiveAsync(arraySegment, CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, $"Message received from Client {_id}");
|
||||
return result;
|
||||
}
|
||||
|
||||
private void BroadcastAsync(string message)
|
||||
{
|
||||
var bytes = Encoding.Default.GetBytes($"{_id}: {message}");
|
||||
var arraySegment = new ArraySegment<byte>(bytes);
|
||||
foreach (var (id, socket) in _websocketManager.GetAllConnections())
|
||||
{
|
||||
socket.SendAsync(arraySegment, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||
_logger.Log(LogLevel.Information, $"Message from Client {_id} sent to Client {id}");
|
||||
}
|
||||
}
|
||||
|
||||
private static byte[] EmptyBuffer()
|
||||
{
|
||||
return new byte[4096];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user