From b3b251c31507f8d45b930f9cdc2b81d3a619af2b Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 09:17:32 +0100 Subject: [PATCH] Collapse client state handle wrappers --- Aetheria.State.Verify/Program.cs | 130 +++++++++------- .../Tests/DaemonRuntimeDocumentTests.cs | 72 ++++----- .../Runtime/AetheriaClientState.cs | 144 +++--------------- 3 files changed, 128 insertions(+), 218 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 21bf6ae67..e421f98c0 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4817,7 +4817,7 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "new AetheriaRuntimeMenuTabModelOption(", "ResolveVisibleTabs(", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", - "AetheriaRuntimeCurrentDockingDocument", + "AetheriaRuntimeCurrentDocking", "CultMeshReactiveDocument _currentDocking", "AetheriaUnityRuntimeClientProvider", ".ReactiveCurrentDocking(\"unity-runtime-menu-tabs\")", @@ -5837,7 +5837,7 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorCommandKind.Close", "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", - "AetheriaRuntimeCurrentDockingDocument", + "AetheriaRuntimeCurrentDocking", "CultMeshReactiveDocument _currentDocking", ".ReactiveCurrentDocking(\"unity-trade\")", "docking = _currentDocking.Current", @@ -6523,7 +6523,7 @@ static void RequireInventoryDropdownUseEveSurface(string root) "_observedEntityIndex.TryResolveEntityByRecordKey", "TryResolveObservedDockingIndex(out var dockingIndex)", "dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", - "ResolveStationRefitDocument()", + "ResolveStationRefit", "currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"", "LoadoutRestoreOptions" }; @@ -6589,7 +6589,7 @@ static void RequireInventoryDropdownUseEveSurface(string root) !source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || !source.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || !source.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || - !source.Contains("ResolveStationRefitDocument()", StringComparison.Ordinal) || + !source.Contains("ResolveStationRefit", StringComparison.Ordinal) || !source.Contains("currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"", StringComparison.Ordinal) || !source.Contains("currentDockingBay.DockingBayIndex", StringComparison.Ordinal) || !source.Contains("ResolveStationRefit()?.DockParentEntityKey", StringComparison.Ordinal) || @@ -6608,7 +6608,7 @@ static void RequireInventoryDropdownUseEveSurface(string root) !inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || !inventoryMenu.Contains("currentEntityKey = ResolveCurrentEntity()?.EntityKey ?? \"\"", StringComparison.Ordinal) || !inventoryMenu.Contains("currentEntity = ResolveCurrentEntity();", StringComparison.Ordinal) || - !inventoryMenu.Contains("ResolveStationRefitDocument()", StringComparison.Ordinal) || + !inventoryMenu.Contains("ResolveStationRefit", StringComparison.Ordinal) || inventoryMenu.Contains("TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) || inventoryMenu.Contains("TryResolveCurrentEntityFacade", StringComparison.Ordinal) || inventoryMenu.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) || @@ -6789,7 +6789,7 @@ static void RequireStationRefitDockingBaysUseTypedDocuments(string root) { "TryResolveCurrentDockingBayRow(out var currentDockingBay)", "AetheriaRuntimeStationDockingBayRow dockingBay", - "ResolveStationRefitDocument()", + "ResolveStationRefit", "refit.DockingBays ?? Array.Empty()", "currentDockingBay.DockingBayIndex" }; @@ -6808,7 +6808,7 @@ static void RequireStationRefitDockingBaysUseTypedDocuments(string root) { "TryResolveCurrentDockingBayRow(out AetheriaRuntimeStationDockingBayRow dockingBay)", "AetheriaRuntimeStationDockingBayRow dockingBay", - "ResolveStationRefitDocument()", + "ResolveStationRefit", "refit.DockingBays ?? Array.Empty()" }; var missingMenuSymbols = requiredMenuSymbols @@ -7255,7 +7255,7 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root) var requiredSymbols = new[] { "ResolveCurrentEntity()", - "ResolveStationRefitDocument()", + "ResolveStationRefit", "ResolveInventory(entityIndex)", "_inventory?.Current" }; @@ -7354,9 +7354,9 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) var requiredClientSymbols = new[] { "public CultMeshDocumentHandle StationRefit { get; }", - "public CultMeshDocumentHandle CurrentDockingDocument { get; }", - "public CultMeshDocumentHandle StationRefitDocument()", - "public CultMeshDocumentHandle CurrentDocking()" + "public CultMeshDocumentHandle CurrentDocking { get; }", + "public CultMeshReactiveDocument ReactiveStationRefit()", + "public CultMeshReactiveDocument ReactiveCurrentDocking()" }; var missingClientSymbols = requiredClientSymbols .Where(symbol => !clientState.Contains(symbol, StringComparison.Ordinal)) @@ -7470,7 +7470,7 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) static bool HasManagedDockingSnapshotAccess(string source) { - if (source.Contains("AetheriaRuntimeCurrentDockingDocument", StringComparison.Ordinal) && + if (source.Contains("AetheriaRuntimeCurrentDocking", StringComparison.Ordinal) && source.Contains("CultMeshReactiveDocument _currentDocking", StringComparison.Ordinal) && source.Contains(".ReactiveCurrentDocking(", StringComparison.Ordinal) && source.Contains("_currentDocking.Current", StringComparison.Ordinal) && @@ -7479,7 +7479,7 @@ static bool HasManagedDockingSnapshotAccess(string source) return true; } - if (source.Contains("AetheriaRuntimeCurrentDockingDocument", StringComparison.Ordinal) && + if (source.Contains("AetheriaRuntimeCurrentDocking", StringComparison.Ordinal) && source.Contains("ResolveClient().State.Latest()", StringComparison.Ordinal) && !source.Contains("ResolveClient().State.CurrentDocking()", StringComparison.Ordinal) && !source.Contains("AetheriaClientReactiveDockingState _dockingState", StringComparison.Ordinal) && @@ -7528,8 +7528,8 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) var clientState = File.ReadAllText(clientStatePath); var requiredClientSymbols = new[] { - "public CultMeshDocumentHandle CatalogSnapshot()", - "public CultMeshDocumentHandle PlayerSettingsDocument()", + "public CultMeshDocumentHandle Catalog", + "public CultMeshDocumentHandle PlayerSettings", "public CultMeshDocumentHandle Inventory(" }; var missingClientSymbols = requiredClientSymbols @@ -8379,39 +8379,39 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root var requiredClientSymbols = new[] { "public enum AetheriaClientEveSurface", - "public CultMeshDocumentHandle ProviderAdvertisementDocument()", + "public CultMeshDocumentHandle ProviderAdvertisement { get; }", "public CultMeshReactiveDocument ReactiveProviderAdvertisement()", - "public CultMeshDocumentHandle HealthDocument()", + "public CultMeshDocumentHandle Health { get; }", "public CultMeshReactiveDocument ReactiveHealth()", - "public CultMeshDocumentHandle CommandBoundaryDocument()", + "public CultMeshDocumentHandle CommandBoundary { get; }", "public CultMeshReactiveDocument ReactiveCommandBoundary()", - "public CultMeshDocumentHandle AuthorityPolicyDocument()", + "public CultMeshDocumentHandle AuthorityPolicy { get; }", "public CultMeshReactiveDocument ReactiveAuthorityPolicy()", - "public CultMeshDocumentHandle DaemonFrameDocument()", + "public CultMeshDocumentHandle DaemonFrame { get; }", "public CultMeshReactiveDocument ReactiveDaemonFrame()", - "public CultMeshDocumentHandle DaemonSoaViewDocument()", + "public CultMeshDocumentHandle DaemonSoaView { get; }", "public CultMeshReactiveDocument ReactiveDaemonSoaView()", - "public CultMeshDocumentHandle ZoneRenderDocument()", + "public CultMeshDocumentHandle ZoneRender { get; }", "public CultMeshReactiveDocument ReactiveZoneRender()", - "public CultMeshDocumentHandle LoadoutTemplatesDocument()", + "public CultMeshDocumentHandle LoadoutTemplates { get; }", "public CultMeshReactiveDocument ReactiveLoadoutTemplates()", - "public CultMeshDocumentHandle SectorMapDocument()", + "public CultMeshDocumentHandle SectorMap { get; }", "public CultMeshReactiveDocument ReactiveSectorMap()", - "public CultMeshDocumentHandle CurrentZoneDocument()", + "public CultMeshDocumentHandle CurrentZone { get; }", "public CultMeshReactiveDocument ReactiveCurrentZone()", - "public CultMeshDocumentHandle ZoneContactsDocument()", + "public CultMeshDocumentHandle ZoneContacts { get; }", "public CultMeshReactiveDocument ReactiveZoneContacts()", - "public CultMeshDocumentHandle VerseHostSettingsDocument()", + "public CultMeshDocumentHandle VerseHostSettings { get; }", "public CultMeshReactiveDocument ReactiveVerseHostSettings()", - "public CultMeshDocumentHandle CurrentDocking()", + "public CultMeshDocumentHandle CurrentDocking { get; }", "public CultMeshReactiveDocument ReactiveCurrentDocking()", - "public CultMeshDocumentHandle CurrentEntityDocument()", + "public CultMeshDocumentHandle CurrentEntity { get; }", "public CultMeshReactiveDocument ReactiveCurrentEntity()", - "public CultMeshDocumentHandle StationRefitDocument()", + "public CultMeshDocumentHandle StationRefit { get; }", "public CultMeshReactiveDocument ReactiveStationRefit()", - "public CultMeshDocumentHandle CatalogSnapshot()", + "public CultMeshDocumentHandle Catalog { get; }", "public CultMeshReactiveDocument ReactiveCatalogSnapshot()", - "public CultMeshDocumentHandle PlayerSettingsDocument()", + "public CultMeshDocumentHandle PlayerSettings { get; }", "public CultMeshReactiveDocument ReactivePlayerSettingsDocument()", "public static bool TryResolveEveSurface(", "public CultMeshDocumentHandle? EveSurfaceDocument(", @@ -8430,11 +8430,11 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root "public CultMeshReactiveDocument ReactiveSelectedObject(", "public CultMeshDocumentHandle Inventory(", "public CultMeshReactiveDocument ReactiveInventory(", - "public CultMeshDocumentHandle StarbridgeScenarioDocument()", + "public CultMeshDocumentHandle StarbridgeScenario { get; }", "public CultMeshReactiveDocument ReactiveStarbridgeScenario()", - "public CultMeshDocumentHandle StarbridgeSessionDocument()", + "public CultMeshDocumentHandle StarbridgeSession { get; }", "public CultMeshReactiveDocument ReactiveStarbridgeSession()", - "public CultMeshDocumentHandle StarbridgeSummaryDocument()", + "public CultMeshDocumentHandle StarbridgeSummary { get; }", "public CultMeshReactiveDocument ReactiveStarbridgeSummary()", "public CultMeshDocumentHandle StarbridgePlayerSeat(", "public CultMeshReactiveDocument ReactiveStarbridgePlayerSeat(" @@ -8455,11 +8455,23 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root clientState.Contains("public CultMeshReactiveDocument Reactive", StringComparison.Ordinal) || clientState.Contains("TryGetDocument", StringComparison.Ordinal) || clientState.Contains("CultMeshDocumentCatalog", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle ProviderAdvertisementDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle HealthDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle CommandBoundaryDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle AuthorityPolicyDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle DaemonFrameDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle DaemonSoaViewDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle CatalogSnapshot(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle PlayerSettingsDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle CurrentEntityDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle CurrentDocking(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle StationRefitDocument(", StringComparison.Ordinal) || + clientState.Contains("public CultMeshDocumentHandle StarbridgeSummaryDocument(", StringComparison.Ordinal) || clientState.Contains("public Task> ReactiveAsync", StringComparison.Ordinal) || clientState.Contains("public Observable Watch", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState must not reintroduce generic document catalogs or latest/watch shortcuts; callers should use named typed document handles."); + "AetheriaClientState must not reintroduce generic document catalogs, latest/watch shortcuts, or fixed FooDocument() wrappers; callers should use named typed document handles directly."); } var forbiddenFixedReactiveWrappers = new[] @@ -8809,7 +8821,7 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root if (!clientState.Contains("StarbridgeSummary", StringComparison.Ordinal) || !checkedSources["DaemonRuntimeDocumentTests.cs"].Contains( - "client.State.StarbridgeSummaryDocument()", + "client.State.StarbridgeSummary", StringComparison.Ordinal)) { throw new InvalidOperationException( @@ -11935,7 +11947,7 @@ static void RequireUnityRuntimeCatalogClientUsesManagedDocument(string root) var forbiddenSymbols = new[] { - "_node.ReadCatalogSnapshot()", + "_node.ReadCatalog", "_node.GetCatalogSurfaceAsync()", "ReadCatalogSurfaceAsync(", "AetheriaRuntimeCatalogStore.ReadEveSurfaces", @@ -12025,7 +12037,7 @@ static void RequireCatalogSurfaceUsesManagedRuntimeCatalog(string root) string.Join(", ", missingBridgeSymbols)); } - if (bridge.Contains("ReadCatalogSnapshot()", StringComparison.Ordinal)) + if (bridge.Contains("ReadCatalog", StringComparison.Ordinal)) { throw new InvalidOperationException( "Eve catalog refresh still rebuilds the legacy catalog snapshot instead of using AetheriaStateNode.RuntimeCatalog()."); @@ -12157,10 +12169,10 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "managedStarbridgeSession?.Current", "BootstrapCatalogDocument(", "CatalogBootstrapSource(", - "BootstrapRuntimeCatalogSnapshot()", - "BootstrapLoadoutTemplatesDocument()", - "BootstrapPlayerSettingsDocument()", - "BootstrapVerseHostSettingsDocument()", + "BootstrapRuntimeCatalog", + "BootstrapLoadoutTemplates", + "BootstrapPlayerSettings", + "BootstrapVerseHostSettings", "SubmitDaemonCommandAsync(", "SubmitEveCommandAsync(", "AetheriaRuntimeVerseRecordKeys.DaemonCommand(command.CommandId)", @@ -12310,7 +12322,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "public sealed class AetheriaClientState : IDisposable", "public CultMeshDocumentHandle Inventory(", "public CultMeshReactiveDocument ReactiveInventory(", - "public CultMeshDocumentHandle StarbridgeSessionDocument()", + "public CultMeshDocumentHandle StarbridgeSession", "public CultMeshReactiveDocument ReactiveStarbridgeSession()", "CultMeshReactiveDocument? _eveStateRefFrame", "CultMeshReactiveDocument? _eveStateRefHealth", @@ -12441,7 +12453,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) : client.Substring(starbridgeSummaryStart); if (!starbridgeSummaryBlock.Contains("RequireManagedCatalog()", StringComparison.Ordinal) || starbridgeSummaryBlock.Contains("catalogDocument.LatestAsync()", StringComparison.Ordinal) || - starbridgeSummaryBlock.Contains("BootstrapRuntimeCatalogSnapshot()", StringComparison.Ordinal) || + starbridgeSummaryBlock.Contains("BootstrapRuntimeCatalog", StringComparison.Ordinal) || starbridgeSummaryBlock.Contains("AetheriaRuntimeCatalogStore.OpenReadOnly", StringComparison.Ordinal)) { throw new InvalidOperationException( @@ -12453,10 +12465,10 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "BootstrapCatalogDocument(", "CatalogBootstrapSource(", "managed Aetheria document bootstrap seed", - "BootstrapRuntimeCatalogSnapshot()", - "BootstrapLoadoutTemplatesDocument()", - "BootstrapPlayerSettingsDocument()", - "BootstrapVerseHostSettingsDocument()", + "BootstrapRuntimeCatalog", + "BootstrapLoadoutTemplates", + "BootstrapPlayerSettings", + "BootstrapVerseHostSettings", "return AetheriaRuntimeCatalogStore.OpenReadOnly(StatePath);", "AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath)", "AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath)", @@ -12477,10 +12489,14 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "return Task.FromResult(AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath));", "return Task.FromResult(AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath));", "public static class AetheriaRuntimeBootstrapDocuments", - "ReadRuntimeCatalogSnapshot()", - "ReadLoadoutTemplatesDocument()", - "ReadPlayerSettingsDocument()", - "ReadVerseHostSettingsDocument()", + "public AetheriaRuntimeCatalogSnapshot ReadRuntimeCatalog(", + "public AetheriaRuntimeLoadoutTemplatesDocument ReadLoadoutTemplates(", + "public AetheriaRuntimePlayerSettingsDocument ReadPlayerSettings(", + "public AetheriaRuntimeVerseHostSettingsDocument ReadVerseHostSettings(", + "public Task ReadRuntimeCatalogAsync(", + "public Task ReadLoadoutTemplatesAsync(", + "public Task ReadPlayerSettingsAsync(", + "public Task ReadVerseHostSettingsAsync(", "var catalogDocument = CatalogDocument(", "var loadoutTemplatesDocument = CatalogDocument(", "CultMeshDocumentHandle CatalogDocument(", @@ -16626,9 +16642,9 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) var requiredManagedStateAccessSymbols = new[] { - "public CultMeshDocumentHandle DaemonFrameDocument()", - "public CultMeshDocumentHandle CatalogSnapshot()", - "public CultMeshDocumentHandle CurrentEntityDocument()", + "public CultMeshDocumentHandle DaemonFrame", + "public CultMeshDocumentHandle Catalog", + "public CultMeshDocumentHandle CurrentEntity", "public CultMeshDocumentHandle ObjectsViewport(", "public CultMeshDocumentHandle Inventory(", "public CultMeshDocumentHandle StarbridgePlayerSeat(" @@ -16838,7 +16854,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public async Task AssetManifestAsync()", "public async Task CurrentZoneAsync()", "public async Task CurrentEntityAsync()", - "public async Task CurrentDockingAsync()", + "public async Task CurrentDockingAsync()", "public async Task ZoneContactsAsync()", "public async Task StationRefitAsync()", "public async Task SectorMapAsync()", diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index e9e464fb5..1e952ae75 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -166,18 +166,18 @@ public class DaemonRuntimeDocumentTests .GetAwaiter() .GetResult(); - var currentEntity = ReadLatest(client.State.CurrentEntityDocument()); - var latestFrame = ReadLatest(client.State.DaemonFrameDocument()); - var catalog = ReadLatest(client.State.CatalogSnapshot()); - var playerSettings = ReadLatest(client.State.PlayerSettingsDocument()); - var verseHostSettings = ReadLatest(client.State.VerseHostSettingsDocument()); + var currentEntity = ReadLatest(client.State.CurrentEntity); + var latestFrame = ReadLatest(client.State.DaemonFrame); + var catalog = ReadLatest(client.State.Catalog); + var playerSettings = ReadLatest(client.State.PlayerSettings); + var verseHostSettings = ReadLatest(client.State.VerseHostSettings); var currentEntityByType = client.State - .CurrentEntityDocument() + .CurrentEntity .LatestAsync() .GetAwaiter() .GetResult(); var latestFrameByType = client.State - .DaemonFrameDocument() + .DaemonFrame .LatestAsync() .GetAwaiter() .GetResult(); @@ -192,17 +192,17 @@ public class DaemonRuntimeDocumentTests var zoneDetails = ReadLatest(client.State.ZoneDetails(0)); var inventory = ReadLatest(client.State.Inventory(0)); var currentEntityFromClientType = client.State - .CurrentEntityDocument() + .CurrentEntity .LatestAsync() .GetAwaiter() .GetResult(); using var currentEntityReactive = client.State - .CurrentEntityDocument() + .CurrentEntity .ReactiveAsync() .GetAwaiter() .GetResult(); using var zoneRenderReactive = client.State.ReactiveZoneRender(); - var observedAuthoritativeFrame = ReadLatest(client.State.DaemonFrameDocument()); + var observedAuthoritativeFrame = ReadLatest(client.State.DaemonFrame); using var catalogReactive = client.State.ReactiveCatalogSnapshot(); using var daemonFrameReactive = client.State.ReactiveDaemonFrame(); using var daemonSoaViewReactive = client.State.ReactiveDaemonSoaView(); @@ -234,12 +234,12 @@ public class DaemonRuntimeDocumentTests var gameTuiSurface = ReadLatest(client.State.GameTuiSurface); var editorSurface = ReadLatest(client.State.EditorSurface); var editorTuiSurface = ReadLatest(client.State.EditorTuiSurface); - var authorityStatus = ReadLatest(client.State.AuthorityPolicyDocument()); - var currentDocking = client.State.CurrentDockingDocument + var authorityStatus = ReadLatest(client.State.AuthorityPolicy); + var currentDocking = client.State.CurrentDocking .LatestAsync() .GetAwaiter() .GetResult(); - var stationRefit = ReadLatest(client.State.StationRefitDocument()); + var stationRefit = ReadLatest(client.State.StationRefit); Assert.AreEqual(currentEntity.EntityKey, currentEntityDocumentReactive.Current.EntityKey); Assert.AreEqual(currentDocking.CurrentEntityKey, currentDockingReactive.Current.CurrentEntityKey); Assert.AreEqual(stationRefit.StationEntityKey, stationRefitReactive.Current.StationEntityKey); @@ -249,34 +249,28 @@ public class DaemonRuntimeDocumentTests using var reactiveEditorTuiSurface = client.State.EditorTuiSurface.Reactive(); Assert.AreEqual("aetheria.current.entity", client.State.CurrentEntity.DocumentId); - Assert.AreSame(client.State.CurrentEntity, client.State.CurrentEntityDocument()); - Assert.AreSame(client.State.Catalog, client.State.CatalogSnapshot()); - Assert.AreSame(client.State.ZoneRender, client.State.ZoneRenderDocument()); - Assert.AreSame( - client.State.StarbridgeSummary, - client.State.StarbridgeSummaryDocument()); - Assert.AreSame(client.State.DaemonFrame, client.State.DaemonFrameDocument()); - Assert.AreSame(client.State.DaemonSoaView, client.State.DaemonSoaViewDocument()); - Assert.IsNotNull(ReadLatest(client.State.ProviderAdvertisementDocument())); - Assert.IsNotNull(ReadLatest(client.State.HealthDocument())); - Assert.IsNotNull(ReadLatest(client.State.CommandBoundaryDocument())); - Assert.AreSame( - client.State.AuthorityPolicyDocument(), - client.State.AuthorityPolicy); + Assert.AreEqual("aetheria.catalog.snapshot", client.State.Catalog.DocumentId); + Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Frame, client.State.DaemonFrame.DocumentType); + Assert.AreEqual(AetheriaRuntimeDaemonSchemas.SoaView, client.State.DaemonSoaView.DocumentType); + Assert.IsNotNull(ReadLatest(client.State.ZoneRender)); + Assert.IsNotNull(ReadLatest(client.State.StarbridgeSummary)); + Assert.IsNotNull(ReadLatest(client.State.ProviderAdvertisement)); + Assert.IsNotNull(ReadLatest(client.State.Health)); + Assert.IsNotNull(ReadLatest(client.State.CommandBoundary)); + Assert.IsNotNull(ReadLatest(client.State.AuthorityPolicy)); Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, reactiveGameSurface.Current.Surface.Id); Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, reactiveGameTuiSurface.Current.Surface.Id); Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, reactiveEditorSurface.Current.Surface.Id); Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, reactiveEditorTuiSurface.Current.Surface.Id); Assert.AreEqual(currentDocking.CurrentEntityKey, currentDockingReactive.Current.CurrentEntityKey); Assert.AreEqual(stationRefit.StationEntityKey, stationRefitReactive.Current.StationEntityKey); - Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettingsDocument()); - Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettingsDocument()); - Assert.AreSame(client.State.CurrentEntity, client.State.CurrentEntityDocument()); - Assert.AreSame(client.State.ZoneContacts, client.State.ZoneContactsDocument()); + Assert.IsNotNull(ReadLatest(client.State.PlayerSettings)); + Assert.IsNotNull(ReadLatest(client.State.VerseHostSettings)); + Assert.IsNotNull(ReadLatest(client.State.ZoneContacts)); Assert.AreEqual( typeof(AetheriaRuntimeCurrentEntityDocument), - client.State.CurrentEntityDocument().DocumentType); - Assert.AreSame(client.State.SectorMap, client.State.SectorMapDocument()); + client.State.CurrentEntity.DocumentType); + Assert.IsNotNull(ReadLatest(client.State.SectorMap)); Assert.AreEqual(AetheriaRuntimeDaemonSchemas.CurrentEntity, currentEntity.Schema); Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Frame, latestFrame.Schema); Assert.AreEqual(frame.FrameId, latestFrame.FrameId); @@ -360,9 +354,9 @@ public class DaemonRuntimeDocumentTests .GetAwaiter() .GetResult(); - var player = ReadLatest(client.State.PlayerSettingsDocument()); - var verseHost = ReadLatest(client.State.VerseHostSettingsDocument()); - var catalog = ReadLatest(client.State.CatalogSnapshot()); + var player = ReadLatest(client.State.PlayerSettings); + var verseHost = ReadLatest(client.State.VerseHostSettings); + var catalog = ReadLatest(client.State.Catalog); Assert.AreEqual(AetheriaRuntimeCatalogSnapshot.SchemaId, client.State.Catalog.Sources.Last().SchemaId); Assert.IsNotNull(catalog); @@ -370,8 +364,8 @@ public class DaemonRuntimeDocumentTests Assert.AreEqual(AetheriaRuntimeVerseHostSettingsDocument.SchemaId, verseHost.Schema); Assert.AreEqual("", player.PlayerName); Assert.AreEqual("", verseHost.VerseId); - Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettingsDocument()); - Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettingsDocument()); + Assert.AreSame(client.State.PlayerSettings, client.State.PlayerSettings); + Assert.AreSame(client.State.VerseHostSettings, client.State.VerseHostSettings); } [Test] @@ -2377,7 +2371,7 @@ public class DaemonRuntimeDocumentTests } [Test] - public void CommandClientSendsCommandAgainstDaemonFrameDocument() + public void CommandClientSendsCommandAgainstDaemonFrame { var statePath = Path.Combine( Path.GetTempPath(), diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index d30be3331..c34f50441 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -78,7 +78,7 @@ namespace GameCult.Aetheria.State.Verse VerseHostSettings = verseHostSettings ?? throw new ArgumentNullException(nameof(verseHostSettings)); CurrentZone = currentZone ?? throw new ArgumentNullException(nameof(currentZone)); CurrentEntity = currentEntity ?? throw new ArgumentNullException(nameof(currentEntity)); - CurrentDockingDocument = currentDocking ?? throw new ArgumentNullException(nameof(currentDocking)); + CurrentDocking = currentDocking ?? throw new ArgumentNullException(nameof(currentDocking)); ZoneContacts = zoneContacts ?? throw new ArgumentNullException(nameof(zoneContacts)); StationRefit = stationRefit ?? throw new ArgumentNullException(nameof(stationRefit)); SectorMap = sectorMap ?? throw new ArgumentNullException(nameof(sectorMap)); @@ -98,50 +98,30 @@ namespace GameCult.Aetheria.State.Verse public CultMeshDocumentHandle ProviderAdvertisement { get; } - public CultMeshDocumentHandle ProviderAdvertisementDocument() - { - return ProviderAdvertisement; - } - public CultMeshReactiveDocument ReactiveProviderAdvertisement() { - return ProviderAdvertisementDocument().Reactive(); + return ProviderAdvertisement.Reactive(); } public CultMeshDocumentHandle Health { get; } - public CultMeshDocumentHandle HealthDocument() - { - return Health; - } - public CultMeshReactiveDocument ReactiveHealth() { - return HealthDocument().Reactive(); + return Health.Reactive(); } public CultMeshDocumentHandle CommandBoundary { get; } - public CultMeshDocumentHandle CommandBoundaryDocument() - { - return CommandBoundary; - } - public CultMeshReactiveDocument ReactiveCommandBoundary() { - return CommandBoundaryDocument().Reactive(); + return CommandBoundary.Reactive(); } public CultMeshDocumentHandle AuthorityPolicy { get; } - public CultMeshDocumentHandle AuthorityPolicyDocument() - { - return AuthorityPolicy; - } - public CultMeshReactiveDocument ReactiveAuthorityPolicy() { - return AuthorityPolicyDocument().Reactive(); + return AuthorityPolicy.Reactive(); } public CultMeshDocumentHandle DaemonFrame { get; } @@ -168,42 +148,27 @@ namespace GameCult.Aetheria.State.Verse public CultMeshDocumentHandle CurrentEntity { get; } - public CultMeshDocumentHandle CurrentDockingDocument { get; } + public CultMeshDocumentHandle CurrentDocking { get; } public CultMeshDocumentHandle StarbridgeScenario { get; } - public CultMeshDocumentHandle StarbridgeScenarioDocument() - { - return StarbridgeScenario; - } - public CultMeshReactiveDocument ReactiveStarbridgeScenario() { - return StarbridgeScenarioDocument().Reactive(); + return StarbridgeScenario.Reactive(); } public CultMeshDocumentHandle StarbridgeSession { get; } - public CultMeshDocumentHandle StarbridgeSessionDocument() - { - return StarbridgeSession; - } - public CultMeshReactiveDocument ReactiveStarbridgeSession() { - return StarbridgeSessionDocument().Reactive(); + return StarbridgeSession.Reactive(); } public CultMeshDocumentHandle StarbridgeSummary { get; } - public CultMeshDocumentHandle StarbridgeSummaryDocument() - { - return StarbridgeSummary; - } - public CultMeshReactiveDocument ReactiveStarbridgeSummary() { - return StarbridgeSummaryDocument().Reactive(); + return StarbridgeSummary.Reactive(); } public CultMeshDocumentHandle ZoneContacts { get; } @@ -214,134 +179,69 @@ namespace GameCult.Aetheria.State.Verse public CultMeshDocumentHandle ZoneRender { get; } - public CultMeshDocumentHandle DaemonFrameDocument() - { - return DaemonFrame; - } - public CultMeshReactiveDocument ReactiveDaemonFrame() { - return DaemonFrameDocument().Reactive(); - } - - public CultMeshDocumentHandle DaemonSoaViewDocument() - { - return DaemonSoaView; + return DaemonFrame.Reactive(); } public CultMeshReactiveDocument ReactiveDaemonSoaView() { - return DaemonSoaViewDocument().Reactive(); - } - - public CultMeshDocumentHandle ZoneRenderDocument() - { - return ZoneRender; + return DaemonSoaView.Reactive(); } public CultMeshReactiveDocument ReactiveZoneRender() { - return ZoneRenderDocument().Reactive(); - } - - public CultMeshDocumentHandle LoadoutTemplatesDocument() - { - return LoadoutTemplates; + return ZoneRender.Reactive(); } public CultMeshReactiveDocument ReactiveLoadoutTemplates() { - return LoadoutTemplatesDocument().Reactive(); - } - - public CultMeshDocumentHandle SectorMapDocument() - { - return SectorMap; + return LoadoutTemplates.Reactive(); } public CultMeshReactiveDocument ReactiveSectorMap() { - return SectorMapDocument().Reactive(); - } - - public CultMeshDocumentHandle CurrentZoneDocument() - { - return CurrentZone; + return SectorMap.Reactive(); } public CultMeshReactiveDocument ReactiveCurrentZone() { - return CurrentZoneDocument().Reactive(); - } - - public CultMeshDocumentHandle ZoneContactsDocument() - { - return ZoneContacts; + return CurrentZone.Reactive(); } public CultMeshReactiveDocument ReactiveZoneContacts() { - return ZoneContactsDocument().Reactive(); - } - - public CultMeshDocumentHandle VerseHostSettingsDocument() - { - return VerseHostSettings; + return ZoneContacts.Reactive(); } public CultMeshReactiveDocument ReactiveVerseHostSettings() { - return VerseHostSettingsDocument().Reactive(); - } - - public CultMeshDocumentHandle CurrentDocking() - { - return CurrentDockingDocument; + return VerseHostSettings.Reactive(); } public CultMeshReactiveDocument ReactiveCurrentDocking() { - return CurrentDocking().Reactive(); - } - - public CultMeshDocumentHandle CurrentEntityDocument() - { - return CurrentEntity; + return CurrentDocking.Reactive(); } public CultMeshReactiveDocument ReactiveCurrentEntity() { - return CurrentEntityDocument().Reactive(); - } - - public CultMeshDocumentHandle StationRefitDocument() - { - return StationRefit; + return CurrentEntity.Reactive(); } public CultMeshReactiveDocument ReactiveStationRefit() { - return StationRefitDocument().Reactive(); - } - - public CultMeshDocumentHandle CatalogSnapshot() - { - return Catalog; + return StationRefit.Reactive(); } public CultMeshReactiveDocument ReactiveCatalogSnapshot() { - return CatalogSnapshot().Reactive(); - } - - public CultMeshDocumentHandle PlayerSettingsDocument() - { - return PlayerSettings; + return Catalog.Reactive(); } public CultMeshReactiveDocument ReactivePlayerSettingsDocument() { - return PlayerSettingsDocument().Reactive(); + return PlayerSettings.Reactive(); } public static bool TryResolveEveSurface(