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

Changed the default way to modify values in store. Added basic validation to stores. Using interfaces to DI store objects.

Browse Source
This commit is contained in:
Tom
2025-01-16 19:49:02 +00:00
parent b00c72ec2a
commit ee3f128a9f
24 changed files with 173 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Requests/CreateTTSVoice.cs
View File

@ -13,7 +13,7 @@ namespace HermesSocketServer.Requests
private ILogger _logger;
private Random _random;
public CreateTTSVoice(VoiceStore voices, ILogger logger)
public CreateTTSVoice(IStore<string, TTSVoice> voices, ILogger logger)
{
_voices = voices;
_logger = logger;

2
Requests/DeleteTTSVoice.cs
View File

@ -12,7 +12,7 @@ namespace HermesSocketServer.Requests
private IStore<string, TTSVoice> _voices;
private ILogger _logger;
public DeleteTTSVoice(VoiceStore voices, ILogger logger)
public DeleteTTSVoice(IStore<string, TTSVoice> voices, ILogger logger)
{
_voices = voices;
_logger = logger;

4
Requests/GetDefaultTTSVoice.cs
View File

@ -8,11 +8,11 @@ namespace HermesSocketServer.Requests
{
public string Name => "get_default_tts_voice";
public string[] RequiredKeys => [];
private readonly UserStore _users;
private readonly IStore<string, User> _users;
private readonly ServerConfiguration _configuration;
private readonly ILogger _logger;
public GetDefaultTTSVoice(UserStore users, ServerConfiguration configuration, ILogger logger)
public GetDefaultTTSVoice(IStore<string, User> users, ServerConfiguration configuration, ILogger logger)
{
_users = users;
_configuration = configuration;

4
Requests/GetTTSVoices.cs
View File

@ -9,10 +9,10 @@ namespace HermesSocketServer.Requests
{
public string Name => "get_tts_voices";
public string[] RequiredKeys => [];
private VoiceStore _voices;
private IStore<string, TTSVoice> _voices;
private ILogger _logger;
public GetTTSVoices(VoiceStore voices, ILogger logger)
public GetTTSVoices(IStore<string, TTSVoice> voices, ILogger logger)
{
_voices = voices;
_logger = logger;

4
Requests/UpdateDefaultTTSVoice.cs
View File

@ -8,10 +8,10 @@ namespace HermesSocketServer.Requests
{
public string Name => "update_default_tts_voice";
public string[] RequiredKeys => ["user", "voice"];
private UserStore _users;
private IStore<string, User> _users;
private ILogger _logger;
public UpdateDefaultTTSVoice(UserStore users, ILogger logger)
public UpdateDefaultTTSVoice(IStore<string, User> users, ILogger logger)
{
_users = users;
_logger = logger;

6
Requests/UpdateRedeemableAction.cs
View File

@ -41,11 +41,7 @@ namespace HermesSocketServer.Requests
Type = type,
};
bool result = channel.Actions.Modify(name, action =>
{
action.Type = type;
action.Data = dict;
});
bool result = channel.Actions.Modify(name, action);
if (result)
{
_logger.Information($"Added redeemable action to channel [name: {name}][type: {type}][channel: {channel.Id}]");

19
Requests/UpdateRedemption.cs
View File

@ -1,3 +1,4 @@
using HermesSocketLibrary.Requests.Messages;
using HermesSocketServer.Models;
using ILogger = Serilog.ILogger;
@ -25,16 +26,16 @@ namespace HermesSocketServer.Requests
return Task.FromResult(RequestResult.Failed("Order must be an integer."));
bool state = data["state"].ToString()?.ToLower() == "true";
bool result = channel.Redemptions.Modify(id, r =>
{
if (r.UserId != channel.Id)
return;
Redemption redemption = new Redemption() {
Id = id,
UserId = channel.Id,
RedemptionId = redemptionId,
ActionName = actionName,
Order = order,
State = state,
};
r.RedemptionId = redemptionId;
r.ActionName = actionName;
r.Order = order;
r.State = state;
});
bool result = channel.Redemptions.Modify(id, redemption);
var r = channel.Redemptions.Get(id);
if (result)

7
Requests/UpdateTTSFilter.cs
View File

@ -35,12 +35,7 @@ namespace HermesSocketServer.Requests
Flag = flag,
};
bool result = channel.Filters.Modify(id, f => {
f.Search = search;
f.Replace = replace;
if (flag >= 0)
f.Flag = flag;
});
bool result = channel.Filters.Modify(id, filter);
if (result)
{

2
Requests/UpdateTTSVoice.cs
View File

@ -12,7 +12,7 @@ namespace HermesSocketServer.Requests
private IStore<string, TTSVoice> _voices;
private ILogger _logger;
public UpdateTTSVoice(VoiceStore voices, ILogger logger)
public UpdateTTSVoice(IStore<string, TTSVoice> voices, ILogger logger)
{
_voices = voices;
_logger = logger;

4
Services/ChannelManager.cs
View File

@ -7,14 +7,14 @@ namespace HermesSocketServer.Services
{
public class ChannelManager
{
private readonly UserStore _users;
private readonly IStore<string, User> _users;
private readonly Database _database;
private readonly ServerConfiguration _configuration;
private readonly Serilog.ILogger _logger;
private readonly IDictionary<string, Channel> _channels;
private readonly object _lock;
public ChannelManager(UserStore users, Database database, ServerConfiguration configuration, Serilog.ILogger logger)
public ChannelManager(IStore<string, User> users, Database database, ServerConfiguration configuration, Serilog.ILogger logger)
{
_users = users;
_database = database;

8
Services/DatabaseService.cs
View File

@ -1,4 +1,6 @@
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketServer.Models;
using HermesSocketServer.Store;
namespace HermesSocketServer.Services
@ -6,12 +8,12 @@ namespace HermesSocketServer.Services
public class DatabaseService : BackgroundService
{
private readonly ChannelManager _channels;
private readonly VoiceStore _voices;
private readonly UserStore _users;
private readonly IStore<string, TTSVoice> _voices;
private readonly IStore<string, User> _users;
private readonly ServerConfiguration _configuration;
private readonly Serilog.ILogger _logger;
public DatabaseService(ChannelManager channels, VoiceStore voices, UserStore users, ServerConfiguration configuration, Serilog.ILogger logger)
public DatabaseService(ChannelManager channels, IStore<string, TTSVoice> voices, IStore<string, User> users, ServerConfiguration configuration, Serilog.ILogger logger)
{
_channels = channels;
_voices = voices;

4
Socket/Handlers/HermesLoginHandler.cs
View File

@ -12,14 +12,14 @@ namespace HermesSocketServer.Socket.Handlers
public int OperationCode { get; } = 1;
private readonly ChannelManager _manager;
private readonly VoiceStore _voices;
private readonly IStore<string, TTSVoice> _voices;
private readonly ServerConfiguration _configuration;
private readonly Database _database;
private readonly HermesSocketManager _sockets;
private readonly ILogger _logger;
private readonly object _lock;
public HermesLoginHandler(ChannelManager manager, VoiceStore voices, ServerConfiguration configuration, Database database, HermesSocketManager sockets, ILogger logger)
public HermesLoginHandler(ChannelManager manager, IStore<string, TTSVoice> voices, ServerConfiguration configuration, Database database, HermesSocketManager sockets, ILogger logger)
{
_manager = manager;
_voices = voices;

6
Startup.cs
View File

@ -17,6 +17,8 @@ using HermesSocketServer.Store;
using HermesSocketServer.Services;
using HermesSocketServer.Store.Internal;
using Microsoft.Extensions.DependencyInjection;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketServer.Models;
var yamlDeserializer = new DeserializerBuilder()
@ -88,8 +90,8 @@ if (configuration.Database.Tables != null)
}
// Stores
s.AddSingleton<VoiceStore>();
s.AddSingleton<UserStore>();
s.AddSingleton<IStore<string, TTSVoice>, VoiceStore>();
s.AddSingleton<IStore<string, User>, UserStore>();
// Request handlers
s.AddSingleton<IRequest, CreatePolicy>();

15
Store/ActionStore.cs
View File

@ -40,10 +40,23 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, RedeemableAction value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(value.Name, nameof(value.Name));
ArgumentException.ThrowIfNullOrWhiteSpace(value.Type, nameof(value.Type));
ArgumentNullException.ThrowIfNull(value.Data, nameof(value.Data));
}
protected override void OnInitialModify(string key, RedeemableAction value)
protected override void OnInitialModify(string key, RedeemableAction oldValue, RedeemableAction newValue)
{
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.Name, nameof(newValue.Name));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.Type, nameof(newValue.Type));
ArgumentNullException.ThrowIfNull(newValue.Data, nameof(newValue.Data));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(oldValue.UserId));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Name, newValue.Name, nameof(oldValue.Name));
}
}
}

13
Store/ChatterStore.cs
View File

@ -38,10 +38,21 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, ChatterVoice value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(value.ChatterId, nameof(value.ChatterId));
ArgumentException.ThrowIfNullOrWhiteSpace(value.VoiceId, nameof(value.VoiceId));
}
protected override void OnInitialModify(string key, ChatterVoice value)
protected override void OnInitialModify(string key, ChatterVoice oldValue, ChatterVoice newValue)
{
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(newValue.ChatterId, nameof(newValue.ChatterId));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.VoiceId, nameof(newValue.VoiceId));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(oldValue.UserId));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.ChatterId, newValue.ChatterId, nameof(oldValue.ChatterId));
}
}
}

5
Store/IStore.cs
View File

@ -5,9 +5,10 @@ namespace HermesSocketServer.Store
V? Get(K key);
IDictionary<K, V> Get();
Task Load();
bool Modify(K? key, Action<V> action);
bool Modify(K? key, Action<V> modify);
bool Modify(K? key, V value);
bool Remove(K? key);
Task Save();
bool Set(K? key, V? value);
bool Set(K? key, V value);
}
}

2
Store/Internal/ComplexAutoSavedStore.cs
View File

@ -48,7 +48,7 @@ namespace HermesSocketServer.Store.Internal
async (query, list) => await _generator.DoPreparedStatement(_database, query, list, _table.KeyColumns));
}
private async Task GenerateQuery(IList<K> keys, Func<int, string> generate, Func<string, IEnumerable<K>, IEnumerable<V>, Task<int>> execute)
private async Task GenerateQuery(IList<K> keys, Func<int, string> generate, Func<string, IEnumerable<K>, IEnumerable<V?>, Task<int>> execute)
{
ImmutableList<K>? list = null;
lock (_lock)

37
Store/Internal/GroupedSaveStore.cs
View File

@ -24,7 +24,7 @@ namespace HermesSocketServer.Store.Internal
public abstract Task Load();
protected abstract void OnInitialAdd(K key, V value);
protected abstract void OnInitialModify(K key, V value);
protected abstract void OnInitialModify(K key, V value, V newValue);
protected abstract void OnPostRemove(K key, V value);
public abstract Task Save();
@ -46,7 +46,28 @@ namespace HermesSocketServer.Store.Internal
}
}
public bool Modify(K? key, Action<V> action)
public bool Modify(K? key, V value)
{
if (key == null)
return false;
lock (_lock)
{
if (_store.TryGetValue(key, out V? oldValue))
{
OnInitialModify(key, oldValue, value);
_store[key] = value;
if (!_added.Contains(key) && !_modified.Contains(key))
{
_modified.Add(key);
}
return true;
}
}
return false;
}
public bool Modify(K? key, Action<V> modify)
{
if (key == null)
return false;
@ -55,11 +76,7 @@ namespace HermesSocketServer.Store.Internal
{
if (_store.TryGetValue(key, out V? value))
{
if (value == null)
return false;
OnInitialModify(key, value);
action(value);
modify(value);
if (!_added.Contains(key) && !_modified.Contains(key))
{
_modified.Add(key);
@ -97,9 +114,9 @@ namespace HermesSocketServer.Store.Internal
return false;
}
public bool Set(K? key, V? value)
public bool Set(K? key, V value)
{
if (key == null || value == null)
if (key == null)
return false;
lock (_lock)
@ -108,7 +125,7 @@ namespace HermesSocketServer.Store.Internal
{
if (fetched != value)
{
OnInitialModify(key, value);
OnInitialModify(key, fetched, value);
_store[key] = value;
if (!_added.Contains(key) && !_modified.Contains(key))
{

21
Store/PolicyStore.cs
View File

@ -41,10 +41,29 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, Policy value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentOutOfRangeException.ThrowIfEqual(value.GroupId, default, nameof(value.GroupId));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(value.Usage, nameof(value.Usage));
ArgumentOutOfRangeException.ThrowIfGreaterThan(value.Usage, 99, nameof(value.Usage));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(value.Span, nameof(value.Span));
ArgumentOutOfRangeException.ThrowIfLessThan(value.Span, 1000, nameof(value.Span));
ArgumentOutOfRangeException.ThrowIfGreaterThan(value.Span, 86400, nameof(value.Span));
}
protected override void OnInitialModify(string key, Policy value)
protected override void OnInitialModify(string key, Policy oldValue, Policy newValue)
{
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentOutOfRangeException.ThrowIfEqual(newValue.GroupId, default, nameof(newValue.GroupId));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(newValue.Usage, nameof(newValue.Usage));
ArgumentOutOfRangeException.ThrowIfGreaterThan(newValue.Usage, 99, nameof(newValue.Usage));
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(newValue.Span, nameof(newValue.Span));
ArgumentOutOfRangeException.ThrowIfLessThan(newValue.Span, 1000, nameof(newValue.Span));
ArgumentOutOfRangeException.ThrowIfGreaterThan(newValue.Span, 86400, nameof(newValue.Span));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Id, newValue.Id, nameof(oldValue.Id));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(oldValue.UserId));
}
protected override void OnPostRemove(string key, Policy value)

23
Store/RedemptionStore.cs
View File

@ -41,13 +41,32 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, Redemption value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(value.RedemptionId, nameof(value.RedemptionId));
ArgumentException.ThrowIfNullOrWhiteSpace(value.ActionName, nameof(value.ActionName));
ArgumentNullException.ThrowIfNull(value.State, nameof(value.State));
ArgumentNullException.ThrowIfNull(value.Order, nameof(value.Order));
ArgumentOutOfRangeException.ThrowIfNegative(value.Order, nameof(value.Order));
ArgumentOutOfRangeException.ThrowIfGreaterThan(value.Order, 99, nameof(value.Order));
}
protected override void OnInitialModify(string key, Redemption value)
protected override void OnInitialModify(string key, Redemption oldValue, Redemption newValue)
{
ArgumentNullException.ThrowIfNull(newValue);
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.RedemptionId, nameof(newValue.RedemptionId));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.ActionName, nameof(newValue.ActionName));
ArgumentNullException.ThrowIfNull(newValue.State, nameof(newValue.State));
ArgumentNullException.ThrowIfNull(newValue.Order, nameof(newValue.Order));
ArgumentOutOfRangeException.ThrowIfNegative(newValue.Order, nameof(newValue.Order));
ArgumentOutOfRangeException.ThrowIfGreaterThan(newValue.Order, 99, nameof(newValue.Order));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Id, newValue.Id, nameof(newValue.Id));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(newValue.UserId));
}
protected override void OnPostRemove(string key, Redemption value)
protected override void OnPostRemove(string key, Redemption? value)
{
}
}

20
Store/TTSFilterStore.cs
View File

@ -1,3 +1,4 @@
using System.Text.RegularExpressions;
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketServer.Store.Internal;
@ -40,10 +41,27 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, TTSWordFilter value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.Id, nameof(value.Id));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(value.Search, nameof(value.Search));
ArgumentNullException.ThrowIfNull(value.Replace, nameof(value.Replace));
ArgumentOutOfRangeException.ThrowIfNegative(value.Flag, nameof(value.Flag));
ArgumentOutOfRangeException.ThrowIfGreaterThan(value.Flag, 2047, nameof(value.Flag));
}
protected override void OnInitialModify(string key, TTSWordFilter value)
protected override void OnInitialModify(string key, TTSWordFilter oldValue, TTSWordFilter newValue)
{
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.Id, nameof(newValue.Id));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.Search, nameof(newValue.Search));
ArgumentNullException.ThrowIfNull(newValue.Replace, nameof(newValue.Replace));
ArgumentOutOfRangeException.ThrowIfNegative(newValue.Flag, nameof(newValue.Flag));
ArgumentOutOfRangeException.ThrowIfGreaterThan(newValue.Flag, 2047, nameof(newValue.Flag));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Id, newValue.Id, nameof(oldValue.Id));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(oldValue.UserId));
}
protected override void OnPostRemove(string key, TTSWordFilter value)

2
Store/UserStore.cs
View File

@ -39,7 +39,7 @@ namespace HermesSocketServer.Store
{
}
protected override void OnInitialModify(string key, User value)
protected override void OnInitialModify(string key, User oldValue, User newValue)
{
}

14
Store/VoiceStateStore.cs
View File

@ -41,11 +41,23 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, TTSVoiceState value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
_idValidator.Check(value.Id);
ArgumentNullException.ThrowIfNull(value, nameof(value));
ArgumentException.ThrowIfNullOrWhiteSpace(value.Id, nameof(value.Id));
ArgumentException.ThrowIfNullOrWhiteSpace(value.UserId, nameof(value.UserId));
ArgumentNullException.ThrowIfNull(value.Enabled, nameof(value.Enabled));
}
protected override void OnInitialModify(string key, TTSVoiceState value)
protected override void OnInitialModify(string key, TTSVoiceState oldValue, TTSVoiceState newValue)
{
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.Id, nameof(newValue.Id));
ArgumentException.ThrowIfNullOrWhiteSpace(newValue.UserId, nameof(newValue.UserId));
ArgumentNullException.ThrowIfNull(newValue.Enabled, nameof(newValue.Enabled));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Id, newValue.Id, nameof(oldValue.Id));
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.UserId, newValue.UserId, nameof(oldValue.UserId));
ArgumentOutOfRangeException.ThrowIfEqual(oldValue.Enabled, newValue.Enabled, nameof(oldValue.Enabled));
}
protected override void OnPostRemove(string key, TTSVoiceState value)

10
Store/VoiceStore.cs
View File

@ -39,13 +39,19 @@ namespace HermesSocketServer.Store
protected override void OnInitialAdd(string key, TTSVoice value)
{
ArgumentException.ThrowIfNullOrWhiteSpace(key, nameof(key));
ArgumentNullException.ThrowIfNull(value, nameof(value));
_idValidator.Check(value.Id);
_nameValidator.Check(value.Name);
}
protected override void OnInitialModify(string key, TTSVoice value)
protected override void OnInitialModify(string key, TTSVoice oldValue, TTSVoice newValue)
{
_nameValidator.Check(value.Name);
ArgumentNullException.ThrowIfNull(newValue, nameof(newValue));
_idValidator.Check(newValue.Id);
_nameValidator.Check(newValue.Name);
ArgumentOutOfRangeException.ThrowIfNotEqual(oldValue.Id, newValue.Id, nameof(oldValue.Id));
ArgumentOutOfRangeException.ThrowIfEqual(oldValue.Name, newValue.Name, nameof(oldValue.Name));
}
protected override void OnPostRemove(string key, TTSVoice value)