diff --git a/Core/Helpers/WeatherHelper.cs b/Core/Helpers/WeatherHelper.cs index 9912a883..0b3163f4 100644 --- a/Core/Helpers/WeatherHelper.cs +++ b/Core/Helpers/WeatherHelper.cs @@ -35,7 +35,7 @@ public class WeatherHelper /// /// (new Date()) /// Date object of current in-raid time - public DateTime GetInRaidTime(double? timestamp = null) + public DateTime GetInRaidTime(long? timestamp = null) { // tarkov time = (real time * 7 % 24 hr) + 3 hour var russiaOffsetMilliseconds = _timeUtil.GetHoursAsSeconds(3) * 1000; diff --git a/Core/Servers/ConfigServer.cs b/Core/Servers/ConfigServer.cs index 1231bc25..c7c6097e 100644 --- a/Core/Servers/ConfigServer.cs +++ b/Core/Servers/ConfigServer.cs @@ -14,16 +14,19 @@ public class ConfigServer { protected ILogger _logger; protected JsonUtil _jsonUtil; + protected FileUtil _fileUtil; protected Dictionary configs = new(); - protected readonly string[] acceptableFileExtensions = [".json", ".jsonc"]; + protected readonly string[] acceptableFileExtensions = ["json", "jsonc"]; public ConfigServer( ILogger logger, - JsonUtil jsonUtil + JsonUtil jsonUtil, + FileUtil fileUtil ) { _logger = logger; _jsonUtil = jsonUtil; + _fileUtil = fileUtil; Initialize(); } @@ -45,13 +48,13 @@ public class ConfigServer // Get all filepaths var filepath = "./assets/configs/"; - var files = Directory.GetFiles(filepath); + var files = _fileUtil.GetFiles(filepath); // Add file content to result foreach (var file in files) - if (acceptableFileExtensions.Contains(Path.GetExtension(file))) + if (acceptableFileExtensions.Contains(_fileUtil.GetFileExtension(file))) { - var fileContent = File.ReadAllText(file); + var fileContent = _fileUtil.ReadFile(file); var type = GetConfigTypeByFilename(file); var deserializedContent = _jsonUtil.Deserialize(fileContent, type); @@ -61,7 +64,7 @@ public class ConfigServer throw new Exception($"Server will not run until the: {file} config error mentioned above is fixed"); } - configs[$"spt-{Path.GetFileNameWithoutExtension(file)}"] = deserializedContent; + configs[$"spt-{_fileUtil.StripExtension(file)}"] = deserializedContent; } /** TODO: deal with this: @@ -77,7 +80,7 @@ public class ConfigServer private Type GetConfigTypeByFilename(string filename) { var type = Enum.GetValues() - .First(en => en.GetValue().Contains(Path.GetFileNameWithoutExtension(filename))); + .First(en => en.GetValue().Contains(_fileUtil.StripExtension(filename))); return type.GetConfigType(); } } diff --git a/Core/Services/I18nService.cs b/Core/Services/I18nService.cs index f656d50f..dc3b96ef 100644 --- a/Core/Services/I18nService.cs +++ b/Core/Services/I18nService.cs @@ -1,10 +1,8 @@ -using System.Text.Json; -using Core.Annotations; -using Core.Utils; +using Core.Utils; +using Core.Utils.Extensions; namespace Core.Services; -[Injectable(InjectionType.Singleton)] public class I18nService { private List _locales; @@ -12,29 +10,39 @@ public class I18nService private string _defaultLocale; private string _directory; private JsonUtil _jsonUtil; + private FileUtil _fileUtil; private string _setLocale; private Dictionary> _loadedLocales = new(); - public I18nService(JsonUtil jsonUtil, List locales, Dictionary fallbacks, string defaultLocale, string directory) + public I18nService( + FileUtil fileUtil, + JsonUtil jsonUtil, + List locales, + Dictionary fallbacks, + string defaultLocale, + string directory + ) { _locales = locales; _fallbacks = fallbacks; _defaultLocale = defaultLocale; _directory = directory; _jsonUtil = jsonUtil; + _fileUtil = fileUtil; Initialize(); } private void Initialize() { - var files = Directory.GetFiles(_directory, "*.json"); - if (files.Length == 0) + var files = _fileUtil.GetFiles(_directory, true).Where(f => _fileUtil.GetFileExtension(f) == "json").ToList(); + if (files.Count == 0) throw new Exception($"Localisation files in directory {_directory} not found."); foreach (var file in files) - _loadedLocales.Add(Path.GetFileNameWithoutExtension(file), - _jsonUtil.Deserialize>(File.ReadAllText(file)) ?? new Dictionary()); + _loadedLocales.Add(_fileUtil.StripExtension(file), + _jsonUtil.Deserialize>(_fileUtil.ReadFile(file)) ?? + new Dictionary()); if (!_loadedLocales.ContainsKey(_defaultLocale)) throw new Exception($"The default locale '{_defaultLocale}' does not exist on the loaded locales."); @@ -53,7 +61,8 @@ public class I18nService { var foundFallbackLocale = fallback.First().Value; if (!_loadedLocales.ContainsKey(foundFallbackLocale)) - throw new Exception($"Locale '{locale}' was not defined, and the found fallback locale did not match any of the loaded locales."); + throw new Exception( + $"Locale '{locale}' was not defined, and the found fallback locale did not match any of the loaded locales."); _setLocale = foundFallbackLocale; } @@ -75,9 +84,26 @@ public class I18nService return value; } - public string GetLocalised(string key, params object[] args) + public string GetLocalised(string key, object? args) { - // TODO: Deal with arguments - return GetLocalised(key); + var rawLocalizedString = GetLocalised(key); + if (args == null) + return rawLocalizedString; + if (args is string value) + { + return rawLocalizedString.Replace("%s", value); + } + else + { + foreach (var propertyInfo in args.GetType().GetProperties()) + { + var localizedName = $"{{{{{propertyInfo.GetJsonName()}}}}}"; + if (rawLocalizedString.Contains(localizedName)) + { + rawLocalizedString.Replace(localizedName, propertyInfo.GetValue(args, null)?.ToString() ?? string.Empty); + } + } + return rawLocalizedString; + } } } diff --git a/Core/Services/LocalisationService.cs b/Core/Services/LocalisationService.cs index 98c45e73..bb664fb3 100644 --- a/Core/Services/LocalisationService.cs +++ b/Core/Services/LocalisationService.cs @@ -19,7 +19,8 @@ public class LocalisationService RandomUtil randomUtil, DatabaseServer databaseServer, LocaleService localeService, - JsonUtil jsonUtil + JsonUtil jsonUtil, + FileUtil fileUtil ) { _logger = logger; @@ -27,6 +28,7 @@ public class LocalisationService _databaseServer = databaseServer; _localeService = localeService; _i18nService = new I18nService( + fileUtil, jsonUtil, localeService.GetServerSupportedLocales(), localeService.GetLocaleFallbacks(), diff --git a/Core/Utils/FileUtil.cs b/Core/Utils/FileUtil.cs index a8242d4d..99df8e35 100644 --- a/Core/Utils/FileUtil.cs +++ b/Core/Utils/FileUtil.cs @@ -25,6 +25,11 @@ public class FileUtil return Path.GetExtension(path).Replace(".", ""); } + public string GetFileName(string path) + { + return Path.GetFileName(path); + } + public string StripExtension(string path, bool keepPath = false) { return keepPath ? path.Split('.').First() : Path.GetFileNameWithoutExtension(path); diff --git a/Core/Utils/ImporterUtil.cs b/Core/Utils/ImporterUtil.cs index b16afbd6..953253be 100644 --- a/Core/Utils/ImporterUtil.cs +++ b/Core/Utils/ImporterUtil.cs @@ -43,18 +43,16 @@ public class ImporterUtil foreach (var file in files) { if (_fileUtil.GetFileExtension(file) != "json") continue; - if (filesToIgnore.Contains(Path.GetFileName(file).ToLower())) continue; + if (filesToIgnore.Contains(_fileUtil.GetFileName(file).ToLower())) continue; tasks.Add( Task.Factory.StartNew(() => { - // const filename = this.vfs.stripExtension(file); - // const filePathAndName = `${filepath}${file}`; - var fileData = File.ReadAllText(file); + var fileData = _fileUtil.ReadFile(file); if (onReadCallback != null) onReadCallback(file, fileData); var setMethod = GetSetMethod( - Path.GetFileNameWithoutExtension(file).ToLower(), + _fileUtil.StripExtension(file).ToLower(), loadedType, out var propertyType, out var isDictionary @@ -66,7 +64,7 @@ public class ImporterUtil onObjectDeserialized(file, fileDeserialized); setMethod.Invoke(result, - isDictionary ? [Path.GetFileNameWithoutExtension(file), fileDeserialized] : [fileDeserialized]); + isDictionary ? [_fileUtil.StripExtension(file), fileDeserialized] : [fileDeserialized]); } catch (Exception e) { @@ -116,124 +114,13 @@ public class ImporterUtil { var matchedProperty = type.GetProperties() .FirstOrDefault(prop => - prop.Name.ToLower() == Path.GetFileNameWithoutExtension(propertyName).ToLower()); + prop.Name.ToLower() == _fileUtil.StripExtension(propertyName).ToLower()); if (matchedProperty == null) throw new Exception( - $"Unable to find property '{Path.GetFileNameWithoutExtension(propertyName)}' for type '{type.Name}'"); + $"Unable to find property '{_fileUtil.StripExtension(propertyName)}' for type '{type.Name}'"); propertyType = matchedProperty.PropertyType; setMethod = matchedProperty.GetSetMethod(); } return setMethod; } - - /** - * Load files into js objects recursively (synchronous) - * @param filepath Path to folder with files - * @returns - */ - public object LoadRecursive( - string filepath, - Type loadedType, - Action? onReadCallback = null, - Action? onObjectDeserialized = null - ) - { - var result = Activator.CreateInstance(loadedType); - - // get all filepaths - var files = Directory.GetFiles(filepath); - var directories = Directory.GetDirectories(filepath); - - foreach (var file in files) - if (Path.GetExtension(file) == "json") - { - // const filename = this.vfs.stripExtension(file); - // const filePathAndName = `${filepath}${file}`; - var fileData = File.ReadAllText(file); - onReadCallback(file, fileData); - var matchedProperty = loadedType.GetProperties() - .FirstOrDefault(prop => prop.Name.ToLower() == Path.GetFileNameWithoutExtension(file).ToLower()); - if (matchedProperty == null) - throw new Exception($"Unable to find property '{Path.GetFileNameWithoutExtension(file)}' for type '{loadedType.Name}'"); - var propertyType = matchedProperty.PropertyType; - var fileDeserialized = _jsonUtil.Deserialize(fileData, propertyType); - onObjectDeserialized(file, fileDeserialized); - - matchedProperty.GetSetMethod().Invoke(result, [fileDeserialized]); - } - - // deep tree search - foreach (var directory in directories) - { - var matchedProperty = loadedType.GetProperties().FirstOrDefault(prop => prop.Name.ToLower() == directory.ToLower()); - if (matchedProperty == null) - throw new Exception($"Unable to find property '{directory}' for type '{loadedType.Name}'"); - matchedProperty.GetSetMethod().Invoke(result, [LoadRecursive($"{filepath}{directory}/", matchedProperty.PropertyType)]); - } - - // return the result of all async fetch - return result; - } - - public async Task LoadAsync( - string filepath, - Type loadedType, - string strippablePath = "", - Action? onReadCallback = null, - Action? onObjectDeserialized = null - ) - { - var result = Activator.CreateInstance(loadedType); - var promises = new List>(); - var filesToProcess = new Queue(_fileUtil.GetFiles(filepath, true)); - - while (filesToProcess.Count != 0) - { - var fileNode = filesToProcess.Dequeue(); - if (fileNode == null || _fileUtil.GetFileExtension(fileNode) != "json") continue; - - promises.Add(File.ReadAllTextAsync(fileNode).ContinueWith(fd => - { - onReadCallback(fileNode, fd.Result); - return _jsonUtil.Deserialize(fd.Result, typeof(object)); - })); - /* - this.vfs - .readFileAsync(filePathAndName) - .then(async (fileData) => { - onReadCallback(filePathAndName, fileData); - return this.jsonUtil.deserializeWithCacheCheckAsync(fileData, filePathAndName); - }) - .then(async (fileDeserialized) => { - onObjectDeserialized(filePathAndName, fileDeserialized); - const strippedFilePath = this.vfs.stripExtension(filePathAndName).replace(filepath, ""); - this.placeObject(fileDeserialized, strippedFilePath, result, strippablePath); - }) - .then(() => progressWriter.increment()), - );*/ - } - - //await JSType.Promise<>.all(promises).catch((e) => console.error(e)); - - return result; - } - - /* - protected placeObject(fileDeserialized: any, strippedFilePath: string, result: T, strippablePath: string): void { - const strippedFinalPath = strippedFilePath.replace(strippablePath, ""); - let temp = result; - const propertiesToVisit = strippedFinalPath.split("/"); - for (let i = 0; i < propertiesToVisit.length; i++) { - const property = propertiesToVisit[i]; - - if (i === propertiesToVisit.length - 1) { - temp[property] = fileDeserialized; - } else { - if (!temp[property]) { - temp[property] = {}; - } - temp = temp[property]; - } - } - }*/ } diff --git a/Core/Utils/TimeUtil.cs b/Core/Utils/TimeUtil.cs index af167958..835ded70 100644 --- a/Core/Utils/TimeUtil.cs +++ b/Core/Utils/TimeUtil.cs @@ -12,7 +12,7 @@ public class TimeUtil /// /// The date to format in UTC. /// The formatted time as 'HH-MM-SS'. - public string FormatTime(DateTime dateTime) + public string FormatTime(DateTimeOffset dateTime) { var hour = Pad(dateTime.ToUniversalTime().Hour); var minute = Pad(dateTime.ToUniversalTime().Minute); @@ -26,7 +26,7 @@ public class TimeUtil /// /// The date to format in UTC. /// The formatted date as 'YYYY-MM-DD'. - public string FormatDate(DateTime dateTime) + public string FormatDate(DateTimeOffset dateTime) { var day = Pad(dateTime.ToUniversalTime().Day); var month = Pad(dateTime.ToUniversalTime().Month); @@ -41,7 +41,7 @@ public class TimeUtil /// The current date as 'YYYY-MM-DD'. public string GetDate() { - return FormatDate(DateTime.Now); + return FormatDate(DateTimeOffset.UtcNow); } /// @@ -50,7 +50,7 @@ public class TimeUtil /// The current time as 'HH-MM-SS'. public string GetTime() { - return FormatTime(DateTime.Now); + return FormatTime(DateTimeOffset.UtcNow); } /// @@ -59,7 +59,7 @@ public class TimeUtil /// The current timestamp in seconds since the Unix epoch in UTC. public long GetTimeStamp() { - return DateTimeOffset.Now.ToUnixTimeSeconds(); + return DateTimeOffset.Now.ToUnixTimeMilliseconds(); } /// @@ -67,12 +67,14 @@ public class TimeUtil /// /// datetime to get the time stamp for, if null it uses current date. /// Unix epoch for the start of day of the calculated date - public long GetStartOfDayTimeStamp(DateTime? dateTime) + public long GetStartOfDayTimeStamp(long? timestamp) { - var now = dateTime ?? DateTime.Now; - - return new DateTimeOffset(new DateTime(now.Year, now.Month, now.Day, 0, 0, 0)) - .ToUnixTimeSeconds(); + DateTime now = timestamp.HasValue + ? DateTimeOffset.FromUnixTimeMilliseconds(timestamp.Value).DateTime + : DateTime.Now; + + DateTime startOfDay = new DateTime(now.Year, now.Month, now.Day, 0, 0, 0); + return ((DateTimeOffset)startOfDay).ToUnixTimeMilliseconds(); } /// @@ -82,7 +84,7 @@ public class TimeUtil /// public long GetTimeStampFromNowDays(int daysFromNow) { - return DateTimeOffset.Now.AddDays(daysFromNow).ToUnixTimeSeconds(); + return DateTimeOffset.UtcNow.AddDays(daysFromNow).ToUnixTimeSeconds(); } /// @@ -92,16 +94,17 @@ public class TimeUtil /// public long GetTimeStampFromNowHours(int hoursFromNow) { - return DateTimeOffset.Now.AddHours(hoursFromNow).ToUnixTimeSeconds(); + return DateTimeOffset.UtcNow.AddHours(hoursFromNow).ToUnixTimeSeconds(); } /// /// Gets the current time in UTC in a format suitable for mail in EFT. /// /// The current time as 'HH:MM' in UTC. + /// GetTimeMailFormat public string GetTimeMailFormat() { - return DateTime.UtcNow.ToString("HH:mm"); + return DateTimeOffset.UtcNow.ToString("HH:mm"); } /// @@ -110,7 +113,7 @@ public class TimeUtil /// The current date as 'DD.MM.YYYY' in UTC. public string GetDateMailFormat() { - return DateTime.UtcNow.ToString("dd.MM.yyyy"); + return DateTimeOffset.UtcNow.ToString("dd.MM.yyyy"); } /// @@ -129,19 +132,14 @@ public class TimeUtil /// Time stamp of the next hour in unix time seconds public long GetTimeStampOfNextHour() { - var now = DateTime.UtcNow; + DateTime now = DateTime.Now; + TimeSpan timeUntilNextHour = TimeSpan.FromMinutes(60 - now.Minute) + .Subtract(TimeSpan.FromSeconds(now.Second)) + .Subtract(TimeSpan.FromMilliseconds(now.Millisecond)); + + var time = ((DateTimeOffset)now.Add(timeUntilNextHour)).ToUnixTimeSeconds(); - var nextHour = new DateTime( - now.Year, - now.Month, - now.Day, - now.Hour, - 0, - 0, - DateTimeKind.Utc - ).AddHours(1); - - return new DateTimeOffset(nextHour).ToUnixTimeSeconds(); + return time; } /// @@ -151,19 +149,20 @@ public class TimeUtil /// Timestamp public long GetTodayMidnightTimeStamp() { - var now = DateTime.UtcNow; - - var midNight = new DateTime( - now.Year, - now.Month, - now.Day, - 0, - 0, - 0, - DateTimeKind.Utc - ); - - return new DateTimeOffset(midNight).ToUnixTimeSeconds(); + DateTime now = DateTime.Now; + int hours = now.Hour; + int minutes = now.Minute; + + // If minutes greater than 0, subtract 1 hour + if (minutes > 0) + { + hours--; + } + + // Create a new DateTime with the last full hour, 0 minutes, and 0 seconds + DateTime lastFullHour = new DateTime(now.Year, now.Month, now.Day, hours, 0, 0); + + return ((DateTimeOffset)lastFullHour).ToUnixTimeMilliseconds(); } /// diff --git a/Server/Logger/AbstractFormatter.cs b/Server/Logger/AbstractFormatter.cs index e9cbf739..c231bf5d 100644 --- a/Server/Logger/AbstractFormatter.cs +++ b/Server/Logger/AbstractFormatter.cs @@ -14,7 +14,8 @@ public abstract class AbstractFormatter : ITextFormatter var logLevel = logEvent.Level.ToString().ToUpper().Substring(0, 4); var message = logEvent.RenderMessage(); var exception = logEvent.Exception != null ? $"{newLine}{logEvent.Exception}{newLine}{logEvent.Exception.StackTrace}" : ""; - var logMessage = ProcessText($"[{timestamp} {logLevel}] {message}{exception}"); + var sourceContext = logEvent.Properties["SourceContext"].ToString().Replace("\"", ""); + var logMessage = ProcessText($"[{timestamp} {logLevel}][{sourceContext}] {message}{exception}"); output.WriteLine(logMessage); } } diff --git a/Server/Program.cs b/Server/Program.cs index b0bbb337..db0e6279 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -8,6 +8,7 @@ using Core.Models.Spt.Config; using Core.Servers; using Core.Utils; using Serilog; +using Serilog.Events; namespace Server; @@ -18,7 +19,7 @@ public static class Program var assemblies = ModDllLoader.LoadAllMods(); HarmonyBootstrapper.LoadAllPatches(assemblies); var builder = WebApplication.CreateBuilder(args); - + builder.Configuration.AddJsonFile("appsettings.json", true, true); CreateAndRegisterLogger(builder); @@ -64,6 +65,7 @@ public static class Program builder.Logging.ClearProviders(); var logger = new LoggerConfiguration() .ReadFrom.Configuration(builder.Configuration) + .MinimumLevel.Override("Microsoft.AspNetCore.Hosting.Diagnostics", LogEventLevel.Warning) .CreateLogger(); builder.Logging.AddSerilog(logger); } diff --git a/Server/Server.csproj b/Server/Server.csproj index 59553677..c73311b6 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -19,6 +19,7 @@ + diff --git a/Server/appsettings.json b/Server/appsettings.json index e5a6eb10..c6b43de4 100644 --- a/Server/appsettings.json +++ b/Server/appsettings.json @@ -1,9 +1,10 @@ { "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Default": "Trace", + "System": "Information", + "Microsoft": "Information", + "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning" } }, "Serilog": { @@ -31,6 +32,14 @@ ] } } + ], + "Filter": [ + { + "Name": "ByExcluding", + "Args": { + "expression": "StartsWith(SourceContext, 'TADAADA')" + } + } ] } }