diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 90d0854f8..4da5d1651 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4688,7 +4688,8 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "new AetheriaRuntimeMenuTabProjectionOption(", "ResolveVisibleTabs(", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "ResolveCurrentDocking()?.IsDocked == true", "AetheriaClient", "AetheriaUnityRuntimeClientProvider.ResolveClient(", @@ -4804,7 +4805,8 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "AetheriaRuntimeLocalStoryCommandKind.Choose", "new AetheriaRuntimeLocalStoryChoiceState(", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "unity-runtime-local-story" }; var dockedStoryObserverCorpus = localMenu; @@ -4923,7 +4925,8 @@ static void RequireInventoryShipSettingsUseEveSurface(string root) "latestCurrentEntity.EntityKey", "(float)latestCurrentEntity.ShutdownPerformance", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "?.CurrentEntity" }; @@ -5634,7 +5637,8 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorCommandKind.Close", "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "SetTargetCargo(", "selection.EntityKey", "OwnedQuantity", @@ -6194,7 +6198,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "TryResolveObservedDockingIndex(out var dockingIndex)", "dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "LoadoutRestoreOptions" }; @@ -6267,7 +6272,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) if (!inventoryMenu.Contains("TryResolveCurrentEntity(out var currentEntity)", StringComparison.Ordinal) || !inventoryMenu.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || !inventoryMenu.Contains(".DockingState", StringComparison.Ordinal) || - !inventoryMenu.Contains(".TryLatest(", StringComparison.Ordinal) || + !inventoryMenu.Contains(".Reactive()", StringComparison.Ordinal) || + !inventoryMenu.Contains(".TryCurrent(", StringComparison.Ordinal) || !inventoryMenu.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || !inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || inventoryMenu.Contains("TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) || @@ -6925,11 +6931,24 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) throw new InvalidOperationException("Cannot verify managed docking snapshot access; AetheriaClientState.cs is missing."); var clientState = File.ReadAllText(clientStatePath); - if (!clientState.Contains("public bool TryLatest(out AetheriaClientDockingSnapshot", StringComparison.Ordinal) || - !clientState.Contains("snapshot = Latest();", StringComparison.Ordinal)) + var requiredClientSymbols = new[] + { + "public AetheriaClientReactiveDockingState Reactive(", + "public sealed class AetheriaClientReactiveDockingState : IDisposable", + "CultMeshReactiveDocument", + "CultMeshReactiveDocument", + "CultMeshReactiveDocument", + "public AetheriaClientDockingSnapshot Current =>", + "public bool TryCurrent(out AetheriaClientDockingSnapshot" + }; + var missingClientSymbols = requiredClientSymbols + .Where(symbol => !clientState.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (missingClientSymbols.Length > 0) { throw new InvalidOperationException( - "AetheriaClientDockingState must expose a managed typed safe latest snapshot read for Unity menu surfaces."); + "AetheriaClientDockingState must expose a managed reactive typed docking snapshot for Unity menu surfaces: " + + string.Join(", ", missingClientSymbols)); } var menuPaths = new[] @@ -6963,19 +6982,21 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) Compact = CompactSource(entry.Source) }) .Where(entry => - !entry.Source.Contains(".DockingState.TryLatest(", StringComparison.Ordinal) || - entry.Compact.Contains(CompactSource(".DockingState.Latest()"), StringComparison.Ordinal)) + !entry.Source.Contains(".DockingState.Reactive()", StringComparison.Ordinal) || + !entry.Source.Contains(".TryCurrent(", StringComparison.Ordinal) || + entry.Compact.Contains(CompactSource(".DockingState.Latest()"), StringComparison.Ordinal) || + entry.Compact.Contains(CompactSource(".DockingState.TryLatest("), StringComparison.Ordinal)) .Select(entry => Path.GetRelativePath(root, entry.Path)) .ToArray(); if (offenders.Length > 0) { throw new InvalidOperationException( - "Unity menu docking state must read through AetheriaClientDockingState.TryLatest instead of local latest wrappers: " + + "Unity menu docking state must read through AetheriaClientDockingState.Reactive instead of latest wrappers: " + string.Join(", ", offenders)); } - Console.WriteLine("Menu docking state: Unity menus read managed typed docking snapshots through AetheriaClientDockingState.TryLatest"); + Console.WriteLine("Menu docking state: Unity menus read managed reactive typed docking snapshots"); } static void RequireUnitySharedDocumentAccessorErgonomics(string root) @@ -11951,7 +11972,8 @@ static void RequireMainMenuContinueRunState(string root) "public sealed class AetheriaUnityObservedDockingIndex", ".Aetheria()", ".DockingState", - ".TryLatest(", + ".Reactive()", + ".TryCurrent(", "public bool IsEntityUndocked(Entity entity)", "public bool TryResolveDockingBay(", "out AetheriaRuntimeCurrentDockingDocument docking", diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 8e085b4b9..cb2ff76c4 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -313,7 +313,9 @@ public class ActionGameManager : MonoBehaviour { _gameplayInputShell?.Dispose(); _observedTargetQuery?.Dispose(); + _observedDocking?.Dispose(); _observedTargetQuery = null; + _observedDocking = null; AetheriaUnityRuntimeClientProvider.Dispose(); } diff --git a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs index cddcfb0ad..c224e3c62 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs @@ -5,10 +5,11 @@ using System; using GameCult.Aetheria.State.Verse; -public sealed class AetheriaUnityObservedDockingIndex +public sealed class AetheriaUnityObservedDockingIndex : IDisposable { private readonly Func _resolveClient; private readonly AetheriaUnityObservedEntityIndex _observedEntityIndex; + private AetheriaClientReactiveDockingState _dockingState; public AetheriaUnityObservedDockingIndex( Func resolveClient, @@ -163,8 +164,8 @@ public sealed class AetheriaUnityObservedDockingIndex snapshot = null; try { - var client = _resolveClient(); - return client?.Aetheria().DockingState.TryLatest(out snapshot) == true; + _dockingState ??= _resolveClient()?.Aetheria().DockingState.Reactive(); + return _dockingState?.TryCurrent(out snapshot) == true; } catch { @@ -172,4 +173,9 @@ public sealed class AetheriaUnityObservedDockingIndex } } + public void Dispose() + { + _dockingState?.Dispose(); + _dockingState = null; + } } diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 69ba6a75d..8b15cd32b 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -36,10 +36,12 @@ public class InventoryMenu : MonoBehaviour private CultMeshReactiveDocument _playerSettings; private CultMeshReactiveDocument _currentEntity; private CultMeshReactiveDocument _stationRefit; + private AetheriaClientReactiveDockingState _reactiveDockingState; private int _inventoryEntityIndex = -1; private CultMeshReactiveDocument _inventory; private AetheriaUnityActionBarPresentation _actionBarPresentation; private AetheriaUnityObservedEntityIndex _observedEntityIndex; + private AetheriaUnityObservedDockingIndex _observedDockingIndex; private readonly AetheriaEveUnitySurfaceChrome _shipSettingsSurfaceChrome = PanelChrome(360f, 420f); private readonly AetheriaEveUnitySurfaceChrome _cargoItemDetailsSurfaceChrome = PanelChrome(420f, 520f); private readonly AetheriaEveUnitySurfaceChrome _equippedItemDetailsSurfaceChrome = PanelChrome(460f, 560f); @@ -779,7 +781,8 @@ public class InventoryMenu : MonoBehaviour private AetheriaClientDockingSnapshot ResolveDockingState() { - if (ResolveClient().Aetheria().DockingState.TryLatest(out var docking)) + _reactiveDockingState ??= ResolveClient().Aetheria().DockingState.Reactive(); + if (_reactiveDockingState.TryCurrent(out var docking)) return docking; Debug.LogWarning("Failed to read Aetheria docking state for inventory menu."); @@ -792,7 +795,7 @@ public class InventoryMenu : MonoBehaviour if (_observedEntityIndex == null) return false; - dockingIndex = new AetheriaUnityObservedDockingIndex(ResolveClient, _observedEntityIndex); + dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(ResolveClient, _observedEntityIndex); return true; } @@ -944,11 +947,15 @@ public class InventoryMenu : MonoBehaviour _playerSettings?.Dispose(); _currentEntity?.Dispose(); _stationRefit?.Dispose(); + _reactiveDockingState?.Dispose(); + _observedDockingIndex?.Dispose(); _inventory?.Dispose(); _catalog = null; _playerSettings = null; _currentEntity = null; _stationRefit = null; + _reactiveDockingState = null; + _observedDockingIndex = null; _inventory = null; _inventoryEntityIndex = -1; } diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 3fbec144d..dcd9d9ba6 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -75,6 +75,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler private RectTransform _firstRect; private AetheriaUnityDragSession _dragSession; private AetheriaUnityObservedEntityIndex _observedEntityIndex; + private AetheriaUnityObservedDockingIndex _observedDockingIndex; public ItemInstance FakeItem; public Shape FakeOccupancy; @@ -106,6 +107,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler private CultMeshReactiveDocument _playerSettings; private CultMeshReactiveDocument _currentEntity; private CultMeshReactiveDocument _stationRefit; + private AetheriaClientReactiveDockingState _reactiveDockingState; private int _inventoryEntityIndex = -1; private CultMeshReactiveDocument _inventory; private AetheriaRuntimeStationRefitEntityOption[] _dropdownStationRefitEntities = @@ -1167,7 +1169,8 @@ private void Update() private AetheriaClientDockingSnapshot ResolveDockingState() { - if (ResolveClient().Aetheria().DockingState.TryLatest(out var docking)) + _reactiveDockingState ??= ResolveClient().Aetheria().DockingState.Reactive(); + if (_reactiveDockingState.TryCurrent(out var docking)) return docking; Debug.LogWarning("Failed to read Aetheria docking state for inventory panel."); @@ -1180,7 +1183,7 @@ private void Update() if (_observedEntityIndex == null) return false; - dockingIndex = new AetheriaUnityObservedDockingIndex(ResolveClient, _observedEntityIndex); + dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(ResolveClient, _observedEntityIndex); return true; } @@ -1493,11 +1496,15 @@ private void Update() _playerSettings?.Dispose(); _currentEntity?.Dispose(); _stationRefit?.Dispose(); + _reactiveDockingState?.Dispose(); + _observedDockingIndex?.Dispose(); _inventory?.Dispose(); _catalog = null; _playerSettings = null; _currentEntity = null; _stationRefit = null; + _reactiveDockingState = null; + _observedDockingIndex = null; _inventory = null; _inventoryEntityIndex = -1; } diff --git a/Assets/Scripts/UI/Menu/LocalMenu.cs b/Assets/Scripts/UI/Menu/LocalMenu.cs index d4a783580..f6216fc3e 100644 --- a/Assets/Scripts/UI/Menu/LocalMenu.cs +++ b/Assets/Scripts/UI/Menu/LocalMenu.cs @@ -27,6 +27,8 @@ public class LocalMenu : MonoBehaviour private UIDocument _surfaceDocument; private readonly AetheriaEveUnitySurfaceChrome _surfaceChrome = new AetheriaEveUnitySurfaceChrome(); private AetheriaUnityObservedEntityIndex _observedEntityIndex; + private string _clientStatePath = ""; + private AetheriaClientReactiveDockingState _dockingState; public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) { @@ -203,7 +205,8 @@ public class LocalMenu : MonoBehaviour private bool TryResolveDockingState(out AetheriaClientDockingSnapshot dockingState) { - var resolved = ResolveClient().Aetheria().DockingState.TryLatest(out dockingState); + _dockingState ??= ResolveClient().Aetheria().DockingState.Reactive(); + var resolved = _dockingState.TryCurrent(out dockingState); if (!resolved) Debug.LogWarning("Failed to read Aetheria docking state for local story surface."); return resolved; @@ -232,9 +235,15 @@ public class LocalMenu : MonoBehaviour private AetheriaClient ResolveClient() { - return AetheriaUnityRuntimeClientProvider.ResolveClient( - AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory), - "unity-runtime-local-story"); + var stateBoot = AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory); + if (!string.Equals(_clientStatePath, stateBoot.StateFilePath, StringComparison.Ordinal)) + { + _clientStatePath = stateBoot.StateFilePath; + _dockingState?.Dispose(); + _dockingState = null; + } + + return AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot, "unity-runtime-local-story"); } private void HideStorySurface() @@ -257,6 +266,8 @@ public class LocalMenu : MonoBehaviour AetheriaEveUnitySurfaceHost.DestroyDocument(_surfaceDocument); _surfaceDocument = null; } + _dockingState?.Dispose(); + _dockingState = null; } // Update is called once per frame diff --git a/Assets/Scripts/UI/Menu/MenuPanel.cs b/Assets/Scripts/UI/Menu/MenuPanel.cs index 22cfd1236..9adcd7244 100644 --- a/Assets/Scripts/UI/Menu/MenuPanel.cs +++ b/Assets/Scripts/UI/Menu/MenuPanel.cs @@ -31,6 +31,8 @@ public class MenuPanel : MonoBehaviour private MenuTabBinding _current; private UIDocument _tabSurfaceDocument; private readonly AetheriaEveUnitySurfaceChrome _tabSurfaceChrome = new AetheriaEveUnitySurfaceChrome(); + private string _clientStatePath = ""; + private AetheriaClientReactiveDockingState _dockingState; public MenuTab CurrentTab { get; private set; } @@ -93,6 +95,8 @@ public class MenuPanel : MonoBehaviour AetheriaEveUnitySurfaceHost.DestroyDocument(_tabSurfaceDocument); _tabSurfaceDocument = null; } + _dockingState?.Dispose(); + _dockingState = null; } private void RenderTabSurface() @@ -167,7 +171,8 @@ public class MenuPanel : MonoBehaviour private AetheriaClientDockingSnapshot ResolveCurrentDocking() { - if (ResolveClient().Aetheria().DockingState.TryLatest(out var docking)) + _dockingState ??= ResolveClient().Aetheria().DockingState.Reactive(); + if (_dockingState.TryCurrent(out var docking)) return docking; Debug.LogWarning("Failed to read Aetheria current docking for runtime menu tabs."); @@ -176,9 +181,15 @@ public class MenuPanel : MonoBehaviour private AetheriaClient ResolveClient() { - return AetheriaUnityRuntimeClientProvider.ResolveClient( - AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory), - "unity-runtime-menu-tabs"); + var stateBoot = AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory); + if (!string.Equals(_clientStatePath, stateBoot.StateFilePath, StringComparison.Ordinal)) + { + _clientStatePath = stateBoot.StateFilePath; + _dockingState?.Dispose(); + _dockingState = null; + } + + return AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot, "unity-runtime-menu-tabs"); } private static string GetTabLabel(MenuTabBinding tabBinding) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 20a7c1d78..eb1a8d5ed 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -47,6 +47,7 @@ public class TradeMenu : MonoBehaviour private AetheriaRuntimeTradeCargoSelectorSurfaceProjection _cargoSelectorSurfaceProjection; private AetheriaRuntimeStationCargoTargetRow[] _cargoSelectorStationRefitTargets = Array.Empty(); + private AetheriaClientReactiveDockingState _reactiveDockingState; private AetheriaClientDockingSnapshot _dockingState; private AetheriaRuntimeStationRefitDocument _stationRefit; private AetheriaRuntimeTradeFilterSurfaceProjection _filterSurfaceProjection; @@ -540,7 +541,8 @@ public class TradeMenu : MonoBehaviour if (_dockingState != null) return _dockingState; - if (!ResolveClient().Aetheria().DockingState.TryLatest(out _dockingState)) + _reactiveDockingState ??= ResolveClient().Aetheria().DockingState.Reactive(); + if (!_reactiveDockingState.TryCurrent(out _dockingState)) { Debug.LogWarning("Failed to read Aetheria docking state for trade menu."); return null; @@ -618,8 +620,10 @@ public class TradeMenu : MonoBehaviour { _catalog?.Dispose(); _playerSettings?.Dispose(); + _reactiveDockingState?.Dispose(); _catalog = null; _playerSettings = null; + _reactiveDockingState = null; _dockingState = null; _stationRefit = null; } diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index fa4d96bb7..c2c999e73 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -708,6 +708,22 @@ namespace GameCult.Aetheria.State.Verse } } + public Task ReactiveAsync( + CultMeshReactiveDocumentOptions? options = null) + { + return AetheriaClientReactiveDockingState.CreateAsync( + _currentEntity, + _currentDocking, + _stationRefit, + options); + } + + public AetheriaClientReactiveDockingState Reactive( + CultMeshReactiveDocumentOptions? options = null) + { + return ReactiveAsync(options).ConfigureAwait(false).GetAwaiter().GetResult(); + } + private static AetheriaClientDockingSnapshot CreateSnapshot( AetheriaRuntimeCurrentEntityDocument? entity, AetheriaRuntimeCurrentDockingDocument? docking, @@ -719,6 +735,74 @@ namespace GameCult.Aetheria.State.Verse : null; return new AetheriaClientDockingSnapshot(entity, docking, refit, dockingBay); } + + internal static AetheriaClientDockingSnapshot SnapshotFromCurrent( + AetheriaRuntimeCurrentEntityDocument? entity, + AetheriaRuntimeCurrentDockingDocument? docking, + AetheriaRuntimeStationRefitDocument? refit) + { + return CreateSnapshot(entity, docking, refit); + } + } + + public sealed class AetheriaClientReactiveDockingState : IDisposable + { + private readonly CultMeshReactiveDocument _currentEntity; + private readonly CultMeshReactiveDocument _currentDocking; + private readonly CultMeshReactiveDocument _stationRefit; + + private AetheriaClientReactiveDockingState( + CultMeshReactiveDocument currentEntity, + CultMeshReactiveDocument currentDocking, + CultMeshReactiveDocument stationRefit) + { + _currentEntity = currentEntity ?? throw new ArgumentNullException(nameof(currentEntity)); + _currentDocking = currentDocking ?? throw new ArgumentNullException(nameof(currentDocking)); + _stationRefit = stationRefit ?? throw new ArgumentNullException(nameof(stationRefit)); + } + + internal static async Task CreateAsync( + CultMeshDocumentHandle currentEntity, + CultMeshDocumentHandle currentDocking, + CultMeshDocumentHandle stationRefit, + CultMeshReactiveDocumentOptions? options) + { + var currentEntityTask = currentEntity.ReactiveAsync(options); + var currentDockingTask = currentDocking.ReactiveAsync(options); + var stationRefitTask = stationRefit.ReactiveAsync(options); + await Task.WhenAll(currentEntityTask, currentDockingTask, stationRefitTask).ConfigureAwait(false); + return new AetheriaClientReactiveDockingState( + currentEntityTask.Result, + currentDockingTask.Result, + stationRefitTask.Result); + } + + public AetheriaClientDockingSnapshot Current => + AetheriaClientDockingState.SnapshotFromCurrent( + _currentEntity.Current, + _currentDocking.Current, + _stationRefit.Current); + + public bool TryCurrent(out AetheriaClientDockingSnapshot? snapshot) + { + snapshot = null; + try + { + snapshot = Current; + return snapshot != null; + } + catch + { + return false; + } + } + + public void Dispose() + { + _currentEntity.Dispose(); + _currentDocking.Dispose(); + _stationRefit.Dispose(); + } } public sealed class AetheriaClientDockingSnapshot