diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 742095390..194105ef6 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -11644,14 +11644,13 @@ static void RequireCatalogSurfaceUsesManagedRuntimeCatalog(string root) static void RequireAetheriaRuntimeVerseClientContract(string root) { var clientPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseClient.cs"); - var managedClientInputsPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeManagedClientInputs.cs"); var clientStatePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaClientState.cs"); var surfaceStatePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeEveSurfaceState.cs"); var oldSurfaceStatePath = Path.Combine(root, "Aetheria.State", "Documents", "EveSurfaceState.cs"); var stateRefResolverPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeStateRefResolver.cs"); var docPath = Path.Combine(root, "docs", "aetheria-verse-client-contract.md"); - var requiredFiles = new[] { clientPath, managedClientInputsPath, clientStatePath, surfaceStatePath, stateRefResolverPath, docPath }; + var requiredFiles = new[] { clientPath, clientStatePath, surfaceStatePath, stateRefResolverPath, docPath }; var missingFiles = requiredFiles .Where(path => !File.Exists(path)) .Select(path => Path.GetRelativePath(root, path)) @@ -11664,7 +11663,6 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) } var client = File.ReadAllText(clientPath); - var managedClientInputs = File.ReadAllText(managedClientInputsPath); var clientState = File.ReadAllText(clientStatePath); var surfaceState = File.ReadAllText(surfaceStatePath); var stateRefResolver = File.ReadAllText(stateRefResolverPath); @@ -11698,19 +11696,31 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "Document(", "typeof(EveSurfaceState)", "private AetheriaClientState? _aetheriaState", - "private AetheriaRuntimeManagedClientInputs? _managedClientInputs", - "_managedClientInputs?.Dispose()", + "private CultMeshReactiveDocument? _managedDaemonFrame", + "private CultMeshReactiveDocument? _managedCatalog", + "private CultMeshReactiveDocument? _managedLoadoutTemplates", + "private CultMeshReactiveDocument? _managedStarbridgeScenario", + "private CultMeshReactiveDocument? _managedStarbridgeSession", + "_managedDaemonFrame?.Dispose()", + "_managedCatalog?.Dispose()", + "_managedLoadoutTemplates?.Dispose()", + "_managedStarbridgeScenario?.Dispose()", + "_managedStarbridgeSession?.Dispose()", "return _aetheriaState ??= CreateAetheriaState();", "AetheriaRuntimeLoadoutTemplatesDocument", "ProjectStarbridgeSummaryAsync", - "AetheriaRuntimeManagedClientInputs? managedInputs = null;", - "managedInputs = new AetheriaRuntimeManagedClientInputs(state);", - "AetheriaRuntimeManagedClientInputs RequireManagedInputs()", - "RequireManagedInputs().RequireFrame()", - "inputs.Catalog", - "inputs.LoadoutTemplates.Templates", - "inputs.StarbridgeScenario", - "inputs.StarbridgeSession", + "CultMeshReactiveDocument? managedDaemonFrame = null;", + "managedDaemonFrame = state.Reactive();", + "managedCatalog = state.Reactive();", + "managedLoadoutTemplates = state.Reactive();", + "managedStarbridgeScenario = state.Reactive();", + "managedStarbridgeSession = state.Reactive();", + "AetheriaRuntimeDaemonFrameDocument RequireManagedFrame()", + "RequireManagedFrame()", + "RequireManagedCatalog()", + "RequireManagedLoadoutTemplates().Templates", + "managedStarbridgeScenario?.Current", + "managedStarbridgeSession?.Current", "BootstrapCatalogDocument(", "CatalogBootstrapSource(", "BootstrapRuntimeCatalogSnapshot()", @@ -11791,48 +11801,18 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) string.Join(", ", survivingNamedMutablePointers)); } - var requiredManagedInputSymbols = new[] - { - "internal sealed class AetheriaRuntimeManagedClientInputs : IDisposable", - "private readonly CultMeshReactiveDocument _daemonFrame;", - "private readonly CultMeshReactiveDocument _catalog;", - "private readonly CultMeshReactiveDocument _loadoutTemplates;", - "private readonly CultMeshReactiveDocument _starbridgeScenario;", - "private readonly CultMeshReactiveDocument _starbridgeSession;", - "public AetheriaRuntimeManagedClientInputs(AetheriaClientState state)", - "_daemonFrame = state.Reactive();", - "_catalog = state.Reactive();", - "_loadoutTemplates = state.Reactive();", - "_starbridgeScenario = state.Reactive();", - "_starbridgeSession = state.Reactive();", - "public AetheriaRuntimeCatalogSnapshot Catalog => _catalog.Current", - "public AetheriaRuntimeLoadoutTemplatesDocument LoadoutTemplates => _loadoutTemplates.Current", - "public AetheriaRuntimeDaemonFrameDocument RequireFrame()", - "_daemonFrame.Dispose();", - "_catalog.Dispose();", - "_loadoutTemplates.Dispose();" - }; - var missingManagedInputSymbols = requiredManagedInputSymbols - .Where(symbol => !managedClientInputs.Contains(symbol, StringComparison.Ordinal)) - .ToArray(); - if (missingManagedInputSymbols.Length > 0) - { - throw new InvalidOperationException( - "Aetheria managed client input documents must live outside VerseClient as a named disposable typed context: " + - string.Join(", ", missingManagedInputSymbols)); - } - - if (managedClientInputs.Contains("AetheriaRuntimeDaemonFrameSession _daemonFrame", StringComparison.Ordinal) || - managedClientInputs.Contains("AetheriaRuntimeCatalogSession _catalog", StringComparison.Ordinal) || - managedClientInputs.Contains("AetheriaRuntimeLoadoutTemplatesSession _loadoutTemplates", StringComparison.Ordinal) || - managedClientInputs.Contains("AetheriaRuntimeStarbridgeScenarioSession _starbridgeScenario", StringComparison.Ordinal) || - managedClientInputs.Contains("AetheriaRuntimeStarbridgeRunSession _starbridgeSession", StringComparison.Ordinal) || - managedClientInputs.Contains("state.ObserveDaemonFrame()", StringComparison.Ordinal) || - managedClientInputs.Contains("state.ObserveCatalog()", StringComparison.Ordinal) || - managedClientInputs.Contains("state.ObserveLoadoutTemplates()", StringComparison.Ordinal) || - managedClientInputs.Contains("state.Starbridge.ObserveScenario()", StringComparison.Ordinal) || - managedClientInputs.Contains("state.Starbridge.ObserveSession()", StringComparison.Ordinal) || - managedClientInputs.Contains(".Reactive()", StringComparison.Ordinal) || + if (File.Exists(Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeManagedClientInputs.cs")) || + client.Contains("AetheriaRuntimeManagedClientInputs", StringComparison.Ordinal) || + client.Contains("AetheriaRuntimeDaemonFrameSession _daemonFrame", StringComparison.Ordinal) || + client.Contains("AetheriaRuntimeCatalogSession _catalog", StringComparison.Ordinal) || + client.Contains("AetheriaRuntimeLoadoutTemplatesSession _loadoutTemplates", StringComparison.Ordinal) || + client.Contains("AetheriaRuntimeStarbridgeScenarioSession _starbridgeScenario", StringComparison.Ordinal) || + client.Contains("AetheriaRuntimeStarbridgeRunSession _starbridgeSession", StringComparison.Ordinal) || + client.Contains("state.ObserveDaemonFrame()", StringComparison.Ordinal) || + client.Contains("state.ObserveCatalog()", StringComparison.Ordinal) || + client.Contains("state.ObserveLoadoutTemplates()", StringComparison.Ordinal) || + client.Contains("state.Starbridge.ObserveScenario()", StringComparison.Ordinal) || + client.Contains("state.Starbridge.ObserveSession()", StringComparison.Ordinal) || client.Contains("catalogDocument.Reactive()", StringComparison.Ordinal) || client.Contains("loadoutTemplatesDocument.Reactive()", StringComparison.Ordinal) || client.Contains("starbridgeScenarioDocument.Reactive()", StringComparison.Ordinal) || @@ -11840,16 +11820,16 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) client.Contains("latestFrameDocument.Reactive()", StringComparison.Ordinal)) { throw new InvalidOperationException( - "Aetheria managed client inputs must own named reactive typed documents instead of legacy session wrappers or raw handle reactive calls."); + "Aetheria Verse client derived documents must sample directly owned generic reactive typed documents instead of a named input/session wrapper."); } if (client.Contains("AetheriaRuntimeReactiveProjectionInputs", StringComparison.Ordinal) || client.Contains("private sealed class AetheriaRuntimeManagedClientInputs", StringComparison.Ordinal) || client.Contains("_projectionInputs", StringComparison.Ordinal) || - managedClientInputs.Contains("ProjectionInputs", StringComparison.Ordinal)) + client.Contains("ProjectionInputs", StringComparison.Ordinal)) { throw new InvalidOperationException( - "AetheriaRuntimeVerseClient reintroduced a nested projection-input helper instead of using managed typed client inputs."); + "AetheriaRuntimeVerseClient reintroduced a projection-input helper instead of owning generic reactive typed documents directly."); } if (client.Contains("ProjectStationRefitAsync", StringComparison.Ordinal) && @@ -11986,7 +11966,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) var starbridgeSummaryBlock = indexedDocumentStart > starbridgeSummaryStart ? client.Substring(starbridgeSummaryStart, indexedDocumentStart - starbridgeSummaryStart) : client.Substring(starbridgeSummaryStart); - if (!starbridgeSummaryBlock.Contains("inputs.Catalog", StringComparison.Ordinal) || + if (!starbridgeSummaryBlock.Contains("RequireManagedCatalog()", StringComparison.Ordinal) || starbridgeSummaryBlock.Contains("catalogDocument.LatestAsync()", StringComparison.Ordinal) || starbridgeSummaryBlock.Contains("BootstrapRuntimeCatalogSnapshot()", StringComparison.Ordinal) || starbridgeSummaryBlock.Contains("AetheriaRuntimeCatalogStore.OpenReadOnly", StringComparison.Ordinal)) @@ -18045,7 +18025,7 @@ static void RequireInventoryLoadoutRestoreRequestAuthority(string root) !rtsProjection.Contains("AetheriaRuntimeDaemonTradeItemQueries.TryProjectLoadoutTemplatePrice(", StringComparison.Ordinal) || !rtsProjection.Contains("credits >= price", StringComparison.Ordinal) || !clientState.Contains("public CultMeshDocumentHandle LoadoutTemplates", StringComparison.Ordinal) || - !verseClient.Contains("inputs.LoadoutTemplates.Templates", StringComparison.Ordinal) || + !verseClient.Contains("RequireManagedLoadoutTemplates().Templates", StringComparison.Ordinal) || !verseClient.Contains("ProjectStationRefit(", StringComparison.Ordinal)) { throw new InvalidOperationException( diff --git a/GameCult.Aetheria.State.Unity.csproj b/GameCult.Aetheria.State.Unity.csproj index 624df2d16..2ef46354b 100644 --- a/GameCult.Aetheria.State.Unity.csproj +++ b/GameCult.Aetheria.State.Unity.csproj @@ -68,7 +68,6 @@ - diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs deleted file mode 100644 index 3d7736dd7..000000000 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using GameCult.Mesh; - -#nullable enable - -namespace GameCult.Aetheria.State.Verse -{ - internal sealed class AetheriaRuntimeManagedClientInputs : IDisposable - { - private readonly CultMeshReactiveDocument _daemonFrame; - private readonly CultMeshReactiveDocument _catalog; - private readonly CultMeshReactiveDocument _loadoutTemplates; - private readonly CultMeshReactiveDocument _starbridgeScenario; - private readonly CultMeshReactiveDocument _starbridgeSession; - - public AetheriaRuntimeManagedClientInputs(AetheriaClientState state) - { - if (state == null) - throw new ArgumentNullException(nameof(state)); - - _daemonFrame = state.Reactive(); - _catalog = state.Reactive(); - _loadoutTemplates = state.Reactive(); - _starbridgeScenario = state.Reactive(); - _starbridgeSession = state.Reactive(); - } - - public AetheriaRuntimeCatalogSnapshot Catalog => _catalog.Current - ?? throw new InvalidOperationException("Aetheria Verse client has no runtime catalog document yet."); - - public AetheriaRuntimeLoadoutTemplatesDocument LoadoutTemplates => _loadoutTemplates.Current - ?? throw new InvalidOperationException("Aetheria Verse client has no loadout templates document yet."); - - public AetheriaRuntimeStarbridgeScenarioDocument? StarbridgeScenario => _starbridgeScenario.Current; - - public AetheriaRuntimeStarbridgeSessionDocument? StarbridgeSession => _starbridgeSession.Current; - - public AetheriaRuntimeDaemonFrameDocument RequireFrame() - { - return _daemonFrame.Current - ?? throw new InvalidOperationException("Aetheria Verse client has no daemon frame yet."); - } - - public void Dispose() - { - _daemonFrame.Dispose(); - _catalog.Dispose(); - _loadoutTemplates.Dispose(); - _starbridgeScenario.Dispose(); - _starbridgeSession.Dispose(); - } - } -} diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs.meta b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs.meta deleted file mode 100644 index 7cbaf8006..000000000 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeManagedClientInputs.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4e31c58477d356f4794aa58ccefa0348 \ No newline at end of file diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs index 42a19b8ac..fe60285ea 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs @@ -144,7 +144,11 @@ namespace GameCult.Aetheria.State.Verse private readonly CultMeshNode _node; private AetheriaClientState? _aetheriaState; - private AetheriaRuntimeManagedClientInputs? _managedClientInputs; + private CultMeshReactiveDocument? _managedDaemonFrame; + private CultMeshReactiveDocument? _managedCatalog; + private CultMeshReactiveDocument? _managedLoadoutTemplates; + private CultMeshReactiveDocument? _managedStarbridgeScenario; + private CultMeshReactiveDocument? _managedStarbridgeSession; private bool _disposed; private AetheriaRuntimeVerseClient(string statePath, string runtimeId, CultMeshNode node) @@ -356,7 +360,11 @@ namespace GameCult.Aetheria.State.Verse return; _disposed = true; - _managedClientInputs?.Dispose(); + _managedDaemonFrame?.Dispose(); + _managedCatalog?.Dispose(); + _managedLoadoutTemplates?.Dispose(); + _managedStarbridgeScenario?.Dispose(); + _managedStarbridgeSession?.Dispose(); _node.Dispose(); } @@ -388,7 +396,11 @@ namespace GameCult.Aetheria.State.Verse AetheriaRuntimeVerseRecordKeys.StarbridgeSessionLatest); var latestFrameDocument = Document( AetheriaRuntimeVerseRecordKeys.DaemonFrameLatest); - AetheriaRuntimeManagedClientInputs? managedInputs = null; + CultMeshReactiveDocument? managedDaemonFrame = null; + CultMeshReactiveDocument? managedCatalog = null; + CultMeshReactiveDocument? managedLoadoutTemplates = null; + CultMeshReactiveDocument? managedStarbridgeScenario = null; + CultMeshReactiveDocument? managedStarbridgeSession = null; var state = new AetheriaClientState( Document( @@ -492,8 +504,16 @@ namespace GameCult.Aetheria.State.Verse seatId => Document( AetheriaRuntimeVerseRecordKeys.StarbridgePlayerSeat(seatId))); - managedInputs = new AetheriaRuntimeManagedClientInputs(state); - _managedClientInputs = managedInputs; + managedDaemonFrame = state.Reactive(); + managedCatalog = state.Reactive(); + managedLoadoutTemplates = state.Reactive(); + managedStarbridgeScenario = state.Reactive(); + managedStarbridgeSession = state.Reactive(); + _managedDaemonFrame = managedDaemonFrame; + _managedCatalog = managedCatalog; + _managedLoadoutTemplates = managedLoadoutTemplates; + _managedStarbridgeScenario = managedStarbridgeScenario; + _managedStarbridgeSession = managedStarbridgeSession; return state; CultMeshDocumentHandle ProjectedDocument( @@ -518,7 +538,7 @@ namespace GameCult.Aetheria.State.Verse return CultMesh.Document( documentId, verse, - async _ => await project(RequireManagedInputs().RequireFrame()).ConfigureAwait(false), + async _ => await project(RequireManagedFrame()).ConfigureAwait(false), _ => frameChanges .SelectAwait(async (frame, cancellationToken) => await project(frame).ConfigureAwait(false)), @@ -526,10 +546,22 @@ namespace GameCult.Aetheria.State.Verse routeHint: new CultMeshRouteHint(CultMeshLocalityKind.SharedMemory, "Aetheria typed projected state")); } - AetheriaRuntimeManagedClientInputs RequireManagedInputs() + AetheriaRuntimeDaemonFrameDocument RequireManagedFrame() { - return managedInputs - ?? throw new InvalidOperationException("Aetheria Verse client managed inputs were sampled before client state was initialized."); + return managedDaemonFrame?.Current + ?? throw new InvalidOperationException("Aetheria Verse client has no daemon frame yet."); + } + + AetheriaRuntimeCatalogSnapshot RequireManagedCatalog() + { + return managedCatalog?.Current + ?? throw new InvalidOperationException("Aetheria Verse client has no runtime catalog document yet."); + } + + AetheriaRuntimeLoadoutTemplatesDocument RequireManagedLoadoutTemplates() + { + return managedLoadoutTemplates?.Current + ?? throw new InvalidOperationException("Aetheria Verse client has no loadout templates document yet."); } CultMeshDocumentHandle BootstrapCatalogDocument( @@ -558,22 +590,20 @@ namespace GameCult.Aetheria.State.Verse Task ProjectStationRefitAsync( AetheriaRuntimeDaemonFrameDocument frame) { - var inputs = RequireManagedInputs(); return Task.FromResult(AetheriaRuntimeRtsProjection.ProjectStationRefit( frame, - inputs.LoadoutTemplates.Templates, - inputs.Catalog)); + RequireManagedLoadoutTemplates().Templates, + RequireManagedCatalog())); } Task ProjectStarbridgeSummaryAsync( AetheriaRuntimeDaemonFrameDocument frame) { - var inputs = RequireManagedInputs(); return Task.FromResult(AetheriaRuntimeStarbridgeProjection.ProjectSessionSummary( frame, - inputs.StarbridgeScenario, - inputs.StarbridgeSession, - inputs.Catalog)); + managedStarbridgeScenario?.Current, + managedStarbridgeSession?.Current, + RequireManagedCatalog())); } static string IndexedDocumentId(string prefix, int index)