diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 8e11d303b..9b6ab3e1d 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -11968,11 +11968,24 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) { "public Func CreateEveSurfaceStateRefResolver()", "public CultMeshStateRefResolver CreateEveSurfaceCultMeshStateRefResolver()", - "public async Task CreateEveSurfaceCultMeshStateRefResolverAsync()", - "LatestAsync()", - "LatestAsync()", - "LatestAsync()", - "() => Latest()", + "public sealed class AetheriaClientState : IDisposable", + "CultMeshReactiveDocument? _eveStateRefFrame", + "CultMeshReactiveDocument? _eveStateRefHealth", + "CultMeshReactiveDocument? _eveStateRefCommandBoundary", + "CultMeshReactiveDocument? _eveStateRefCatalog", + "_eveStateRefFrame ??= Reactive()", + "_eveStateRefHealth ??= Reactive()", + "_eveStateRefCommandBoundary ??= Reactive()", + "_eveStateRefCatalog ??= Reactive()", + "() => _eveStateRefFrame.Current", + "() => _eveStateRefHealth.Current", + "() => _eveStateRefCommandBoundary.Current", + "() => _eveStateRefCatalog.Current", + "public void Dispose()", + "_eveStateRefFrame?.Dispose()", + "_eveStateRefHealth?.Dispose()", + "_eveStateRefCommandBoundary?.Dispose()", + "_eveStateRefCatalog?.Dispose()", "AetheriaRuntimeStateRefResolver.CreateEveSurfaceCultMeshStateRefResolver(" }; var missingClientStateSymbols = requiredClientStateSymbols @@ -11988,10 +12001,21 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) if (clientState.Contains("var frameTask = Daemon.LatestFrameDocumentAsync()", StringComparison.Ordinal) || clientState.Contains("var healthTask = Daemon.LatestHealthAsync()", StringComparison.Ordinal) || clientState.Contains("var commandBoundaryTask = Daemon.LatestCommandBoundaryAsync()", StringComparison.Ordinal) || + clientState.Contains("LatestAsync()", StringComparison.Ordinal) || + clientState.Contains("LatestAsync()", StringComparison.Ordinal) || + clientState.Contains("LatestAsync()", StringComparison.Ordinal) || + clientState.Contains("Latest()", StringComparison.Ordinal) || clientState.Contains("LatestCatalog)", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaClientState Eve state-ref resolver must use top-level managed accessors instead of walking through the nested daemon state."); + "AetheriaClientState Eve state-ref resolver must own reactive typed documents instead of bootstrapping one-shot latest snapshots."); + } + + if (!client.Contains("_aetheriaState?.Dispose()", StringComparison.Ordinal) || + !client.Contains("_aetheriaState = null", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "AetheriaRuntimeVerseClient must dispose AetheriaClientState so cached reactive state-ref resolver documents do not leak."); } var requiredStateRefResolverSymbols = new[] @@ -15669,6 +15693,11 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "AetheriaRuntimeDaemonItemStatQueries.StateRefPrefix", "AetheriaRuntimeDaemonStateRefs.CurrentEntityName", "public static CultMeshStateRefResolver CreateEveSurfaceCultMeshStateRefResolver(", + "Func frameProvider", + "Func healthProvider", + "Func commandBoundaryProvider", + "frameProvider?.Invoke()", + "catalogProvider?.Invoke()", "CultMesh.StateRefResolver(", "FindDaemonItem(" }; diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index 43cb58cd5..908ee3425 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -17,7 +17,7 @@ namespace GameCult.Aetheria.State.Verse EditorTui } - public sealed class AetheriaClientState + public sealed class AetheriaClientState : IDisposable { private readonly CultMeshDocumentCatalog _documents; private readonly Func> _mapViewport; @@ -28,6 +28,10 @@ namespace GameCult.Aetheria.State.Verse private readonly Func> _selectedObject; private readonly Func> _inventory; private readonly Func> _starbridgePlayerSeat; + private CultMeshReactiveDocument? _eveStateRefFrame; + private CultMeshReactiveDocument? _eveStateRefHealth; + private CultMeshReactiveDocument? _eveStateRefCommandBoundary; + private CultMeshReactiveDocument? _eveStateRefCatalog; internal AetheriaClientState( CultMeshDocumentHandle providerAdvertisement, @@ -437,22 +441,28 @@ namespace GameCult.Aetheria.State.Verse public CultMeshStateRefResolver CreateEveSurfaceCultMeshStateRefResolver() { - return CreateEveSurfaceCultMeshStateRefResolverAsync().ConfigureAwait(false).GetAwaiter().GetResult(); - } - - public async Task CreateEveSurfaceCultMeshStateRefResolverAsync() - { - var frameTask = LatestAsync(); - var healthTask = LatestAsync(); - var commandBoundaryTask = LatestAsync(); - - await Task.WhenAll(frameTask, healthTask, commandBoundaryTask).ConfigureAwait(false); + _eveStateRefFrame ??= Reactive(); + _eveStateRefHealth ??= Reactive(); + _eveStateRefCommandBoundary ??= Reactive(); + _eveStateRefCatalog ??= Reactive(); return AetheriaRuntimeStateRefResolver.CreateEveSurfaceCultMeshStateRefResolver( - frameTask.Result, - healthTask.Result, - commandBoundaryTask.Result, - () => Latest()); + () => _eveStateRefFrame.Current, + () => _eveStateRefHealth.Current, + () => _eveStateRefCommandBoundary.Current, + () => _eveStateRefCatalog.Current); + } + + public void Dispose() + { + _eveStateRefFrame?.Dispose(); + _eveStateRefHealth?.Dispose(); + _eveStateRefCommandBoundary?.Dispose(); + _eveStateRefCatalog?.Dispose(); + _eveStateRefFrame = null; + _eveStateRefHealth = null; + _eveStateRefCommandBoundary = null; + _eveStateRefCatalog = null; } } diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateRefResolver.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateRefResolver.cs index 78bacfed8..6f37c41fd 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateRefResolver.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateRefResolver.cs @@ -128,17 +128,20 @@ namespace GameCult.Aetheria.State.Verse } public static CultMeshStateRefResolver CreateEveSurfaceCultMeshStateRefResolver( - AetheriaRuntimeDaemonFrameDocument? frame, - AetheriaRuntimeDaemonHealthDocument? health, - AetheriaRuntimeDaemonCommandBoundaryDocument? commandBoundary, + Func frameProvider, + Func healthProvider, + Func commandBoundaryProvider, Func? catalogProvider = null, CultMeshRouteHint? routeHint = null) { - AetheriaRuntimeCatalogSnapshot? catalog = null; - var daemonRefs = CultMesh.StateRefResolver( "aetheria.daemon.refs", - (stateRef, _context) => TryResolveDaemonStateRef(frame, health, commandBoundary, stateRef, out var value) + (stateRef, _context) => TryResolveDaemonStateRef( + frameProvider?.Invoke(), + healthProvider?.Invoke(), + commandBoundaryProvider?.Invoke(), + stateRef, + out var value) ? value : "", new[] @@ -156,8 +159,11 @@ namespace GameCult.Aetheria.State.Verse if (!stateRef.StartsWith(AetheriaRuntimeDaemonItemStatQueries.StateRefPrefix + "/", StringComparison.Ordinal)) return ""; - catalog ??= catalogProvider?.Invoke(); - return TryResolveDaemonItemStatRef(frame, catalog, stateRef, out var value) + return TryResolveDaemonItemStatRef( + frameProvider?.Invoke(), + catalogProvider?.Invoke(), + stateRef, + out var value) ? value : ""; }, diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs index 3977ecca9..bae8288c0 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs @@ -351,6 +351,8 @@ namespace GameCult.Aetheria.State.Verse return; _disposed = true; + _aetheriaState?.Dispose(); + _aetheriaState = null; _managedDaemonFrame?.Dispose(); _managedCatalog?.Dispose(); _managedLoadoutTemplates?.Dispose();