From d4f3476ad3cfffb6799a66a2ad2e0d47f4ff3dec Mon Sep 17 00:00:00 2001 From: Ben Parsons <9parsonsb@gmail.com> Date: Thu, 16 May 2024 23:39:16 +1000 Subject: [PATCH] Update Flag handling Status now shows readable flag names Updated Power display Added more missing Journal events --- .../Files/Journal/Exploration/Scan.cs | 2 +- Pulsar/Utils/JournalJsonConverter.cs | 26 ++++++-- Pulsar/WebApp/src/lib/Status.svelte | 63 +++++++++++-------- Pulsar/WebApp/src/types/api/enums.ts | 6 +- Pulsar/WebApp/src/types/flags.ts | 52 +++++++++++++++ 5 files changed, 116 insertions(+), 33 deletions(-) create mode 100644 Pulsar/WebApp/src/types/flags.ts diff --git a/ObservatoryFramework/Files/Journal/Exploration/Scan.cs b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs index 3d1a34f..22969b4 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/Scan.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/Scan.cs @@ -43,7 +43,7 @@ public class Scan : ScanBaryCentre } } Parent = ParentList.ToImmutableList(); - } + } } /// /// "Parents" object rearranged into more intuitive structure for ease of use. diff --git a/Pulsar/Utils/JournalJsonConverter.cs b/Pulsar/Utils/JournalJsonConverter.cs index 98e00f5..e683516 100644 --- a/Pulsar/Utils/JournalJsonConverter.cs +++ b/Pulsar/Utils/JournalJsonConverter.cs @@ -12,7 +12,6 @@ namespace Pulsar.Utils; using Observatory.Framework.Files.Journal; - [Flags] public enum JournalReaderState { @@ -20,14 +19,17 @@ public enum JournalReaderState /// Have read the first character of the object /// Start, + /// /// Have read the timestamp. Generally the first property in a journal entry. /// Timestamp, + /// /// have read the event name. Generally the second property in a journal entry. /// Event, + /// /// Have read the last character of the object, the next character should be a newline, whitespace, EOF, or another object. /// @@ -40,9 +42,10 @@ public enum JournalReaderState /// all Journals can be deserialized into a JournalBase object for identification /// and then deserialized into their respective types. /// -public class JournalConverter(ILogger logger) : JsonConverter +public class JournalConverter(ILogger logger) : JsonConverter { private JournalReaderState state = JournalReaderState.Start; + public override JournalBase? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { Utf8JsonReader clone = reader; @@ -86,12 +89,13 @@ public class JournalConverter(ILogger logger) : JsonConverter break; } } - + if ((state & JournalReaderState.Event) != 0) { // create destination type return GetDestinationType(ref reader, eventName!); } + break; case JsonTokenType.Comment: continue; @@ -108,7 +112,6 @@ public class JournalConverter(ILogger logger) : JsonConverter default: throw new ArgumentOutOfRangeException(); } - } while (clone.Read()); return new() { Timestamp = timestamp!.Value, Event = eventName! }; @@ -340,7 +343,20 @@ public class JournalConverter(ILogger logger) : JsonConverter return JsonSerializer.Deserialize(ref reader)!; case "modulestore": return JsonSerializer.Deserialize(ref reader)!; - + case "factionkillbond": + return JsonSerializer.Deserialize(ref reader)!; + case "rebootrepair": + return JsonSerializer.Deserialize(ref reader)!; + case "launchdrone": + return JsonSerializer.Deserialize(ref reader)!; + case "sellmicroresources": + return JsonSerializer.Deserialize(ref reader)!; + case "navbeaconscan": + return JsonSerializer.Deserialize(ref reader)!; + case "searchandrescue": + return JsonSerializer.Deserialize(ref reader)!; + case "marketsell": + return JsonSerializer.Deserialize(ref reader)!; default: logger.LogWarning("Unknown Journal event type {EventName}", eventName); return JsonSerializer.Deserialize(ref reader)!; diff --git a/Pulsar/WebApp/src/lib/Status.svelte b/Pulsar/WebApp/src/lib/Status.svelte index 40d84f5..b69615d 100644 --- a/Pulsar/WebApp/src/lib/Status.svelte +++ b/Pulsar/WebApp/src/lib/Status.svelte @@ -2,9 +2,12 @@ import { onMount } from "svelte"; import { statusStore } from "./stores/Status.store"; import connection from "./stores/Connection.store"; - import { StatusFlags, StatusFlags2 } from "../types/api/enums"; + import { FocusStatus, StatusFlags, StatusFlags2 } from "../types/api/enums"; import type JournalBase from "../types/api/JournalBase"; - import { slide } from "svelte/transition"; + import { fly, scale, slide } from "svelte/transition"; + import { getEnumFlags, getEnumNameFromValue, getEnumNamesFromFlag, getEnumPairsFromValue } from "../types/flags"; + import type Status from "../types/api/Status"; + import { HubConnectionState } from "@microsoft/signalr"; const x: string | null = $state(null); @@ -16,7 +19,11 @@ let alert: JournalBase[] = $state([]); onMount(async () => { - await $connection.start(); + + if ($connection.state === HubConnectionState.Disconnected) + { + await $connection.start(); + } loading = false; @@ -36,9 +43,9 @@ change.push(last[i] - last[i - 1]); } - const avg = change.reduce((a, b) => a + b, 0) / change.length; + const avg = change.length ? change.reduce((a, b) => a + b, 0) / change.length : 0; const max = 32; - if ($statusStore.fuel?.fuelMain) { + if ($statusStore.fuel?.fuelMain && avg) { timeToMax = (max - $statusStore.fuel?.fuelMain) / avg; } @@ -57,9 +64,15 @@ }); if (!$statusStore.pips) { - statusStore.set( - await (await fetch("http://localhost:5000/api/status")).json() - ); + const value = (await ( + await fetch("http://localhost:5000/api/status") + ).json()) as Status; + + console.log(value); + + statusStore.set({ + ...value, + }); } }); @@ -88,33 +101,33 @@ >
- {#each [...Array($statusStore?.pips?.sys ?? 0)] as sys} -
- {/each}
{$statusStore?.pips?.sys ?? "?"}
Sys
-
-
- {#each [...Array($statusStore?.pips?.eng ?? 0)] as eng} -
+ {#each [...Array($statusStore?.pips?.sys ?? 0)].map((_,i) => i) as sys (sys)} +
{/each} -
{$statusStore?.pips?.eng ?? "?"}
+
+
+
{$statusStore?.pips?.eng ?? "?"}
Eng
-
-
- {#each [...Array($statusStore?.pips?.wep ?? 0)] as wep} -
+ {#each [...Array($statusStore?.pips?.eng ?? 0)].map((_,i) => i) as eng (eng)} +
{/each} +
+
{$statusStore?.pips?.wep ?? "?"}
-
Wep
+
Wep
+ {#each [...Array($statusStore?.pips?.wep ?? 0)].map((_,i) => i) as wep (wep)} +
+ {/each}
dest?: {$statusStore?.destination?.name} - gui focus: {$statusStore.guiFocus} + gui focus: {getEnumNameFromValue(FocusStatus, $statusStore.guiFocus!)} cargo: {$statusStore.cargo} - flag1: {$statusStore.flags} - flag2: {$statusStore.flags2} + flag1: {getEnumNamesFromFlag(StatusFlags, $statusStore.flags!)} + flag2: {getEnumNamesFromFlag(StatusFlags2, $statusStore.flags2!)} {:else} No data :( {/if} @@ -133,7 +146,7 @@ div { display: flex; height: 100%; - flex-direction: column; + flex-direction: column-reverse; align-items: center; div.pip { min-width: 2vw; diff --git a/Pulsar/WebApp/src/types/api/enums.ts b/Pulsar/WebApp/src/types/api/enums.ts index 8439e8b..acda485 100644 --- a/Pulsar/WebApp/src/types/api/enums.ts +++ b/Pulsar/WebApp/src/types/api/enums.ts @@ -1,5 +1,6 @@ export enum StatusFlags { - Docked = 1, + None = 0, + Docked = 1 << 0, Landed = 1 << 1, LandingGear = 1 << 2, Shields = 1 << 3, @@ -34,7 +35,8 @@ export enum StatusFlags { } export enum StatusFlags2 { - OnFoot = 1, + None = 0, + OnFoot = 1 << 0, InTaxi = 1 << 1, InMulticrew = 1 << 2, OnFootInStation = 1 << 3, diff --git a/Pulsar/WebApp/src/types/flags.ts b/Pulsar/WebApp/src/types/flags.ts new file mode 100644 index 0000000..5a2d138 --- /dev/null +++ b/Pulsar/WebApp/src/types/flags.ts @@ -0,0 +1,52 @@ +const isPowerOfTwo = (x: number): boolean => { + return x !== 0 && (x & (x - 1)) === 0; +}; + +/*** + * returns all possible flags for an enum + * @param obj the Enum type + */ +export function getEnumFlags< + O extends object, + F extends O[keyof O] = O[keyof O], +>(obj: O): [number, string][] { + const isFlag = (arg: string | number | F): arg is F => { + const nArg = Number(arg); + const isNumber = !Number.isNaN(nArg); + return isNumber && isPowerOfTwo(nArg); + }; + + if (!obj) return []; + + return Object.entries(obj) + .filter((k) => Number.parseInt(k[0])) + .map((k) => [Number(k[0]), k[1]]); +} + +export function getEnumPairsFromValue(e: E, flag: number) { + const flags = getEnumFlags(e); + const active = []; + for (const f of flags) { + if (f[0] & flag) active.push(f[1]); + } + return active; +} + +export function getEnumNamesFromFlag>( + e: E, + flag: number, +) { + const flags = getEnumFlags(e); + const active = []; + for (const f of flags) { + if (f[0] & flag) active.push(e[f[0]]); + } + return active; +} + +export function getEnumNameFromValue>( + e: E, + value: number, +) { + return e[value]; +}