Remove AetheriaClient document read helpers

This commit is contained in:
Meta Vens 2026-06-28 05:21:42 +01:00
commit ac860dc21c
4 changed files with 70 additions and 213 deletions

View file

@ -3172,10 +3172,10 @@ static void RequireEveRuntimeBootstrap(string root)
"ReadDaemonSurface(statePath)",
"ReadDaemonSurface(stateBoot.StateFilePath)",
"AetheriaUnityRuntimeClientProvider.ResolveClient(",
"DaemonGameSurfaceAsync()",
"DaemonGameTuiSurfaceAsync()",
"DaemonEditorSurfaceAsync()",
"DaemonEditorTuiSurfaceAsync()",
"client.State.Daemon.GameSurface.LatestAsync()",
"client.State.Daemon.GameTuiSurface.LatestAsync()",
"client.State.Daemon.EditorSurface.LatestAsync()",
"client.State.Daemon.EditorTuiSurface.LatestAsync()",
"AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(",
"private bool ShouldMountSurface(",
"_mountedSurfaceVersion != surface.Version",
@ -3202,6 +3202,15 @@ static void RequireEveRuntimeBootstrap(string root)
"Aetheria Eve presenter still mounts daemon surfaces through file-reader lookup instead of the shared AetheriaClient facade.");
}
if (presenter.Contains(".DaemonGameSurfaceAsync()", StringComparison.Ordinal) ||
presenter.Contains(".DaemonGameTuiSurfaceAsync()", StringComparison.Ordinal) ||
presenter.Contains(".DaemonEditorSurfaceAsync()", StringComparison.Ordinal) ||
presenter.Contains(".DaemonEditorTuiSurfaceAsync()", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"Aetheria Eve presenter still reads daemon surfaces through AetheriaClient compatibility helpers instead of managed document handles.");
}
if (presenter.Contains("new EveUiToolkitSurfaceLowerer", StringComparison.Ordinal))
{
throw new InvalidOperationException(
@ -13448,27 +13457,25 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
string.Join(", ", missingDaemonStateFacadeSymbols));
}
var requiredDaemonClientFacadeSymbols = new[]
var requiredManagedClientAccessSymbols = new[]
{
"public AetheriaClientState State => _state;",
"public AetheriaClientState Aetheria() => State;",
"public CultMeshDocumentHandle<TDocument> Document<TDocument>()",
"public Task<TDocument> LatestAsync<TDocument>()",
"public Observable<TDocument> Watch<TDocument>()",
"public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(",
"State.Daemon.LatestFrame.LatestAsync()",
"State.Daemon.LatestSoaView.LatestAsync()",
"State.Daemon.Health.LatestAsync()",
"State.Daemon.AuthorityPolicy.LatestAsync()",
"State.Daemon.GameSurface.LatestAsync()",
"State.Daemon.GameTuiSurface.LatestAsync()",
"State.Daemon.EditorSurface.LatestAsync()",
"State.Daemon.EditorTuiSurface.LatestAsync()",
"State.Starbridge.Scenario.LatestAsync()",
"State.Starbridge.Session.LatestAsync()"
"State.Daemon.LatestSoaView.LatestAsync()"
};
var missingDaemonClientFacadeSymbols = requiredDaemonClientFacadeSymbols
var missingManagedClientAccessSymbols = requiredManagedClientAccessSymbols
.Where(symbol => !aetheriaClient.Contains(symbol, StringComparison.Ordinal))
.ToArray();
if (missingDaemonClientFacadeSymbols.Length > 0)
if (missingManagedClientAccessSymbols.Length > 0)
{
throw new InvalidOperationException(
"AetheriaClient daemon compatibility methods must read managed typed state documents: " +
string.Join(", ", missingDaemonClientFacadeSymbols));
"AetheriaClient must expose managed typed document access instead of document-specific compatibility readers: " +
string.Join(", ", missingManagedClientAccessSymbols));
}
var forbiddenDaemonClientBypassSymbols = new[]
@ -13489,7 +13496,31 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
"public async Task<System.Collections.Generic.IReadOnlyList<AetheriaRuntimeLoadoutTemplateSnapshot>> LoadoutTemplatesAsync()",
"scenario ??= await _verse.GetStarbridgeScenarioAsync()",
"session ??= await _verse.GetStarbridgeSessionAsync()",
"var frame = await _verse.GetLatestFrameAsync()"
"var frame = await _verse.GetLatestFrameAsync()",
"public async Task<AetheriaRuntimeDaemonFrameDocument?> LatestAuthoritativeRunFrameAsync()",
"public async Task<AetheriaRuntimeRtsViewportDocument> MapViewportAsync(",
"public async Task<AetheriaRuntimeObjectsViewportDocument> ObjectsViewportAsync(",
"public async Task<AetheriaRuntimeGravityViewportDocument> GravityViewportAsync(",
"public async Task<AetheriaRuntimeRenderSplatsViewportDocument> RenderSplatsViewportAsync(",
"public async Task<AetheriaRuntimeAssetManifestDocument> AssetManifestAsync()",
"public async Task<AetheriaRuntimeCurrentZoneDocument> CurrentZoneAsync()",
"public async Task<AetheriaRuntimeCurrentEntityDocument> CurrentEntityAsync()",
"public async Task<AetheriaRuntimeCurrentDockingDocument> CurrentDockingAsync()",
"public async Task<AetheriaRuntimeZoneContactsDocument> ZoneContactsAsync()",
"public async Task<AetheriaRuntimeStationRefitDocument> StationRefitAsync()",
"public async Task<AetheriaRuntimeSectorMapDocument> SectorMapAsync()",
"public async Task<AetheriaRuntimeZoneDetailsDocument> ZoneDetailsAsync(",
"public async Task<AetheriaRuntimeZoneRenderDocument> ZoneRenderAsync()",
"public async Task<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSessionSummaryAsync(",
"public async Task<AetheriaRuntimeSelectedObjectDocument> SelectedObjectAsync(",
"public async Task<AetheriaRuntimeInventoryDocument> InventoryAsync(",
"public async Task<AetheriaRuntimeDaemonHealthDocument?> DaemonHealthAsync()",
"public async Task<AetheriaRuntimeVerseAuthorityPolicyDocument?> AuthorityStatusAsync()",
"public async Task<AetheriaRuntimeDaemonSoaViewDocument?> SoaViewAsync()",
"public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonGameSurfaceAsync()",
"public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonGameTuiSurfaceAsync()",
"public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonEditorSurfaceAsync()",
"public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonEditorTuiSurfaceAsync()"
};
var daemonClientBypassHits = forbiddenDaemonClientBypassSymbols
.Where(symbol => aetheriaClient.Contains(symbol, StringComparison.Ordinal))

View file

@ -204,14 +204,13 @@ public class DaemonRuntimeDocumentTests
.GetResult();
using var zoneRenderReactive = client.State
.Reactive<AetheriaRuntimeZoneRenderDocument>();
var legacyCurrentEntity = client.CurrentEntityAsync().GetAwaiter().GetResult();
var legacyObserved = client.ObserveAsync().GetAwaiter().GetResult();
var legacyAuthoritativeFrame = client.LatestAuthoritativeRunFrameAsync().GetAwaiter().GetResult();
var legacyGameSurface = client.DaemonGameSurfaceAsync().GetAwaiter().GetResult();
var legacyGameTuiSurface = client.DaemonGameTuiSurfaceAsync().GetAwaiter().GetResult();
var legacyEditorSurface = client.DaemonEditorSurfaceAsync().GetAwaiter().GetResult();
var legacyEditorTuiSurface = client.DaemonEditorTuiSurfaceAsync().GetAwaiter().GetResult();
var legacyAuthorityStatus = client.AuthorityStatusAsync().GetAwaiter().GetResult();
var observedAuthoritativeFrame = client.State.Daemon.LatestFrame.LatestAsync().GetAwaiter().GetResult();
var gameSurface = client.State.Daemon.GameSurface.LatestAsync().GetAwaiter().GetResult();
var gameTuiSurface = client.State.Daemon.GameTuiSurface.LatestAsync().GetAwaiter().GetResult();
var editorSurface = client.State.Daemon.EditorSurface.LatestAsync().GetAwaiter().GetResult();
var editorTuiSurface = client.State.Daemon.EditorTuiSurface.LatestAsync().GetAwaiter().GetResult();
var authorityStatus = client.State.Daemon.AuthorityPolicy.LatestAsync().GetAwaiter().GetResult();
var dockingState = client.Aetheria()
.DockingState
.LatestAsync()
@ -264,14 +263,15 @@ public class DaemonRuntimeDocumentTests
Assert.AreEqual(frame.FrameId, latestFrame.FrameId);
Assert.AreEqual(frame.FrameId, latestFrameByType.FrameId);
Assert.AreEqual(frame.FrameId, legacyObserved.Frame.FrameId);
Assert.AreEqual(frame.FrameId, legacyAuthoritativeFrame.FrameId);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, legacyGameSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, legacyGameTuiSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, legacyEditorSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, legacyEditorTuiSurface.Surface.Id);
Assert.IsNotNull(legacyAuthorityStatus);
Assert.AreEqual(AetheriaRuntimeVerseAuthoritySchemas.Policy, legacyAuthorityStatus!.Schema);
Assert.AreEqual(authorityPolicy.HostRuntimeId, legacyAuthorityStatus.HostRuntimeId);
Assert.AreEqual(frame.FrameId, observedAuthoritativeFrame.FrameId);
Assert.IsTrue(observedAuthoritativeFrame.IsAuthoritative);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, gameSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, gameTuiSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, editorSurface.Surface.Id);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, editorTuiSurface.Surface.Id);
Assert.IsNotNull(authorityStatus);
Assert.AreEqual(AetheriaRuntimeVerseAuthoritySchemas.Policy, authorityStatus!.Schema);
Assert.AreEqual(authorityPolicy.HostRuntimeId, authorityStatus.HostRuntimeId);
Assert.AreEqual(AetheriaRuntimeCatalogSnapshot.SchemaId, client.State.Catalog.Sources.Last().SchemaId);
Assert.GreaterOrEqual(catalog.Items.Count, 0);
Assert.AreEqual(AetheriaRuntimePlayerSettingsDocument.SchemaId, playerSettings.Schema);
@ -289,7 +289,6 @@ public class DaemonRuntimeDocumentTests
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ZoneRender, zoneRenderReactive.Current.Schema);
Assert.AreEqual(currentEntity.EntityKey, currentEntityByType.EntityKey);
Assert.AreEqual(currentEntity.EntityKey, currentEntityFromClientType.EntityKey);
Assert.AreEqual(legacyCurrentEntity.EntityKey, currentEntity.EntityKey);
Assert.AreEqual(currentEntity.EntityKey, dockingState.CurrentEntityKey);
Assert.AreEqual("", dockingState.DockParentEntityKey);
Assert.AreEqual(-1, dockingState.DockingBayIndex);

View file

@ -132,16 +132,16 @@ namespace GameCult.Aetheria.EveRuntime
private global::Aetheria.State.Documents.EveSurfaceState? ReadDaemonSurfaceState(AetheriaClient client)
{
if (string.Equals(surfaceId, AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, StringComparison.Ordinal))
return client.DaemonGameSurfaceAsync().GetAwaiter().GetResult();
return client.State.Daemon.GameSurface.LatestAsync().GetAwaiter().GetResult();
if (string.Equals(surfaceId, AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, StringComparison.Ordinal))
return client.DaemonGameTuiSurfaceAsync().GetAwaiter().GetResult();
return client.State.Daemon.GameTuiSurface.LatestAsync().GetAwaiter().GetResult();
if (string.Equals(surfaceId, AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, StringComparison.Ordinal))
return client.DaemonEditorSurfaceAsync().GetAwaiter().GetResult();
return client.State.Daemon.EditorSurface.LatestAsync().GetAwaiter().GetResult();
if (string.Equals(surfaceId, AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, StringComparison.Ordinal))
return client.DaemonEditorTuiSurfaceAsync().GetAwaiter().GetResult();
return client.State.Daemon.EditorTuiSurface.LatestAsync().GetAwaiter().GetResult();
return null;
}

View file

@ -158,179 +158,6 @@ namespace GameCult.Aetheria.State.Verse
entityKey ?? "");
}
public async Task<AetheriaRuntimeDaemonFrameDocument?> LatestAuthoritativeRunFrameAsync()
{
ThrowIfDisposed();
var frame = await State.Daemon.LatestFrame.LatestAsync().ConfigureAwait(false);
if (frame == null ||
!frame.IsAuthoritative ||
frame.Run == null ||
frame.Run.Zones == null ||
frame.Run.Zones.Count == 0)
{
return null;
}
return frame;
}
public async Task<AetheriaRuntimeRtsViewportDocument> MapViewportAsync(
AetheriaRuntimeRtsViewportBounds viewport)
{
ThrowIfDisposed();
return await State.Viewports.Map(viewport).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeObjectsViewportDocument> ObjectsViewportAsync(
AetheriaRuntimeRtsViewportBounds viewport)
{
ThrowIfDisposed();
return await State.Viewports.Objects(viewport).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeGravityViewportDocument> GravityViewportAsync(
AetheriaRuntimeRtsViewportBounds viewport)
{
ThrowIfDisposed();
return await State.Viewports.Gravity(viewport).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeRenderSplatsViewportDocument> RenderSplatsViewportAsync(
AetheriaRuntimeRtsViewportBounds viewport)
{
ThrowIfDisposed();
return await State.Viewports.RenderSplats(viewport).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeAssetManifestDocument> AssetManifestAsync()
{
ThrowIfDisposed();
var frame = await RequireFrameAsync().ConfigureAwait(false);
return AetheriaRuntimeAssets.ProjectManifest(
State.Catalog.Latest(),
frame.Run?.RunId ?? "");
}
public async Task<AetheriaRuntimeCurrentZoneDocument> CurrentZoneAsync()
{
ThrowIfDisposed();
return await State.Current.Zone.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeCurrentEntityDocument> CurrentEntityAsync()
{
ThrowIfDisposed();
return await State.Current.Entity.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeCurrentDockingDocument> CurrentDockingAsync()
{
ThrowIfDisposed();
return await State.Current.Docking.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeZoneContactsDocument> ZoneContactsAsync()
{
ThrowIfDisposed();
return await State.ZoneContacts.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeStationRefitDocument> StationRefitAsync()
{
ThrowIfDisposed();
return await State.StationRefit.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeSectorMapDocument> SectorMapAsync()
{
ThrowIfDisposed();
return await State.SectorMap.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeZoneDetailsDocument> ZoneDetailsAsync(int zoneIndex)
{
ThrowIfDisposed();
return await State.Details.Zone(zoneIndex).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeZoneRenderDocument> ZoneRenderAsync()
{
ThrowIfDisposed();
return await State.ZoneRender.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeStarbridgeSessionSummaryDocument> StarbridgeSessionSummaryAsync(
AetheriaRuntimeStarbridgeScenarioDocument? scenario = null,
AetheriaRuntimeStarbridgeSessionDocument? session = null)
{
ThrowIfDisposed();
if (scenario == null && session == null)
return await State.Starbridge.Summary.LatestAsync().ConfigureAwait(false);
var frame = await RequireFrameAsync().ConfigureAwait(false);
scenario ??= await State.Starbridge.Scenario.LatestAsync().ConfigureAwait(false);
session ??= await State.Starbridge.Session.LatestAsync().ConfigureAwait(false);
return AetheriaRuntimeStarbridgeProjection.ProjectSessionSummary(
frame,
scenario,
session,
State.Catalog.Latest());
}
public async Task<AetheriaRuntimeSelectedObjectDocument> SelectedObjectAsync(int entityIndex)
{
ThrowIfDisposed();
return await State.Details.SelectedObject(entityIndex).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeInventoryDocument> InventoryAsync(int entityIndex)
{
ThrowIfDisposed();
return await State.Details.Inventory(entityIndex).LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeDaemonHealthDocument?> DaemonHealthAsync()
{
ThrowIfDisposed();
return await State.Daemon.Health.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeVerseAuthorityPolicyDocument?> AuthorityStatusAsync()
{
ThrowIfDisposed();
return await State.Daemon.AuthorityPolicy.LatestAsync().ConfigureAwait(false);
}
public async Task<AetheriaRuntimeDaemonSoaViewDocument?> SoaViewAsync()
{
ThrowIfDisposed();
return await State.Daemon.LatestSoaView.LatestAsync().ConfigureAwait(false);
}
public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonGameSurfaceAsync()
{
ThrowIfDisposed();
return await State.Daemon.GameSurface.LatestAsync().ConfigureAwait(false);
}
public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonGameTuiSurfaceAsync()
{
ThrowIfDisposed();
return await State.Daemon.GameTuiSurface.LatestAsync().ConfigureAwait(false);
}
public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonEditorSurfaceAsync()
{
ThrowIfDisposed();
return await State.Daemon.EditorSurface.LatestAsync().ConfigureAwait(false);
}
public async Task<global::Aetheria.State.Documents.EveSurfaceState?> DaemonEditorTuiSurfaceAsync()
{
ThrowIfDisposed();
return await State.Daemon.EditorTuiSurface.LatestAsync().ConfigureAwait(false);
}
public Func<string, string> CreateEveSurfaceStateRefResolver()
{
ThrowIfDisposed();