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

Added policy messages for WS. Fixed DB changes via stores. Updated chat voices messages via WS to use stores.

Browse Source
This commit is contained in:
Tom
2024-10-21 20:44:20 +00:00
parent e3c78d96fa
commit 94e0d54c31
19 changed files with 255 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Requests/CreatePolicy.cs Normal file
View File

@ -0,0 +1,49 @@
using HermesSocketServer.Models;
using HermesSocketServer.Services;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Requests
{
public class CreatePolicy : IRequest
{
public string Name => "create_policy";
public string[] RequiredKeys => ["groupId", "path", "count", "span"];
private ChannelManager _channels;
private ILogger _logger;
public CreatePolicy(ChannelManager channels, ILogger logger)
{
_channels = channels;
_logger = logger;
}
public async Task<RequestResult> Grant(string sender, IDictionary<string, object>? data)
{
var id = Guid.NewGuid();
string groupId = data["groupId"].ToString()!;
string path = data["path"].ToString()!;
int count = int.Parse(data["count"].ToString()!);
int span = int.Parse(data["span"].ToString()!);
var policy = new PolicyMessage()
{
Id = id,
UserId = sender,
GroupId = Guid.Parse(groupId),
Path = path,
Usage = count,
Span = span,
};
var channel = _channels.Get(sender);
bool result = channel.Policies.Set(id.ToString(), policy);
if (result)
{
_logger.Information($"Added policy to channel [policy id: {id}][group id: {groupId}][path: {path}][count: {count}][span: {span}][channel: {sender}]");
return RequestResult.Successful(policy);
}
return RequestResult.Failed("Something went wrong when updating the cache.");
}
}
}

3
Requests/CreateTTSUser.cs
View File

@ -8,7 +8,6 @@ namespace HermesSocketServer.Requests
public class CreateTTSUser : IRequest
{
public string Name => "create_tts_user";
public string[] RequiredKeys => ["chatter", "voice"];
private ChannelManager _channels;
private Database _database;
@ -40,7 +39,7 @@ namespace HermesSocketServer.Requests
bool result = channel.Chatters.Set(chatterId.ToString(), new ChatterVoice()
{
UserId = sender,
ChatterId = chatterId.ToString(),
ChatterId = chatterId,
VoiceId = data["voice"].ToString()!
});

2
Requests/GetConnections.cs
View File

@ -35,7 +35,7 @@ namespace HermesSocketServer.Requests
Default = sql.GetBoolean(7)
})
);
return RequestResult.Successful(connections, false);
return RequestResult.Successful(connections, notifyClientsOnAccount: false);
}
}
}

28
Requests/GetPolicies.cs Normal file
View File

@ -0,0 +1,28 @@
using HermesSocketServer.Services;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Requests
{
public class GetPolicies : IRequest
{
public string Name => "get_policies";
public string[] RequiredKeys => [];
private ChannelManager _channels;
private ILogger _logger;
public GetPolicies(ChannelManager channels, ILogger logger)
{
_channels = channels;
_logger = logger;
}
public async Task<RequestResult> Grant(string sender, IDictionary<string, object>? data)
{
var channel = _channels.Get(sender);
var results = channel.Policies.Get().Values;
_logger.Information($"Fetched policies for channel [policy size: {results.Count}][channel: {sender}]");
return RequestResult.Successful(results, notifyClientsOnAccount: false);
}
}
}

15
Requests/RequestManager.cs
View File

@ -1,6 +1,5 @@
using HermesSocketLibrary.Socket.Data;
using HermesSocketServer.Services;
using Serilog;
namespace HermesSocketServer.Requests
{
@ -21,11 +20,17 @@ namespace HermesSocketServer.Requests
public async Task<RequestResult> Grant(string sender, RequestMessage? message)
{
if (message == null || message.Type == null)
{
_logger.Debug($"Request type does not exist [id: {message.RequestId}][nounce: {message.Nounce}]");
return RequestResult.Failed("Request type does not exist.");
}
var channel = _channels.Get(sender);
if (channel == null)
{
_logger.Debug($"Channel does not exist [id: {message.RequestId}][nounce: {message.Nounce}]");
return RequestResult.Failed("Channel does not exist.");
}
if (!_requests.TryGetValue(message.Type, out IRequest? request) || request == null)
{
@ -36,12 +41,18 @@ namespace HermesSocketServer.Requests
if (request.RequiredKeys.Any())
{
if (message.Data == null)
{
_logger.Debug($"Request is lacking data entries [id: {message.RequestId}][nounce: {message.Nounce}]");
return RequestResult.Failed($"Request is lacking data entries.");
}
foreach (var key in request.RequiredKeys)
{
if (!message.Data.ContainsKey(key))
{
_logger.Debug($"Request is missing '{key}' in its data entries [id: {message.RequestId}][nounce: {message.Nounce}]");
return RequestResult.Failed($"Request is missing '{key}' in its data entries.");
}
}
}

4
Requests/RequestResult.cs
View File

@ -15,12 +15,12 @@ namespace HermesSocketServer.Requests
public static RequestResult Successful(object? result, bool notifyClientsOnAccount = true)
{
return RequestResult.Successful(result, notifyClientsOnAccount);
return new RequestResult(true, result, notifyClientsOnAccount);
}
public static RequestResult Failed(string error, bool notifyClientsOnAccount = true)
{
return RequestResult.Successful(error, notifyClientsOnAccount);
return new RequestResult(false, error, notifyClientsOnAccount);
}
}
}

48
Requests/UpdatePolicy.cs Normal file
View File

@ -0,0 +1,48 @@
using HermesSocketServer.Models;
using HermesSocketServer.Services;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Requests
{
public class UpdatePolicy : IRequest
{
public string Name => "update_policy";
public string[] RequiredKeys => ["id", "groupId", "path", "count", "span"];
private ChannelManager _channels;
private ILogger _logger;
public UpdatePolicy(ChannelManager channels, ILogger logger)
{
_channels = channels;
_logger = logger;
}
public async Task<RequestResult> Grant(string sender, IDictionary<string, object>? data)
{
var id = Guid.Parse(data["id"].ToString()!);
string groupId = data["groupId"].ToString()!;
string path = data["path"].ToString()!;
int count = int.Parse(data["count"].ToString()!);
int span = int.Parse(data["span"].ToString()!);
var channel = _channels.Get(sender)!;
bool result = channel.Policies.Set(id.ToString(), new PolicyMessage()
{
Id = id,
UserId = sender,
GroupId = Guid.Parse(groupId),
Path = path,
Usage = count,
Span = span,
});
if (result)
{
var policy = channel.Policies.Get(id.ToString());
_logger.Information($"Updated policy to channel [policy id: {id}][group id: {groupId}][path: {path}][count: {count}][span: {span}][channel: {sender}]");
return RequestResult.Successful(policy);
}
return RequestResult.Failed("Something went wrong when updating the cache.");
}
}
}

3
Requests/UpdateTTSUser.cs
View File

@ -28,6 +28,7 @@ namespace HermesSocketServer.Requests
if (long.TryParse(data["chatter"].ToString(), out long chatterId))
data["chatter"] = chatterId;
data["voice"] = data["voice"].ToString();
data["user"] = sender;
var check = await _database.ExecuteScalar("SELECT state FROM \"TtsVoiceState\" WHERE \"userId\" = @user AND \"ttsVoiceId\" = @voice", data) ?? false;
if ((check is not bool state || !state) && chatterId != _configuration.Tts.OwnerId)
@ -37,7 +38,7 @@ namespace HermesSocketServer.Requests
var result = channel.Chatters.Set(chatterId.ToString(), new ChatterVoice()
{
UserId = sender,
ChatterId = chatterId.ToString(),
ChatterId = chatterId,
VoiceId = data["voice"].ToString()!
});
if (result)