Use generic Eve surface documents

This commit is contained in:
Meta Vens 2026-06-29 00:41:49 +01:00
commit 0c94708672
4 changed files with 135 additions and 187 deletions

View file

@ -3214,10 +3214,10 @@ static void RequireEveRuntimeBootstrap(string root)
"AetheriaUnityRuntimeClientProvider.ResolveClient(",
"CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>",
"ResolveReactiveDaemonSurfaceState(",
"client.State.ReactiveGameSurface()",
"client.State.ReactiveGameTuiSurface()",
"client.State.ReactiveEditorSurface()",
"client.State.ReactiveEditorTuiSurface()",
"client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game)",
"client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui)",
"client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor)",
"client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui)",
"DisposeReactiveSurfaceState()",
"AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(",
"private bool ShouldMountSurface(",
@ -8114,14 +8114,10 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
"public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(",
"public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(",
"public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(",
"public global::Aetheria.State.Documents.EveSurfaceState LatestGameSurface()",
"public global::Aetheria.State.Documents.EveSurfaceState LatestGameTuiSurface()",
"public global::Aetheria.State.Documents.EveSurfaceState LatestEditorSurface()",
"public global::Aetheria.State.Documents.EveSurfaceState LatestEditorTuiSurface()",
"public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameSurface(",
"public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameTuiSurface(",
"public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorSurface(",
"public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorTuiSurface(",
"public enum AetheriaClientEveSurface",
"public CultMeshDocumentHandle<TDocument> Document<TDocument>(AetheriaClientEveSurface surface)",
"public TDocument Latest<TDocument>(AetheriaClientEveSurface surface)",
"public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(",
"public CultMeshDocumentHandle<TDocument> Document<TDocument>(AetheriaRuntimeRtsViewportBounds viewport)",
"public TDocument Latest<TDocument>(AetheriaRuntimeRtsViewportBounds viewport)",
"public CultMeshDocumentHandle<TDocument> Document<TDocument>(int entityOrZoneIndex)",
@ -8206,7 +8202,23 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
"LatestSummary(",
"LatestSummaryAsync(",
"ReactiveSummary(",
"ReactiveSummaryAsync("
"ReactiveSummaryAsync(",
"LatestGameSurface(",
"LatestGameSurfaceAsync(",
"ReactiveGameSurface(",
"ReactiveGameSurfaceAsync(",
"LatestGameTuiSurface(",
"LatestGameTuiSurfaceAsync(",
"ReactiveGameTuiSurface(",
"ReactiveGameTuiSurfaceAsync(",
"LatestEditorSurface(",
"LatestEditorSurfaceAsync(",
"ReactiveEditorSurface(",
"ReactiveEditorSurfaceAsync(",
"LatestEditorTuiSurface(",
"LatestEditorTuiSurfaceAsync(",
"ReactiveEditorTuiSurface(",
"ReactiveEditorTuiSurfaceAsync("
};
var survivingFixedReactiveWrappers = forbiddenFixedReactiveWrappers
.Where(symbol => clientState.Contains(symbol, StringComparison.Ordinal))
@ -8428,6 +8440,14 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
"client.State.Daemon.LatestGameTuiSurface()",
"client.State.Daemon.LatestEditorSurface()",
"client.State.Daemon.LatestEditorTuiSurface()",
"client.State.LatestGameSurface()",
"client.State.LatestGameTuiSurface()",
"client.State.LatestEditorSurface()",
"client.State.LatestEditorTuiSurface()",
"client.State.ReactiveGameSurface()",
"client.State.ReactiveGameTuiSurface()",
"client.State.ReactiveEditorSurface()",
"client.State.ReactiveEditorTuiSurface()",
"client.State.ObserveCatalog()",
"client.State.ObserveDaemonFrame()",
"client.State.ObserveLoadoutTemplates()",
@ -8480,7 +8500,7 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root
"Starbridge player-seat examples must use generic parameterized managed document access instead of named wrappers or raw handle walks.");
}
Console.WriteLine("Domain document accessors: managed Aetheria state uses generic fixed-document reads plus generic parameterized viewport/detail/Starbridge access");
Console.WriteLine("Domain document accessors: managed Aetheria state uses generic fixed-document reads plus generic parameterized viewport/detail/Starbridge/Eve-surface access");
}
static void RequireVerseHostSettingsAuthority(string root)

View file

@ -227,10 +227,10 @@ public class DaemonRuntimeDocumentTests
using var playerHudCatalog = client.State.Reactive<AetheriaRuntimeCatalogSnapshot>();
using var playerHudSettings = client.State.Reactive<AetheriaRuntimePlayerSettingsDocument>();
using var playerHudEntity = client.State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
var gameSurface = client.State.LatestGameSurface();
var gameTuiSurface = client.State.LatestGameTuiSurface();
var editorSurface = client.State.LatestEditorSurface();
var editorTuiSurface = client.State.LatestEditorTuiSurface();
var gameSurface = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game);
var gameTuiSurface = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui);
var editorSurface = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor);
var editorTuiSurface = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui);
var authorityStatus = client.State.Latest<AetheriaRuntimeVerseAuthorityPolicyDocument>();
var currentDocking = client.State.Current.Docking
.LatestAsync()
@ -238,10 +238,10 @@ public class DaemonRuntimeDocumentTests
.GetResult();
var stationRefit = client.State.Latest<AetheriaRuntimeStationRefitDocument>();
var observedDocking = client.State.CurrentDocking();
using var reactiveGameSurface = client.State.ReactiveGameSurface();
using var reactiveGameTuiSurface = client.State.ReactiveGameTuiSurface();
using var reactiveEditorSurface = client.State.ReactiveEditorSurface();
using var reactiveEditorTuiSurface = client.State.ReactiveEditorTuiSurface();
using var reactiveGameSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game);
using var reactiveGameTuiSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui);
using var reactiveEditorSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor);
using var reactiveEditorTuiSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui);
Assert.AreEqual("aetheria.current.entity", client.State.Current.Entity.DocumentId);
Assert.AreSame(client.State.Current.Entity, client.State.Document<AetheriaRuntimeCurrentEntityDocument>());
@ -603,10 +603,10 @@ public class DaemonRuntimeDocumentTests
.OpenAsync(statePath, "unity-surface-test", pullOnOpen: true)
.GetAwaiter()
.GetResult();
var unityGameSurfaceState = client.State.LatestGameSurface();
var unityGameTuiSurfaceState = client.State.LatestGameTuiSurface();
var unityEditorSurfaceState = client.State.LatestEditorSurface();
var unityEditorTuiSurfaceState = client.State.LatestEditorTuiSurface();
var unityGameSurfaceState = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game);
var unityGameTuiSurfaceState = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui);
var unityEditorSurfaceState = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor);
var unityEditorTuiSurfaceState = client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui);
var surfaceResolver = client.State.CreateEveSurfaceStateRefResolver();
var unityGameSurface = AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(
unityGameSurfaceState,
@ -638,7 +638,7 @@ public class DaemonRuntimeDocumentTests
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, unityEditorTuiSurface.Surface.Id);
Assert.AreEqual("editor.daemon", unityEditorTuiSurface.ProviderKind);
var genericGameSurface = AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(
client.State.LatestGameSurface(),
client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game),
surfaceResolver);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, genericGameSurface.Surface.Id);
Assert.AreEqual(unityGameSurface.ProviderId, genericGameSurface.ProviderId);
@ -661,11 +661,11 @@ public class DaemonRuntimeDocumentTests
AetheriaRuntimeDaemonStateRefs.CurrentTargetName,
AetheriaRuntimeDaemonSchemas.Frame));
var genericGameTuiSurface = AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(
client.State.LatestGameTuiSurface(),
client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui),
surfaceResolver);
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, genericGameTuiSurface.Surface.Id);
var genericEditorTuiSurface = AetheriaRuntimeEveSurfaceAdapter.ToEveSurfaceDocument(
client.State.LatestEditorTuiSurface(),
client.State.Latest<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui),
surfaceResolver);
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, genericEditorTuiSurface.Surface.Id);
}

View file

@ -169,16 +169,16 @@ namespace GameCult.Aetheria.EveRuntime
AetheriaClient client)
{
if (string.Equals(surfaceId, AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, StringComparison.Ordinal))
return client.State.ReactiveGameSurface();
return client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game);
if (string.Equals(surfaceId, AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, StringComparison.Ordinal))
return client.State.ReactiveGameTuiSurface();
return client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui);
if (string.Equals(surfaceId, AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, StringComparison.Ordinal))
return client.State.ReactiveEditorSurface();
return client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor);
if (string.Equals(surfaceId, AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, StringComparison.Ordinal))
return client.State.ReactiveEditorTuiSurface();
return client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui);
return null;
}

View file

@ -9,6 +9,14 @@ using R3;
namespace GameCult.Aetheria.State.Verse
{
public enum AetheriaClientEveSurface
{
Game,
GameTui,
Editor,
EditorTui
}
public sealed class AetheriaClientState
{
private readonly CultMeshDocumentCatalog _documents;
@ -217,6 +225,40 @@ namespace GameCult.Aetheria.State.Verse
: null;
}
public CultMeshDocumentHandle<TDocument> Document<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return Daemon.Document<TDocument>(surface);
}
public Task<TDocument> LatestAsync<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return Document<TDocument>(surface).LatestAsync();
}
public TDocument Latest<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return LatestAsync<TDocument>(surface).ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<TDocument>> ReactiveAsync<TDocument>(
AetheriaClientEveSurface surface,
CultMeshReactiveDocumentOptions? options = null)
where TDocument : class
{
return Document<TDocument>(surface).ReactiveAsync(options);
}
public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(
AetheriaClientEveSurface surface,
CultMeshReactiveDocumentOptions? options = null)
where TDocument : class
{
return Document<TDocument>(surface).Reactive(options);
}
private CultMeshReactiveDocument<TDocument>? TryReactive<TDocument>(
CultMeshReactiveDocumentOptions? options)
where TDocument : class
@ -246,94 +288,6 @@ namespace GameCult.Aetheria.State.Verse
}
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestGameSurfaceAsync()
{
return Daemon.LatestGameSurfaceAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestGameSurface()
{
return LatestGameSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveGameSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveGameSurfaceAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveGameSurface(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestGameTuiSurfaceAsync()
{
return Daemon.LatestGameTuiSurfaceAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestGameTuiSurface()
{
return LatestGameTuiSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveGameTuiSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveGameTuiSurfaceAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameTuiSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveGameTuiSurface(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestEditorSurfaceAsync()
{
return Daemon.LatestEditorSurfaceAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestEditorSurface()
{
return LatestEditorSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveEditorSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveEditorSurfaceAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveEditorSurface(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestEditorTuiSurfaceAsync()
{
return Daemon.LatestEditorTuiSurfaceAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestEditorTuiSurface()
{
return LatestEditorTuiSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveEditorTuiSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveEditorTuiSurfaceAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorTuiSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return Daemon.ReactiveEditorTuiSurface(options);
}
public Observable<TDocument> Watch<TDocument>()
where TDocument : class
{
@ -433,92 +387,66 @@ namespace GameCult.Aetheria.State.Verse
public CultMeshDocumentHandle<global::Aetheria.State.Documents.EveSurfaceState> EditorTuiSurface { get; }
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestGameSurfaceAsync()
public bool TryGetDocument<TDocument>(
AetheriaClientEveSurface surface,
out CultMeshDocumentHandle<TDocument> document)
where TDocument : class
{
return GameSurface.LatestAsync();
if (typeof(TDocument) == typeof(global::Aetheria.State.Documents.EveSurfaceState))
{
var eveSurface = surface switch
{
AetheriaClientEveSurface.Game => GameSurface,
AetheriaClientEveSurface.GameTui => GameTuiSurface,
AetheriaClientEveSurface.Editor => EditorSurface,
AetheriaClientEveSurface.EditorTui => EditorTuiSurface,
_ => throw new ArgumentOutOfRangeException(nameof(surface), surface, null)
};
document = (CultMeshDocumentHandle<TDocument>)(object)eveSurface;
return true;
}
document = null!;
return false;
}
public global::Aetheria.State.Documents.EveSurfaceState LatestGameSurface()
public CultMeshDocumentHandle<TDocument> Document<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return LatestGameSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
if (TryGetDocument<TDocument>(surface, out var document))
return document;
throw new NotSupportedException(
$"Aetheria daemon state does not expose an Eve surface document for {typeof(TDocument).FullName}.");
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveGameSurfaceAsync(
public Task<TDocument> LatestAsync<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return Document<TDocument>(surface).LatestAsync();
}
public TDocument Latest<TDocument>(AetheriaClientEveSurface surface)
where TDocument : class
{
return LatestAsync<TDocument>(surface).ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<TDocument>> ReactiveAsync<TDocument>(
AetheriaClientEveSurface surface,
CultMeshReactiveDocumentOptions? options = null)
where TDocument : class
{
return GameSurface.ReactiveAsync(options);
return Document<TDocument>(surface).ReactiveAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameSurface(
public CultMeshReactiveDocument<TDocument> Reactive<TDocument>(
AetheriaClientEveSurface surface,
CultMeshReactiveDocumentOptions? options = null)
where TDocument : class
{
return GameSurface.Reactive(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestGameTuiSurfaceAsync()
{
return GameTuiSurface.LatestAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestGameTuiSurface()
{
return LatestGameTuiSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveGameTuiSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return GameTuiSurface.ReactiveAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveGameTuiSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return GameTuiSurface.Reactive(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestEditorSurfaceAsync()
{
return EditorSurface.LatestAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestEditorSurface()
{
return LatestEditorSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveEditorSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return EditorSurface.ReactiveAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return EditorSurface.Reactive(options);
}
public Task<global::Aetheria.State.Documents.EveSurfaceState> LatestEditorTuiSurfaceAsync()
{
return EditorTuiSurface.LatestAsync();
}
public global::Aetheria.State.Documents.EveSurfaceState LatestEditorTuiSurface()
{
return LatestEditorTuiSurfaceAsync().ConfigureAwait(false).GetAwaiter().GetResult();
}
public Task<CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState>> ReactiveEditorTuiSurfaceAsync(
CultMeshReactiveDocumentOptions? options = null)
{
return EditorTuiSurface.ReactiveAsync(options);
}
public CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEditorTuiSurface(
CultMeshReactiveDocumentOptions? options = null)
{
return EditorTuiSurface.Reactive(options);
return Document<TDocument>(surface).Reactive(options);
}
}