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

Fixed issues with TTS voice changes. Added proper handling for slave clients. Fixed several stores. Fixed database saving to safely save foreign keys.

Browse Source
This commit is contained in:
Tom
2025-03-06 16:11:36 +00:00
parent 3e717522c2
commit fd0bca5c7c
13 changed files with 139 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
Server.cs
View File

@@ -2,6 +2,7 @@ using System.Net.WebSockets;
using System.Text;
using System.Text.Json;
using CommonSocketLibrary.Common;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketLibrary.Socket.Data;
using HermesSocketServer.Socket;
using ILogger = Serilog.ILogger;
@@ -32,7 +33,7 @@ namespace HermesSocketLibrary
public async Task Handle(WebSocketUser socket, HttpContext context)
{
_logger.Information($"Socket connected [ip: {socket.IPAddress}][uid: {socket.UID}]");
_logger.Information($"Socket connected [ip: {socket.IPAddress}][uid: {socket.SessionId}]");
_sockets.Add(socket);
var buffer = new byte[1024 * 8];
@@ -44,70 +45,71 @@ namespace HermesSocketLibrary
if (result == null || result.MessageType == WebSocketMessageType.Close || !socket.Connected)
break;
string message = Encoding.UTF8.GetString(buffer, 0, result.Count).TrimEnd('\0');
var obj = JsonSerializer.Deserialize<WebSocketMessage>(message, _options);
if (obj == null)
string messageString = Encoding.UTF8.GetString(buffer, 0, result.Count).TrimEnd('\0');
var message = JsonSerializer.Deserialize<WebSocketMessage>(messageString, _options);
if (message == null)
continue;
if (obj.OpCode != 0)
_logger.Information($"rxm: {message} [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
if (message.OpCode != 0)
_logger.Information($"rxm: {messageString} [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
int[] nonProtectedOps = { 0, 1 };
if (string.IsNullOrEmpty(socket.Id) && !nonProtectedOps.Contains(obj.OpCode))
if (message.OpCode < 0 || message.OpCode > 8 || message.OpCode == 2 || message.OpCode == 4)
{
_logger.Warning($"An attempt was made to use protected routes while not logged in [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
await socket.Send(5, new LoggingMessage("Received an invalid message: " + messageString, HermesLoggingLevel.Error));
return;
}
bool loggedIn = !string.IsNullOrEmpty(socket.Id);
int[] nonProtectedOps = { 0, 1 };
if (!loggedIn && !nonProtectedOps.Contains(message.OpCode))
{
_logger.Warning($"An attempt was made to use protected routes while not logged in [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
return;
}
int[] protectedOps = { 0, 3, 5, 6, 7, 8 };
if (!string.IsNullOrEmpty(socket.Id) && !protectedOps.Contains(obj.OpCode))
if (loggedIn && !protectedOps.Contains(message.OpCode))
{
_logger.Warning($"An attempt was made to use non-protected routes while logged in [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
_logger.Warning($"An attempt was made to use non-protected routes while logged in [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
return;
}
/**
* 0: Heartbeat
* 1: Login RX
* 2: Login Ack TX
* 3: Request RX
* 4: Request Ack TX
* 5: Logging RX/TX
*/
if (obj.Data == null)
if (message.Data == null)
{
await socket.Send(5, new LoggingMessage("Received no data in the message.", HermesLoggingLevel.Warn));
continue;
}
string data = obj.Data.ToString()!;
if (obj.OpCode == 0)
obj.Data = JsonSerializer.Deserialize<HeartbeatMessage>(data, _options);
else if (obj.OpCode == 1)
obj.Data = JsonSerializer.Deserialize<HermesLoginMessage>(data, _options);
else if (obj.OpCode == 3)
obj.Data = JsonSerializer.Deserialize<RequestMessage>(data, _options);
else if (obj.OpCode == 5)
obj.Data = JsonSerializer.Deserialize<LoggingMessage>(data, _options);
else if (obj.OpCode == 6)
obj.Data = JsonSerializer.Deserialize<ChatterMessage>(data, _options);
else if (obj.OpCode == 7)
obj.Data = JsonSerializer.Deserialize<EmoteDetailsMessage>(data, _options);
else if (obj.OpCode == 8)
obj.Data = JsonSerializer.Deserialize<EmoteUsageMessage>(data, _options);
string data = message.Data.ToString()!;
if (message.OpCode == 0)
message.Data = JsonSerializer.Deserialize<HeartbeatMessage>(data, _options);
else if (message.OpCode == 1)
message.Data = JsonSerializer.Deserialize<HermesLoginMessage>(data, _options);
else if (message.OpCode == 3)
message.Data = JsonSerializer.Deserialize<RequestMessage>(data, _options);
else if (message.OpCode == 5)
message.Data = JsonSerializer.Deserialize<LoggingMessage>(data, _options);
else if (message.OpCode == 6)
message.Data = JsonSerializer.Deserialize<ChatterMessage>(data, _options);
else if (message.OpCode == 7)
message.Data = JsonSerializer.Deserialize<EmoteDetailsMessage>(data, _options);
else if (message.OpCode == 8)
message.Data = JsonSerializer.Deserialize<EmoteUsageMessage>(data, _options);
//else if (message.OpCode == 9)
// message.Data = JsonSerializer.Deserialize<SlaveMessage>(data, _options);
else
{
await socket.Send(5, new LoggingMessage("Received an invalid message: " + message, HermesLoggingLevel.Error));
await socket.Send(5, new LoggingMessage("Received a message with invalid data: " + messageString, HermesLoggingLevel.Error));
continue;
}
await _handlers.Execute(socket, obj.OpCode, obj.Data);
await _handlers.Execute(socket, message.OpCode, message.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}]");
_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.SessionId}]");
}
catch (Exception e)
{
_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}]");
_logger.Error(e, $"Error trying to process a socket message [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
}
}
@@ -118,14 +120,26 @@ namespace HermesSocketLibrary
}
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}]");
_logger.Information(e, $"Client failed to disconnect [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
}
finally
{
socket.Dispose();
_sockets.Remove(socket);
}
_logger.Information($"Client disconnected [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.UID}]");
_logger.Information($"Client disconnected [ip: {socket.IPAddress}][id: {socket.Id}][name: {socket.Name}][token: {socket.ApiKey}][uid: {socket.SessionId}]");
// Update slave status of another client from the same user if available.
// TODO: Ensure one of the clients is always a non-slave.
if (socket.Id != null && !socket.Slave)
{
var client = _sockets.GetSockets(socket.Id).Where(s => !s.WebLogin).FirstOrDefault();
if (client != null)
{
await client.Send(9, new SlaveMessage() { Slave = false });
client.Slave = false;
}
}
}
}
}