quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Update Status Fuel Display

Browse Source 
Start working on Explorer Panel
Backend now uses polymorphic de/serialization (net9)
This commit is contained in:
Ben Parsons 2024-05-17 23:40:36 +10:00
parent d4f3476ad3
commit 337a9d5ea0
14 changed files with 684 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Botanist/Botanist.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<Configurations>Debug;Release;Portable</Configurations> <Configurations>Debug;Release;Portable</Configurations>

529
ObservatoryFramework/Files/Journal/JournalBase.cs
View File

@ -13,279 +13,268 @@ using StationServices;
using Trade; using Trade;
using Travel; using Travel;
[JsonDerivedType(typeof(BackpackFile))] [JsonPolymorphic(TypeDiscriminatorPropertyName = "event", UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FailSerialization)]
[JsonDerivedType(typeof(CargoFile))] [JsonDerivedType(typeof(Bounty), "Bounty")]
[JsonDerivedType(typeof(FCMaterialsFile))] [JsonDerivedType(typeof(CapShipBound), "CapShipBound")]
[JsonDerivedType(typeof(Bounty))] [JsonDerivedType(typeof(Died), "Died")]
[JsonDerivedType(typeof(CapShipBound))] [JsonDerivedType(typeof(EscapeInterdiction), "EscapeInterdiction")]
[JsonDerivedType(typeof(Died))] [JsonDerivedType(typeof(FactionKillBond), "FactionKillBond")]
[JsonDerivedType(typeof(EscapeInterdiction))] [JsonDerivedType(typeof(FighterDestroyed), "FighterDestroyed")]
[JsonDerivedType(typeof(FactionKillBond))] [JsonDerivedType(typeof(HeatDamage), "HeatDamage")]
[JsonDerivedType(typeof(FighterDestroyed))] [JsonDerivedType(typeof(HeatWarning), "HeatWarning")]
[JsonDerivedType(typeof(HeatDamage))] [JsonDerivedType(typeof(HullDamage), "HullDamage")]
[JsonDerivedType(typeof(HeatWarning))] [JsonDerivedType(typeof(Interdicted), "Interdicted")]
[JsonDerivedType(typeof(HullDamage))] [JsonDerivedType(typeof(Interdiction), "Interdiction")]
[JsonDerivedType(typeof(Interdicted))] [JsonDerivedType(typeof(PVPKill), "PVPKill")]
[JsonDerivedType(typeof(Interdiction))] [JsonDerivedType(typeof(SRVDestroyed), "SRVDestroyed")]
[JsonDerivedType(typeof(PVPKill))] [JsonDerivedType(typeof(ShieldState), "ShieldState")]
[JsonDerivedType(typeof(SRVDestroyed))] [JsonDerivedType(typeof(ShipTargeted), "ShipTargeted")]
[JsonDerivedType(typeof(ShieldState))] [JsonDerivedType(typeof(UnderAttack), "UnderAttack")]
[JsonDerivedType(typeof(ShipTargeted))] [JsonDerivedType(typeof(BuyExplorationData), "BuyExplorationData")]
[JsonDerivedType(typeof(UnderAttack))] [JsonDerivedType(typeof(CodexEntry), "CodexEntry")]
[JsonDerivedType(typeof(BuyExplorationData))] [JsonDerivedType(typeof(DiscoveryScan), "DiscoveryScan")]
[JsonDerivedType(typeof(CodexEntry))] [JsonDerivedType(typeof(FSSAllBodiesFound), "FSSAllBodiesFound")]
[JsonDerivedType(typeof(DiscoveryScan))] [JsonDerivedType(typeof(FSSBodySignals), "FSSBodySignals")]
[JsonDerivedType(typeof(FSSAllBodiesFound))] [JsonDerivedType(typeof(FSSDiscoveryScan), "FSSDiscoveryScan")]
[JsonDerivedType(typeof(FSSBodySignals))] [JsonDerivedType(typeof(FSSSignalDiscovered), "FSSSignalDiscovered")]
[JsonDerivedType(typeof(FSSDiscoveryScan))] [JsonDerivedType(typeof(MaterialCollected), "MaterialCollected")]
[JsonDerivedType(typeof(FSSSignalDiscovered))] [JsonDerivedType(typeof(MaterialDiscarded), "MaterialDiscarded")]
[JsonDerivedType(typeof(MaterialCollected))] [JsonDerivedType(typeof(MaterialDiscovered), "MaterialDiscovered")]
[JsonDerivedType(typeof(MaterialDiscarded))] [JsonDerivedType(typeof(MultiSellExplorationData), "MultiSellExplorationData")]
[JsonDerivedType(typeof(MaterialDiscovered))] [JsonDerivedType(typeof(NavBeaconScan), "NavBeaconScan")]
[JsonDerivedType(typeof(MultiSellExplorationData))] [JsonDerivedType(typeof(SAAScanComplete), "SAAScanComplete")]
[JsonDerivedType(typeof(NavBeaconScan))] [JsonDerivedType(typeof(SAASignalsFound), "SAASignalsFound")]
[JsonDerivedType(typeof(SAAScanComplete))] [JsonDerivedType(typeof(Scan), "Scan")]
[JsonDerivedType(typeof(SAASignalsFound))] [JsonDerivedType(typeof(ScanBaryCentre), "ScanBaryCentre")]
[JsonDerivedType(typeof(Scan))] [JsonDerivedType(typeof(Screenshot), "Screenshot")]
[JsonDerivedType(typeof(ScanBaryCentre))] [JsonDerivedType(typeof(SellExplorationData), "SellExplorationData")]
[JsonDerivedType(typeof(Screenshot))] [JsonDerivedType(typeof(CarrierBankTransfer), "CarrierBankTransfer")]
[JsonDerivedType(typeof(SellExplorationData))] [JsonDerivedType(typeof(CarrierBuy), "CarrierBuy")]
[JsonDerivedType(typeof(CarrierBankTransfer))] [JsonDerivedType(typeof(CarrierCancelDecommission), "CarrierCancelDecommission")]
[JsonDerivedType(typeof(CarrierBuy))] [JsonDerivedType(typeof(CarrierCrewServices), "CarrierCrewServices")]
[JsonDerivedType(typeof(CarrierCancelDecommission))] [JsonDerivedType(typeof(CarrierDecommission), "CarrierDecommission")]
[JsonDerivedType(typeof(CarrierCrewServices))] [JsonDerivedType(typeof(CarrierDepositFuel), "CarrierDepositFuel")]
[JsonDerivedType(typeof(CarrierDecommission))] [JsonDerivedType(typeof(CarrierDockingPermission), "CarrierDockingPermission")]
[JsonDerivedType(typeof(CarrierDepositFuel))] [JsonDerivedType(typeof(CarrierFinance), "CarrierFinance")]
[JsonDerivedType(typeof(CarrierDockingPermission))] [JsonDerivedType(typeof(CarrierJump), "CarrierJump")]
[JsonDerivedType(typeof(CarrierFinance))] [JsonDerivedType(typeof(CarrierJumpCancelled), "CarrierJumpCancelled")]
[JsonDerivedType(typeof(CarrierJump))] [JsonDerivedType(typeof(CarrierJumpRequest), "CarrierJumpRequest")]
[JsonDerivedType(typeof(CarrierJumpCancelled))] [JsonDerivedType(typeof(CarrierModulePack), "CarrierModulePack")]
[JsonDerivedType(typeof(CarrierJumpRequest))] [JsonDerivedType(typeof(CarrierShipPack), "CarrierShipPack")]
[JsonDerivedType(typeof(CarrierModulePack))] [JsonDerivedType(typeof(CarrierStats), "CarrierStats")]
[JsonDerivedType(typeof(CarrierShipPack))] [JsonDerivedType(typeof(CarrierTradeOrder), "CarrierTradeOrder")]
[JsonDerivedType(typeof(CarrierStats))] [JsonDerivedType(typeof(FCMaterlas), "FCMaterlas")]
[JsonDerivedType(typeof(CarrierTradeOrder))] [JsonDerivedType(typeof(InvalidJson), "InvalidJson")]
[JsonDerivedType(typeof(FCMaterlas))] [JsonDerivedType(typeof(BackpackChange), "BackpackChange")]
[JsonDerivedType(typeof(InvalidJson))] [JsonDerivedType(typeof(BackpackMaterials), "Backpack")]
[JsonDerivedType(typeof(BackPack))] [JsonDerivedType(typeof(BookDropship), "BookDropship")]
[JsonDerivedType(typeof(BackpackChange))] [JsonDerivedType(typeof(BookTaxi), "BookTaxi")]
[JsonDerivedType(typeof(BackpackMaterials))] [JsonDerivedType(typeof(BuyMicroResources), "BuyMicroResources")]
[JsonDerivedType(typeof(BookDropship))] [JsonDerivedType(typeof(BuySuit), "BuySuit")]
[JsonDerivedType(typeof(BookTaxi))] [JsonDerivedType(typeof(BuyWeapon), "BuyWeapon")]
[JsonDerivedType(typeof(BuyMicroResources))] [JsonDerivedType(typeof(CancelDropship), "CancelDropship")]
[JsonDerivedType(typeof(BuySuit))] [JsonDerivedType(typeof(CancelTaxi), "CancelTaxi")]
[JsonDerivedType(typeof(BuyWeapon))] [JsonDerivedType(typeof(CollectItems), "CollectItems")]
[JsonDerivedType(typeof(CancelDropship))] [JsonDerivedType(typeof(CreateSuitLoadout), "CreateSuitLoadout")]
[JsonDerivedType(typeof(CancelTaxi))] [JsonDerivedType(typeof(DeleteSuitLoadout), "DeleteSuitLoadout")]
[JsonDerivedType(typeof(CollectItems))] [JsonDerivedType(typeof(Disembark), "Disembark")]
[JsonDerivedType(typeof(CreateSuitLoadout))] [JsonDerivedType(typeof(DropItems), "DropItems")]
[JsonDerivedType(typeof(DeleteSuitLoadout))] [JsonDerivedType(typeof(DropShipDeploy), "DropShipDeploy")]
[JsonDerivedType(typeof(Disembark))] [JsonDerivedType(typeof(Embark), "Embark")]
[JsonDerivedType(typeof(DropItems))] [JsonDerivedType(typeof(FCMaterials), "FCMaterials")]
[JsonDerivedType(typeof(DropShipDeploy))] [JsonDerivedType(typeof(LoadoutEquipModule), "LoadoutEquipModule")]
[JsonDerivedType(typeof(Embark))] [JsonDerivedType(typeof(LoadoutRemoveModule), "LoadoutRemoveModule")]
[JsonDerivedType(typeof(FCMaterials))] [JsonDerivedType(typeof(RenameSuitLoadout), "RenameSuitLoadout")]
[JsonDerivedType(typeof(LoadoutEquipModule))] [JsonDerivedType(typeof(ScanOrganic), "ScanOrganic")]
[JsonDerivedType(typeof(LoadoutRemoveModule))] [JsonDerivedType(typeof(SellMicroResources), "SellMicroResources")]
[JsonDerivedType(typeof(RenameSuitLoadout))] [JsonDerivedType(typeof(SellOrganicData), "SellOrganicData")]
[JsonDerivedType(typeof(ScanOrganic))] [JsonDerivedType(typeof(SellSuit), "SellSuit")]
[JsonDerivedType(typeof(SellMicroResources))] [JsonDerivedType(typeof(SellWeapon), "SellWeapon")]
[JsonDerivedType(typeof(SellOrganicData))] [JsonDerivedType(typeof(ShipLockerMaterials), "ShipLocker")]
[JsonDerivedType(typeof(SellSuit))] [JsonDerivedType(typeof(SuitLoadout), "SuitLoadout")]
[JsonDerivedType(typeof(SellWeapon))] [JsonDerivedType(typeof(SwitchSuitLoadout) , "SwitchSuitLoadout")]
[JsonDerivedType(typeof(ShipLockerMaterials))] [JsonDerivedType(typeof(TradeMicroResources), "TradeMicroResources")]
[JsonDerivedType(typeof(SuitLoadout))] [JsonDerivedType(typeof(TransferMicroResources), "TransferMicroResources")]
[JsonDerivedType(typeof(SwitchSuitLoadout))] [JsonDerivedType(typeof(UpgradeSuit), "UpgradeSuit")]
[JsonDerivedType(typeof(TradeMicroResources))] [JsonDerivedType(typeof(UpgradeWeapon), "UpgradeWeapon")]
[JsonDerivedType(typeof(TransferMicroResources))] [JsonDerivedType(typeof(UseConsumable), "UseConsumable")]
[JsonDerivedType(typeof(UpgradeSuit))] [JsonDerivedType(typeof(AfmuRepairs), "AfmuRepairs")]
[JsonDerivedType(typeof(UpgradeWeapon))] [JsonDerivedType(typeof(ApproachSettlement), "ApproachSettlement")]
[JsonDerivedType(typeof(UseConsumable))] [JsonDerivedType(typeof(CargoTransfer), "CargoTransfer")]
[JsonDerivedType(typeof(AfmuRepairs))] [JsonDerivedType(typeof(ChangeCrewRole), "ChangeCrewRole")]
[JsonDerivedType(typeof(ApproachSettlement))] [JsonDerivedType(typeof(CockpitBreached), "CockpitBreached")]
[JsonDerivedType(typeof(CargoTransfer))] [JsonDerivedType(typeof(CommitCrime), "CommitCrime")]
[JsonDerivedType(typeof(ChangeCrewRole))] [JsonDerivedType(typeof(Continued), "Continued")]
[JsonDerivedType(typeof(CockpitBreached))] [JsonDerivedType(typeof(CrewLaunchFighter), "CrewLaunchFighter")]
[JsonDerivedType(typeof(CommitCrime))] [JsonDerivedType(typeof(CrewMemberJoins), "CrewMemberJoins")]
[JsonDerivedType(typeof(Continued))] [JsonDerivedType(typeof(CrewMemberQuits), "CrewMemberQuits")]
[JsonDerivedType(typeof(CrewLaunchFighter))] [JsonDerivedType(typeof(CrewMemberRoleChange), "CrewMemberRoleChange")]
[JsonDerivedType(typeof(CrewMemberJoins))] [JsonDerivedType(typeof(CrimeVictim), "CrimeVictim")]
[JsonDerivedType(typeof(CrewMemberQuits))] [JsonDerivedType(typeof(DataScanned), "DataScanned")]
[JsonDerivedType(typeof(CrewMemberRoleChange))] [JsonDerivedType(typeof(DatalinkScan), "DatalinkScan")]
[JsonDerivedType(typeof(CrimeVictim))] [JsonDerivedType(typeof(DatalinkVoucher), "DatalinkVoucher")]
[JsonDerivedType(typeof(DataScanned))] [JsonDerivedType(typeof(DockFighter), "DockFighter")]
[JsonDerivedType(typeof(DatalinkScan))] [JsonDerivedType(typeof(DockSRV), "DockSRV")]
[JsonDerivedType(typeof(DatalinkVoucher))] [JsonDerivedType(typeof(EndCrewSession), "EndCrewSession")]
[JsonDerivedType(typeof(DockFighter))] [JsonDerivedType(typeof(FighterRebuilt), "FighterRebuilt")]
[JsonDerivedType(typeof(DockSRV))] [JsonDerivedType(typeof(Friends), "Friends")]
[JsonDerivedType(typeof(EndCrewSession))] [JsonDerivedType(typeof(FuelScoop), "FuelScoop")]
[JsonDerivedType(typeof(FighterRebuilt))] [JsonDerivedType(typeof(JetConeBoost), "JetConeBoost")]
[JsonDerivedType(typeof(Friends))] [JsonDerivedType(typeof(JetConeDamage), "JetConeDamage")]
[JsonDerivedType(typeof(FuelScoop))] [JsonDerivedType(typeof(JoinACrew), "JoinACrew")]
[JsonDerivedType(typeof(JetConeBoost))] [JsonDerivedType(typeof(KickCrewMember), "KickCrewMember")]
[JsonDerivedType(typeof(JetConeDamage))] [JsonDerivedType(typeof(LaunchDrone), "LaunchDrone")]
[JsonDerivedType(typeof(JoinACrew))] [JsonDerivedType(typeof(LaunchFighter), "LaunchFighter")]
[JsonDerivedType(typeof(KickCrewMember))] [JsonDerivedType(typeof(LaunchSRV), "LaunchSRV")]
[JsonDerivedType(typeof(LaunchDrone))] [JsonDerivedType(typeof(ModuleInfo), "ModuleInfo")]
[JsonDerivedType(typeof(LaunchFighter))] [JsonDerivedType(typeof(Music), "Music")]
[JsonDerivedType(typeof(LaunchSRV))] [JsonDerivedType(typeof(NpcCrewPaidWage), "NpcCrewPaidWage")]
[JsonDerivedType(typeof(ModuleInfo))] [JsonDerivedType(typeof(NpcCrewRank), "NpcCrewRank")]
[JsonDerivedType(typeof(Music))] [JsonDerivedType(typeof(Promotion), "Promotion")]
[JsonDerivedType(typeof(NpcCrewPaidWage))] [JsonDerivedType(typeof(ProspectedAsteroid), "ProspectedAsteroid")]
[JsonDerivedType(typeof(NpcCrewRank))] [JsonDerivedType(typeof(QuitACrew), "QuitACrew")]
[JsonDerivedType(typeof(Promotion))] [JsonDerivedType(typeof(RebootRepair), "RebootRepair")]
[JsonDerivedType(typeof(ProspectedAsteroid))] [JsonDerivedType(typeof(ReceiveText), "ReceiveText")]
[JsonDerivedType(typeof(QuitACrew))] [JsonDerivedType(typeof(RepairDrone), "RepairDrone")]
[JsonDerivedType(typeof(RebootRepair))] [JsonDerivedType(typeof(ReservoirReplenished), "ReservoirReplenished")]
[JsonDerivedType(typeof(ReceiveText))] [JsonDerivedType(typeof(Resurrect), "Resurrect")]
[JsonDerivedType(typeof(RepairDrone))] [JsonDerivedType(typeof(Scanned), "Scanned")]
[JsonDerivedType(typeof(ReservoirReplenished))] [JsonDerivedType(typeof(SelfDestruct), "SelfDestruct")]
[JsonDerivedType(typeof(Resurrect))] [JsonDerivedType(typeof(SendText), "SendText")]
[JsonDerivedType(typeof(Scanned))] [JsonDerivedType(typeof(Shutdown), "Shutdown")]
[JsonDerivedType(typeof(SelfDestruct))] [JsonDerivedType(typeof(Synthesis), "Synthesis")]
[JsonDerivedType(typeof(SendText))] [JsonDerivedType(typeof(SystemsShutdown), "SystemsShutdown")]
[JsonDerivedType(typeof(Shutdown))] [JsonDerivedType(typeof(USSDrop), "USSDrop")]
[JsonDerivedType(typeof(Synthesis))] [JsonDerivedType(typeof(VehicleSwitch), "VehicleSwitch")]
[JsonDerivedType(typeof(SystemsShutdown))] [JsonDerivedType(typeof(WingAdd), "WingAdd")]
[JsonDerivedType(typeof(USSDrop))] [JsonDerivedType(typeof(WingInvite), "WingInvite")]
[JsonDerivedType(typeof(VehicleSwitch))] [JsonDerivedType(typeof(WingJoin), "WingJoin")]
[JsonDerivedType(typeof(WingAdd))] [JsonDerivedType(typeof(WingLeave), "WingLeave")]
[JsonDerivedType(typeof(WingInvite))] [JsonDerivedType(typeof(PowerplayCollect), "PowerplayCollect")]
[JsonDerivedType(typeof(WingJoin))] [JsonDerivedType(typeof(PowerplayDefect), "PowerplayDefect")]
[JsonDerivedType(typeof(WingLeave))] [JsonDerivedType(typeof(PowerplayDeliver), "PowerplayDeliver")]
[JsonDerivedType(typeof(PowerplayCollect))] [JsonDerivedType(typeof(PowerplayFastTrack), "PowerplayFastTrack")]
[JsonDerivedType(typeof(PowerplayDefect))] [JsonDerivedType(typeof(PowerplayJoin), "PowerplayJoin")]
[JsonDerivedType(typeof(PowerplayDeliver))] [JsonDerivedType(typeof(PowerplayLeave), "PowerplayLeave")]
[JsonDerivedType(typeof(PowerplayFastTrack))] [JsonDerivedType(typeof(PowerplaySalary), "PowerplaySalary")]
[JsonDerivedType(typeof(PowerplayJoin))] [JsonDerivedType(typeof(PowerplayVote), "PowerplayVote")]
[JsonDerivedType(typeof(PowerplayLeave))] [JsonDerivedType(typeof(PowerplayVoucher), "PowerplayVoucher")]
[JsonDerivedType(typeof(PowerplaySalary))] [JsonDerivedType(typeof(AppliedToSquadron), "AppliedToSquadron")]
[JsonDerivedType(typeof(PowerplayVote))] [JsonDerivedType(typeof(DisbandedSquadron), "DisbandedSquadron")]
[JsonDerivedType(typeof(PowerplayVoucher))] [JsonDerivedType(typeof(InvitedToSquadron), "InvitedToSquadron")]
[JsonDerivedType(typeof(AppliedToSquadron))] [JsonDerivedType(typeof(JoinedSquadron), "JoinedSquadron")]
[JsonDerivedType(typeof(DisbandedSquadron))] [JsonDerivedType(typeof(KickedFromSquadron), "KickedFromSquadron")]
[JsonDerivedType(typeof(InvitedToSquadron))] [JsonDerivedType(typeof(LeftSquadron), "LeftSquadron")]
[JsonDerivedType(typeof(JoinedSquadron))] [JsonDerivedType(typeof(SharedBookmarkToSquadron), "SharedBookmarkToSquadron")]
[JsonDerivedType(typeof(KickedFromSquadron))] [JsonDerivedType(typeof(SquadronCreated), "SquadronCreated")]
[JsonDerivedType(typeof(LeftSquadron))] [JsonDerivedType(typeof(SquadronDemotion), "SquadronDemotion")]
[JsonDerivedType(typeof(SharedBookmarkToSquadron))] [JsonDerivedType(typeof(SquadronPromotion), "SquadronPromotion")]
[JsonDerivedType(typeof(SquadronCreated))] [JsonDerivedType(typeof(SquadronStartup), "SquadronStartup")]
[JsonDerivedType(typeof(SquadronDemotion))] [JsonDerivedType(typeof(WonATrophyForSquadron), "WonATrophyForSquadron")]
[JsonDerivedType(typeof(SquadronPromotion))] [JsonDerivedType(typeof(Cargo), "Cargo")]
[JsonDerivedType(typeof(SquadronStartup))] [JsonDerivedType(typeof(ClearSavedGame), "ClearSavedGame")]
[JsonDerivedType(typeof(WonATrophyForSquadron))] [JsonDerivedType(typeof(Commander), "Commander")]
[JsonDerivedType(typeof(Cargo))] [JsonDerivedType(typeof(FileHeader), "Fileheader")]
[JsonDerivedType(typeof(ClearSavedGame))] [JsonDerivedType(typeof(LoadGame), "LoadGame")]
[JsonDerivedType(typeof(Commander))] [JsonDerivedType(typeof(Loadout), "Loadout")]
[JsonDerivedType(typeof(FileHeader))] [JsonDerivedType(typeof(Materials), "Materials")]
[JsonDerivedType(typeof(LoadGame))] [JsonDerivedType(typeof(Missions), "Missions")]
[JsonDerivedType(typeof(Loadout))] [JsonDerivedType(typeof(NewCommander), "NewCommander")]
[JsonDerivedType(typeof(Materials))] [JsonDerivedType(typeof(Passengers), "Passengers")]
[JsonDerivedType(typeof(Missions))] [JsonDerivedType(typeof(Startup.Powerplay), "Powerplay")]
[JsonDerivedType(typeof(NewCommander))] [JsonDerivedType(typeof(Progress), "Progress")]
[JsonDerivedType(typeof(Passengers))] [JsonDerivedType(typeof(Rank), "Rank")]
[JsonDerivedType(typeof(Startup.Powerplay))] [JsonDerivedType(typeof(Reputation), "Reputation")]
[JsonDerivedType(typeof(Progress))] [JsonDerivedType(typeof(Statistics), "Statistics")]
[JsonDerivedType(typeof(Rank))] [JsonDerivedType(typeof(BuyAmmo), "BuyAmmo")]
[JsonDerivedType(typeof(Reputation))] [JsonDerivedType(typeof(BuyDrones), "BuyDrones")]
[JsonDerivedType(typeof(Statistics))] [JsonDerivedType(typeof(CargoDepot), "CargoDepot")]
[JsonDerivedType(typeof(BuyAmmo))] [JsonDerivedType(typeof(ClearImpound), "ClearImpound")]
[JsonDerivedType(typeof(BuyDrones))] [JsonDerivedType(typeof(CommunityGoal), "CommunityGoal")]
[JsonDerivedType(typeof(CargoDepot))] [JsonDerivedType(typeof(CommunityGoalDiscard), "CommunityGoalDiscard")]
[JsonDerivedType(typeof(ClearImpound))] [JsonDerivedType(typeof(CommunityGoalJoin), "CommunityGoalJoin")]
[JsonDerivedType(typeof(CommunityGoal))] [JsonDerivedType(typeof(CommunityGoalReward), "CommunityGoalReward")]
[JsonDerivedType(typeof(CommunityGoalDiscard))] [JsonDerivedType(typeof(CrewAssign), "CrewAssign")]
[JsonDerivedType(typeof(CommunityGoalJoin))] [JsonDerivedType(typeof(CrewFire), "CrewFire")]
[JsonDerivedType(typeof(CommunityGoalReward))] [JsonDerivedType(typeof(CrewHire), "CrewHire")]
[JsonDerivedType(typeof(CrewAssign))] [JsonDerivedType(typeof(EngineerApply), "EngineerApply")]
[JsonDerivedType(typeof(CrewFire))] [JsonDerivedType(typeof(EngineerContribution), "EngineerContribution")]
[JsonDerivedType(typeof(CrewHire))] [JsonDerivedType(typeof(EngineerCraft), "EngineerCraft")]
[JsonDerivedType(typeof(EngineerApply))] [JsonDerivedType(typeof(EngineerLegacyConvert), "EngineerLegacyConvert")]
[JsonDerivedType(typeof(EngineerContribution))] [JsonDerivedType(typeof(EngineerProgress), "EngineerProgress")]
[JsonDerivedType(typeof(EngineerCraft))] [JsonDerivedType(typeof(FetchRemoteModule), "FetchRemoteModule")]
[JsonDerivedType(typeof(EngineerLegacyConvert))] [JsonDerivedType(typeof(Market), "Market")]
[JsonDerivedType(typeof(EngineerProgress))] [JsonDerivedType(typeof(MassModuleStore), "MassModuleStore")]
[JsonDerivedType(typeof(FetchRemoteModule))] [JsonDerivedType(typeof(MaterialTrade), "MaterialTrade")]
[JsonDerivedType(typeof(Market))] [JsonDerivedType(typeof(MissionAbandoned), "MissionAbandoned")]
[JsonDerivedType(typeof(MassModuleStore))] [JsonDerivedType(typeof(MissionAccepted), "MissionAccepted")]
[JsonDerivedType(typeof(MaterialTrade))] [JsonDerivedType(typeof(MissionCompleted), "MissionCompleted")]
[JsonDerivedType(typeof(MissionAbandoned))] [JsonDerivedType(typeof(MissionFailed), "MissionFailed")]
[JsonDerivedType(typeof(MissionAccepted))] [JsonDerivedType(typeof(MissionRedirected), "MissionRedirected")]
[JsonDerivedType(typeof(MissionCompleted))] [JsonDerivedType(typeof(ModuleBuy), "ModuleBuy")]
[JsonDerivedType(typeof(MissionFailed))] [JsonDerivedType(typeof(ModuleRetrieve), "ModuleRetrieve")]
[JsonDerivedType(typeof(MissionRedirected))] [JsonDerivedType(typeof(ModuleSell), "ModuleSell")]
[JsonDerivedType(typeof(ModuleBuy))] [JsonDerivedType(typeof(ModuleSellRemote), "ModuleSellRemote")]
[JsonDerivedType(typeof(ModuleRetrieve))] [JsonDerivedType(typeof(ModuleStore), "ModuleStore")]
[JsonDerivedType(typeof(ModuleSell))] [JsonDerivedType(typeof(ModuleSwap), "ModuleSwap")]
[JsonDerivedType(typeof(ModuleSellRemote))] [JsonDerivedType(typeof(Outfitting), "Outfitting")]
[JsonDerivedType(typeof(ModuleStore))] [JsonDerivedType(typeof(PayBounties), "PayBounties")]
[JsonDerivedType(typeof(ModuleSwap))] [JsonDerivedType(typeof(PayFines), "PayFines")]
[JsonDerivedType(typeof(Outfitting))] [JsonDerivedType(typeof(PayLegacyFines), "PayLegacyFines")]
[JsonDerivedType(typeof(PayBounties))] [JsonDerivedType(typeof(RedeemVoucher), "RedeemVoucher")]
[JsonDerivedType(typeof(PayFines))] [JsonDerivedType(typeof(RefuelAll), "RefuelAll")]
[JsonDerivedType(typeof(PayLegacyFines))] [JsonDerivedType(typeof(RefuelPartial), "RefuelPartial")]
[JsonDerivedType(typeof(RedeemVoucher))] [JsonDerivedType(typeof(Repair), "Repair")]
[JsonDerivedType(typeof(RefuelAll))] [JsonDerivedType(typeof(RepairAll), "RepairAll")]
[JsonDerivedType(typeof(RefuelPartial))] [JsonDerivedType(typeof(RestockVehicle), "RestockVehicle")]
[JsonDerivedType(typeof(Repair))] [JsonDerivedType(typeof(ScientificResearch), "ScientificResearch")]
[JsonDerivedType(typeof(RepairAll))] [JsonDerivedType(typeof(SearchAndRescue), "SearchAndRescue")]
[JsonDerivedType(typeof(RestockVehicle))] [JsonDerivedType(typeof(SellDrones), "SellDrones")]
[JsonDerivedType(typeof(ScientificResearch))] [JsonDerivedType(typeof(SellShipOnRebuy), "SellShipOnRebuy")]
[JsonDerivedType(typeof(SearchAndRescue))] [JsonDerivedType(typeof(SetUserShipName), "SetUserShipName")]
[JsonDerivedType(typeof(SellDrones))] [JsonDerivedType(typeof(Shipyard), "Shipyard")]
[JsonDerivedType(typeof(SellShipOnRebuy))] [JsonDerivedType(typeof(ShipyardBuy), "ShipyardBuy")]
[JsonDerivedType(typeof(SetUserShipName))] [JsonDerivedType(typeof(ShipyardNew), "ShipyardNew")]
[JsonDerivedType(typeof(Shipyard))] [JsonDerivedType(typeof(ShipyardSell), "ShipyardSell")]
[JsonDerivedType(typeof(ShipyardBuy))] [JsonDerivedType(typeof(ShipyardSwap), "ShipyardSwap")]
[JsonDerivedType(typeof(ShipyardNew))] [JsonDerivedType(typeof(ShipyardTransfer), "ShipyardTransfer")]
[JsonDerivedType(typeof(ShipyardSell))] [JsonDerivedType(typeof(StoredModules), "StoredModules")]
[JsonDerivedType(typeof(ShipyardSwap))] [JsonDerivedType(typeof(StoredShips), "StoredShips")]
[JsonDerivedType(typeof(ShipyardTransfer))] [JsonDerivedType(typeof(TechnologyBroker), "TechnologyBroker")]
[JsonDerivedType(typeof(StoredModules))] [JsonDerivedType(typeof(AsteroidCracked), "AsteroidCracked")]
[JsonDerivedType(typeof(StoredShips))] [JsonDerivedType(typeof(BuyTradeData), "BuyTradeData")]
[JsonDerivedType(typeof(TechnologyBroker))] [JsonDerivedType(typeof(CollectCargo), "CollectCargo")]
[JsonDerivedType(typeof(AsteroidCracked))] [JsonDerivedType(typeof(EjectCargo), "EjectCargo")]
[JsonDerivedType(typeof(BuyTradeData))] [JsonDerivedType(typeof(MarketBuy), "MarketBuy")]
[JsonDerivedType(typeof(CollectCargo))] [JsonDerivedType(typeof(MarketSell), "MarketSell")]
[JsonDerivedType(typeof(EjectCargo))] [JsonDerivedType(typeof(MiningRefined), "MiningRefined")]
[JsonDerivedType(typeof(MarketBuy))] [JsonDerivedType(typeof(ApproachBody), "ApproachBody")]
[JsonDerivedType(typeof(MarketSell))] [JsonDerivedType(typeof(Docked), "Docked")]
[JsonDerivedType(typeof(MiningRefined))] [JsonDerivedType(typeof(DockingCancelled), "DockingCancelled")]
[JsonDerivedType(typeof(ApproachBody))] [JsonDerivedType(typeof(DockingDenied), "DockingDenied")]
[JsonDerivedType(typeof(Docked))] [JsonDerivedType(typeof(DockingGranted), "DockingGranted")]
[JsonDerivedType(typeof(DockingCancelled))] [JsonDerivedType(typeof(DockingRequested), "DockingRequested")]
[JsonDerivedType(typeof(DockingDenied))] [JsonDerivedType(typeof(DockingTimeout), "DockingTimeout")]
[JsonDerivedType(typeof(DockingGranted))] [JsonDerivedType(typeof(FSDJump), "FSDJump")]
[JsonDerivedType(typeof(DockingRequested))] [JsonDerivedType(typeof(FSDTarget), "FSDTarget")]
[JsonDerivedType(typeof(DockingTimeout))] [JsonDerivedType(typeof(LeaveBody), "LeaveBody")]
[JsonDerivedType(typeof(FSDJump))] [JsonDerivedType(typeof(Liftoff), "Liftoff")]
[JsonDerivedType(typeof(FSDTarget))] [JsonDerivedType(typeof(Location), "Location")]
[JsonDerivedType(typeof(LeaveBody))] [JsonDerivedType(typeof(NavRoute), "NavRoute")]
[JsonDerivedType(typeof(Liftoff))] [JsonDerivedType(typeof(NavRouteClear), "NavRouteClear")]
[JsonDerivedType(typeof(Location))] [JsonDerivedType(typeof(StartJump), "StartJump")]
[JsonDerivedType(typeof(NavRoute))] [JsonDerivedType(typeof(SupercruiseDestinationDrop), "SupercruiseDestinationDrop")]
[JsonDerivedType(typeof(NavRouteClear))] [JsonDerivedType(typeof(SupercruiseEntry), "SupercruiseEntry")]
[JsonDerivedType(typeof(StartJump))] [JsonDerivedType(typeof(SupercruiseExit), "SupercruiseExit")]
[JsonDerivedType(typeof(SupercruiseDestinationDrop))] [JsonDerivedType(typeof(Touchdown), "Touchdown")]
[JsonDerivedType(typeof(SupercruiseEntry))] [JsonDerivedType(typeof(Undocked), "Undocked")]
[JsonDerivedType(typeof(SupercruiseExit))] [JsonDerivedType(typeof(Status), "Status")]
[JsonDerivedType(typeof(Touchdown))] public abstract class JournalBase
[JsonDerivedType(typeof(Undocked))]
[JsonDerivedType(typeof(MarketFile))]
[JsonDerivedType(typeof(ModuleInfoFile))]
[JsonDerivedType(typeof(NavRouteFile))]
[JsonDerivedType(typeof(OutfittingFile))]
[JsonDerivedType(typeof(ShipyardFile))]
[JsonDerivedType(typeof(Status))]
[JsonDerivedType(typeof(JournalBase))]
public class JournalBase
{ {
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public DateTimeOffset Timestamp { get; init; } public DateTimeOffset Timestamp { get; init; }
[JsonPropertyName("event")]
public string Event { get; init; }
[JsonExtensionData] [JsonExtensionData]
public Dictionary<string, object> AdditionalProperties { get; init; } public Dictionary<string, object> AdditionalProperties { get; init; }
} }

2
ObservatoryFramework/ObservatoryFramework.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Observatory.Framework</RootNamespace> <RootNamespace>Observatory.Framework</RootNamespace>
<Configurations>Debug;Release;Portable</Configurations> <Configurations>Debug;Release;Portable</Configurations>

43
Pulsar/Features/Journal/JournalService.cs
View File

@ -19,6 +19,13 @@ public class JournalService(
static ConcurrentBag<JournalBase> _journals = new(); static ConcurrentBag<JournalBase> _journals = new();
static DateTimeOffset notBefore = DateTimeOffset.UtcNow.AddHours(-1); static DateTimeOffset notBefore = DateTimeOffset.UtcNow.AddHours(-1);
readonly JsonSerializerOptions options = new()
{
PropertyNameCaseInsensitive = true,
AllowOutOfOrderMetadataProperties = true,
// Converters = { ActivatorUtilities.CreateInstance<JournalJsonConverter>(serviceProvider) }
};
public async Task HandleFile(string filePath) public async Task HandleFile(string filePath)
{ {
@ -29,28 +36,35 @@ public class JournalService(
var file = await File.ReadAllLinesAsync(filePath, Encoding.UTF8); var file = await File.ReadAllLinesAsync(filePath, Encoding.UTF8);
var newJournals = new List<JournalBase>(); var newJournals = new List<JournalBase>();
var select = file.AsParallel().Select(line => JsonSerializer.Deserialize<JournalBase>(line, await Parallel.ForEachAsync(file, (line, _) =>
new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true,
Converters = { ActivatorUtilities.CreateInstance<JournalConverter>(serviceProvider) }
}));
foreach (var journal in select)
{ {
if (_journals.Any(j => j.Timestamp == journal.Timestamp && j.Event == journal.Event)) if (string.IsNullOrWhiteSpace(line))
{ {
continue; return ValueTask.CompletedTask;
} }
var journal = JsonSerializer.Deserialize<JournalBase>(line, options);
if (journal == null)
{
return ValueTask.CompletedTask;
}
if (_journals.Any(j => j.Timestamp == journal.Timestamp && j.GetType() == journal.GetType()))
{
return ValueTask.CompletedTask;
}
_journals.Add(journal);
if (journal.Timestamp < notBefore) if (journal.Timestamp < notBefore)
{ {
continue; return ValueTask.CompletedTask;
} }
_journals.Add(journal);
newJournals.Add(journal); newJournals.Add(journal);
} return ValueTask.CompletedTask;
});
if (newJournals.Any()) if (newJournals.Any())
{ {
@ -60,7 +74,6 @@ public class JournalService(
public async Task<List<JournalBase>> Get() public async Task<List<JournalBase>> Get()
{ {
await hub.Clients.All.JournalUpdated(_journals.ToList()); return [];
return _journals.ToList();
} }
} }

2
Pulsar/Features/Status/StatusService.cs
View File

@ -41,7 +41,7 @@ public class StatusService
public async Task<Status> Get() public async Task<Status> Get()
{ {
var statusFile = Path.Combine(options.Value.JournalDirectory, FileName); var statusFile = Path.Join(options.Value.JournalDirectory, FileName);
if (!FileHelper.ValidateFile(statusFile)) if (!FileHelper.ValidateFile(statusFile))
{ {

2
Pulsar/Pulsar.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>exe</OutputType> <OutputType>exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Pulsar</RootNamespace> <RootNamespace>Pulsar</RootNamespace>

252
Pulsar/Utils/JournalJsonConverter.cs
View File

@ -42,7 +42,7 @@ public enum JournalReaderState
/// all Journals can be deserialized into a JournalBase object for identification /// all Journals can be deserialized into a JournalBase object for identification
/// and then deserialized into their respective types. /// and then deserialized into their respective types.
/// </summary> /// </summary>
public class JournalConverter(ILogger<JournalConverter> logger) : JsonConverter<JournalBase> public class JournalJsonConverter(ILogger<JournalJsonConverter> logger) : JsonConverter<JournalBase>
{ {
private JournalReaderState state = JournalReaderState.Start; private JournalReaderState state = JournalReaderState.Start;
@ -58,18 +58,12 @@ public class JournalConverter(ILogger<JournalConverter> logger) : JsonConverter<
depth++; depth++;
switch (clone.TokenType) switch (clone.TokenType)
{ {
case JsonTokenType.None:
break;
case JsonTokenType.StartObject: case JsonTokenType.StartObject:
state = JournalReaderState.Start; state = JournalReaderState.Start;
break; break;
case JsonTokenType.EndObject: case JsonTokenType.EndObject:
state = JournalReaderState.End; state = JournalReaderState.End;
break; break;
case JsonTokenType.StartArray:
break;
case JsonTokenType.EndArray:
break;
case JsonTokenType.PropertyName: case JsonTokenType.PropertyName:
var propertyName = clone.GetString(); var propertyName = clone.GetString();
// if we have not started reading the body, and we have not read the (timestamp or event name) // if we have not started reading the body, and we have not read the (timestamp or event name)
@ -99,23 +93,23 @@ public class JournalConverter(ILogger<JournalConverter> logger) : JsonConverter<
break; break;
case JsonTokenType.Comment: case JsonTokenType.Comment:
continue; continue;
case JsonTokenType.None:
case JsonTokenType.StartArray:
case JsonTokenType.EndArray:
case JsonTokenType.String: case JsonTokenType.String:
break;
case JsonTokenType.Number: case JsonTokenType.Number:
break;
case JsonTokenType.True: case JsonTokenType.True:
break;
case JsonTokenType.False: case JsonTokenType.False:
break;
case JsonTokenType.Null: case JsonTokenType.Null:
logger.LogWarning("Unexpected token type {TokenType} at depth {Depth}", clone.TokenType, depth);
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
} while (clone.Read()); } while (clone.Read());
return new() { Timestamp = timestamp!.Value, Event = eventName! }; logger.LogWarning("Failed to deserialize journal entry at depth: {Depth}. Event?: {EventName}, Timestamp?: {Timestamp}", depth, eventName, timestamp);
return null;
// TODO: handle inf (invalid data) in the journal files // TODO: handle inf (invalid data) in the journal files
// else if (typeof(TJournal) == typeof(Scan) && json.Contains("\"RotationPeriod\":inf")) // else if (typeof(TJournal) == typeof(Scan) && json.Contains("\"RotationPeriod\":inf"))
// { // {
@ -125,237 +119,237 @@ public class JournalConverter(ILogger<JournalConverter> logger) : JsonConverter<
private JournalBase GetDestinationType(ref Utf8JsonReader reader, string eventName) private JournalBase GetDestinationType(ref Utf8JsonReader reader, string eventName)
{ {
switch (eventName.ToLower()) switch (eventName)
{ {
case "fileheader": case "Fileheader":
return JsonSerializer.Deserialize<FileHeader>(ref reader)!; return JsonSerializer.Deserialize<FileHeader>(ref reader)!;
case "commander": case "Commander":
return JsonSerializer.Deserialize<Commander>(ref reader)!; return JsonSerializer.Deserialize<Commander>(ref reader)!;
case "materials": case "Materials":
return JsonSerializer.Deserialize<Materials>(ref reader)!; return JsonSerializer.Deserialize<Materials>(ref reader)!;
case "rank": case "Rank":
return JsonSerializer.Deserialize<Rank>(ref reader)!; return JsonSerializer.Deserialize<Rank>(ref reader)!;
case "music": case "Music":
return JsonSerializer.Deserialize<Music>(ref reader)!; return JsonSerializer.Deserialize<Music>(ref reader)!;
case "cargo": case "Cargo":
return JsonSerializer.Deserialize<Cargo>(ref reader)!; return JsonSerializer.Deserialize<Cargo>(ref reader)!;
case "loadout": case "Loadout":
return JsonSerializer.Deserialize<Loadout>(ref reader)!; return JsonSerializer.Deserialize<Loadout>(ref reader)!;
case "missions": case "Missions":
return JsonSerializer.Deserialize<Missions>(ref reader)!; return JsonSerializer.Deserialize<Missions>(ref reader)!;
case "fsssignaldiscovered": case "FSSSignalDiscovered":
return JsonSerializer.Deserialize<FSSSignalDiscovered>(ref reader)!; return JsonSerializer.Deserialize<FSSSignalDiscovered>(ref reader)!;
case "reputation": case "Reputation":
return JsonSerializer.Deserialize<Reputation>(ref reader)!; return JsonSerializer.Deserialize<Reputation>(ref reader)!;
case "loadgame": case "LoadGame":
return JsonSerializer.Deserialize<LoadGame>(ref reader)!; return JsonSerializer.Deserialize<LoadGame>(ref reader)!;
case "receivetext": case "ReceiveText":
return JsonSerializer.Deserialize<ReceiveText>(ref reader)!; return JsonSerializer.Deserialize<ReceiveText>(ref reader)!;
case "shiplocker": case "ShipLocker":
return JsonSerializer.Deserialize<ShipLockerMaterials>(ref reader)!; return JsonSerializer.Deserialize<ShipLockerMaterials>(ref reader)!;
case "location": case "Location":
return JsonSerializer.Deserialize<Location>(ref reader)!; return JsonSerializer.Deserialize<Location>(ref reader)!;
case "powerplay": case "Powerplay":
return JsonSerializer.Deserialize<Powerplay>(ref reader)!; return JsonSerializer.Deserialize<Powerplay>(ref reader)!;
case "reservoirreplenished": case "ReservoirReplenished":
return JsonSerializer.Deserialize<ReservoirReplenished>(ref reader)!; return JsonSerializer.Deserialize<ReservoirReplenished>(ref reader)!;
case "statistics": case "Statistics":
return JsonSerializer.Deserialize<Statistics>(ref reader)!; return JsonSerializer.Deserialize<Statistics>(ref reader)!;
case "scan": case "Scan":
return JsonSerializer.Deserialize<Scan>(ref reader)!; return JsonSerializer.Deserialize<Scan>(ref reader)!;
case "shipyard": case "Shipyard":
return JsonSerializer.Deserialize<Shipyard>(ref reader)!; return JsonSerializer.Deserialize<Shipyard>(ref reader)!;
case "docked": case "Docked":
return JsonSerializer.Deserialize<Docked>(ref reader)!; return JsonSerializer.Deserialize<Docked>(ref reader)!;
case "leavebody": case "LeaveBody":
return JsonSerializer.Deserialize<LeaveBody>(ref reader)!; return JsonSerializer.Deserialize<LeaveBody>(ref reader)!;
case "progress": case "Progress":
return JsonSerializer.Deserialize<Progress>(ref reader)!; return JsonSerializer.Deserialize<Progress>(ref reader)!;
case "supercruiseexit": case "SupercruiseExit":
return JsonSerializer.Deserialize<SupercruiseExit>(ref reader)!; return JsonSerializer.Deserialize<SupercruiseExit>(ref reader)!;
case "engineerprogress": case "EngineerProgress":
return JsonSerializer.Deserialize<EngineerProgress>(ref reader)!; return JsonSerializer.Deserialize<EngineerProgress>(ref reader)!;
case "dockingrequested": case "DockingRequested":
return JsonSerializer.Deserialize<DockingRequested>(ref reader)!; return JsonSerializer.Deserialize<DockingRequested>(ref reader)!;
case "npccrewpaidwage": case "NpcCrewPaidWage":
return JsonSerializer.Deserialize<NpcCrewPaidWage>(ref reader)!; return JsonSerializer.Deserialize<NpcCrewPaidWage>(ref reader)!;
case "supercruiseentry": case "SupercruiseEntry":
return JsonSerializer.Deserialize<SupercruiseEntry>(ref reader)!; return JsonSerializer.Deserialize<SupercruiseEntry>(ref reader)!;
case "dockinggranted": case "DockingGranted":
return JsonSerializer.Deserialize<DockingGranted>(ref reader)!; return JsonSerializer.Deserialize<DockingGranted>(ref reader)!;
case "startjump": case "StartJump":
return JsonSerializer.Deserialize<StartJump>(ref reader)!; return JsonSerializer.Deserialize<StartJump>(ref reader)!;
case "fssallbodiesfound": case "FSSAllBodiesFound":
return JsonSerializer.Deserialize<FSSAllBodiesFound>(ref reader)!; return JsonSerializer.Deserialize<FSSAllBodiesFound>(ref reader)!;
case "fssbodysignals": case "FSSBodySignals":
return JsonSerializer.Deserialize<FSSBodySignals>(ref reader)!; return JsonSerializer.Deserialize<FSSBodySignals>(ref reader)!;
case "liftoff": case "Liftoff":
return JsonSerializer.Deserialize<Liftoff>(ref reader)!; return JsonSerializer.Deserialize<Liftoff>(ref reader)!;
case "supercruisedestinationdrop": case "SupercruiseDestinationDrop":
return JsonSerializer.Deserialize<SupercruiseDestinationDrop>(ref reader)!; return JsonSerializer.Deserialize<SupercruiseDestinationDrop>(ref reader)!;
case "fsdtarget": case "FSDTarget":
return JsonSerializer.Deserialize<FSDTarget>(ref reader)!; return JsonSerializer.Deserialize<FSDTarget>(ref reader)!;
case "fsdjump": case "FSDJump":
return JsonSerializer.Deserialize<FSDJump>(ref reader)!; return JsonSerializer.Deserialize<FSDJump>(ref reader)!;
case "codexentry": case "CodexEntry":
return JsonSerializer.Deserialize<CodexEntry>(ref reader)!; return JsonSerializer.Deserialize<CodexEntry>(ref reader)!;
case "hulldamage": case "HullDamage":
return JsonSerializer.Deserialize<HullDamage>(ref reader)!; return JsonSerializer.Deserialize<HullDamage>(ref reader)!;
case "materialcollected": case "MaterialCollected":
return JsonSerializer.Deserialize<MaterialCollected>(ref reader)!; return JsonSerializer.Deserialize<MaterialCollected>(ref reader)!;
case "navroute": case "NavRoute":
return JsonSerializer.Deserialize<NavRoute>(ref reader)!; return JsonSerializer.Deserialize<NavRoute>(ref reader)!;
case "navrouteclear": case "NavRouteClear":
return JsonSerializer.Deserialize<NavRouteClear>(ref reader)!; return JsonSerializer.Deserialize<NavRouteClear>(ref reader)!;
case "scanbarycentre": case "ScanBaryCentre":
return JsonSerializer.Deserialize<ScanBaryCentre>(ref reader)!; return JsonSerializer.Deserialize<ScanBaryCentre>(ref reader)!;
case "jetconeboost": case "JetConeBoost":
return JsonSerializer.Deserialize<JetConeBoost>(ref reader)!; return JsonSerializer.Deserialize<JetConeBoost>(ref reader)!;
case "shutdown": case "Shutdown":
return JsonSerializer.Deserialize<Shutdown>(ref reader)!; return JsonSerializer.Deserialize<Shutdown>(ref reader)!;
case "fuelscoop": case "FuelScoop":
return JsonSerializer.Deserialize<FuelScoop>(ref reader)!; return JsonSerializer.Deserialize<FuelScoop>(ref reader)!;
case "fssdiscoveryscan": case "FSSDiscoveryScan":
return JsonSerializer.Deserialize<FSSDiscoveryScan>(ref reader)!; return JsonSerializer.Deserialize<FSSDiscoveryScan>(ref reader)!;
case "moduleinfo": case "ModuleInfo":
return JsonSerializer.Deserialize<ModuleInfo>(ref reader)!; return JsonSerializer.Deserialize<ModuleInfo>(ref reader)!;
case "shiptargeted": case "ShipTargeted":
return JsonSerializer.Deserialize<ShipTargeted>(ref reader)!; return JsonSerializer.Deserialize<ShipTargeted>(ref reader)!;
case "afmurepairs": case "AfmuRepairs":
return JsonSerializer.Deserialize<AfmuRepairs>(ref reader)!; return JsonSerializer.Deserialize<AfmuRepairs>(ref reader)!;
case "heatwarning": case "HeatWarning":
return JsonSerializer.Deserialize<HeatWarning>(ref reader)!; return JsonSerializer.Deserialize<HeatWarning>(ref reader)!;
case "modulebuy": case "ModuleBuy":
return JsonSerializer.Deserialize<ModuleBuy>(ref reader)!; return JsonSerializer.Deserialize<ModuleBuy>(ref reader)!;
case "buydrones": case "BuyDrones":
return JsonSerializer.Deserialize<BuyDrones>(ref reader)!; return JsonSerializer.Deserialize<BuyDrones>(ref reader)!;
case "shieldstate": case "ShieldState":
return JsonSerializer.Deserialize<ShieldState>(ref reader)!; return JsonSerializer.Deserialize<ShieldState>(ref reader)!;
case "buyammo": case "BuyAmmo":
return JsonSerializer.Deserialize<BuyAmmo>(ref reader)!; return JsonSerializer.Deserialize<BuyAmmo>(ref reader)!;
case "ejectcargo": case "EjectCargo":
return JsonSerializer.Deserialize<EjectCargo>(ref reader)!; return JsonSerializer.Deserialize<EjectCargo>(ref reader)!;
case "approachbody": case "ApproachBody":
return JsonSerializer.Deserialize<ApproachBody>(ref reader)!; return JsonSerializer.Deserialize<ApproachBody>(ref reader)!;
case "docksrv": case "DockSRV":
return JsonSerializer.Deserialize<DockSRV>(ref reader)!; return JsonSerializer.Deserialize<DockSRV>(ref reader)!;
case "touchdown": case "Touchdown":
return JsonSerializer.Deserialize<Touchdown>(ref reader)!; return JsonSerializer.Deserialize<Touchdown>(ref reader)!;
case "saasignalsfound": case "SAASignalsFound":
return JsonSerializer.Deserialize<SAASignalsFound>(ref reader)!; return JsonSerializer.Deserialize<SAASignalsFound>(ref reader)!;
case "engineercraft": case "EngineerCraft":
return JsonSerializer.Deserialize<EngineerCraft>(ref reader)!; return JsonSerializer.Deserialize<EngineerCraft>(ref reader)!;
case "materialtrade": case "MaterialTrade":
return JsonSerializer.Deserialize<MaterialTrade>(ref reader)!; return JsonSerializer.Deserialize<MaterialTrade>(ref reader)!;
case "repair": case "Repair":
return JsonSerializer.Deserialize<Repair>(ref reader)!; return JsonSerializer.Deserialize<Repair>(ref reader)!;
case "refuelall": case "RefuelAll":
return JsonSerializer.Deserialize<RefuelAll>(ref reader)!; return JsonSerializer.Deserialize<RefuelAll>(ref reader)!;
case "storedmodules": case "StoredModules":
return JsonSerializer.Deserialize<StoredModules>(ref reader)!; return JsonSerializer.Deserialize<StoredModules>(ref reader)!;
case "synthesis": case "Synthesis":
return JsonSerializer.Deserialize<Synthesis>(ref reader)!; return JsonSerializer.Deserialize<Synthesis>(ref reader)!;
case "scanned": case "Scanned":
return JsonSerializer.Deserialize<Scanned>(ref reader)!; return JsonSerializer.Deserialize<Scanned>(ref reader)!;
case "sendtext": case "SendText":
return JsonSerializer.Deserialize<SendText>(ref reader)!; return JsonSerializer.Deserialize<SendText>(ref reader)!;
case "embark": case "Embark":
return JsonSerializer.Deserialize<Embark>(ref reader)!; return JsonSerializer.Deserialize<Embark>(ref reader)!;
case "multisellexplorationdata": case "MultiSellExplorationData":
return JsonSerializer.Deserialize<MultiSellExplorationData>(ref reader)!; return JsonSerializer.Deserialize<MultiSellExplorationData>(ref reader)!;
case "backpack": case "Backpack":
return JsonSerializer.Deserialize<BackpackMaterials>(ref reader)!; return JsonSerializer.Deserialize<BackpackMaterials>(ref reader)!;
case "modulesell": case "ModuleSell":
return JsonSerializer.Deserialize<ModuleSell>(ref reader)!; return JsonSerializer.Deserialize<ModuleSell>(ref reader)!;
case "undocked": case "Undocked":
return JsonSerializer.Deserialize<Undocked>(ref reader)!; return JsonSerializer.Deserialize<Undocked>(ref reader)!;
case "repairall": case "RepairAll":
return JsonSerializer.Deserialize<RepairAll>(ref reader)!; return JsonSerializer.Deserialize<RepairAll>(ref reader)!;
case "outfitting": case "Outfitting":
return JsonSerializer.Deserialize<Outfitting>(ref reader)!; return JsonSerializer.Deserialize<Outfitting>(ref reader)!;
case "powerplaysalary": case "PowerplaySalary":
return JsonSerializer.Deserialize<PowerplaySalary>(ref reader)!; return JsonSerializer.Deserialize<PowerplaySalary>(ref reader)!;
case "redeemvoucher": case "RedeemVoucher":
return JsonSerializer.Deserialize<RedeemVoucher>(ref reader)!; return JsonSerializer.Deserialize<RedeemVoucher>(ref reader)!;
case "saascancomplete": case "SAAScanComplete":
return JsonSerializer.Deserialize<SAAScanComplete>(ref reader)!; return JsonSerializer.Deserialize<SAAScanComplete>(ref reader)!;
case "friends": case "Friends":
return JsonSerializer.Deserialize<Friends>(ref reader)!; return JsonSerializer.Deserialize<Friends>(ref reader)!;
case "launchsrv": case "LaunchSRV":
return JsonSerializer.Deserialize<LaunchSRV>(ref reader)!; return JsonSerializer.Deserialize<LaunchSRV>(ref reader)!;
case "suitloadout": case "SuitLoadout":
return JsonSerializer.Deserialize<SuitLoadout>(ref reader)!; return JsonSerializer.Deserialize<SuitLoadout>(ref reader)!;
case "disembark": case "Disembark":
return JsonSerializer.Deserialize<Disembark>(ref reader)!; return JsonSerializer.Deserialize<Disembark>(ref reader)!;
case "materialdiscovered": case "MaterialDiscovered":
return JsonSerializer.Deserialize<MaterialDiscovered>(ref reader)!; return JsonSerializer.Deserialize<MaterialDiscovered>(ref reader)!;
case "storedships": case "StoredShips":
return JsonSerializer.Deserialize<StoredShips>(ref reader)!; return JsonSerializer.Deserialize<StoredShips>(ref reader)!;
case "scanorganic": case "ScanOrganic":
return JsonSerializer.Deserialize<ScanOrganic>(ref reader)!; return JsonSerializer.Deserialize<ScanOrganic>(ref reader)!;
case "market": case "Market":
return JsonSerializer.Deserialize<Market>(ref reader)!; return JsonSerializer.Deserialize<Market>(ref reader)!;
case "missioncompleted": case "MissionCompleted":
return JsonSerializer.Deserialize<MissionCompleted>(ref reader)!; return JsonSerializer.Deserialize<MissionCompleted>(ref reader)!;
case "sellshiponrebuy": case "SellShipOnRebuy":
return JsonSerializer.Deserialize<SellShipOnRebuy>(ref reader)!; return JsonSerializer.Deserialize<SellShipOnRebuy>(ref reader)!;
case "missionaccepted": case "MissionAccepted":
return JsonSerializer.Deserialize<MissionAccepted>(ref reader)!; return JsonSerializer.Deserialize<MissionAccepted>(ref reader)!;
case "approachsettlement": case "ApproachSettlement":
return JsonSerializer.Deserialize<ApproachSettlement>(ref reader)!; return JsonSerializer.Deserialize<ApproachSettlement>(ref reader)!;
case "screenshot": case "Screenshot":
return JsonSerializer.Deserialize<Screenshot>(ref reader)!; return JsonSerializer.Deserialize<Screenshot>(ref reader)!;
case "moduleswap": case "ModuleSwap":
return JsonSerializer.Deserialize<ModuleSwap>(ref reader)!; return JsonSerializer.Deserialize<ModuleSwap>(ref reader)!;
case "underattack": case "UnderAttack":
return JsonSerializer.Deserialize<UnderAttack>(ref reader)!; return JsonSerializer.Deserialize<UnderAttack>(ref reader)!;
case "datascanned": case "DataScanned":
return JsonSerializer.Deserialize<DataScanned>(ref reader)!; return JsonSerializer.Deserialize<DataScanned>(ref reader)!;
case "dockingdenied": case "DockingDenied":
return JsonSerializer.Deserialize<DockingDenied>(ref reader)!; return JsonSerializer.Deserialize<DockingDenied>(ref reader)!;
case "fetchremotemodule": case "FetchRemoteModule":
return JsonSerializer.Deserialize<FetchRemoteModule>(ref reader)!; return JsonSerializer.Deserialize<FetchRemoteModule>(ref reader)!;
case "engineercontribution": case "EngineerContribution":
return JsonSerializer.Deserialize<EngineerContribution>(ref reader)!; return JsonSerializer.Deserialize<EngineerContribution>(ref reader)!;
case "collectcargo": case "CollectCargo":
return JsonSerializer.Deserialize<CollectCargo>(ref reader)!; return JsonSerializer.Deserialize<CollectCargo>(ref reader)!;
case "moduleretrieve": case "ModuleRetrieve":
return JsonSerializer.Deserialize<ModuleRetrieve>(ref reader)!; return JsonSerializer.Deserialize<ModuleRetrieve>(ref reader)!;
case "marketbuy": case "MarketBuy":
return JsonSerializer.Deserialize<MarketBuy>(ref reader)!; return JsonSerializer.Deserialize<MarketBuy>(ref reader)!;
case "selldrones": case "SellDrones":
return JsonSerializer.Deserialize<SellDrones>(ref reader)!; return JsonSerializer.Deserialize<SellDrones>(ref reader)!;
case "interdicted": case "Interdicted":
return JsonSerializer.Deserialize<Interdicted>(ref reader)!; return JsonSerializer.Deserialize<Interdicted>(ref reader)!;
case "sellorganicdata": case "SellOrganicData":
return JsonSerializer.Deserialize<SellOrganicData>(ref reader)!; return JsonSerializer.Deserialize<SellOrganicData>(ref reader)!;
case "wingadd": case "WingAdd":
return JsonSerializer.Deserialize<WingAdd>(ref reader)!; return JsonSerializer.Deserialize<WingAdd>(ref reader)!;
case "winginvite": case "WingInvite":
return JsonSerializer.Deserialize<WingInvite>(ref reader)!; return JsonSerializer.Deserialize<WingInvite>(ref reader)!;
case "wingjoin": case "WingJoin":
return JsonSerializer.Deserialize<WingJoin>(ref reader)!; return JsonSerializer.Deserialize<WingJoin>(ref reader)!;
case "wingleave": case "WingLeave":
return JsonSerializer.Deserialize<WingLeave>(ref reader)!; return JsonSerializer.Deserialize<WingLeave>(ref reader)!;
case "bounty": case "Bounty":
return JsonSerializer.Deserialize<Bounty>(ref reader)!; return JsonSerializer.Deserialize<Bounty>(ref reader)!;
case "commitcrime": case "CommitCrime":
return JsonSerializer.Deserialize<CommitCrime>(ref reader)!; return JsonSerializer.Deserialize<CommitCrime>(ref reader)!;
case "modulestore": case "ModuleStore":
return JsonSerializer.Deserialize<ModuleStore>(ref reader)!; return JsonSerializer.Deserialize<ModuleStore>(ref reader)!;
case "factionkillbond": case "FactionKillBond":
return JsonSerializer.Deserialize<FactionKillBond>(ref reader)!; return JsonSerializer.Deserialize<FactionKillBond>(ref reader)!;
case "rebootrepair": case "RebootRepair":
return JsonSerializer.Deserialize<RebootRepair>(ref reader)!; return JsonSerializer.Deserialize<RebootRepair>(ref reader)!;
case "launchdrone": case "LaunchDrone":
return JsonSerializer.Deserialize<LaunchDrone>(ref reader)!; return JsonSerializer.Deserialize<LaunchDrone>(ref reader)!;
case "sellmicroresources": case "SellMicroResources":
return JsonSerializer.Deserialize<SellMicroResources>(ref reader)!; return JsonSerializer.Deserialize<SellMicroResources>(ref reader)!;
case "navbeaconscan": case "NavBeaconScan":
return JsonSerializer.Deserialize<NavBeaconScan>(ref reader)!; return JsonSerializer.Deserialize<NavBeaconScan>(ref reader)!;
case "searchandrescue": case "SearchAndRescue":
return JsonSerializer.Deserialize<SearchAndRescue>(ref reader)!; return JsonSerializer.Deserialize<SearchAndRescue>(ref reader)!;
case "marketsell": case "MarketSell":
return JsonSerializer.Deserialize<MarketSell>(ref reader)!; return JsonSerializer.Deserialize<MarketSell>(ref reader)!;
default: default:
logger.LogWarning("Unknown Journal event type {EventName}", eventName); logger.LogWarning("Unknown Journal event type {EventName}", eventName);

203
Pulsar/WebApp/package-lock.json generated
View File

@ -12,13 +12,13 @@
"@microsoft/signalr": "^8.0.0", "@microsoft/signalr": "^8.0.0",
"@playwright/test": "^1.44.0", "@playwright/test": "^1.44.0",
"@sveltejs/adapter-static": "^3.0.1", "@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.7", "@sveltejs/kit": "^2.5.8",
"@sveltejs/vite-plugin-svelte": "next", "@sveltejs/vite-plugin-svelte": "^3.1.0",
"@sveltestack/svelte-query": "^1.6.0", "@sveltestack/svelte-query": "^1.6.0",
"eslint-plugin-svelte": "^2.39.0", "eslint-plugin-svelte": "^2.39.0",
"globals": "^15.2.0", "globals": "^15.2.0",
"sass": "^1.77.0", "sass": "^1.77.2",
"svelte": "^5.0.0-next.126", "svelte": "^5.0.0-next.136",
"svelte-check": "^3.7.1", "svelte-check": "^3.7.1",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"typescript": "^5.4.5", "typescript": "^5.4.5",
@ -800,9 +800,9 @@
"dev": true "dev": true
}, },
"node_modules/@rollup/rollup-android-arm-eabi": { "node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
"integrity": "sha512-ahxSgCkAEk+P/AVO0vYr7DxOD3CwAQrT0Go9BJyGQ9Ef0QxVOfjDZMiF4Y2s3mLyPrjonchIMH/tbWHucJMykQ==", "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
@ -813,9 +813,9 @@
] ]
}, },
"node_modules/@rollup/rollup-android-arm64": { "node_modules/@rollup/rollup-android-arm64": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
"integrity": "sha512-lAarIdxZWbFSHFSDao9+I/F5jDaKyCqAPMq5HqnfpBw8dKDiCaaqM0lq5h1pQTLeIqueeay4PieGR5jGZMWprw==", "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@ -826,9 +826,9 @@
] ]
}, },
"node_modules/@rollup/rollup-darwin-arm64": { "node_modules/@rollup/rollup-darwin-arm64": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
"integrity": "sha512-SWsr8zEUk82KSqquIMgZEg2GE5mCSfr9sE/thDROkX6pb3QQWPp8Vw8zOq2GyxZ2t0XoSIUlvHDkrf5Gmf7x3Q==", "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@ -839,9 +839,9 @@
] ]
}, },
"node_modules/@rollup/rollup-darwin-x64": { "node_modules/@rollup/rollup-darwin-x64": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
"integrity": "sha512-o/HAIrQq0jIxJAhgtIvV5FWviYK4WB0WwV91SLUnsliw1lSAoLsmgEEgRWzDguAFeUEUUoIWXiJrPqU7vGiVkA==", "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@ -852,9 +852,22 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-arm-gnueabihf": { "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
"integrity": "sha512-nwlJ65UY9eGq91cBi6VyDfArUJSKOYt5dJQBq8xyLhvS23qO+4Nr/RreibFHjP6t+5ap2ohZrUJcHv5zk5ju/g==", "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
"cpu": [
"arm"
],
"dev": true,
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
"version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
"integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
@ -865,9 +878,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-arm64-gnu": { "node_modules/@rollup/rollup-linux-arm64-gnu": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
"integrity": "sha512-Pg5TxxO2IVlMj79+c/9G0LREC9SY3HM+pfAwX7zj5/cAuwrbfj2Wv9JbMHIdPCfQpYsI4g9mE+2Bw/3aeSs2rQ==", "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@ -878,9 +891,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-arm64-musl": { "node_modules/@rollup/rollup-linux-arm64-musl": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
"integrity": "sha512-cAOTjGNm84gc6tS02D1EXtG7tDRsVSDTBVXOLbj31DkwfZwgTPYZ6aafSU7rD/4R2a34JOwlF9fQayuTSkoclA==", "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@ -891,9 +904,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": { "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
"integrity": "sha512-4RyT6v1kXb7C0fn6zV33rvaX05P0zHoNzaXI/5oFHklfKm602j+N4mn2YvoezQViRLPnxP8M1NaY4s/5kXO5cw==", "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
"cpu": [ "cpu": [
"ppc64" "ppc64"
], ],
@ -904,9 +917,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-riscv64-gnu": { "node_modules/@rollup/rollup-linux-riscv64-gnu": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
"integrity": "sha512-KNUH6jC/vRGAKSorySTyc/yRYlCwN/5pnMjXylfBniwtJx5O7X17KG/0efj8XM3TZU7raYRXJFFReOzNmL1n1w==", "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
"cpu": [ "cpu": [
"riscv64" "riscv64"
], ],
@ -917,9 +930,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-s390x-gnu": { "node_modules/@rollup/rollup-linux-s390x-gnu": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
"integrity": "sha512-xPV4y73IBEXToNPa3h5lbgXOi/v0NcvKxU0xejiFw6DtIYQqOTMhZ2DN18/HrrP0PmiL3rGtRG9gz1QE8vFKXQ==", "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
"cpu": [ "cpu": [
"s390x" "s390x"
], ],
@ -930,9 +943,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-x64-gnu": { "node_modules/@rollup/rollup-linux-x64-gnu": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
"integrity": "sha512-QBhtr07iFGmF9egrPOWyO5wciwgtzKkYPNLVCFZTmr4TWmY0oY2Dm/bmhHjKRwZoGiaKdNcKhFtUMBKvlchH+Q==", "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@ -943,9 +956,9 @@
] ]
}, },
"node_modules/@rollup/rollup-linux-x64-musl": { "node_modules/@rollup/rollup-linux-x64-musl": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
"integrity": "sha512-8zfsQRQGH23O6qazZSFY5jP5gt4cFvRuKTpuBsC1ZnSWxV8ZKQpPqOZIUtdfMOugCcBvFGRa1pDC/tkf19EgBw==", "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@ -956,9 +969,9 @@
] ]
}, },
"node_modules/@rollup/rollup-win32-arm64-msvc": { "node_modules/@rollup/rollup-win32-arm64-msvc": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
"integrity": "sha512-H4s8UjgkPnlChl6JF5empNvFHp77Jx+Wfy2EtmYPe9G22XV+PMuCinZVHurNe8ggtwoaohxARJZbaH/3xjB/FA==", "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@ -969,9 +982,9 @@
] ]
}, },
"node_modules/@rollup/rollup-win32-ia32-msvc": { "node_modules/@rollup/rollup-win32-ia32-msvc": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
"integrity": "sha512-djqpAjm/i8erWYF0K6UY4kRO3X5+T4TypIqw60Q8MTqSBaQNpNXDhxdjpZ3ikgb+wn99svA7jxcXpiyg9MUsdw==", "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
"cpu": [ "cpu": [
"ia32" "ia32"
], ],
@ -982,9 +995,9 @@
] ]
}, },
"node_modules/@rollup/rollup-win32-x64-msvc": { "node_modules/@rollup/rollup-win32-x64-msvc": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.2.tgz", "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
"integrity": "sha512-teAqzLT0yTYZa8ZP7zhFKEx4cotS8Tkk5XiqNMJhD4CpaWB1BHARE4Qy+RzwnXvSAYv+Q3jAqCVBS+PS+Yee8Q==", "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@ -1004,9 +1017,9 @@
} }
}, },
"node_modules/@sveltejs/kit": { "node_modules/@sveltejs/kit": {
"version": "2.5.7", "version": "2.5.8",
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.7.tgz", "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.8.tgz",
"integrity": "sha512-6uedTzrb7nQrw6HALxnPrPaXdIN2jJJTzTIl96Z3P5NiG+OAfpdPbrWrvkJ3GN4CfWqrmU4dJqwMMRMTD/C7ow==", "integrity": "sha512-ZQXYaVHd1p0kDGwOi4l82i5kAiUQtrhMthDKtJi0zVzmNupKJ0ZlBVAoceuarCuIntPNctyQchW29h5DkFxd1Q==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
@ -1086,6 +1099,20 @@
"svelte": "^3.19.0 || ^4.0.0" "svelte": "^3.19.0 || ^4.0.0"
} }
}, },
"node_modules/@sveltejs/vite-plugin-svelte/node_modules/vitefu": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz",
"integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==",
"dev": true,
"peerDependencies": {
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
"vite": {
"optional": true
}
}
},
"node_modules/@sveltestack/svelte-query": { "node_modules/@sveltestack/svelte-query": {
"version": "1.6.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/@sveltestack/svelte-query/-/svelte-query-1.6.0.tgz", "resolved": "https://registry.npmjs.org/@sveltestack/svelte-query/-/svelte-query-1.6.0.tgz",
@ -2284,15 +2311,12 @@
} }
}, },
"node_modules/magic-string": { "node_modules/magic-string": {
"version": "0.30.9", "version": "0.30.10",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
"integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==", "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@jridgewell/sourcemap-codec": "^1.4.15" "@jridgewell/sourcemap-codec": "^1.4.15"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/merge2": { "node_modules/merge2": {
@ -2802,9 +2826,9 @@
} }
}, },
"node_modules/rollup": { "node_modules/rollup": {
"version": "4.14.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.2.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
"integrity": "sha512-WkeoTWvuBoFjFAhsEOHKRoZ3r9GfTyhh7Vff1zwebEFLEFjT1lG3784xEgKiTa7E+e70vsC81roVL2MP4tgEEQ==", "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/estree": "1.0.5" "@types/estree": "1.0.5"
@ -2817,21 +2841,22 @@
"npm": ">=8.0.0" "npm": ">=8.0.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"@rollup/rollup-android-arm-eabi": "4.14.2", "@rollup/rollup-android-arm-eabi": "4.17.2",
"@rollup/rollup-android-arm64": "4.14.2", "@rollup/rollup-android-arm64": "4.17.2",
"@rollup/rollup-darwin-arm64": "4.14.2", "@rollup/rollup-darwin-arm64": "4.17.2",
"@rollup/rollup-darwin-x64": "4.14.2", "@rollup/rollup-darwin-x64": "4.17.2",
"@rollup/rollup-linux-arm-gnueabihf": "4.14.2", "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
"@rollup/rollup-linux-arm64-gnu": "4.14.2", "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
"@rollup/rollup-linux-arm64-musl": "4.14.2", "@rollup/rollup-linux-arm64-gnu": "4.17.2",
"@rollup/rollup-linux-powerpc64le-gnu": "4.14.2", "@rollup/rollup-linux-arm64-musl": "4.17.2",
"@rollup/rollup-linux-riscv64-gnu": "4.14.2", "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
"@rollup/rollup-linux-s390x-gnu": "4.14.2", "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
"@rollup/rollup-linux-x64-gnu": "4.14.2", "@rollup/rollup-linux-s390x-gnu": "4.17.2",
"@rollup/rollup-linux-x64-musl": "4.14.2", "@rollup/rollup-linux-x64-gnu": "4.17.2",
"@rollup/rollup-win32-arm64-msvc": "4.14.2", "@rollup/rollup-linux-x64-musl": "4.17.2",
"@rollup/rollup-win32-ia32-msvc": "4.14.2", "@rollup/rollup-win32-arm64-msvc": "4.17.2",
"@rollup/rollup-win32-x64-msvc": "4.14.2", "@rollup/rollup-win32-ia32-msvc": "4.17.2",
"@rollup/rollup-win32-x64-msvc": "4.17.2",
"fsevents": "~2.3.2" "fsevents": "~2.3.2"
} }
}, },
@ -2895,9 +2920,9 @@
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.77.0", "version": "1.77.2",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.77.0.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz",
"integrity": "sha512-eGj4HNfXqBWtSnvItNkn7B6icqH14i3CiCGbzMKs3BAPTq62pp9NBYsBgyN4cA+qssqo9r26lW4JSvlaUUWbgw==", "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
@ -3045,9 +3070,9 @@
} }
}, },
"node_modules/svelte": { "node_modules/svelte": {
"version": "5.0.0-next.126", "version": "5.0.0-next.136",
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.126.tgz", "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.136.tgz",
"integrity": "sha512-Qnxhf+LG/qxhXpYm6I5+o8msSFBba2QOfnybrOqWbbtQbgbfy4gDVr3p2IExCT4yPOSUcqZWJiiSPsMbCuVwtA==", "integrity": "sha512-M3jHAIfWZ7K+hjZdvu2p53ZtWE843yubxJfjxeQw9XiwMYG5z6quCA5u8r23GrxAp20JBl36B6ucbZvLUf0Z/g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@ampproject/remapping": "^2.2.1", "@ampproject/remapping": "^2.2.1",
@ -3388,20 +3413,6 @@
"node": "^8.16.0 || ^10.6.0 || >=11.0.0" "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
} }
}, },
"node_modules/vitefu": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz",
"integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==",
"dev": true,
"peerDependencies": {
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
"vite": {
"optional": true
}
}
},
"node_modules/webidl-conversions": { "node_modules/webidl-conversions": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",

8
Pulsar/WebApp/package.json
View File

@ -17,12 +17,12 @@
"@playwright/test": "^1.44.0", "@playwright/test": "^1.44.0",
"@sveltejs/adapter-static": "^3.0.1", "@sveltejs/adapter-static": "^3.0.1",
"@sveltestack/svelte-query": "^1.6.0", "@sveltestack/svelte-query": "^1.6.0",
"@sveltejs/kit": "^2.5.7", "@sveltejs/kit": "^2.5.8",
"@sveltejs/vite-plugin-svelte": "next", "@sveltejs/vite-plugin-svelte": "^3.1.0",
"eslint-plugin-svelte": "^2.39.0", "eslint-plugin-svelte": "^2.39.0",
"globals": "^15.2.0", "globals": "^15.2.0",
"sass": "^1.77.0", "sass": "^1.77.2",
"svelte": "^5.0.0-next.126", "svelte": "^5.0.0-next.136",
"svelte-check": "^3.7.1", "svelte-check": "^3.7.1",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"typescript": "^5.4.5", "typescript": "^5.4.5",

14
Pulsar/WebApp/src/lib/Status.svelte
View File

@ -17,6 +17,7 @@
let loading = $state(true); let loading = $state(true);
let alert: JournalBase[] = $state([]); let alert: JournalBase[] = $state([]);
let fuelDown = $state(false);
onMount(async () => { onMount(async () => {
@ -39,17 +40,19 @@
last.push(message.fuel?.fuelMain ?? 0); last.push(message.fuel?.fuelMain ?? 0);
const change = []; const change = [];
for (let i = last.length - 1; i === 0; i--) { for (let i = last.length - 1; i > 0; i--) {
change.push(last[i] - last[i - 1]); change.push(last[i] - last[i - 1]);
} }
const avg = change.length ? change.reduce((a, b) => a + b, 0) / change.length : 0; const avg = change.length ? change.reduce((a, b) => a + b, 0) / change.length : 0;
const max = 32; const max = 32;
if ($statusStore.fuel?.fuelMain && avg) { const currentEmpty = (max - message.fuel?.fuelMain);
timeToMax = (max - $statusStore.fuel?.fuelMain) / avg; if (message.fuel?.fuelMain && !Number.isNaN(avg) && avg) {
fuelDown = avg < 0;
timeToMax = fuelDown ? (message.fuel?.fuelMain / -avg) : currentEmpty / avg ;
} }
console.log($statusStore); console.log(message);
}); });
$connection.on("JournalUpdated", (message) => { $connection.on("JournalUpdated", (message) => {
@ -97,7 +100,7 @@
<div> <div>
{#if $statusStore} {#if $statusStore}
<span <span
>Fuel%: {(($statusStore.fuel?.fuelMain ?? 0) / 32) * 100}% est: {timeToMax}s</span >Fuel%: {((($statusStore.fuel?.fuelMain ?? 0) / 32) * 100).toFixed(2)}% est{fuelDown ? ' REMAINING' : ' to fill'}: {timeToMax.toFixed(2 )}s</span
> >
<div class="power"> <div class="power">
<div class="sys"> <div class="sys">
@ -148,6 +151,7 @@
height: 100%; height: 100%;
flex-direction: column-reverse; flex-direction: column-reverse;
align-items: center; align-items: center;
min-width: 2vw;
div.pip { div.pip {
min-width: 2vw; min-width: 2vw;
min-height: 1vh; min-height: 1vh;

90
Pulsar/WebApp/src/routes/explorer/Explorer.svelte
View File

@ -1,29 +1,91 @@
<script lang="ts"> <script lang="ts">
const data: unknown[] = [{}, {}, {}, {}]; import connection from "$lib/stores/Connection.store";
// number of scans completed import type { FSSDiscoveryScan } from "../../types/api/FSSDiscoveryScan";
const scanned = 2; import type { Scan } from "../../types/api/Scan";
import type JournalBase from "../../types/api/JournalBase";
const data: Partial<Scan>[] = [{}, {}, {}, {}];
// total bodies in the current system (FSSDiscovery event) // total bodies in the current system (FSSDiscovery event)
const totalBodies = 12; let totalBodies = $state(0);
let currentSystem = $state("");
// accumulated list of bodies in the current system (Scan events) // accumulated list of bodies in the current system (Scan events)
const bodies = $state([ let scans = $state([] as Scan[]);
{ value: 50 },
{ value: 1000 }, const targetEvents = ["Scan", "FSSScanBaryCenter", "FSSDiscoveryScan"];
{ value: 800000 },
{ value: 800000 }, $connection.on("JournalUpdated", (messages: JournalBase[]) => {
]); const filtered = messages.filter((message) =>
targetEvents.includes(message.event)
);
if (!filtered.length) return;
for (let i = 0; i < filtered.length; i++) {
const message = filtered[i];
switch (message.event) {
case "FSSDiscoveryScan": {
// initial scan when jumping into a system
const scan = message as FSSDiscoveryScan;
totalBodies = scan.bodyCount;
if (currentSystem !== scan.systemName) {
scans = [];
currentSystem = scan.systemName;
}
break;
}
case "Scan": {
// contains all information about a scanned body (resources, biology, mapping/discovery status, body type, etc.)
const scan = message as Scan;
if (currentSystem !== scan.starSystem) {
currentSystem = scan.starSystem;
scans = [];
}
scans.push(scan);
break;
}
case "FSSAllBodiesFound": {
// when all bodies in a system have been scanned
break;
}
default:
console.log(message);
break;
}
}
});
const toShortPlanetClass = (planetClass?: string) => {
switch (planetClass) {
case "High metal content":
case "High metal content body":
return "HMC";
case "Sudarsky class I gas giant":
case "Sudarsky class II gas giant":
case "Sudarsky class III gas giant":
case "Sudarsky class IV gas giant":
return "GAS";
default:
return planetClass;
}
};
</script> </script>
<section> <section>
<div class="title"> <div class="title">
<h1>Explorer</h1> <h1>Explorer</h1>
</div> </div>
Current System: {currentSystem}
<!-- summary & high value targets --> <!-- summary & high value targets -->
<h1>Bodies</h1> <h1>Bodies</h1>
Scan:&nbsp;<span>{scanned}</span>/<span>{totalBodies}</span> Scan:&nbsp;<span>{scans.length}</span>/<span>{totalBodies}</span>
<div class="title">High Value (>500kcr)</div> <div class="title">High Value (>500kcr)</div>
<ol> <ol>
{#each bodies.filter((b) => b.value > 500000) as body} <li>example</li>
<li>[HMC/WW/ELT/ELN] $body.name - {body.value}cr</li> {#each scans as body}
<li>
[HMC/WW/ELT/ELN] {toShortPlanetClass(body.planetClass)}
{body.bodyName} - 0cr
</li>
{/each} {/each}
</ol> </ol>
<br /> <br />
@ -78,7 +140,7 @@
<style lang="scss"> <style lang="scss">
section { section {
margin-top: 5px; margin-top: 5px;
max-height: 500px; max-height: 300px;
overflow-y: scroll; overflow-y: scroll;
} }

11
Pulsar/WebApp/src/types/api/FSSDiscoveryScan.ts Normal file
View File

@ -0,0 +1,11 @@
import type JournalBase from "./JournalBase";
export interface FSSDiscoveryScan extends JournalBase {
event: "FSSDiscoveryScan";
systemName: string;
systemAddress: number;
progress: number;
bodyCount: number;
nonBodyCount: number;
timestamp: string | Date;
}

2
Pulsar/WebApp/src/types/api/JournalBase.ts
View File

@ -1,4 +1,4 @@
export default interface JournalBase { export default interface JournalBase {
event: string; event: string;
timestamp: Date; timestamp: Date | string;
} }

62
Pulsar/WebApp/src/types/api/Scan.ts Normal file
View File

@ -0,0 +1,62 @@
import type JournalBase from "./JournalBase";
export interface Scan extends JournalBase {
event: "Scan";
/** may include "Detailed" = via FSS, "AutoScan" = via proximity, "NavBeaconDetail", etc. */
scanType: string;
bodyName: string;
distanceFromArrivalLS: number;
tidalLock: boolean;
massEM: number;
radius: number;
surfaceGravity: number;
surfaceTemperature: number;
surfacePressure: number;
landable: boolean;
rotationPeriod: number;
axialTilt: number;
/** if the body is a star, the star class */
starType?: string;
subclass: number;
stellarMass: number;
absoluteMagnitude: number;
age_MY: number;
luminosity: string;
wasDiscovered: boolean;
wasMapped: boolean;
starSystem: string;
systemAddress: number;
bodyID: number;
semiMajorAxis: number;
eccentricity: number;
orbitalInclination: number;
periapsis: number;
orbitalPeriod: number;
ascendingNode: number;
meanAnomaly: number;
timestamp: Date | string;
parents?: Parent[];
terraformState?: string;
/** if the body is a planet, the planet class */
planetClass?: string;
atmosphere?: string;
atmosphereType?: string;
atmosphereComposition?: AtmosphereComposition[];
volcanism?: string;
composition?: Composition;
}
export interface AtmosphereComposition {
name: string;
percent: number;
}
export interface Composition {
ice: number;
rock: number;
metal: number;
}
export interface Parent {
star: number;
}