tom/hermes-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added several request messages. Added redemptions. Added life TTS voice changes. A bunch of stuffs.

Browse Source
This commit is contained in:
Tom
2024-08-10 19:36:32 +00:00
parent 95bc073a73
commit c771a56971
36 changed files with 552 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Server.cs
View File

@@ -1,6 +1,7 @@
using System.Net.WebSockets;
using System.Text;
using System.Text.Json;
using CommonSocketLibrary.Common;
using HermesSocketLibrary.Socket.Data;
using HermesSocketServer.Socket;
using ILogger = Serilog.ILogger;
@@ -31,7 +32,7 @@ namespace HermesSocketLibrary
public async Task Handle(WebSocketUser socket, HttpContext context)
{
_logger.Information($"Socket connected [ip: {socket.IPAddress}]");
_logger.Information($"Socket connected [ip: {socket.IPAddress}][uid: {socket.UID}]");
_sockets.Add(socket);
var buffer = new byte[1024 * 8];
@@ -44,12 +45,12 @@ namespace HermesSocketLibrary
break;
string message = Encoding.UTF8.GetString(buffer, 0, result.Count).TrimEnd('\0');
var obj = JsonSerializer.Deserialize<SocketMessage>(message, _options);
if (obj == null || !obj.OpCode.HasValue)
var obj = JsonSerializer.Deserialize<WebSocketMessage>(message, _options);
if (obj == null)
continue;
if (obj.OpCode != 0)
_logger.Information("Message: " + message);
_logger.Information($"rxm: {message} [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
/**
* 0: Heartbeat
@@ -57,11 +58,11 @@ namespace HermesSocketLibrary
* 2: Login Ack TX
* 3: Request RX
* 4: Request Ack TX
* 5: Error RX/TX
* 5: Logging RX/TX
*/
if (obj.Data == null)
{
await socket.Send(5, new ErrorMessage("Received no data in the message."));
await socket.Send(5, new LoggingMessage("Received no data in the message.", HermesLoggingLevel.Warn));
continue;
}
else if (obj.OpCode == 0)
@@ -71,7 +72,7 @@ namespace HermesSocketLibrary
else if (obj.OpCode == 3)
obj.Data = JsonSerializer.Deserialize<RequestMessage>(obj.Data.ToString(), _options);
else if (obj.OpCode == 5)
obj.Data = JsonSerializer.Deserialize<ErrorMessage>(obj.Data.ToString(), _options);
obj.Data = JsonSerializer.Deserialize<LoggingMessage>(obj.Data.ToString(), _options);
else if (obj.OpCode == 6)
obj.Data = JsonSerializer.Deserialize<ChatterMessage>(obj.Data.ToString(), _options);
else if (obj.OpCode == 7)
@@ -80,27 +81,36 @@ namespace HermesSocketLibrary
obj.Data = JsonSerializer.Deserialize<EmoteUsageMessage>(obj.Data.ToString(), _options);
else
{
await socket.Send(5, new ErrorMessage("Received an invalid message: " + message));
await socket.Send(5, new LoggingMessage("Received an invalid message: " + message, HermesLoggingLevel.Error));
continue;
}
await _handlers.Execute(socket, obj.OpCode.Value, obj.Data);
await _handlers.Execute(socket, obj.OpCode, obj.Data);
}
catch (WebSocketException wse)
{
_logger.Error(wse, $"Error trying to process a socket message [code: {wse.ErrorCode}][ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
}
catch (Exception e)
{
_logger.Error(e, "Error trying to process a socket message");
_logger.Error(e, $"Error trying to process a socket message [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
}
}
try
{
if (socket.Connected)
await socket.Close(socket.CloseStatus ?? WebSocketCloseStatus.NormalClosure, socket.CloseStatusDescription, CancellationToken.None);
await socket.Close(socket.CloseStatus ?? WebSocketCloseStatus.NormalClosure, "", CancellationToken.None);
}
catch (Exception)
catch (Exception e)
{
_logger.Information(e, $"Client failed to disconnect [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
}
finally
{
socket.Dispose();
_sockets.Remove(socket);
}
_logger.Information($"Client disconnected [username: {socket.Name}][id: {socket.Id}][ip: {socket.IPAddress}]");
_logger.Information($"Client disconnected [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
}
}
}