From 0a4f1530fb5262d77a8f38afdef305342c651f0a Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 13 Jun 2026 01:59:17 +0100 Subject: [PATCH] Move economy server to Aetheria state spine --- .voidbot/state/aetheria.cc | Bin 9542 -> 10716 bytes Assets/Scripts/Gameplay/ActionGameManager.cs | 31 +- Assets/Scripts/UI/MainMenu.cs | 7 +- .../UI/Properties Panel/PropertiesPanel.cs | 2 +- Economy.Server/Economy.Server.csproj | 16 +- Economy.Server/Program.cs | 279 ++++-------------- Economy.Server/Server.cs | 240 --------------- 7 files changed, 86 insertions(+), 489 deletions(-) delete mode 100644 Economy.Server/Server.cs diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 1c0d74e9a5b544bab7463bdacdcea71160e21b32..803e5b614a3c7e6af3af9d003ce8a0563265a646 100644 GIT binary patch delta 2259 zcmZWrO>Z1E7;ch6OAy~JX#x=z5mcb;>~2E7wx@hls3=L>q+BX4UeCL`PG;=E_GGgH zX%CgSAr5opQV}RZNPxl#fjGgr98>ZqIQGVCd$PN;IgQ3+zaP*0Jdfw^k4|@gemMH# z{Jl!0wy;#IRD-#NrK~#jdiK}o7lq};6D5zI<_dbn;<#{o+yg=q8gw z#+_gn)Bz~crkb$S5NTf;O2%XdOpA;CjkWRyHMCAOtW(wkVk9y65YQ&8xCIoa!LFeO z$a)%?Ezm8}lG@xL9}8|eghd>LArUkw!#5X#>n;(pP2ezzIO8Vj5J6)I$)?+7QUrBtupAY9ur@Evan6gqjxNnrNd^W>Q5X46h)@&O#yuVKRinZkgt_ zm$a?Dq@bSiD6Ek?N;VaZ1EyUYy4R%ZaT^bNj3@~h!z8xx29IEtcqHvX3uXur7zk$x z73azpvP&W zWV>$36j{X(2pl8zkd;swI*n;Pg5L0RhFesy|1ysgsSK&hRD@J@W^E}VudxV10d|kK zRabYI>P}Xj1SvWsDvuyEII79DFIgI+qO`+Tf#K?`%z?=v0nY}HGBB;+2Pzl}WCt4h z^uol03!6O7OMpRB#a&NJN9N_s-gH|7gswQAd0!+0MR05ap51X#rQG`hUY6i@JJNuETsQ_eX*-Y0$b)63WB z&bs$AYewG8oZp~?apO4yb2I8WOao{At`xlDgs}dtIREyDvPD+eD=@PDPAjnChiQnV9L;2bR)GcNSi1<9B**~IULt< zj&^HF$8sNr!VP8XezJyciTd#fZ)|Q7nSek5Q2)s}XY~3CkpxUCbexbY?~5o1yi)K3 z%9soEC2Oa7J@2SyN#K28P}#%Pj2D~lwzuV(MV9-vS)@a`2axmE@)>7VRa1(&@@_|C z?ZFOKWHXW$M?QM9B3$&%*>~)jo>#h@ef8Q~lfCe6#}Ht5@7@;v8o~*64f2Te#EU#2-oa4{l`2D$;1_P}u-2WeWh%Dv+ delta 1244 zcmY*Z&1(}u6t`(DiuDU3BAEKrgGJ)Tq%D;Sinc2Fg_wFNC`@)=veQgv)|uJF1tEfe zfXH6FiWNaT2)T)e;=zkhyehqU^yJZ#zS*QDxrFfE&U?SFnXT&An;&22_E%Oavx}95 z#qzwjFqi%rKbrn4Os3y*&khcCE}TEV`f}_@s>b8d@?2KlGf~JL*_WP~Snt-apbb%T z1{!NI7XcW{w8a2w39umGvH?s2H%c&9wMj(3OR=y^%nz~T{@pi>L|h^rpfN4g zL)y5>o^f zp)}cuWoB844b(Z;QCb9^?-w(2Au}Kq2;N2-M@Irel7Nz+NWm)VHtH&IAC{^J_h}fH z&E=~_xM`HUB~_;@R|tjMtKlwotdd66t@q9n3a;dj-%c+#^MT|xDVc0C=vZ3bBDF0S z0%AjC9NHQ)cuiWJoI}m}g7x7#HJmbjtVuE}5{P0U47B5}AU#=4AdohOHSiwun=tE@ zy*aR&5eQ2hMRIY-6+gB>cD0>^12;2U0H1JU4b-R~DC$aOAwf(2kW3A7h1}fX;4^}5 zrnsdKm9&aHO`}u!?&e*5;@s_rF=EDm2~|uIWMddernTy9Yf!>~TM{o~Htf&Y4s<_Q zMQ9>MAh5y6AdQToV&HMih@7Pu1bv0#C~)yziXZir8df7CXF?u}yF=J@o{ zp;uv{QeIuRtU*8y^&TECjHNFMXAg{ikbWP}k31RW{!8+&@M*L>KX_m!(_hnTqpb^B X>+y-FBV}4nPg3tNeBL`+pI`kCZvV03 diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 21e28ba46..079a6e704 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -11,7 +11,6 @@ using Cinemachine; using Ink; using Ink.Runtime; using MessagePack; -using Newtonsoft.Json; using TMPro; using UniRx; using UnityEngine; @@ -38,30 +37,34 @@ public class ActionGameManager : MonoBehaviour get => _gameDataDirectory ??= new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); } - private static CultCache _cultCache; + public static string AetheriaStateFilePath => Path.Combine(GameDataDirectory.FullName, "aetheria-world.cc"); + public static string LegacyAetherDatabasePath => Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack"); - public static CultCache CultCache + private static CultCache _legacyCultCache; + + public static CultCache LegacyCultCache { get { - if (_cultCache != null) return _cultCache; + if (_legacyCultCache != null) return _legacyCultCache; - _cultCache = new CultCache(); - //RethinkConnection.RethinkConnect(_cultCache, "gamecult.org:28016", DatabaseName); - //_cultCache.AddBackingStore(new MultiFileJsonBackingStore(GameDataDirectory.FullName)); - _cultCache.AddBackingStore( - new SingleFileMessagePackBackingStore(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack"))); + _legacyCultCache = new CultCache(); + _legacyCultCache.AddBackingStore( + new SingleFileMessagePackBackingStore(LegacyAetherDatabasePath)); // Particularly heavy objects should be stored in / retrieved from MsgPack files as it's much tighter than JSON // Such as NameFiles, which are just huge collections of geonames used to condition Markov chains - _cultCache.AddBackingStore(new MultiFileMessagePackBackingStore(GameDataDirectory.FullName), typeof(NameFile)); + _legacyCultCache.AddBackingStore(new MultiFileMessagePackBackingStore(GameDataDirectory.FullName), typeof(NameFile)); - _cultCache.PullAllBackingStores(); + _legacyCultCache.PullAllBackingStores(); - return _cultCache; + return _legacyCultCache; } } + [Obsolete("Use LegacyCultCache only for migration-era catalog reads. Live state belongs in GameData/aetheria-world.cc through Aetheria.State.")] + public static CultCache CultCache => LegacyCultCache; + private static PlayerSettings _playerSettings; public static PlayerSettings PlayerSettings { @@ -263,7 +266,9 @@ public class ActionGameManager : MonoBehaviour EntityInstance.EffectManagerParent = EffectManagerParent; ConsoleController.MessageReceiver = this; - ItemManager = new ItemManager(CultCache, Settings.GameplaySettings, Debug.Log); + Debug.Log($"Aetheria typed state file: {AetheriaStateFilePath}"); + Debug.Log($"Aetheria legacy item catalog: {LegacyAetherDatabasePath}"); + ItemManager = new ItemManager(LegacyCultCache, Settings.GameplaySettings, Debug.Log); ZoneRenderer.ItemManager = ItemManager; // If hiding minimap asteroids, turn them off to start with diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index f7956ae11..0c137b6a0 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -30,7 +30,6 @@ public class MainMenu : MonoBehaviour private float _fadeLerp; private bool _fading; private Vector3 _panelPosition; - //private Task _databaseLoad; void Start() { @@ -100,7 +99,7 @@ public class MainMenu : MonoBehaviour { ActionGameManager.IsTutorial = ActionGameManager.PlayerSettings.SavedRun.IsTutorial; ActionGameManager.CurrentGalaxy = new Galaxy( - ActionGameManager.CultCache, + ActionGameManager.LegacyCultCache, ActionGameManager.PlayerSettings.SavedRun, Debug.Log); SceneManager.LoadScene("ARPG"); @@ -131,7 +130,7 @@ public class MainMenu : MonoBehaviour Settings.SectorGenerationSettings, Settings.SectorBackgroundSettings, Settings.NameGeneratorSettings, - ActionGameManager.CultCache, + ActionGameManager.LegacyCultCache, Debug.Log, setState); Observable.NextFrame().Subscribe(_ => @@ -158,7 +157,7 @@ public class MainMenu : MonoBehaviour Settings.TutorialGenerationSettings, Settings.TutorialBackgroundSettings, Settings.NameGeneratorSettings, - ActionGameManager.CultCache, + ActionGameManager.LegacyCultCache, ActionGameManager.PlayerSettings, ActionGameManager.GameDataDirectory.CreateSubdirectory("Narrative"), Debug.Log, diff --git a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs index 54c14f617..c2c189224 100644 --- a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs +++ b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs @@ -390,7 +390,7 @@ public class PropertiesPanel : MonoBehaviour AddProperty("Quantity", () => simpleCommodity.Quantity.ToString()); var sheet = AddStatSheet(); - var manufacturer = ActionGameManager.CultCache.Get(data.Manufacturer); + var manufacturer = ActionGameManager.LegacyCultCache.Get(data.Manufacturer); sheet.AddStat("Manufacturer", () => manufacturer?.Name ?? "GameCult"); sheet.AddStat("Mass", () => ActionGameManager.PlayerSettings.Format(GameManager.ItemManager.GetMass(item))); diff --git a/Economy.Server/Economy.Server.csproj b/Economy.Server/Economy.Server.csproj index f96ca8953..b9fc3350e 100644 --- a/Economy.Server/Economy.Server.csproj +++ b/Economy.Server/Economy.Server.csproj @@ -2,20 +2,14 @@ Exe - netcoreapp3.1 + net10.0 + enable + latest + enable - - - - - - - - - - + diff --git a/Economy.Server/Program.cs b/Economy.Server/Program.cs index 584873baa..e653b7e46 100644 --- a/Economy.Server/Program.cs +++ b/Economy.Server/Program.cs @@ -1,234 +1,73 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Reflection; -using System.Threading; -using System.Threading.Tasks; -using MessagePack; -using MessagePack.Resolvers; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using RethinkDb.Driver; -using RethinkDb.Driver.Ast; -using RethinkDb.Driver.Net; -using Serilog; -using ILogger = Microsoft.Extensions.Logging.ILogger; +using Aetheria.State; +using Aetheria.State.Documents; -namespace ChatApp.Server +namespace Aetheria.Server; + +internal static class Program { - class Program + private static async Task Main(string[] args) { - private static readonly RethinkDB R = RethinkDB.R; - private static ILogger _logger; - - static async Task Main(string[] args) + var statePath = ResolveStatePath(args); + Console.WriteLine($"Aetheria CultMesh state host starting: {statePath}"); + + await using var node = await AetheriaStateNode.OpenAsync( + statePath, + runtimeId: "aetheria-economy-server", + startServer: true).ConfigureAwait(false); + + await EnsureWorldDocumentAsync(node).ConfigureAwait(false); + await node.FlushAsync().ConfigureAwait(false); + + Console.WriteLine("Aetheria CultMesh state host is running. Press Ctrl+C to stop."); + await WaitForShutdownAsync().ConfigureAwait(false); + + Console.WriteLine("Aetheria CultMesh state host stopping."); + } + + private static string ResolveStatePath(IReadOnlyList args) + { + for (var i = 0; i < args.Count - 1; i++) { - var serilogger = new LoggerConfiguration() - .WriteTo.File("log.txt", rollingInterval: RollingInterval.Day) - .CreateLogger(); - var loggerFactory = LoggerFactory.Create(builder => + if (string.Equals(args[i], "--state", StringComparison.OrdinalIgnoreCase)) { - builder - // .AddFilter("Microsoft", LogLevel.Warning) - // .AddFilter("System", LogLevel.Warning) - // .AddFilter("LoggingConsoleApp.Program", LogLevel.Debug) - .AddSerilog(serilogger) - .AddConsole(); - }); - _logger = loggerFactory.CreateLogger(); - - // Register extensions to Json.NET Serialization - JsonConvert.DefaultSettings = () => new JsonSerializerSettings - { - Converters = new List - { - new MathJsonConverter(), - Converter.DateTimeConverter, - Converter.BinaryConverter, - Converter.GroupingConverter, - Converter.PocoExprConverter - } - }; - Converter.Serializer.Converters.Add(new MathJsonConverter()); - - // Register extensions to MessagePack Serialization - var resolver = CompositeResolver.Create( - MathResolver.Instance, - NativeGuidResolver.Instance, - StandardResolver.Instance - ); - var options = MessagePackSerializerOptions.Standard.WithResolver(resolver); - MessagePackSerializer.DefaultOptions = options; - - var connection = R.Connection().Hostname("asgard.gamecult.games") - .Port(RethinkDBConstants.DefaultPort).Timeout(60).Connect(); - - var cache = new DatabaseCache(); - - // When entries are changed locally, push the changes to RethinkDB - cache.OnDataUpdateLocal += async entry => - { - var table = entry.GetType().GetCustomAttribute()?.TableName ?? "Other"; - var result = await R.Db("Aetheria").Table(table).Update(entry).RunAsync(connection); - _logger.Log(LogLevel.Information, $"Uploaded entry to RethinkDB: {entry.ID} result: {result}"); - }; - - cache.OnDataInsertLocal += async entry => - { - var table = entry.GetType().GetCustomAttribute()?.TableName ?? "Other"; - var inserted = false; - for (int i = 0; i < 5 && !inserted; i++) - { - try - { - var result = await R.Db("Aetheria").Table(table).Insert(entry).RunAsync(connection); - _logger.Log(LogLevel.Information, $"Inserted entry to RethinkDB: {entry.ID} result: {result}"); - inserted = true; - } - catch (Exception e) - { - _logger.LogError(e,e.Message); - } - } - if(!inserted) - _logger.LogError("Failed to insert after 5 attempts!"); - }; - - cache.OnDataDeleteLocal += async entry => - { - var table = entry.GetType().GetCustomAttribute()?.TableName ?? "Other"; - var result = await R.Db("Aetheria").Table(table).Get(entry.ID).Delete().RunAsync(connection); - _logger.Log(LogLevel.Information, $"Deleted entry from RethinkDB: {entry.ID} result: {result}"); - }; - - // Get data from RethinkDB - await GetTable("Items", connection, cache); - await GetTable("Galaxy", connection, cache); - await GetTable("Users", connection, cache); - - // Subscribe to changes from RethinkDB - SubscribeTable("Items", connection, cache); - SubscribeTable("Galaxy", connection, cache); - SubscribeTable("Users", connection, cache); - - var server = new MasterServer(cache) - { - Logger = _logger - }; - server.Start(); - - var context = new GameContext(cache, s=>_logger.Log(LogLevel.Information, s)); - - context.MapLayers = cache.GetAll().ToDictionary(m => m.Name); - - server.AddMessageListener(galaxyRequest => galaxyRequest.Peer.Send( - new GalaxyResponseMessage - { - Zones = cache.GetAll().Select(zd=> - new GalaxyResponseZone - { - Name = zd.Name, - Position = zd.Position, - ZoneID = zd.ID, - Links = zd.Wormholes?.ToArray() ?? Array.Empty() - }).ToArray(), - GlobalData = context.GlobalData, - StarDensity = context.MapLayers["StarDensity"] - })); - - server.AddMessageListener(blueprintRequest => blueprintRequest.Peer.Send( - new BlueprintsResponseMessage - { - Blueprints = cache.GetAll().ToArray() - })); - - server.AddMessageListener(zoneRequest => - { - var zone = cache.Get(zoneRequest.ZoneID); - - // Zone has not been populated, generate the contents now! - if (!zone.Visited) - { - zone.Visited = true; - OrbitData[] orbits; - PlanetData[] planets; - ZoneGenerator.GenerateZone( - global: context.GlobalData, - zone: zone, - mapLayers: context.MapLayers.Values, - resources: cache.GetAll().Where(i=>i.ResourceDensity.Any()), - orbitData: out orbits, - planetsData: out planets); - cache.AddAll(orbits); - cache.AddAll(planets); - cache.Add(zone); - } - zoneRequest.Peer.Send( - new ZoneResponseMessage - { - Zone = zone, - Contents = zone.Orbits.Select(id=>cache.Get(id)) - .Concat(zone.Planets.Select(id=>cache.Get(id))) - .Concat(zone.Stations.Select(id=>cache.Get(id))).ToArray() - }); - }); - - Observable.Timer(DateTimeOffset.Now, TimeSpan.FromSeconds(60)).SubscribeOn(NewThreadScheduler.Default).Subscribe(_ => - { - _logger.Log(LogLevel.Information, R.Now().Run(connection).ToString() as string); - }); - - while (true) - { - Thread.Sleep(100); + return Path.GetFullPath(args[i + 1]); } } - private static void SubscribeTable(string table, Connection connection, DatabaseCache cache) + var repoRoot = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "..")); + return AetheriaStatePaths.ResolveDefaultStatePath(repoRoot); + } + + private static async Task EnsureWorldDocumentAsync(AetheriaStateNode node) + { + var existing = await node.GetWorldAsync().ConfigureAwait(false); + if (existing != null) { - Task.Run(async () => - { - var result = await R.Db("Aetheria").Table(table).Changes() - .RunChangesAsync(connection); - while (await result.MoveNextAsync()) - { - var change = result.Current; - if (change.OldValue == null) - { - _logger.Log(LogLevel.Information, - $"Received change from RethinkDB {table} table (Entry Created): {change.NewValue.GetType()} {(change.NewValue as INamedEntry)?.EntryName ?? ""}:{change.NewValue.ID}"); - cache.Add(change.NewValue, true); - } - else if (change.NewValue == null) - { - _logger.Log(LogLevel.Information, - $"Received change from RethinkDB {table} table (Entry Deleted): {change.OldValue.GetType()} {(change.OldValue as INamedEntry)?.EntryName ?? ""}:{change.OldValue.ID}"); - cache.Delete(change.NewValue, true); - } - else - { - _logger.Log(LogLevel.Information, - $"Received change from RethinkDB {table} table: {change.NewValue.GetType()} {(change.NewValue as INamedEntry)?.EntryName ?? ""}:{change.NewValue.ID}"); - cache.Add(change.NewValue, true); - } - } - }); + existing.UpdatedAtUtc = DateTimeOffset.UtcNow.ToString("O"); + await node.PutWorldAsync(existing).ConfigureAwait(false); + return; } - private static async Task GetTable(string table, Connection connection, DatabaseCache cache) + var now = DateTimeOffset.UtcNow.ToString("O"); + await node.PutWorldAsync(new AetheriaWorldState { - var result = await R.Db("Aetheria").Table(table).RunCursorAsync(connection); - while (await result.MoveNextAsync()) - { - var entry = result.Current; - _logger.Log(LogLevel.Information, - $"Received {table} entry from RethinkDB: {entry.GetType()} {(entry as INamedEntry)?.EntryName ?? ""}:{entry.ID}"); - cache.Add(entry, true); - } - } + Name = "Aetheria", + WorldId = "aetheria", + SchemaEpoch = 1, + CreatedAtUtc = now, + UpdatedAtUtc = now + }).ConfigureAwait(false); + } + + private static Task WaitForShutdownAsync() + { + var stopped = new TaskCompletionSource(); + Console.CancelKeyPress += (_, eventArgs) => + { + eventArgs.Cancel = true; + stopped.TrySetResult(null); + }; + + return stopped.Task; } } diff --git a/Economy.Server/Server.cs b/Economy.Server/Server.cs deleted file mode 100644 index ebc17a31d..000000000 --- a/Economy.Server/Server.cs +++ /dev/null @@ -1,240 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; - using System.Reactive.Linq; - using System.Security.Cryptography; - using System.Text.RegularExpressions; -using Isopoh.Cryptography.Argon2; -using LiteNetLib; -using MessagePack; -using Microsoft.Extensions.Logging; - - public class MasterServer - { - public ILogger Logger = null; - - private const string EmailPattern = - @"^([0-9a-zA-Z]" + //Start with a digit or alphabetical - @"([\+\-_\.][0-9a-zA-Z]+)*" + // No continuous or ending +-_. chars in email - @")+" + - @"@(([0-9a-zA-Z][-\w]*[0-9a-zA-Z]*\.)+[a-zA-Z0-9]{2,17})$"; - - private const string UsernamePattern = @"^[A-Za-z0-9]+(?:[ _-][A-Za-z0-9]+)*$"; - private readonly Dictionary _messageCallbacks = new Dictionary(); - private readonly Dictionary _users = new Dictionary(); - private readonly Dictionary _sessions = new Dictionary(); - private List _readyPlayers = new List(); - private NetManager _netManager; - private Stopwatch _timer; - private Random _random = new Random(); - private readonly DatabaseCache _database; - private static readonly RandomNumberGenerator Rng = RandomNumberGenerator.Create(); - - private float Time => (float)_timer.Elapsed.TotalSeconds; - - public bool IsValidEmail(string email) => Regex.IsMatch(email, EmailPattern); - public bool IsValidUsername(string name) => Regex.IsMatch(name, UsernamePattern); - - public MasterServer(DatabaseCache cache) - { - _database = cache; - } - - public void ClearMessageListeners() - { - _messageCallbacks.Clear(); - } - - public void AddMessageListener(Action callback) where T : Message - { - if (!_messageCallbacks.ContainsKey(typeof(T))) - _messageCallbacks[typeof(T)] = new ActionCollection(); - ((ActionCollection)_messageCallbacks[typeof(T)]).Add(callback); - } - - public void Stop() - { - _netManager.Stop(); - } - - public void Start() - { - _timer = new Stopwatch(); - _timer.Start(); - - EventBasedNetListener listener = new EventBasedNetListener(); - _netManager = new NetManager(listener) - { - UnsyncedEvents = true, - NatPunchEnabled = true, - }; - _netManager.Start(3075); - - listener.NetworkErrorEvent += (point, code) => Logger.Log(LogLevel.Debug, $"{point.Address}: Error {code}"); - - listener.ConnectionRequestEvent += request => request.AcceptIfKey("aetheria-cc65a44d"); - - listener.PeerConnectedEvent += peer => - { - Logger.Log(LogLevel.Debug, $"User Connected: {peer.EndPoint}"); // Show peer ip - _users[peer.Id] = new User {Peer = peer}; - }; - - listener.PeerDisconnectedEvent += (peer, info) => - { - Logger.Log(LogLevel.Debug, $"User Disconnected: {peer.EndPoint}"); // Show peer ip - -// foreach (var verifiedUser in _users.Values.Where(IsVerified)) -// verifiedUser.Peer.Send("PlayerLeft", SessionData(verifiedUser.Peer).Username); - - _users.Remove(peer.Id); - }; - - listener.NetworkLatencyUpdateEvent += (peer, latency) => - { -// Logger($"Received Ping: {latency}"); - _users[peer.Id].Latency = latency; - }; - - listener.NetworkReceiveEvent += (peer, reader, method) => - { - var bytes = reader.GetRemainingBytes(); - var message = MessagePackSerializer.Deserialize(bytes); - Logger.Log(LogLevel.Information, $"Received message: {MessagePackSerializer.ConvertToJson(new ReadOnlyMemory(bytes))}"); - if (message == null) - return; - message.Peer = peer; - var user = _users[peer.Id]; - var type = message.GetType(); - - if (type == typeof(LoginMessage) || type == typeof(RegisterMessage) || type == typeof(VerifyMessage)) - { - if (IsVerified(user)) - { - peer.Send(new LoginSuccessMessage {Session = _users[peer.Id].SessionGuid}); - return; - } - - Guid sessionGuid; - switch (message) - { - case RegisterMessage register when !IsValidUsername(register.Name): - peer.Send(new ErrorMessage {Error = "Username Invalid"}); - return; - case RegisterMessage register when !IsValidEmail(register.Email): - peer.Send(new ErrorMessage {Error = "Email Invalid"}); - return; - case RegisterMessage register: - { - sessionGuid = Guid.NewGuid(); - peer.Send(new LoginSuccessMessage {Session = sessionGuid}); - - var newUserData = new Player - { - ID = Guid.NewGuid(), - Email = register.Email, - Password = Argon2.Hash(register.Password, null, memoryCost: 16384), - Username = register.Name - }; - _database.Add(newUserData); - - _sessions[sessionGuid] = new Session {Data = newUserData, LastUpdate = DateTime.Now}; - if (!_users.ContainsKey(peer.Id)) - return; - _users[peer.Id].SessionGuid = sessionGuid; - break; - } - case VerifyMessage verify when _sessions.ContainsKey(verify.Session): - _users[peer.Id].SessionGuid = verify.Session; - peer.Send(new LoginSuccessMessage {Session = verify.Session}); - return; - case LoginMessage login: - { - var isEmail = IsValidEmail(login.Auth); - var userData = _database.GetAll().FirstOrDefault(x => - (isEmail ? x.Email : x.Username) == login.Auth); - - if (userData == null) - { - peer.Send(new ErrorMessage {Error = isEmail ? "Email Not Found" : "Username Not Found"}); - return; - } - - if (!Argon2.Verify(userData.Password, login.Password)) - { - peer.Send(new ErrorMessage {Error = "Password Incorrect"}); - return; - } - - sessionGuid = Guid.NewGuid(); - peer.Send(new LoginSuccessMessage {Session = sessionGuid}); - - _sessions.Add(sessionGuid, new Session { Data = userData, LastUpdate = DateTime.Now }); - // TODO: Intermittent: users getting disconnected before getting here, check that key exists! - if (!_users.ContainsKey(peer.Id)) - return; - _users[peer.Id].SessionGuid = sessionGuid; - break; - } - } - } - else - { - if (IsVerified(user)) - { - if (_messageCallbacks.ContainsKey(type)) - typeof(ActionCollection<>).MakeGenericType(new[] {type}).GetMethod("Invoke") - .Invoke(_messageCallbacks[type], new object[] {message}); - else Logger.Log(LogLevel.Warning, $"Received {type.Name} message but no one is listening for it so I'll just leave it here ¯\\_(ツ)_/¯\n{MessagePackSerializer.ConvertToJson(new ReadOnlyMemory(bytes))}"); - _sessions[_users[peer.Id].SessionGuid].LastUpdate = DateTime.Now; - } - else - peer.Send(new ErrorMessage {Error = "User Not Verified"}); - } - }; - - AddMessageListener(message => - { - foreach (var verifiedUser in _users.Values.Where(IsVerified)) - verifiedUser.Peer.Send(new ChatBroadcastMessage{User = SessionData(message.Peer).Username, Text = message.Text}); - }); - - AddMessageListener(message => - { - SessionData(message.Peer).Username = message.Name; - _database.Add(SessionData(message.Peer)); - }); - - // Observable.Timer(DateTimeOffset.Now, TimeSpan.FromSeconds(30)).Subscribe(_ => - // { - // foreach (var s in _sessions.ToArray()) - // { - // if (DateTime.Now.Subtract(s.Value.LastUpdate).TotalSeconds > s.Value.DurationSeconds) - // _sessions.Remove(s.Key); - // } - // }); - - Logger.LogInformation("LiteNetLib is now open to new connections. Please be gentle."); - } - - private bool IsVerified(User u) => _sessions.ContainsKey(u.SessionGuid); - - public Player SessionData(NetPeer peer) => IsVerified(_users[peer.Id])?_sessions[_users[peer.Id].SessionGuid].Data:null; -} - - public class Session -{ - public DateTime LastUpdate; - public Player Data; - public float DurationSeconds; -} - -public class User -{ - public NetPeer Peer; - public int Latency; - public Guid SessionGuid; - public float Tardiness; -} \ No newline at end of file