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

6
Socket/Handlers/ChatterHandler.cs
View File

@ -6,7 +6,7 @@ namespace HermesSocketServer.Socket.Handlers
{
public class ChatterHandler : ISocketHandler
{
public int OpCode { get; } = 6;
public int OperationCode { get; } = 6;
private readonly Database _database;
private readonly HashSet<long> _chatters;
private readonly ChatterMessage[] _array;
@ -27,7 +27,7 @@ namespace HermesSocketServer.Socket.Handlers
public async Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets)
{
if (message is not ChatterMessage data)
if (message is not ChatterMessage data || sender.Id == null)
return;
lock (_lock)
@ -45,7 +45,7 @@ namespace HermesSocketServer.Socket.Handlers
try
{
string sql = "INSERT INTO \"Chatter\" (id, name) VALUES (@idd, @name)";
string sql = "INSERT INTO \"Chatter\" (id, name) VALUES (@idd, @name) ON CONFLICT (id) DO UPDATE SET name = @name";
await _database.Execute(sql, new Dictionary<string, object>() { { "idd", data.Id }, { "name", data.Name } });
}
catch (Exception e)

4
Socket/Handlers/EmoteDetailsHandler.cs
View File

@ -7,7 +7,7 @@ namespace HermesSocketServer.Socket.Handlers
{
public class EmoteDetailsHandler : ISocketHandler
{
public int OpCode { get; } = 7;
public int OperationCode { get; } = 7;
private readonly Database _database;
private readonly HashSet<string> _emotes;
private readonly ILogger _logger;
@ -23,7 +23,7 @@ namespace HermesSocketServer.Socket.Handlers
public async Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets)
{
if (message is not EmoteDetailsMessage data)
if (message is not EmoteDetailsMessage data || sender.Id == null)
return;
if (data.Emotes == null)

6
Socket/Handlers/EmoteUsageHandler.cs
View File

@ -7,7 +7,7 @@ namespace HermesSocketServer.Socket.Handlers
{
public class EmoteUsageHandler : ISocketHandler
{
public int OpCode { get; } = 8;
public int OperationCode { get; } = 8;
private readonly Database _database;
private readonly HashSet<string> _history;
@ -28,7 +28,7 @@ namespace HermesSocketServer.Socket.Handlers
public async Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets)
{
if (message is not EmoteUsageMessage data)
if (message is not EmoteUsageMessage data || sender.Id == null)
return;
lock (_logger)
@ -69,7 +69,7 @@ namespace HermesSocketServer.Socket.Handlers
}
}
_logger.Information($"Tracked {rows} emote(s) to history.");
_logger.Debug($"Tracked {rows} emote(s) to history.");
}
}
}

29
Socket/Handlers/ErrorHandler.cs
View File

@ -1,29 +0,0 @@
using HermesSocketLibrary.Socket.Data;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Socket.Handlers
{
public class ErrorHandler : ISocketHandler
{
public int OpCode { get; } = 0;
private ILogger _logger;
public ErrorHandler(ILogger logger)
{
_logger = logger;
}
public async Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets)
{
if (message is not ErrorMessage data)
return;
if (data.Exception == null)
_logger.Error(data.Message);
else
_logger.Error(data.Exception, data.Message);
}
}
}

5
Socket/Handlers/HeartbeatHandler.cs
View File

@ -5,7 +5,7 @@ namespace HermesSocketServer.Socket.Handlers
{
public class HeartbeatHandler : ISocketHandler
{
public int OpCode { get; } = 0;
public int OperationCode { get; } = 0;
private ILogger _logger;
@ -23,11 +23,14 @@ namespace HermesSocketServer.Socket.Handlers
_logger.Verbose($"Received heartbeat from socket [ip: {sender.IPAddress}].");
if (data.Respond)
{
sender.LastHearbeatSent = DateTime.UtcNow;
await sender.Send(0, new HeartbeatMessage()
{
DateTime = DateTime.UtcNow,
Respond = false
});
}
}
}
}

84
Socket/Handlers/HermesLoginHandler.cs
View File

@ -1,4 +1,5 @@
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketLibrary.Socket.Data;
using ILogger = Serilog.ILogger;
@ -6,15 +7,17 @@ namespace HermesSocketServer.Socket.Handlers
{
public class HermesLoginHandler : ISocketHandler
{
public int OpCode { get; } = 1;
public int OperationCode { get; } = 1;
private readonly ServerConfiguration _configuration;
private readonly Database _database;
private readonly HermesSocketManager _sockets;
private readonly ILogger _logger;
private readonly object _lock;
public HermesLoginHandler(Database database, HermesSocketManager sockets, ILogger logger)
public HermesLoginHandler(ServerConfiguration configuration, Database database, HermesSocketManager sockets, ILogger logger)
{
_configuration = configuration;
_database = database;
_sockets = sockets;
_logger = logger;
@ -36,48 +39,89 @@ namespace HermesSocketServer.Socket.Handlers
if (userId == null)
return;
var recipients = _sockets.GetSockets(userId).ToList();
lock (_lock)
{
if (sender.Id != null)
return;
sender.Id = userId;
sender.ApiKey = data.ApiKey;
sender.WebLogin = data.WebLogin;
}
string sql2 = "select \"name\" from \"User\" where id = @user";
var result2 = await _database.ExecuteScalar(sql2, new Dictionary<string, object>() { { "user", userId } });
string? name = result2?.ToString();
if (string.IsNullOrEmpty(name))
return;
sender.Name = name;
await sender.Send(2, new LoginAckMessage()
string sql2 = "select name, role from \"User\" where id = @user";
await _database.Execute(sql2, new Dictionary<string, object>() { { "user", userId } }, sql =>
{
UserId = userId
sender.Name = sql.GetString(0);
sender.Admin = sql.GetString(1) == "ADMIN";
});
if (string.IsNullOrEmpty(sender.Name))
{
_logger.Error($"Could not find username using the user id [user id: {userId}][api key: {data.ApiKey}]");
return;
}
var ack = new LoginAckMessage()
{
AnotherClient = true,
UserId = userId
UserId = userId,
OwnerId = _configuration.OwnerId,
Admin = sender.Admin,
WebLogin = data.WebLogin,
};
var connections = new List<Connection>();
string sql3 = "select \"name\", \"type\", \"clientId\", \"accessToken\", \"grantType\", \"scope\", \"expiresAt\", \"default\" from \"Connection\" where \"userId\" = @user";
await _database.Execute(sql3, new Dictionary<string, object>() { { "user", userId } }, sql =>
connections.Add(new Connection()
{
Name = sql.GetString(0),
Type = sql.GetString(1),
ClientId = sql.GetString(2),
AccessToken = sql.GetString(3),
GrantType = sql.GetString(4),
Scope = sql.GetString(5),
ExpiresIn = sql.GetDateTime(6),
Default = sql.GetBoolean(7)
})
);
ack.Connections = connections.ToArray();
IList<VoiceDetails> voices = new List<VoiceDetails>();
string sql4 = "SELECT id, name FROM \"TtsVoice\"";
await _database.Execute(sql4, (IDictionary<string, object>?) null, (r) => voices.Add(new VoiceDetails()
{
Id = r.GetString(0),
Name = r.GetString(1)
}));
ack.TTSVoicesAvailable = voices.ToDictionary(e => e.Id, e => e.Name);
await sender.Send(2, ack);
string version = data.MajorVersion == null ? "unknown" : $"{data.MajorVersion}.{data.MinorVersion}";
_logger.Information($"Hermes client logged in {(sender.Admin ? "as administrator " : "")}[name: {sender.Name}][id: {userId}][ip: {sender.IPAddress}][version: {version}][web: {data.WebLogin}]");
ack = new LoginAckMessage()
{
AnotherClient = true,
UserId = userId,
OwnerId = _configuration.OwnerId,
WebLogin = data.WebLogin
};
var recipients = _sockets.GetSockets(userId).ToList().Where(s => s.UID != sender.UID);
var tasks = new List<Task>();
foreach (var socket in recipients)
{
try
{
await socket.Send(2, ack);
tasks.Add(socket.Send(2, ack));
}
catch (Exception)
{
}
}
_logger.Information($"Hermes client logged in [name: {name}][id: {userId}][ip: {sender.IPAddress}]");
await Task.WhenAll(tasks);
}
}
}

4
Socket/Handlers/ISocketHandler.cs
View File

@ -1,10 +1,8 @@
using System.Net.WebSockets;
namespace HermesSocketServer.Socket.Handlers
{
public interface ISocketHandler
{
int OpCode { get; }
int OperationCode { get; }
Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets);
}
}

44
Socket/Handlers/LoggingHandler.cs Normal file
View File

@ -0,0 +1,44 @@
using HermesSocketLibrary.Socket.Data;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Socket.Handlers
{
public class LoggingHandler : ISocketHandler
{
public int OperationCode { get; } = 5;
private ILogger _logger;
public LoggingHandler(ILogger logger)
{
_logger = logger;
}
public async Task Execute<T>(WebSocketUser sender, T data, HermesSocketManager sockets)
{
if (data is not LoggingMessage message || sender.Id == null)
return;
Action<Exception?, string> logging;
if (message.Level == HermesLoggingLevel.Trace)
logging = _logger.Verbose;
else if (message.Level == HermesLoggingLevel.Debug)
logging = _logger.Debug;
else if (message.Level == HermesLoggingLevel.Info)
logging = _logger.Information;
else if (message.Level == HermesLoggingLevel.Warn)
logging = _logger.Warning;
else if (message.Level == HermesLoggingLevel.Error)
logging = _logger.Error;
else if (message.Level == HermesLoggingLevel.Critical)
logging = _logger.Fatal;
else {
_logger.Warning("Failed to receive a logging level from client.");
return;
}
logging.Invoke(message.Exception, message.Message + $" [ip: {sender.IPAddress}][id: {sender.Id}][name: {sender.Name}][token: {sender.ApiKey}][uid: {sender.UID}]");
}
}
}

10
Socket/Handlers/RequestHandler.cs
View File

@ -6,12 +6,12 @@ namespace HermesSocketServer.Socket.Handlers
{
public class RequestHandler : ISocketHandler
{
public int OpCode { get; } = 3;
private readonly RequestManager _requests;
public int OperationCode { get; } = 3;
private readonly IRequestManager _requests;
private readonly HermesSocketManager _sockets;
private readonly ILogger _logger;
public RequestHandler(RequestManager requests, HermesSocketManager sockets, ILogger logger)
public RequestHandler(IRequestManager requests, HermesSocketManager sockets, ILogger logger)
{
_requests = requests;
_sockets = sockets;
@ -21,9 +21,7 @@ namespace HermesSocketServer.Socket.Handlers
public async Task Execute<T>(WebSocketUser sender, T message, HermesSocketManager sockets)
{
if (sender.Id == null)
return;
if (message is not RequestMessage data)
if (message is not RequestMessage data || sender.Id == null)
return;
RequestResult? result = null;

14
Socket/SocketHandlerManager.cs
View File

@ -1,4 +1,3 @@
using System.Text.Json;
using CommonSocketLibrary.Abstract;
using HermesSocketServer.Socket.Handlers;
using ILogger = Serilog.ILogger;
@ -8,22 +7,15 @@ namespace HermesSocketServer.Socket
public class SocketHandlerManager : HandlerManager<WebSocketUser, ISocketHandler>
{
private readonly HermesSocketManager _sockets;
private readonly IServiceProvider _serviceProvider;
public SocketHandlerManager(HermesSocketManager sockets, IServiceProvider serviceProvider, ILogger logger)
public SocketHandlerManager(HermesSocketManager sockets, IEnumerable<ISocketHandler> handlers, ILogger logger)
: base(logger)
{
_sockets = sockets;
_serviceProvider = serviceProvider;
Add(0, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-heartbeat"));
Add(1, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-hermeslogin"));
Add(3, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-request"));
Add(5, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-error"));
Add(6, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-chatter"));
Add(7, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-emotedetails"));
Add(8, _serviceProvider.GetRequiredKeyedService<ISocketHandler>("hermes-emoteusage"));
foreach (ISocketHandler handler in handlers)
Add(handler.OperationCode, handler);
}
protected override async Task Execute<T>(WebSocketUser sender, ISocketHandler handler, T value)

26
Socket/SocketManager.cs
View File

@ -1,4 +1,3 @@
using System.Net.WebSockets;
using System.Timers;
using HermesSocketLibrary.Socket.Data;
using ILogger = Serilog.ILogger;
@ -16,7 +15,6 @@ namespace HermesSocketServer.Socket
{
_sockets = new List<WebSocketUser>();
_timer = new System.Timers.Timer(TimeSpan.FromSeconds(1));
_timer.AutoReset = true;
_timer.Elapsed += async (sender, e) => await HandleHeartbeats(e);
_timer.Enabled = true;
_logger = logger;
@ -66,25 +64,27 @@ namespace HermesSocketServer.Socket
try
{
socket.LastHearbeatSent = DateTime.UtcNow;
await socket.Send(0, new HeartbeatMessage() { DateTime = socket.LastHearbeatSent });
await socket.Send(0, new HeartbeatMessage() { DateTime = signalTime, Respond = true });
}
catch (Exception)
{
}
}
else if (signalTime - socket.LastHeartbeatReceived > TimeSpan.FromSeconds(60))
{
_logger.Debug($"Closing socket [ip: {socket.IPAddress}] for not responding for 2 minutes.");
try
{
socket.Dispose();
}
catch (Exception)
{
_logger.Warning($"Failed to send the heartbeat to socket [ip: {socket.IPAddress}].");
await socket.Close(WebSocketCloseStatus.NormalClosure, "Failed to send a heartbeat message.", CancellationToken.None);
}
finally
{
if (!socket.Connected)
_sockets.RemoveAt(i--);
_sockets.RemoveAt(i--);
}
}
else if (signalTime - socket.LastHeartbeatReceived > TimeSpan.FromSeconds(120))
{
_logger.Debug($"Closing socket [ip: {socket.IPAddress}] for not responding for 2 minutes.");
await socket.Close(WebSocketCloseStatus.NormalClosure, "No heartbeat received.", CancellationToken.None);
_sockets.RemoveAt(i--);
}
}
}
}

20
Socket/WebSocketUser.cs
View File

@ -2,12 +2,12 @@ using System.Net;
using System.Net.WebSockets;
using System.Text;
using System.Text.Json;
using HermesSocketLibrary.Socket.Data;
using CommonSocketLibrary.Common;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Socket
{
public class WebSocketUser
public class WebSocketUser : IDisposable
{
private readonly WebSocket _socket;
private readonly JsonSerializerOptions _options;
@ -22,8 +22,12 @@ namespace HermesSocketServer.Socket
public WebSocketState State { get => _socket.State; }
public IPAddress? IPAddress { get => _ipAddress; }
public bool Connected { get => _connected; }
public string UID { get; }
public string ApiKey { get; set; }
public string? Id { get; set; }
public string? Name { get; set; }
public bool Admin { get; set; }
public bool WebLogin { get; set; }
public DateTime LastHeartbeatReceived { get; set; }
public DateTime LastHearbeatSent { get; set; }
public CancellationToken Token { get => _cts.Token; }
@ -36,7 +40,10 @@ namespace HermesSocketServer.Socket
_options = options;
_connected = true;
_logger = logger;
Admin = false;
WebLogin = false;
_cts = new CancellationTokenSource();
UID = Guid.NewGuid().ToString("D");
LastHeartbeatReceived = DateTime.UtcNow;
}
@ -65,6 +72,11 @@ namespace HermesSocketServer.Socket
}
}
public void Dispose()
{
_socket.Dispose();
}
public async Task Send<Data>(int opcode, Data data)
{
var message = GenerateMessage(opcode, data);
@ -101,9 +113,9 @@ namespace HermesSocketServer.Socket
return null;
}
private SocketMessage GenerateMessage<Data>(int opcode, Data data)
private WebSocketMessage GenerateMessage<Data>(int opcode, Data data)
{
return new SocketMessage()
return new WebSocketMessage()
{
OpCode = opcode,
Data = data