From 2f072542f91b00794604718e83be83529a793081 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 02:50:49 +0100 Subject: [PATCH] Inline docking state document access --- Aetheria.State.Verify/Program.cs | 62 +++++----------- .../AetheriaUnityObservedDockingIndex.cs | 53 ++++++++----- .../Tests/DaemonRuntimeDocumentTests.cs | 8 +- GameCult.Aetheria.State.Unity.csproj | 1 - .../AetheriaRuntimeObservedDockingState.cs | 74 ------------------- ...etheriaRuntimeObservedDockingState.cs.meta | 2 - 6 files changed, 56 insertions(+), 144 deletions(-) delete mode 100644 Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs delete mode 100644 Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs.meta diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index eccd31037..c6b8aedf4 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7282,21 +7282,6 @@ static bool HasManagedDockingSnapshotAccess(string source) return true; } - if (source.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) && - source.Contains("var state = _resolveClient()?.State;", StringComparison.Ordinal) && - source.Contains("state.Latest()", StringComparison.Ordinal) && - source.Contains("state.Latest()", StringComparison.Ordinal) && - source.Contains("state.Latest()", StringComparison.Ordinal) && - !source.Contains("State?.CurrentDocking()", StringComparison.Ordinal) && - !source.Contains(".State.CurrentDocking()", StringComparison.Ordinal) && - !source.Contains("ResolveClient().State.CurrentDocking()", StringComparison.Ordinal) && - !source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) && - !source.Contains("AetheriaClientReactiveDockingState _dockingState", StringComparison.Ordinal) && - !source.Contains(".ReactiveDockingState()", StringComparison.Ordinal)) - { - return true; - } - if (source.Contains("AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) && source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) && source.Contains("dockingIndex.TryResolveCurrent", StringComparison.Ordinal) && @@ -7306,14 +7291,15 @@ static bool HasManagedDockingSnapshotAccess(string source) } return source.Contains("public sealed class AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) && - source.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) && source.Contains("CultMeshReactiveDocument _currentEntity", StringComparison.Ordinal) && source.Contains("CultMeshReactiveDocument _currentDocking", StringComparison.Ordinal) && source.Contains("CultMeshReactiveDocument _stationRefit", StringComparison.Ordinal) && - source.Contains("AetheriaRuntimeObservedDockingState.TryCreateCurrent(", StringComparison.Ordinal) && + source.Contains("TryReadCurrentDockingDocuments(", StringComparison.Ordinal) && source.Contains("state.Document().Reactive()", StringComparison.Ordinal) && source.Contains("state.Document().Reactive()", StringComparison.Ordinal) && source.Contains("state.Document().Reactive()", StringComparison.Ordinal) && + source.Contains("_currentDocking?.Current", StringComparison.Ordinal) && + source.Contains("_stationRefit?.Current", StringComparison.Ordinal) && !source.Contains("State?.CurrentDocking()", StringComparison.Ordinal) && !source.Contains(".State.CurrentDocking()", StringComparison.Ordinal) && !source.Contains("state.Latest()", StringComparison.Ordinal) && @@ -8147,12 +8133,6 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeObservedDaemonState.cs"); - var observedDockingStatePath = Path.Combine( - root, - "Packages", - "org.gamecult.aetheria.state", - "Runtime", - "AetheriaRuntimeObservedDockingState.cs"); var daemonRuntimeDocumentTestsPath = Path.Combine( root, "Assets", @@ -8170,7 +8150,6 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root { clientStatePath, observedDaemonStatePath, - observedDockingStatePath, daemonRuntimeDocumentTestsPath, starbridgePlayerSeatTestsPath }; @@ -8468,32 +8447,23 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root "Observed daemon state must compose current values from managed typed frame, SoA, and zone-render documents."); } - var observedDockingState = File.ReadAllText(observedDockingStatePath); - if (!observedDockingState.Contains("public sealed class AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) || - !observedDockingState.Contains("public static bool TryCreateCurrent(", StringComparison.Ordinal) || - !observedDockingState.Contains("CultMeshReactiveDocument? entity", StringComparison.Ordinal) || - !observedDockingState.Contains("CultMeshReactiveDocument docking", StringComparison.Ordinal) || - !observedDockingState.Contains("CultMeshReactiveDocument refit", StringComparison.Ordinal) || - !observedDockingState.Contains("new AetheriaRuntimeObservedDockingState(", StringComparison.Ordinal) || - !observedDockingState.Contains("TryResolveCurrentDockingBayRow(", StringComparison.Ordinal)) + if (File.Exists(Path.Combine( + root, + "Packages", + "org.gamecult.aetheria.state", + "Runtime", + "AetheriaRuntimeObservedDockingState.cs"))) { throw new InvalidOperationException( - "Observed docking state must compose current entity, docking, and station-refit documents inside the managed state package."); + "AetheriaRuntimeObservedDockingState must not return as a docking aggregate wrapper; callers should own the managed typed docking documents directly."); } - if (observedDockingState.Contains("AetheriaRuntimeCurrentEntitySession", StringComparison.Ordinal) || - observedDockingState.Contains("AetheriaRuntimeCurrentDockingSession", StringComparison.Ordinal) || - observedDockingState.Contains("AetheriaRuntimeStationRefitSession", StringComparison.Ordinal)) - { - throw new InvalidOperationException( - "Observed docking state still samples legacy session wrappers instead of direct reactive CultMesh documents."); - } - - if (!daemonRuntimeDocumentTests.Contains("AetheriaRuntimeObservedDockingState.TryCreateCurrent(", StringComparison.Ordinal) || + if (!daemonRuntimeDocumentTests.Contains("currentDockingReactive.Current.CurrentEntityKey", StringComparison.Ordinal) || + daemonRuntimeDocumentTests.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) || daemonRuntimeDocumentTests.Contains("client.State.CurrentDocking()", StringComparison.Ordinal)) { throw new InvalidOperationException( - "Daemon runtime document tests must teach observed docking composition from caller-owned managed reactive typed documents."); + "Daemon runtime document tests must teach direct docking samples from caller-owned managed reactive typed documents."); } if (observedDaemonState.Contains("state.LatestFrame.ReactiveAsync", StringComparison.Ordinal) || @@ -13280,14 +13250,15 @@ static void RequireMainMenuContinueRunState(string root) var requiredObservedDockingSymbols = new[] { "public sealed class AetheriaUnityObservedDockingIndex", - "AetheriaRuntimeObservedDockingState", "CultMeshReactiveDocument _currentEntity", "CultMeshReactiveDocument _currentDocking", "CultMeshReactiveDocument _stationRefit", - "AetheriaRuntimeObservedDockingState.TryCreateCurrent(", + "TryReadCurrentDockingDocuments(", "state.Document().Reactive()", "state.Document().Reactive()", "state.Document().Reactive()", + "_currentDocking?.Current", + "_stationRefit?.Current", "public bool IsEntityUndocked(Entity entity)", "public bool TryResolveDockingBay(", "out AetheriaRuntimeCurrentDockingDocument docking", @@ -13309,6 +13280,7 @@ static void RequireMainMenuContinueRunState(string root) "state.Latest()", "state.Latest()", "state.Latest()", + "AetheriaRuntimeObservedDockingState", "new AetheriaRuntimeObservedDockingState(", "State?.CurrentDocking()", ".State.CurrentDocking()", diff --git a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs index 97859d2c2..0f9525825 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs @@ -3,6 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ using System; +using System.Linq; using GameCult.Aetheria.State.Verse; using GameCult.Mesh; @@ -45,36 +46,38 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable public bool TryResolveCurrentEntityKey(out string currentEntityKey) { currentEntityKey = ""; - if (TryResolveCurrentDocking(out var docking)) - currentEntityKey = docking.CurrentEntityKey; + if (TryReadCurrentDockingDocuments(out var currentEntity, out var docking, out _)) + currentEntityKey = CurrentEntityKey(currentEntity, docking); return !string.IsNullOrWhiteSpace(currentEntityKey); } public bool TryResolveCurrentEntityDocument(out AetheriaRuntimeCurrentEntityDocument currentEntity) { currentEntity = null; - if (!TryResolveCurrentDocking(out var docking)) + if (!TryReadCurrentDockingDocuments(out var document, out _, out _)) return false; - currentEntity = docking.Entity; + currentEntity = document; return currentEntity != null; } public AetheriaRuntimeStationRefitDocument ResolveStationRefit() { - return TryResolveCurrentDocking(out var docking) - ? docking.Refit + return TryReadCurrentDockingDocuments(out _, out _, out var refit) + ? refit : null; } public bool TryResolveCurrentDockingBayRow(out AetheriaRuntimeStationDockingBayRow dockingBay) { dockingBay = null; - if (!TryResolveCurrentDocking(out var docking) || - !docking.TryResolveCurrentDockingBayRow(out var row)) + if (!TryReadCurrentDockingDocuments(out _, out _, out var refit) || + !refit.IsDocked || + refit.DockingBayIndex < 0) return false; - dockingBay = row; + dockingBay = (refit.DockingBays ?? Array.Empty()) + .FirstOrDefault(row => row != null && row.DockingBayIndex == refit.DockingBayIndex); return dockingBay != null; } @@ -99,10 +102,10 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable public bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking) { docking = null; - if (!TryResolveCurrentDocking(out var currentDocking)) + if (!TryReadCurrentDockingDocuments(out _, out var currentDocking, out _)) return false; - docking = currentDocking.Docking; + docking = currentDocking; return docking != null; } @@ -166,17 +169,24 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable return true; } - private bool TryResolveCurrentDocking(out AetheriaRuntimeObservedDockingState docking) + private bool TryReadCurrentDockingDocuments( + out AetheriaRuntimeCurrentEntityDocument entity, + out AetheriaRuntimeCurrentDockingDocument docking, + out AetheriaRuntimeStationRefitDocument refit) { + entity = null; docking = null; + refit = null; try { EnsureDockingDocuments(); - return AetheriaRuntimeObservedDockingState.TryCreateCurrent( - _currentEntity, - _currentDocking, - _stationRefit, - out docking); + docking = _currentDocking?.Current; + refit = _stationRefit?.Current; + if (docking == null || refit == null) + return false; + + entity = _currentEntity?.Current; + return true; } catch { @@ -184,6 +194,15 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable } } + private static string CurrentEntityKey( + AetheriaRuntimeCurrentEntityDocument entity, + AetheriaRuntimeCurrentDockingDocument docking) + { + return !string.IsNullOrWhiteSpace(entity?.EntityKey) + ? entity.EntityKey + : docking?.CurrentEntityKey ?? ""; + } + private void EnsureDockingDocuments() { if (_currentEntity != null && _currentDocking != null && _stationRefit != null) diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index 41a9166a4..7b1d84bab 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -240,11 +240,9 @@ public class DaemonRuntimeDocumentTests .GetAwaiter() .GetResult(); var stationRefit = ReadLatest(client.State.Document()); - Assert.IsTrue(AetheriaRuntimeObservedDockingState.TryCreateCurrent( - currentEntityDocumentReactive, - currentDockingReactive, - stationRefitReactive, - out var observedDocking)); + Assert.AreEqual(currentEntity.EntityKey, currentEntityDocumentReactive.Current.EntityKey); + Assert.AreEqual(currentDocking.CurrentEntityKey, currentDockingReactive.Current.CurrentEntityKey); + Assert.AreEqual(stationRefit.StationEntityKey, stationRefitReactive.Current.StationEntityKey); using var reactiveGameSurface = client.State.Document(AetheriaClientEveSurface.Game).Reactive(); using var reactiveGameTuiSurface = client.State.Document(AetheriaClientEveSurface.GameTui).Reactive(); using var reactiveEditorSurface = client.State.Document(AetheriaClientEveSurface.Editor).Reactive(); diff --git a/GameCult.Aetheria.State.Unity.csproj b/GameCult.Aetheria.State.Unity.csproj index 2ef46354b..c13c06f8b 100644 --- a/GameCult.Aetheria.State.Unity.csproj +++ b/GameCult.Aetheria.State.Unity.csproj @@ -95,7 +95,6 @@ - diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs deleted file mode 100644 index 9a0836e5a..000000000 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Linq; -using GameCult.Mesh; - -#nullable enable - -namespace GameCult.Aetheria.State.Verse -{ - public sealed class AetheriaRuntimeObservedDockingState - { - public AetheriaRuntimeObservedDockingState( - AetheriaRuntimeCurrentEntityDocument? entity, - AetheriaRuntimeCurrentDockingDocument docking, - AetheriaRuntimeStationRefitDocument refit) - { - Entity = entity; - Docking = docking ?? throw new ArgumentNullException(nameof(docking)); - Refit = refit ?? throw new ArgumentNullException(nameof(refit)); - } - - public AetheriaRuntimeCurrentEntityDocument? Entity { get; } - public AetheriaRuntimeCurrentDockingDocument Docking { get; } - public AetheriaRuntimeStationRefitDocument Refit { get; } - public string CurrentEntityKey => !string.IsNullOrWhiteSpace(Entity?.EntityKey) - ? Entity.EntityKey - : Docking.CurrentEntityKey ?? ""; - public int CurrentEntityIndex => Entity?.EntityIndex >= 0 - ? Entity.EntityIndex - : Docking.CurrentEntityIndex; - public bool IsDocked => Docking.IsDocked || Refit.IsDocked; - public string DockParentEntityKey => !string.IsNullOrWhiteSpace(Refit.DockParentEntityKey) - ? Refit.DockParentEntityKey - : Docking.DockParentEntityKey ?? ""; - public int DockingBayIndex => Refit.DockingBayIndex; - - public bool TryResolveCurrentDockingBayRow( - out AetheriaRuntimeStationDockingBayRow? dockingBay) - { - dockingBay = null; - if (!Refit.IsDocked || Refit.DockingBayIndex < 0) - return false; - - dockingBay = (Refit.DockingBays ?? Array.Empty()) - .FirstOrDefault(row => row != null && row.DockingBayIndex == Refit.DockingBayIndex); - return dockingBay != null; - } - - public static bool TryCreateCurrent( - CultMeshReactiveDocument? entity, - CultMeshReactiveDocument docking, - CultMeshReactiveDocument refit, - out AetheriaRuntimeObservedDockingState? observed) - { - observed = null; - try - { - var currentDocking = docking?.Current; - var currentRefit = refit?.Current; - if (currentDocking == null || currentRefit == null) - return false; - - observed = new AetheriaRuntimeObservedDockingState( - entity?.Current, - currentDocking, - currentRefit); - return true; - } - catch - { - return false; - } - } - } -} diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs.meta b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs.meta deleted file mode 100644 index c2393ffdb..000000000 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeObservedDockingState.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 30e9106680734e93b752b294036a3a26