From 7eae5e5ee6c677649acfd277834e7251c7032fca Mon Sep 17 00:00:00 2001 From: Ben Parsons <9parsonsb@gmail.com> Date: Sat, 25 May 2024 22:49:08 +1000 Subject: [PATCH] Implement Other state events now emitted to websocket connections on connect --- ObservatoryFramework/Files/BackPackFile.cs | 8 +- ObservatoryFramework/Files/CargoFile.cs | 2 +- .../MaterialCompositionConverter.cs | 8 +- .../Files/Converters/MaterialConverter.cs | 8 +- ObservatoryFramework/Files/FCMaterialsFile.cs | 2 +- .../Files/Journal/Combat/Bounty.cs | 2 +- .../Files/Journal/Combat/Died.cs | 2 +- .../Files/Journal/Exploration/CodexEntry.cs | 2 +- .../Exploration/MultiSellExplorationData.cs | 2 +- .../Journal/Exploration/SAAScanComplete.cs | 4 +- .../Journal/Exploration/SAASignalsFound.cs | 4 +- .../Files/Journal/Exploration/Scan.cs | 12 +- .../Exploration/SellExplorationData.cs | 4 +- .../Files/Journal/FleetCarrier/CarrierJump.cs | 2 +- .../Journal/FleetCarrier/CarrierStats.cs | 6 +- .../Files/Journal/Odyssey/BackpackChange.cs | 4 +- .../Journal/Odyssey/BackpackMaterials.cs | 8 +- .../Journal/Odyssey/BuyMicroResources.cs | 2 +- .../Journal/Odyssey/CreateSuitLoadout.cs | 4 +- .../Journal/Odyssey/SellMicroResources.cs | 2 +- .../Files/Journal/Odyssey/SellOrganicData.cs | 2 +- .../Journal/Odyssey/ShipLockerMaterials.cs | 8 +- .../Journal/Odyssey/TradeMicroResources.cs | 2 +- .../Journal/Odyssey/TransferMicroResources.cs | 2 +- .../Files/Journal/Other/ApproachSettlement.cs | 2 +- .../Files/Journal/Other/CargoTransfer.cs | 2 +- .../Files/Journal/Other/ProspectedAsteroid.cs | 2 +- .../Files/Journal/Other/RebootRepair.cs | 2 +- .../Files/Journal/Other/Synthesis.cs | 2 +- .../Files/Journal/Other/WingJoin.cs | 2 +- .../Journal/Powerplay/PowerplayVoucher.cs | 2 +- .../Files/Journal/Startup/Cargo.cs | 2 +- .../Files/Journal/Startup/Loadout.cs | 2 +- .../Files/Journal/Startup/Materials.cs | 6 +- .../Files/Journal/Startup/Missions.cs | 6 +- .../Journal/StationServices/CommunityGoal.cs | 2 +- .../Journal/StationServices/EngineerCraft.cs | 4 +- .../StationServices/EngineerProgress.cs | 2 +- .../StationServices/MassModuleStore.cs | 2 +- .../StationServices/MissionCompleted.cs | 8 +- .../Journal/StationServices/RedeemVoucher.cs | 2 +- .../Files/Journal/StationServices/Repair.cs | 2 +- .../Journal/StationServices/StoredModules.cs | 2 +- .../Journal/StationServices/StoredShips.cs | 4 +- .../StationServices/TechnologyBroker.cs | 6 +- .../Files/Journal/Travel/Docked.cs | 2 +- .../Files/Journal/Travel/FSDJump.cs | 6 +- .../Files/Journal/Travel/Location.cs | 10 +- ObservatoryFramework/Files/MarketFile.cs | 2 +- ObservatoryFramework/Files/ModuleInfoFile.cs | 2 +- ObservatoryFramework/Files/NavRouteFile.cs | 2 +- ObservatoryFramework/Files/OutfittingFile.cs | 2 +- .../Files/ParameterTypes/DetailedFaction.cs | 4 +- .../Files/ParameterTypes/Engineering.cs | 2 +- .../Files/ParameterTypes/FactionEffect.cs | 4 +- .../Files/ParameterTypes/SuitModule.cs | 2 +- .../Files/ParameterTypes/SystemFaction.cs | 6 +- ObservatoryFramework/Files/ShipyardFile.cs | 2 +- .../Configuration/CargoConfiguration.cs | 5 +- .../Configuration/ShipLockerConfiguration.cs | 5 +- Pulsar/Context/PulsarContext.cs | 6 +- Pulsar/Features/EventsHub.cs | 13 +- Pulsar/Features/FileHandlerService.cs | 4 +- Pulsar/Features/Journal/JournalProcessor.cs | 3 +- Pulsar/Features/Journal/JournalService.cs | 142 +++++++++++------- Pulsar/Features/Status/StatusService.cs | 1 + Pulsar/Global.Usings.cs | 4 + Pulsar/Program.cs | 9 +- 68 files changed, 222 insertions(+), 182 deletions(-) diff --git a/ObservatoryFramework/Files/BackPackFile.cs b/ObservatoryFramework/Files/BackPackFile.cs index 78e28b2..29bfc33 100644 --- a/ObservatoryFramework/Files/BackPackFile.cs +++ b/ObservatoryFramework/Files/BackPackFile.cs @@ -13,17 +13,17 @@ public class BackpackFile : JournalBase /// /// List of all items carried. /// - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } /// /// List of all components carried. /// - public IReadOnlyCollection Components { get; init; } + public List Components { get; init; } /// /// List of player consumable items carried. /// - public IReadOnlyCollection Consumables { get; init; } + public List Consumables { get; init; } /// /// List of all data currently stored by the player. /// - public IReadOnlyCollection Data { get; init; } + public List Data { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/CargoFile.cs b/ObservatoryFramework/Files/CargoFile.cs index c19112d..531b698 100644 --- a/ObservatoryFramework/Files/CargoFile.cs +++ b/ObservatoryFramework/Files/CargoFile.cs @@ -21,5 +21,5 @@ public class CargoFile : JournalBase /// /// List of full cargo details. /// - public IReadOnlyCollection Inventory { get; init; } + public List Inventory { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs b/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs index 0acfcf8..c81ea1f 100644 --- a/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs +++ b/ObservatoryFramework/Files/Converters/MaterialCompositionConverter.cs @@ -9,9 +9,9 @@ namespace Observatory.Framework.Files.Converters; /// The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". /// Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. /// -public class MaterialCompositionConverter : JsonConverter> +public class MaterialCompositionConverter : JsonConverter> { - public override IReadOnlyCollection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override List Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType == JsonTokenType.StartObject) { @@ -42,10 +42,10 @@ public class MaterialCompositionConverter : JsonConverter>(ref reader, options)!; + return JsonSerializer.Deserialize>(ref reader, options)!; } - public override void Write(Utf8JsonWriter writer, IReadOnlyCollection value, + public override void Write(Utf8JsonWriter writer, List value, JsonSerializerOptions options) { JsonSerializer.Serialize(writer, value, options); diff --git a/ObservatoryFramework/Files/Converters/MaterialConverter.cs b/ObservatoryFramework/Files/Converters/MaterialConverter.cs index 532e2e7..7f3dbc1 100644 --- a/ObservatoryFramework/Files/Converters/MaterialConverter.cs +++ b/ObservatoryFramework/Files/Converters/MaterialConverter.cs @@ -9,9 +9,9 @@ namespace Observatory.Framework.Files.Converters; /// The format used for materials changed from an object with a key for each material to an array of objects containing "name" and "percent". /// Need to handle both if we're going to read historical data. This reads the old format into a class reflecting the new structure. /// -public class MaterialConverter : JsonConverter> +public class MaterialConverter : JsonConverter> { - public override IReadOnlyCollection Read(ref Utf8JsonReader reader, Type typeToConvert, + public override List Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType == JsonTokenType.StartObject) @@ -44,10 +44,10 @@ public class MaterialConverter : JsonConverter> return materialComposition; } - return JsonSerializer.Deserialize>(ref reader, options)!; + return JsonSerializer.Deserialize>(ref reader, options)!; } - public override void Write(Utf8JsonWriter writer, IReadOnlyCollection value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, List value, JsonSerializerOptions options) { JsonSerializer.Serialize(writer, value, options); } diff --git a/ObservatoryFramework/Files/FCMaterialsFile.cs b/ObservatoryFramework/Files/FCMaterialsFile.cs index c81b82a..1e10969 100644 --- a/ObservatoryFramework/Files/FCMaterialsFile.cs +++ b/ObservatoryFramework/Files/FCMaterialsFile.cs @@ -13,5 +13,5 @@ public class FCMaterialsFile : JournalBase /// /// List of items in stock and in demand from the carrier bartender. /// - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Combat/Bounty.cs b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs index 4ebdf59..f084a2d 100644 --- a/ObservatoryFramework/Files/Journal/Combat/Bounty.cs +++ b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal.Combat; public class Bounty : JournalBase { public override string Event => "Bounty"; - public IReadOnlyCollection Rewards { get; init; } + public List Rewards { get; init; } public string PilotName { get; set; } public string PilotName_Localised { get; set; } public string Target { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Combat/Died.cs b/ObservatoryFramework/Files/Journal/Combat/Died.cs index 4631e45..ee4684a 100644 --- a/ObservatoryFramework/Files/Journal/Combat/Died.cs +++ b/ObservatoryFramework/Files/Journal/Combat/Died.cs @@ -10,5 +10,5 @@ public class Died : JournalBase public string KillerName_Localised { get; init; } public string KillerShip { get; init; } public string KillerRank { get; init; } - public IReadOnlyCollection Killers { get; init; } + public List Killers { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs index 7405fa2..5e7a141 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/CodexEntry.cs @@ -71,7 +71,7 @@ public class CodexEntry : JournalBase /// /// List of trais of the scanned item. /// - public ICollection Traits { get; init; } + public IList Traits { get; init; } /// /// Value of the codex entry when sold to Universal Cartographics. /// diff --git a/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs b/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs index 48ce20c..7afedce 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/MultiSellExplorationData.cs @@ -12,7 +12,7 @@ public class MultiSellExplorationData : JournalBase /// /// List of all sold first discoveries. /// - public IReadOnlyCollection Discovered { get; init; } + public List Discovered { get; init; } /// /// Base value of total sold data. /// diff --git a/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs b/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs index e2158f8..2a43d74 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/SAAScanComplete.cs @@ -23,11 +23,11 @@ public class SAAScanComplete : JournalBase /// /// This property is indicated with strikethrough in Frontier's documentation and is likely unused. /// - public ICollection Discoverers { get; init; } + public IList Discoverers { get; init; } /// /// This property is indicated with strikethrough in Frontier's documentation and is likely unused. /// - public ICollection Mappers { get; init; } + public IList Mappers { get; init; } /// /// Number of probes fired to complete the surface scan. /// diff --git a/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs b/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs index 7925e7b..2045340 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/SAASignalsFound.cs @@ -24,9 +24,9 @@ public class SAASignalsFound : JournalBase /// /// List of signals found. /// - public IReadOnlyCollection Signals { get; init; } + public List Signals { get; init; } /// /// List of genuses present. /// - public IReadOnlyCollection Genuses { get; init; } + public List Genuses { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Exploration/Scan.cs b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs index 27a326c..0d71667 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/Scan.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs @@ -22,7 +22,7 @@ public class Scan : ScanBaryCentre /// /// List which reflects Frontier's JSON structure for the "Parents" object. Use of Parent property is recommended instead. /// - public IReadOnlyCollection Parents { + public List Parents { get => _Parents; init { @@ -51,8 +51,8 @@ public class Scan : ScanBaryCentre /// "Parents" object rearranged into more intuitive structure for ease of use. /// [JsonIgnore] - public IReadOnlyCollection<(ParentType ParentType, int Body)> Parent { get; init; } - private IReadOnlyCollection _Parents; + public List<(ParentType ParentType, int Body)> Parent { get; init; } + private List _Parents; /// /// Body distance from system arrival point in light-seconds. /// @@ -80,7 +80,7 @@ public class Scan : ScanBaryCentre /// /// List containing full breakdown of atmospheric components and their relative percentages. /// - public IReadOnlyCollection AtmosphereComposition { get; init; } + public List AtmosphereComposition { get; init; } /// /// Descriptive string for type of volcanism present, or an empty string for none, e.g. "major silicate vapour geysers volcanism". /// @@ -113,7 +113,7 @@ public class Scan : ScanBaryCentre /// List containing full breakdown of prospectable surface materials and their relative percentages. /// [JsonConverter(typeof(MaterialCompositionConverter))] - public IReadOnlyCollection Materials { get; init; } + public List Materials { get; init; } /// /// Overall composition of body, expressed as percentages of ice, rock, and metal. /// @@ -130,7 +130,7 @@ public class Scan : ScanBaryCentre /// /// List of all planetary or stellar ring systems around the body. /// - public IReadOnlyCollection Rings { get; init; } + public List Rings { get; init; } /// /// Description of the minable material abundance.
Possible values inclue "PristineResources", "MajorResources", "CommonResources", "LowResources", and "DepletedResources". /// diff --git a/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs b/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs index 60ca367..c93ca97 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/SellExplorationData.cs @@ -11,11 +11,11 @@ public class SellExplorationData : JournalBase /// /// List of systems for which data was sold. /// - public ICollection Systems { get; init; } + public IList Systems { get; init; } /// /// List of first discovered bodies. /// - public ICollection Discovered { get; init; } + public IList Discovered { get; init; } /// /// Base value of sold data. /// diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs index 8375359..0893570 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs @@ -24,5 +24,5 @@ public class CarrierJump : FSDJump public StationService StationServices { get; init; } public string StationEconomy { get; init; } public string StationEconomy_Localised { get; init; } - public IReadOnlyCollection StationEconomies { get; init; } + public List StationEconomies { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs index 60a191f..293e76c 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierStats.cs @@ -19,7 +19,7 @@ public class CarrierStats : JournalBase public bool PendingDecommission { get; init; } public CarrierSpaceUsage SpaceUsage { get; init; } public ParameterTypes.CarrierFinance Finance { get; init; } - public IReadOnlyCollection Crew { get; init; } - public IReadOnlyCollection ShipPacks { get; init; } - public IReadOnlyCollection ModulePacks { get; init; } + public List Crew { get; init; } + public List ShipPacks { get; init; } + public List ModulePacks { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs b/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs index f18e4c3..13a51a0 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/BackpackChange.cs @@ -6,6 +6,6 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class BackpackChange : JournalBase { public override string Event => "BackpackChange"; - public IReadOnlyCollection Added { get; init; } - public IReadOnlyCollection Removed { get; init; } + public List Added { get; init; } + public List Removed { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs b/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs index dc849c1..26e4864 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/BackpackMaterials.cs @@ -6,8 +6,8 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class BackpackMaterials : JournalBase { public override string Event => "BackpackMaterials"; - public IReadOnlyCollection Items { get; init; } - public IReadOnlyCollection Components { get; init; } - public IReadOnlyCollection Consumables { get; init; } - public IReadOnlyCollection Data { get; init; } + public List Items { get; init; } + public List Components { get; init; } + public List Consumables { get; init; } + public List Data { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs index bbd5eea..74e724c 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/BuyMicroResources.cs @@ -15,5 +15,5 @@ public class BuyMicroResources : JournalBase public int Price { get; init; } public ulong MarketID { get; init; } public int TotalCount { get; init; } - public IReadOnlyCollection MicroResources { get; init; } + public List MicroResources { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs b/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs index 2c3f5bf..95b4e7a 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/CreateSuitLoadout.cs @@ -6,6 +6,6 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class CreateSuitLoadout : DeleteSuitLoadout { public override string Event => "CreateSuitLoadout"; - public IReadOnlyCollection Modules { get; init; } - public ICollection SuitMods { get; init; } + public List Modules { get; init; } + public IList SuitMods { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs index 885000d..ebcfc75 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellMicroResources.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class SellMicroResources : JournalBase { public override string Event => "SellMicroResources"; - public IReadOnlyCollection MicroResources { get; init; } + public List MicroResources { get; init; } public int Price { get; init; } public ulong MarketID { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs b/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs index 659c492..0528a0c 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/SellOrganicData.cs @@ -7,5 +7,5 @@ public class SellOrganicData : JournalBase { public override string Event => "SellOrganicData"; public ulong MarketID { get; init; } - public IReadOnlyCollection BioData { get; init; } + public List BioData { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs b/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs index b19da7f..c40b3df 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/ShipLockerMaterials.cs @@ -6,8 +6,8 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class ShipLockerMaterials : JournalBase { public override string Event => "ShipLockerMaterials"; - public IReadOnlyCollection Items { get; init; } - public IReadOnlyCollection Components { get; init; } - public IReadOnlyCollection Consumables { get; init; } - public IReadOnlyCollection Data { get; init; } + public List Items { get; init; } + public List Components { get; init; } + public List Consumables { get; init; } + public List Data { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs index 0b7d9b3..19faffa 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/TradeMicroResources.cs @@ -7,7 +7,7 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class TradeMicroResources : JournalBase { public override string Event => "TradeMicroResources"; - public IReadOnlyCollection Offered { get; init; } + public List Offered { get; init; } public string Received { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] public MicroCategory Category { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs b/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs index 599db43..9edccce 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/TransferMicroResources.cs @@ -6,5 +6,5 @@ namespace Observatory.Framework.Files.Journal.Odyssey; public class TransferMicroResources : JournalBase { public override string Event => "TransferMicroResources"; - public IReadOnlyCollection Transfers { get; init; } + public List Transfers { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs index 0bcca7b..3de2ab8 100644 --- a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs +++ b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs @@ -16,7 +16,7 @@ public class ApproachSettlement : JournalBase public float Longitude { get; init; } public int BodyID { get; init; } public string BodyName { get; init; } - public IReadOnlyCollection StationEconomies { get; init; } + public List StationEconomies { get; init; } public string StationEconomy { get; init; } public string StationEconomy_Localised { get; init; } public Faction StationFaction { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs b/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs index f3b997f..6109f83 100644 --- a/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs +++ b/ObservatoryFramework/Files/Journal/Other/CargoTransfer.cs @@ -6,5 +6,5 @@ namespace Observatory.Framework.Files.Journal.Other; public class CargoTransfer : JournalBase { public override string Event => "CargoTransfer"; - public IReadOnlyCollection Transfers { get; init; } + public List Transfers { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs b/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs index 29a55fe..ed99461 100644 --- a/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs +++ b/ObservatoryFramework/Files/Journal/Other/ProspectedAsteroid.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal.Other; public class ProspectedAsteroid : JournalBase { public override string Event => "ProspectedAsteroid"; - public IReadOnlyCollection Materials { get; init; } + public List Materials { get; init; } public string Content { get; init; } public string Content_Localised { get; init; } public string MotherlodeMaterial { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs b/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs index dab38cc..dfa99b9 100644 --- a/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs +++ b/ObservatoryFramework/Files/Journal/Other/RebootRepair.cs @@ -5,5 +5,5 @@ namespace Observatory.Framework.Files.Journal.Other; public class RebootRepair : JournalBase { public override string Event => "RebootRepair"; - public ICollection Modules { get; init; } + public IList Modules { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Other/Synthesis.cs b/ObservatoryFramework/Files/Journal/Other/Synthesis.cs index d8c7b07..d865a17 100644 --- a/ObservatoryFramework/Files/Journal/Other/Synthesis.cs +++ b/ObservatoryFramework/Files/Journal/Other/Synthesis.cs @@ -11,5 +11,5 @@ public class Synthesis : JournalBase public string Name { get; init; } [JsonConverter(typeof(MaterialConverter))] - public IReadOnlyCollection Materials { get; init; } + public List Materials { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Other/WingJoin.cs b/ObservatoryFramework/Files/Journal/Other/WingJoin.cs index 09efd98..fcef7a1 100644 --- a/ObservatoryFramework/Files/Journal/Other/WingJoin.cs +++ b/ObservatoryFramework/Files/Journal/Other/WingJoin.cs @@ -5,5 +5,5 @@ namespace Observatory.Framework.Files.Journal.Other; public class WingJoin : JournalBase { public override string Event => "WingJoin"; - public ICollection Others { get; init; } + public IList Others { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs index 4c41fd4..d535320 100644 --- a/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs +++ b/ObservatoryFramework/Files/Journal/Powerplay/PowerplayVoucher.cs @@ -5,5 +5,5 @@ namespace Observatory.Framework.Files.Journal.Powerplay; public class PowerplayVoucher : PowerplayJoin { public override string Event => "PowerplayVoucher"; - public ICollection Systems { get; init; } + public IList Systems { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Startup/Cargo.cs b/ObservatoryFramework/Files/Journal/Startup/Cargo.cs index fede8e4..f90e5dc 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Cargo.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Cargo.cs @@ -8,5 +8,5 @@ public class Cargo : JournalBase public override string Event => "Cargo"; public string Vessel { get; init; } public int Count { get; init; } - public IReadOnlyCollection Inventory { get; init; } + public List Inventory { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Startup/Loadout.cs b/ObservatoryFramework/Files/Journal/Startup/Loadout.cs index 3e163e1..8c6eac8 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Loadout.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Loadout.cs @@ -19,5 +19,5 @@ public class Loadout : JournalBase public double MaxJumpRange { get; init; } public ulong Rebuy { get; init; } public bool Hot { get; init; } - public IReadOnlyCollection Modules { get; init; } + public List Modules { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Startup/Materials.cs b/ObservatoryFramework/Files/Journal/Startup/Materials.cs index 8e8cbbc..245dda8 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Materials.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Materials.cs @@ -6,8 +6,8 @@ using ParameterTypes; public class Materials : JournalBase { public override string Event => "Materials"; - public virtual IReadOnlyCollection Raw { get; init; } - public virtual IReadOnlyCollection Manufactured { get; init; } - public virtual IReadOnlyCollection Encoded { get; init; } + public virtual List Raw { get; init; } + public virtual List Manufactured { get; init; } + public virtual List Encoded { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Startup/Missions.cs b/ObservatoryFramework/Files/Journal/Startup/Missions.cs index f5a82a5..7e9bc6e 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Missions.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Missions.cs @@ -6,7 +6,7 @@ namespace Observatory.Framework.Files.Journal.Startup; public class Missions : JournalBase { public override string Event => "Missions"; - public IReadOnlyCollection Active { get; init; } - public IReadOnlyCollection Failed { get; init; } - public IReadOnlyCollection Complete { get; init; } + public List Active { get; init; } + public List Failed { get; init; } + public List Complete { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs index ef98b8b..26b30e0 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/CommunityGoal.cs @@ -6,5 +6,5 @@ namespace Observatory.Framework.Files.Journal.StationServices; public class CommunityGoal : JournalBase { public override string Event => "CommunityGoal"; - public IReadOnlyCollection CurrentGoals { get; init; } + public List CurrentGoals { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs index 590bd32..8bdfe1b 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerCraft.cs @@ -21,6 +21,6 @@ public class EngineerCraft : JournalBase public float Quality { get; init; } public string ApplyExperimentalEffect { get; init; } [JsonConverter(typeof(MaterialConverter))] - public IReadOnlyCollection Ingredients { get; init; } - public IReadOnlyCollection Modifiers { get; init; } + public List Ingredients { get; init; } + public List Modifiers { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs index a5dcead..460af16 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/EngineerProgress.cs @@ -15,7 +15,7 @@ public class EngineerProgress : JournalBase [JsonConverter(typeof(JsonStringEnumConverter))] public Progress? Progress { get; set; } - public IReadOnlyCollection Engineers { get; set; } + public List Engineers { get; set; } } //{ "timestamp":"2024-05-25T04:44:34Z", "event":"EngineerProgress", //"Engineers":[ diff --git a/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs index 8b4dcb1..03aa4c0 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs @@ -9,5 +9,5 @@ public class MassModuleStore : JournalBase public ulong MarketID { get; init; } public string Ship { get; init; } public ulong ShipID { get; init; } - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs index c7115ba..78cdce4 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MissionCompleted.cs @@ -23,9 +23,9 @@ public class MissionCompleted : JournalBase [JsonConverter(typeof(StringIntConverter))] public int Donation { get; init; } public long Donated { get; init; } - public ICollection PermitsAwarded { get; init; } - public IReadOnlyCollection CommodityReward { get; init; } - public IReadOnlyCollection MaterialsReward { get; init; } + public IList PermitsAwarded { get; init; } + public List CommodityReward { get; init; } + public List MaterialsReward { get; init; } public string DestinationSystem { get; init; } public string DestinationStation { get; init; } public string DestinationSettlement { get; init; } @@ -33,5 +33,5 @@ public class MissionCompleted : JournalBase public string NewDestinationStation { get; init; } public int KillCount { get; init; } public string TargetFaction { get; init; } - public IReadOnlyCollection FactionEffects { get; init; } + public List FactionEffects { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs b/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs index 4fc3c7b..c32232f 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/RedeemVoucher.cs @@ -13,6 +13,6 @@ public class RedeemVoucher : JournalBase public long Amount { get; init; } public string Faction { get; init; } public float BrokerPercentage { get; init; } - public IReadOnlyCollection Factions { get; init; } + public List Factions { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/Repair.cs b/ObservatoryFramework/Files/Journal/StationServices/Repair.cs index 9aa7de7..0156567 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Repair.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Repair.cs @@ -7,5 +7,5 @@ public class Repair : JournalBase public override string Event => "Repair"; public string Item { get; init; } public int Cost { get; init; } - public ICollection Items { get; init; } + public IList Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs index efe023e..7a57167 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs @@ -12,5 +12,5 @@ public class StoredModules : JournalBase /// public string StationName { get; init; } public ulong MarketID { get; init; } - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs index 5ed5f07..b1182ff 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs @@ -12,6 +12,6 @@ public class StoredShips : JournalBase /// public string StationName { get; init; } public string StarSystem { get; init; } - public IReadOnlyCollection ShipsHere { get; init; } - public IReadOnlyCollection ShipsRemote { get; init; } + public List ShipsHere { get; init; } + public List ShipsRemote { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs index ec18a87..1ce0ccb 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/TechnologyBroker.cs @@ -8,7 +8,7 @@ public class TechnologyBroker : JournalBase public override string Event => "TechnologyBroker"; public string BrokerType { get; init; } public ulong MarketID { get; init; } - public IReadOnlyCollection ItemsUnlocked { get; init; } - public IReadOnlyCollection Commodities { get; init; } - public IReadOnlyCollection Materials { get; init; } + public List ItemsUnlocked { get; init; } + public List Commodities { get; init; } + public List Materials { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Journal/Travel/Docked.cs b/ObservatoryFramework/Files/Journal/Travel/Docked.cs index f039d14..7b0effc 100644 --- a/ObservatoryFramework/Files/Journal/Travel/Docked.cs +++ b/ObservatoryFramework/Files/Journal/Travel/Docked.cs @@ -81,7 +81,7 @@ public class Docked : JournalBase private get => StationEconomy_Localised; init => StationEconomy_Localised = value; } - public IReadOnlyCollection StationEconomies { get; init; } + public List StationEconomies { get; init; } [Obsolete("StationState is a rundundant property. Use StationEconomy to potentially reduce unnecessary checks.")] public string StationState { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs index 68451e2..4a71dc9 100644 --- a/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs +++ b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs @@ -33,9 +33,9 @@ public class FSDJump : JournalBase public string SystemSecurity_Localised { get; init; } public long Population { get; init; } public bool Wanted { get; init; } - public IReadOnlyCollection Factions { get; init; } - public IReadOnlyCollection Conflicts { get; init; } - public ICollection Powers { get; init; } + public List Factions { get; init; } + public List Conflicts { get; init; } + public IList Powers { get; init; } public string PowerplayState { get; init; } public bool Taxi { get; init; } public bool Multicrew { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Travel/Location.cs b/ObservatoryFramework/Files/Journal/Travel/Location.cs index 88cba4a..0599a7e 100644 --- a/ObservatoryFramework/Files/Journal/Travel/Location.cs +++ b/ObservatoryFramework/Files/Journal/Travel/Location.cs @@ -30,10 +30,10 @@ public class Location : JournalBase public string StationGovernment { get; init; } public string StationGovernment_Localised { get; init; } public string StationAllegiance { get; init; } - public ICollection StationServices { get; init; } + public IList StationServices { get; init; } public string StationEconomy { get; init; } public string StationEconomy_Localised { get; init; } - public IReadOnlyCollection StationEconomies { get; init; } + public List StationEconomies { get; init; } public string StarSystem { get; init; } public ulong SystemAddress { get; init; } @@ -53,13 +53,13 @@ public class Location : JournalBase public string Body { get; init; } public int BodyID { get; init; } public string BodyType { get; init; } - public IReadOnlyCollection Factions { get; init; } + public List Factions { get; init; } [JsonConverter(typeof(LegacyFactionConverter))] public DetailedFaction SystemFaction { get; init; } - public IReadOnlyCollection Conflicts { get; init; } - public ICollection Powers { get; init; } + public List Conflicts { get; init; } + public IList Powers { get; init; } public string PowerplayState { get; init; } public bool Taxi { get; init; } public bool Multicrew { get; init; } diff --git a/ObservatoryFramework/Files/MarketFile.cs b/ObservatoryFramework/Files/MarketFile.cs index 25b6da0..f4f356f 100644 --- a/ObservatoryFramework/Files/MarketFile.cs +++ b/ObservatoryFramework/Files/MarketFile.cs @@ -29,5 +29,5 @@ public class MarketFile : JournalBase /// /// List of all commodities available in the market. /// - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/ModuleInfoFile.cs b/ObservatoryFramework/Files/ModuleInfoFile.cs index 42dcbba..ee9ab5e 100644 --- a/ObservatoryFramework/Files/ModuleInfoFile.cs +++ b/ObservatoryFramework/Files/ModuleInfoFile.cs @@ -13,5 +13,5 @@ public class ModuleInfoFile : JournalBase /// /// List of all equipped modules. /// - public IReadOnlyCollection Modules { get; init; } + public List Modules { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/NavRouteFile.cs b/ObservatoryFramework/Files/NavRouteFile.cs index 705f3ef..0e04fee 100644 --- a/ObservatoryFramework/Files/NavRouteFile.cs +++ b/ObservatoryFramework/Files/NavRouteFile.cs @@ -13,5 +13,5 @@ public class NavRouteFile : JournalBase /// /// List of star systems and their locations in the current route. /// - public IReadOnlyCollection Route { get; init; } + public List Route { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/OutfittingFile.cs b/ObservatoryFramework/Files/OutfittingFile.cs index 587289f..9d5b021 100644 --- a/ObservatoryFramework/Files/OutfittingFile.cs +++ b/ObservatoryFramework/Files/OutfittingFile.cs @@ -29,5 +29,5 @@ public class OutfittingFile : JournalBase /// /// List of all available parts in shipyard. /// - public IReadOnlyCollection Items { get; init; } + public List Items { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs b/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs index 688b31b..03d4e75 100644 --- a/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs +++ b/ObservatoryFramework/Files/ParameterTypes/DetailedFaction.cs @@ -10,6 +10,6 @@ public class DetailedFaction : Faction public string Happiness { get; init; } public string Happiness_Localised { get; init; } public float MyReputation { get; init; } - public IReadOnlyCollection RecoveringStates { get; init; } - public IReadOnlyCollection ActiveStates { get; init; } + public List RecoveringStates { get; init; } + public List ActiveStates { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/ParameterTypes/Engineering.cs b/ObservatoryFramework/Files/ParameterTypes/Engineering.cs index 34a607b..edf5972 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Engineering.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Engineering.cs @@ -18,5 +18,5 @@ public class Engineering public string ExperimentalEffect { get; init; } - public IReadOnlyCollection Modifiers { get; init; } + public List Modifiers { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs b/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs index 123617c..4373ca3 100644 --- a/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs +++ b/ObservatoryFramework/Files/ParameterTypes/FactionEffect.cs @@ -7,8 +7,8 @@ namespace Observatory.Framework.Files.ParameterTypes; public class FactionEffect { public string Faction { get; init; } - public IReadOnlyCollection Effects { get; init; } - public IReadOnlyCollection Influence { get; init; } + public List Effects { get; init; } + public List Influence { get; init; } [JsonConverter(typeof(RepInfConverter))] public int Reputation { get; init; } [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs b/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs index 363e2a3..786a38b 100644 --- a/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs +++ b/ObservatoryFramework/Files/ParameterTypes/SuitModule.cs @@ -8,5 +8,5 @@ public class SuitModule public string ModuleName { get; init; } public ulong SuitModuleID { get; init; } public int Class { get; init; } - public ICollection WeaponMods { get; init; } + public IList WeaponMods { get; init; } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs b/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs index 8acb66b..24970ab 100644 --- a/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs +++ b/ObservatoryFramework/Files/ParameterTypes/SystemFaction.cs @@ -14,11 +14,11 @@ public class SystemFaction : Faction public double MyReputation { get; init; } - public IReadOnlyCollection PendingStates { get; init; } + public List PendingStates { get; init; } - public IReadOnlyCollection RecoveringStates { get; init; } + public List RecoveringStates { get; init; } - public IReadOnlyCollection ActiveStates { get; init; } + public List ActiveStates { get; init; } public bool? SquadronFaction { get; init; } diff --git a/ObservatoryFramework/Files/ShipyardFile.cs b/ObservatoryFramework/Files/ShipyardFile.cs index 8bec21f..1197171 100644 --- a/ObservatoryFramework/Files/ShipyardFile.cs +++ b/ObservatoryFramework/Files/ShipyardFile.cs @@ -34,5 +34,5 @@ public class ShipyardFile : JournalBase /// /// List of all ships and prices for them at the current shipyard. /// - public IReadOnlyCollection PriceList { get; init; } + public List PriceList { get; init; } } \ No newline at end of file diff --git a/Pulsar/Context/Configuration/CargoConfiguration.cs b/Pulsar/Context/Configuration/CargoConfiguration.cs index a8d13b0..3089388 100644 --- a/Pulsar/Context/Configuration/CargoConfiguration.cs +++ b/Pulsar/Context/Configuration/CargoConfiguration.cs @@ -1,9 +1,8 @@ -using Microsoft.EntityFrameworkCore; +namespace Pulsar.Context.Configuration; + using Microsoft.EntityFrameworkCore.Metadata.Builders; using Observatory.Framework.Files.Journal.Startup; -namespace Pulsar.Context.Configuration; - public class CargoConfiguration : IEntityTypeConfiguration { public void Configure(EntityTypeBuilder builder) diff --git a/Pulsar/Context/Configuration/ShipLockerConfiguration.cs b/Pulsar/Context/Configuration/ShipLockerConfiguration.cs index 8e21f74..73f2539 100644 --- a/Pulsar/Context/Configuration/ShipLockerConfiguration.cs +++ b/Pulsar/Context/Configuration/ShipLockerConfiguration.cs @@ -1,9 +1,8 @@ -using Microsoft.EntityFrameworkCore; +namespace Pulsar.Context.Configuration; + using Microsoft.EntityFrameworkCore.Metadata.Builders; using Observatory.Framework.Files.Journal.Odyssey; -namespace Pulsar.Context.Configuration; - public class ShipLockerConfiguration : IEntityTypeConfiguration { public void Configure(EntityTypeBuilder builder) diff --git a/Pulsar/Context/PulsarContext.cs b/Pulsar/Context/PulsarContext.cs index a6456eb..197fc0e 100644 --- a/Pulsar/Context/PulsarContext.cs +++ b/Pulsar/Context/PulsarContext.cs @@ -1,12 +1,11 @@ +namespace Pulsar.Context; + using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Observatory.Framework.Files.Journal; using Observatory.Framework.Files.Journal.Odyssey; using Observatory.Framework.Files.Journal.Startup; using Observatory.Framework.Files.Journal.StationServices; using Observatory.Framework.Files.Journal.Travel; -using Pulsar.Features.ShipLocker; /// /// An in-memory database context for Pulsar. @@ -14,7 +13,6 @@ using Pulsar.Features.ShipLocker; public class PulsarContext : DbContext { public SqliteConnection Connection { get; private set; } - public DbSet Commander { get; set; } public DbSet Materials { get; set; } diff --git a/Pulsar/Features/EventsHub.cs b/Pulsar/Features/EventsHub.cs index 27bb6da..78839e7 100644 --- a/Pulsar/Features/EventsHub.cs +++ b/Pulsar/Features/EventsHub.cs @@ -1,17 +1,20 @@ -using Pulsar.Features.Journal; - namespace Pulsar.Features; using Observatory.Framework.Files; using Observatory.Framework.Files.Journal; using Observatory.Framework.Files.Journal.Odyssey; - + public class EventsHub(IJournalService journalService) : Hub { public override async Task OnConnectedAsync() { await base.OnConnectedAsync(); await Clients.Caller.JournalUpdated(await journalService.GetLastStartupEvents()); + var state = await journalService.GetLatestState(); + if (state.Any()) + { + await Clients.Caller.JournalUpdated(state); + } } public async Task Status([FromServices] IStatusService statusService) @@ -30,7 +33,7 @@ public class EventsHub(IJournalService journalService) : Hub public async Task MarketUpdated(MarketFile market) => await Clients.All.MarketUpdated(market); - public async Task JournalUpdated(IReadOnlyCollection journals) => await Clients.All.JournalUpdated(journals); + public async Task JournalUpdated(List journals) => await Clients.All.JournalUpdated(journals); public async Task ModuleInfoUpdated(ModuleInfoFile moduleInfo) => await Clients.All.ModuleInfoUpdated(moduleInfo); @@ -55,7 +58,7 @@ public interface IEventsHub Task MarketUpdated(MarketFile market); - Task JournalUpdated(IReadOnlyCollection journals); + Task JournalUpdated(List journals); Task ModuleInfoUpdated(ModuleInfoFile moduleInfo); diff --git a/Pulsar/Features/FileHandlerService.cs b/Pulsar/Features/FileHandlerService.cs index cc0071f..157bd15 100644 --- a/Pulsar/Features/FileHandlerService.cs +++ b/Pulsar/Features/FileHandlerService.cs @@ -1,8 +1,8 @@ -using System.Collections.Concurrent; +namespace Pulsar.Features; + using Observatory.Framework.Files; using Observatory.Framework.Files.Journal; using Observatory.Framework.Files.Journal.Odyssey; -namespace Pulsar.Features; public interface IFileHandler { diff --git a/Pulsar/Features/Journal/JournalProcessor.cs b/Pulsar/Features/Journal/JournalProcessor.cs index 3583252..8db6b41 100644 --- a/Pulsar/Features/Journal/JournalProcessor.cs +++ b/Pulsar/Features/Journal/JournalProcessor.cs @@ -1,10 +1,9 @@ -using Observatory.Framework.Files.Journal.StationServices; - namespace Pulsar.Features.Journal; using Observatory.Framework; using Observatory.Framework.Files.Journal; using Observatory.Framework.Files.Journal.Startup; +using Observatory.Framework.Files.Journal.StationServices; public class JournalProcessor( ILogger logger, diff --git a/Pulsar/Features/Journal/JournalService.cs b/Pulsar/Features/Journal/JournalService.cs index a47d924..f4583db 100644 --- a/Pulsar/Features/Journal/JournalService.cs +++ b/Pulsar/Features/Journal/JournalService.cs @@ -1,14 +1,36 @@ -using Microsoft.EntityFrameworkCore; -using Observatory.Framework.Files.Journal.Startup; -using Observatory.Framework.Files.Journal.StationServices; - namespace Pulsar.Features.Journal; using Observatory.Framework.Files.Journal; public interface IJournalService : IJournalHandler> { + /// + /// Gets the Latest of the following (start of game) events: + /// Commander + /// Materials + /// Rank + /// Progress + /// Reputation + /// EngineerProgress + /// LoadGame + /// Statistics + /// + /// Task> GetLastStartupEvents(); + + /// + /// Get the Latest of the following events: + ///

+ /// Location
+ /// Powerplay
+ /// Music
+ /// ShipLocker
+ /// Missions
+ /// Loadout

+ ///

When there are none of an event since the last game start, no event will be given.

+ /// + /// + Task> GetLatestState(); } public class JournalService( @@ -29,10 +51,8 @@ public class JournalService( store.EnqueueFile(filePath); return Task.CompletedTask; } - - - - + + // Start of game events/order: /** Commander * Materials @@ -51,7 +71,7 @@ public class JournalService( Loadout Cargo */ - + // StartupEvents: // Commander // Materials @@ -60,45 +80,19 @@ public class JournalService( // Reputation // EngineerProgress // LoadGame - - // StateEvents: - // Location - // Powerplay - // Music - // ShipLocker - // Missions - // Loadout - // Cargo + // -- ... + // Statistics public async Task> GetLastStartupEvents() { - //TODO: add other state events - var commanderTask = context.Commander.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var materialsTask = context.Materials.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var rankTask = context.Rank.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var progressTask = context.Progress.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var reputationTask = context.Reputation.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var engineerProgressTask = context.EngineerProgress.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var loadGameTask = context.LoadGames.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - var statisticsTask = context.Statistics.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var commander = await context.Commander.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var materials = await context.Materials.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var rank = await context.Rank.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var progress = await context.Progress.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var reputation = await context.Reputation.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var engineerProgress = await context.EngineerProgress.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var loadGame = await context.LoadGames.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var statistics = await context.Statistics.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); - await Task.WhenAll( - commanderTask, - materialsTask, - rankTask, - progressTask, - reputationTask, - engineerProgressTask, - loadGameTask, - statisticsTask); - - var commander = await commanderTask; - var materials = await materialsTask; - var rank = await rankTask; - var progress = await progressTask; - var reputation = await reputationTask; - var engineerProgress = await engineerProgressTask; - var loadGame = await loadGameTask; - var statistics = await statisticsTask; // if any null, return empty list if (materials == null || rank == null || progress == null || reputation == null || engineerProgress == null || @@ -108,20 +102,62 @@ public class JournalService( } // dont check the time of statistics as it may occur a few moments after - if (commander.Timestamp != materials.Timestamp || - materials.Timestamp != rank.Timestamp || - rank.Timestamp != progress.Timestamp || - progress.Timestamp != reputation.Timestamp || - reputation.Timestamp != engineerProgress.Timestamp || - engineerProgress.Timestamp != loadGame.Timestamp || - statistics.Timestamp < materials.Timestamp) + if (commander.Timestamp > materials.Timestamp || + commander.Timestamp > materials.Timestamp || + commander.Timestamp > rank.Timestamp || + commander.Timestamp > progress.Timestamp || + commander.Timestamp > reputation.Timestamp || + commander.Timestamp > engineerProgress.Timestamp || + commander.Timestamp > loadGame.Timestamp || + commander.Timestamp > statistics.Timestamp) { - throw new InvalidOperationException("Timestamps do not match"); + throw new InvalidOperationException("Timestamps are invalid"); } return [commander, materials, rank, progress, reputation, engineerProgress, loadGame, statistics]; } + /// + /// StateEvents: + /// Location + /// Powerplay + /// Music + /// ShipLocker + /// Missions + /// Loadout + /// Cargo + /// + /// + public async Task> GetLatestState() + { + // dont get anything before the last command timestamp + var commander = await context.Commander.OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + + if (commander == null) return []; + + var location = await context.Locations + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var powerplay = await context.PowerPlay + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var shiplocker = await context.ShipLocker + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var missions = await context.Missions + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var loadout = await context.Loadout + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + var cargo = await context.Cargo + .Where(x => x.Timestamp > commander.Timestamp) + .OrderByDescending(x => x.Timestamp).FirstOrDefaultAsync(); + + return new List { location, powerplay, shiplocker, missions, loadout, cargo } + .Where(x => x != null).Cast().ToList(); + } + public async Task> Get() { return []; diff --git a/Pulsar/Features/Status/StatusService.cs b/Pulsar/Features/Status/StatusService.cs index f24bd19..3a371c4 100644 --- a/Pulsar/Features/Status/StatusService.cs +++ b/Pulsar/Features/Status/StatusService.cs @@ -1,5 +1,6 @@ using Microsoft.EntityFrameworkCore; using Observatory.Framework.Files.Journal.Startup; +using Pulsar.Context; namespace Pulsar.Features.Status; diff --git a/Pulsar/Global.Usings.cs b/Pulsar/Global.Usings.cs index 6e7b23e..f3c0a18 100644 --- a/Pulsar/Global.Usings.cs +++ b/Pulsar/Global.Usings.cs @@ -1,6 +1,9 @@ global using Pulsar; global using Pulsar.Utils; +global using Pulsar.Context; +global using Pulsar.Features; global using Pulsar.Features.Status; +global using Pulsar.Features.Journal; global using System.Text; global using System.Text.Json; global using System.Text.Json.Nodes; @@ -8,4 +11,5 @@ global using System.Text.Json.Serialization; global using Microsoft.AspNetCore.Mvc; global using Microsoft.AspNetCore.SignalR; global using Microsoft.Extensions.Options; +global using Microsoft.EntityFrameworkCore; global using IEventHubContext = Microsoft.AspNetCore.SignalR.IHubContext; \ No newline at end of file diff --git a/Pulsar/Program.cs b/Pulsar/Program.cs index a65aa1e..943f7a4 100644 --- a/Pulsar/Program.cs +++ b/Pulsar/Program.cs @@ -1,15 +1,16 @@ using Lamar.Microsoft.DependencyInjection; using Microsoft.AspNetCore.Cors.Infrastructure; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.FileProviders; -using Pulsar.Features; -using Pulsar.Features.Journal; Console.WriteLine((string?)null!); var builder = WebApplication.CreateBuilder(new WebApplicationOptions() { - Args = args, WebRootPath = "static", ContentRootPath = "WebApp", ApplicationName = "Pulsar", EnvironmentName = + Args = args, + WebRootPath = "static", + ContentRootPath = "WebApp", + ApplicationName = "Pulsar", + EnvironmentName = #if DEBUG "Development" #else