From 87a8ac5eead0f1f542ae9aae939b819656472f68 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Wed, 17 Jun 2026 12:14:16 +0100 Subject: [PATCH] Add typed Verse discovery to client target --- .../Aetheria.State.Unity.csproj | 1 + Aetheria.State.Verify/Program.cs | 66 ++++++++- Assets/Scripts/UI/MainMenu.cs | 32 ++++ .../AetheriaRuntimeClientTargetCommands.cs | 8 +- .../AetheriaRuntimeClientTargetStore.cs | 38 +++++ ...theriaRuntimeClientTargetSurfaceBuilder.cs | 140 +++++++++++++++++- .../Runtime/AetheriaRuntimeStateBoot.cs | 21 ++- .../Runtime/AetheriaRuntimeVerseDiscovery.cs | 91 ++++++++++++ 8 files changed, 392 insertions(+), 5 deletions(-) create mode 100644 Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseDiscovery.cs diff --git a/Aetheria.State.Unity/Aetheria.State.Unity.csproj b/Aetheria.State.Unity/Aetheria.State.Unity.csproj index ff839461a..d1784fdd5 100644 --- a/Aetheria.State.Unity/Aetheria.State.Unity.csproj +++ b/Aetheria.State.Unity/Aetheria.State.Unity.csproj @@ -14,6 +14,7 @@ + diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index a60b81987..aa85fcc74 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -3830,6 +3830,7 @@ static void RequireClientTargetBootAuthority(string root) var boundaryPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeStateBoundary.cs"); var bootPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeStateBoot.cs"); var clientTargetStorePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeClientTargetStore.cs"); + var verseDiscoveryPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseDiscovery.cs"); var bootstrapPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.eve-runtime", "Runtime", "AetheriaEveRuntimeBootstrap.cs"); var presenterPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.eve-runtime", "Runtime", "AetheriaEveSurfacePresenter.cs"); var actionGameManagerPath = Path.Combine(root, "Assets", "Scripts", "Gameplay", "ActionGameManager.cs"); @@ -3841,6 +3842,7 @@ static void RequireClientTargetBootAuthority(string root) boundaryPath, bootPath, clientTargetStorePath, + verseDiscoveryPath, bootstrapPath, presenterPath, actionGameManagerPath, @@ -3862,6 +3864,7 @@ static void RequireClientTargetBootAuthority(string root) var boundary = File.ReadAllText(boundaryPath); var boot = File.ReadAllText(bootPath); var clientTargetStore = File.ReadAllText(clientTargetStorePath); + var verseDiscovery = File.ReadAllText(verseDiscoveryPath); var bootstrap = File.ReadAllText(bootstrapPath); var presenter = File.ReadAllText(presenterPath); var actionGameManager = File.ReadAllText(actionGameManagerPath); @@ -3870,6 +3873,7 @@ static void RequireClientTargetBootAuthority(string root) var requiredUnityFacadeSymbols = new[] { "AetheriaRuntimeClientTargetStore.cs", + "AetheriaRuntimeVerseDiscovery.cs", "AetheriaRuntimeStateBoundary.cs", "AetheriaRuntimeStateBoot.cs" }; @@ -3909,6 +3913,10 @@ static void RequireClientTargetBootAuthority(string root) "TargetKind", "StateFilePath", "CultMeshAddress", + "DiscoveryEndpoints", + "DiscoveredVerses", + "LastDiscoveryAtUtc", + "LastDiscoveryError", "ReadOrInitialize", "CreateDefault", "Write(string clientTargetPath, AetheriaRuntimeClientTargetDocument document)", @@ -3931,6 +3939,10 @@ static void RequireClientTargetBootAuthority(string root) "TargetSource", "SupportsLocalStateFileRead", "FailureMessage", + "DiscoveryEndpoints", + "DiscoveredVerses", + "LastDiscoveryAtUtc", + "LastDiscoveryError", "TargetLabel", "AetheriaRuntimeClientTargetStore.ReadOrInitialize", "AetheriaRuntimeStateBoundary.ResolveStatePathOverride()", @@ -3948,6 +3960,25 @@ static void RequireClientTargetBootAuthority(string root) string.Join(", ", missingBootSymbols)); } + var requiredVerseDiscoverySymbols = new[] + { + "CultMesh.CreateVerseCatalog()", + "CultMesh.CreateVerseDiscoveryClient()", + "DiscoverAsync(catalog, endpoints)", + "DiscoveredVerses", + "LastDiscoveryAtUtc", + "LastDiscoveryError" + }; + var missingVerseDiscoverySymbols = requiredVerseDiscoverySymbols + .Where(symbol => !verseDiscovery.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (missingVerseDiscoverySymbols.Length > 0) + { + throw new InvalidOperationException( + "Runtime Verse discovery helper no longer refreshes the typed client-target catalog through CultMesh discovery: " + + string.Join(", ", missingVerseDiscoverySymbols)); + } + var requiredActionGameManagerSymbols = new[] { "AetheriaRuntimeStateBoot.Inspect(GameDataDirectory)", @@ -3993,6 +4024,10 @@ static void RequireClientTargetBootAuthority(string root) "LatestContinueRun(AetheriaRuntimeStateBootReport stateBoot)", "LatestVerseHostSettings(AetheriaRuntimeStateBootReport stateBoot)", "stateBoot.FailureMessage", + "stateBoot.DiscoveryEndpoints", + "stateBoot.DiscoveredVerses", + "stateBoot.LastDiscoveryAtUtc", + "stateBoot.LastDiscoveryError", "\"Client Target\"", "\"Transport\"", "\"Target Source\"" @@ -4049,6 +4084,7 @@ static void RequireVerseSettingsShellAndBridge(string root) var clientTargetSurfaceBuilderPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeClientTargetSurfaceBuilder.cs"); var verseHostCommandsPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseHostCommands.cs"); var clientTargetStorePath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeClientTargetStore.cs"); + var verseDiscoveryPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeVerseDiscovery.cs"); var mainMenuPath = Path.Combine(root, "Assets", "Scripts", "UI", "MainMenu.cs"); var commandBridgePath = Path.Combine(root, "Aetheria.State", "AetheriaEveCommandBridge.cs"); var drainStatusPath = Path.Combine(root, "Aetheria.State", "Documents", "AetheriaEveCommandDrainStatus.cs"); @@ -4064,6 +4100,7 @@ static void RequireVerseSettingsShellAndBridge(string root) clientTargetSurfaceBuilderPath, verseHostCommandsPath, clientTargetStorePath, + verseDiscoveryPath, mainMenuPath, commandBridgePath, drainStatusPath, @@ -4089,6 +4126,7 @@ static void RequireVerseSettingsShellAndBridge(string root) var clientTargetSurfaceBuilder = File.ReadAllText(clientTargetSurfaceBuilderPath); var verseHostCommands = File.ReadAllText(verseHostCommandsPath); var clientTargetStore = File.ReadAllText(clientTargetStorePath); + var verseDiscovery = File.ReadAllText(verseDiscoveryPath); var mainMenu = File.ReadAllText(mainMenuPath); var commandBridge = File.ReadAllText(commandBridgePath); var drainStatus = File.ReadAllText(drainStatusPath); @@ -4099,7 +4137,8 @@ static void RequireVerseSettingsShellAndBridge(string root) var requiredUnityFacadeSymbols = new[] { "AetheriaRuntimeClientTargetCommands.cs", - "AetheriaRuntimeClientTargetSurfaceBuilder.cs" + "AetheriaRuntimeClientTargetSurfaceBuilder.cs", + "AetheriaRuntimeVerseDiscovery.cs" }; var missingUnityFacadeSymbols = requiredUnityFacadeSymbols .Where(symbol => !unityFacadeProject.Contains(symbol, StringComparison.Ordinal)) @@ -4125,6 +4164,9 @@ static void RequireVerseSettingsShellAndBridge(string root) "SetVerseId", "SetCultMeshAddress", "SetStateFilePath", + "SetDiscoveryEndpoints", + "DiscoverVerses", + "SelectDiscoveredVerse", "IsKnown" }; var missingClientTargetCommandSymbols = requiredClientTargetCommandSymbols @@ -4159,8 +4201,12 @@ static void RequireVerseSettingsShellAndBridge(string root) "public sealed class AetheriaRuntimeClientTargetSurfaceState", "\"Client Target\"", "\"Target Fields\"", + "\"Verse Discovery\"", "\"Daemon Verse Host\"", "AetheriaRuntimeClientTargetCommands.SetStateFilePath", + "AetheriaRuntimeClientTargetCommands.SetDiscoveryEndpoints", + "AetheriaRuntimeClientTargetCommands.DiscoverVerses", + "AetheriaRuntimeClientTargetCommands.SelectDiscoveredVerse", "AetheriaRuntimeVerseHostCommands.CycleVisibility", "AetheriaRuntimeVerseHostCommands.Refresh" }; @@ -4180,6 +4226,22 @@ static void RequireVerseSettingsShellAndBridge(string root) "Client-target store no longer exposes typed update ownership for local target edits."); } + var requiredVerseDiscoverySymbols = new[] + { + "CultMesh.CreateVerseCatalog()", + "CultMesh.CreateVerseDiscoveryClient()", + "DiscoverAsync(catalog, endpoints)" + }; + var missingVerseDiscoverySymbols = requiredVerseDiscoverySymbols + .Where(symbol => !verseDiscovery.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (missingVerseDiscoverySymbols.Length > 0) + { + throw new InvalidOperationException( + "Verse discovery helper no longer routes scans through the CultMesh catalog client: " + + string.Join(", ", missingVerseDiscoverySymbols)); + } + var requiredMainMenuSymbols = new[] { "VerseSettingsShellSurfaceId", @@ -4191,6 +4253,8 @@ static void RequireVerseSettingsShellAndBridge(string root) "TryCommitClientTargetCommand(", "TryQueueVerseHostCommand(", "AetheriaRuntimeClientTargetStore.Update(", + "AetheriaRuntimeVerseDiscovery.RefreshClientTarget(", + "ParseDiscoveryEndpoints(", "new EveSurfaceCommandRequest(", "AetheriaRuntimeVerseHostCommands.SurfaceId" }; diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index fbb14da60..ccb7648d1 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -453,6 +453,10 @@ public class MainMenu : MonoBehaviour stateBoot.VerseId, stateBoot.CultMeshAddress, stateBoot.StateFilePath, + string.Join(", ", stateBoot.DiscoveryEndpoints ?? Array.Empty()), + stateBoot.DiscoveredVerses ?? Array.Empty(), + stateBoot.LastDiscoveryAtUtc, + stateBoot.LastDiscoveryError, stateBoot.TargetSource, stateBoot.SupportsLocalStateFileRead, stateBoot.FailureMessage, @@ -615,6 +619,12 @@ public class MainMenu : MonoBehaviour var gameDataDirectory = ActionGameManager.GameDataDirectory; var clientTargetPath = AetheriaRuntimeStateBoundary.GetClientTargetPath(gameDataDirectory); var defaultStateFilePath = AetheriaRuntimeStateBoundary.GetStateFilePath(gameDataDirectory); + if (string.Equals(command, AetheriaRuntimeClientTargetCommands.DiscoverVerses, StringComparison.Ordinal)) + { + AetheriaRuntimeVerseDiscovery.RefreshClientTarget(clientTargetPath, defaultStateFilePath); + return true; + } + AetheriaRuntimeClientTargetStore.Update( clientTargetPath, defaultStateFilePath, @@ -639,6 +649,18 @@ public class MainMenu : MonoBehaviour case var _ when string.Equals(command, AetheriaRuntimeClientTargetCommands.SetStateFilePath, StringComparison.Ordinal): document.StateFilePath = ReadPayloadValue(payload, "value"); break; + case var _ when string.Equals(command, AetheriaRuntimeClientTargetCommands.SetDiscoveryEndpoints, StringComparison.Ordinal): + document.DiscoveryEndpoints = ParseDiscoveryEndpoints(ReadPayloadValue(payload, "value")); + document.LastDiscoveryError = ""; + break; + case var _ when string.Equals(command, AetheriaRuntimeClientTargetCommands.SelectDiscoveredVerse, StringComparison.Ordinal): + document.TargetKind = AetheriaRuntimeClientTargetKinds.CultMeshVerse; + document.Title = ReadPayloadValue(payload, "title"); + document.VerseId = ReadPayloadValue(payload, "verseId"); + document.CultMeshAddress = ReadPayloadValue(payload, "cultMeshAddress"); + document.DiscoveryEndpoints = ParseDiscoveryEndpoints(ReadPayloadValue(payload, "discoveryEndpoints")); + document.LastDiscoveryError = ""; + break; } if (string.IsNullOrWhiteSpace(document.TargetKind)) @@ -697,6 +719,16 @@ public class MainMenu : MonoBehaviour : ""; } + private static string[] ParseDiscoveryEndpoints(string value) + { + return (value ?? "") + .Split(new[] { ',', ';', '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries) + .Select(endpoint => endpoint.Trim()) + .Where(endpoint => !string.IsNullOrWhiteSpace(endpoint)) + .Distinct(StringComparer.Ordinal) + .ToArray(); + } + private static EveSurfaceDocument BuildInputSettingsSurfaceDefinition(bool canOpenRuntimeInputScreen, bool inGame) { var commands = new List diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetCommands.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetCommands.cs index d48929e03..4b5925034 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetCommands.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetCommands.cs @@ -9,6 +9,9 @@ namespace GameCult.Aetheria.State.Unity public const string SetVerseId = "aetheria.client_target.verse_id.set"; public const string SetCultMeshAddress = "aetheria.client_target.cultmesh_address.set"; public const string SetStateFilePath = "aetheria.client_target.state_file_path.set"; + public const string SetDiscoveryEndpoints = "aetheria.client_target.discovery_endpoints.set"; + public const string DiscoverVerses = "aetheria.client_target.discovery.refresh"; + public const string SelectDiscoveredVerse = "aetheria.client_target.discovery.select"; public static bool IsKnown(string command) { @@ -17,7 +20,10 @@ namespace GameCult.Aetheria.State.Unity command == SetTitle || command == SetVerseId || command == SetCultMeshAddress || - command == SetStateFilePath; + command == SetStateFilePath || + command == SetDiscoveryEndpoints || + command == DiscoverVerses || + command == SelectDiscoveredVerse; } } } diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetStore.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetStore.cs index 58ae8b8e9..4db81371b 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetStore.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetStore.cs @@ -28,6 +28,24 @@ namespace GameCult.Aetheria.State.Unity [Key(4)] public string CultMeshAddress { get; set; } = "asgard.local.aetheria/eve"; [Key(5)] public string StateFilePath { get; set; } = ""; [Key(6)] public string UpdatedAtUtc { get; set; } = ""; + [Key(7)] public string[] DiscoveryEndpoints { get; set; } = Array.Empty(); + [Key(8)] public AetheriaRuntimeDiscoveredVerse[] DiscoveredVerses { get; set; } = Array.Empty(); + [Key(9)] public string LastDiscoveryAtUtc { get; set; } = ""; + [Key(10)] public string LastDiscoveryError { get; set; } = ""; + } + + [MessagePackObject] + public sealed class AetheriaRuntimeDiscoveredVerse + { + [Key(0)] public string VerseId { get; set; } = ""; + [Key(1)] public string DisplayName { get; set; } = ""; + [Key(2)] public string AuthorityModel { get; set; } = ""; + [Key(3)] public string TransportVersion { get; set; } = ""; + [Key(4)] public string RulesHash { get; set; } = ""; + [Key(5)] public string Description { get; set; } = ""; + [Key(6)] public string[] DiscoveryEndpoints { get; set; } = Array.Empty(); + [Key(7)] public string[] AuthorityRuntimeIds { get; set; } = Array.Empty(); + [Key(8)] public string ParentVerseId { get; set; } = ""; } public static class AetheriaRuntimeClientTargetStore @@ -69,6 +87,26 @@ namespace GameCult.Aetheria.State.Unity if (document == null) throw new ArgumentNullException(nameof(document)); document.Schema = AetheriaRuntimeClientTargetDocument.SchemaId; + document.DiscoveryEndpoints ??= Array.Empty(); + document.DiscoveredVerses ??= Array.Empty(); + document.LastDiscoveryAtUtc ??= ""; + document.LastDiscoveryError ??= ""; + foreach (var verse in document.DiscoveredVerses) + { + if (verse == null) + continue; + + verse.VerseId ??= ""; + verse.DisplayName ??= ""; + verse.AuthorityModel ??= ""; + verse.TransportVersion ??= ""; + verse.RulesHash ??= ""; + verse.Description ??= ""; + verse.DiscoveryEndpoints ??= Array.Empty(); + verse.AuthorityRuntimeIds ??= Array.Empty(); + verse.ParentVerseId ??= ""; + } + document.UpdatedAtUtc = string.IsNullOrWhiteSpace(document.UpdatedAtUtc) ? DateTime.UtcNow.ToString("O") : document.UpdatedAtUtc; diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetSurfaceBuilder.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetSurfaceBuilder.cs index df3994eca..5b3d1237f 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetSurfaceBuilder.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeClientTargetSurfaceBuilder.cs @@ -12,6 +12,10 @@ namespace GameCult.Aetheria.State.Unity string targetVerseId, string targetCultMeshAddress, string targetStateFilePath, + string discoveryEndpointsText, + IReadOnlyList discoveredVerses, + string lastDiscoveryAtUtc, + string lastDiscoveryError, string targetSource, bool supportsLocalStateFileRead, string bootFailureMessage, @@ -26,6 +30,10 @@ namespace GameCult.Aetheria.State.Unity TargetVerseId = targetVerseId ?? ""; TargetCultMeshAddress = targetCultMeshAddress ?? ""; TargetStateFilePath = targetStateFilePath ?? ""; + DiscoveryEndpointsText = discoveryEndpointsText ?? ""; + DiscoveredVerses = discoveredVerses ?? Array.Empty(); + LastDiscoveryAtUtc = lastDiscoveryAtUtc ?? ""; + LastDiscoveryError = lastDiscoveryError ?? ""; TargetSource = targetSource ?? ""; SupportsLocalStateFileRead = supportsLocalStateFileRead; BootFailureMessage = bootFailureMessage ?? ""; @@ -41,6 +49,10 @@ namespace GameCult.Aetheria.State.Unity public string TargetVerseId { get; } public string TargetCultMeshAddress { get; } public string TargetStateFilePath { get; } + public string DiscoveryEndpointsText { get; } + public IReadOnlyList DiscoveredVerses { get; } + public string LastDiscoveryAtUtc { get; } + public string LastDiscoveryError { get; } public string TargetSource { get; } public bool SupportsLocalStateFileRead { get; } public string BootFailureMessage { get; } @@ -78,6 +90,10 @@ namespace GameCult.Aetheria.State.Unity "", "", "", + Array.Empty(), + "", + "", + "", supportsLocalStateFileRead: true, bootFailureMessage: "", hostTitle: "", @@ -93,11 +109,61 @@ namespace GameCult.Aetheria.State.Unity var visibilityActionLabel = string.Equals(visibilityLabel, "public", StringComparison.OrdinalIgnoreCase) ? "Make Private" : "Make Public"; + var lastDiscoveryLabel = string.IsNullOrWhiteSpace(state.LastDiscoveryAtUtc) ? "never" : state.LastDiscoveryAtUtc; var summaryNote = !state.SupportsLocalStateFileRead && !string.IsNullOrWhiteSpace(state.BootFailureMessage) ? state.BootFailureMessage : string.Equals(state.TargetSource, "state-path-override", StringComparison.Ordinal) ? "AETHERIA_STATE_PATH is overriding the persisted client target. Update the environment if you want boot to follow the saved target again." - : "Client target edits persist in aetheria-client.cc. Verse visibility changes queue typed Eve commands for the provider bridge."; + : "Client target edits persist in aetheria-client.cc. Verse discovery and selection mutate the same typed owner. Verse visibility changes queue provider-owned Eve commands for the daemon bridge."; + + var discoveryChildren = new List + { + TextInput( + "aetheria.clientTarget.discovery.endpoints", + "Discovery Endpoints", + state.DiscoveryEndpointsText, + AetheriaRuntimeClientTargetCommands.SetDiscoveryEndpoints), + Metric("aetheria.clientTarget.discovery.lastScan", "Last Scan", lastDiscoveryLabel) + }; + + if (!string.IsNullOrWhiteSpace(state.LastDiscoveryError)) + { + discoveryChildren.Add(Text( + "aetheria.clientTarget.discovery.error", + state.LastDiscoveryError)); + } + + if (state.DiscoveredVerses.Count == 0) + { + discoveryChildren.Add(Text( + "aetheria.clientTarget.discovery.empty", + string.IsNullOrWhiteSpace(state.DiscoveryEndpointsText) + ? "Add one or more cultnet:// discovery endpoints to scan for public or federated Aetheria Verses." + : "No Verse descriptors are cached yet for the configured discovery endpoints.")); + } + else + { + discoveryChildren.Add(Metric( + "aetheria.clientTarget.discovery.count", + "Known Verses", + state.DiscoveredVerses.Count.ToString())); + discoveryChildren.Add(Row( + "aetheria.clientTarget.discovery.list", + state.DiscoveredVerses + .Select((verse, index) => BuildDiscoveredVerseNode(state, verse, index)) + .ToArray())); + } + + discoveryChildren.Add(ButtonRow( + "aetheria.clientTarget.discovery.actions", + Button( + "aetheria.clientTarget.discovery.scan", + "Discover", + AetheriaRuntimeClientTargetCommands.DiscoverVerses), + Button( + "aetheria.clientTarget.discovery.refresh", + "Refresh Shell", + AetheriaRuntimeClientTargetCommands.Refresh))); return new AetheriaRuntimeSurfaceDocument( providerId: "aetheria", @@ -155,6 +221,11 @@ namespace GameCult.Aetheria.State.Unity "aetheria.clientTarget.target.refresh", "Refresh", AetheriaRuntimeClientTargetCommands.Refresh))), + Node( + "aetheria.clientTarget.discovery", + "card", + new[] { ("title", "Verse Discovery") }, + discoveryChildren.ToArray()), Node( "aetheria.clientTarget.host", "card", @@ -206,6 +277,18 @@ namespace GameCult.Aetheria.State.Unity AetheriaRuntimeClientTargetCommands.SetStateFilePath, "Set State File Path", "unity-uitoolkit"), + new AetheriaRuntimeSurfaceCommandTemplate( + AetheriaRuntimeClientTargetCommands.SetDiscoveryEndpoints, + "Set Discovery Endpoints", + "unity-uitoolkit"), + new AetheriaRuntimeSurfaceCommandTemplate( + AetheriaRuntimeClientTargetCommands.DiscoverVerses, + "Discover Verses", + "unity-uitoolkit"), + new AetheriaRuntimeSurfaceCommandTemplate( + AetheriaRuntimeClientTargetCommands.SelectDiscoveredVerse, + "Select Discovered Verse", + "unity-uitoolkit"), new AetheriaRuntimeSurfaceCommandTemplate( AetheriaRuntimeVerseHostCommands.CycleVisibility, "Toggle Visibility", @@ -247,6 +330,13 @@ namespace GameCult.Aetheria.State.Unity return Node(id, "row", Array.Empty<(string Key, string Value)>(), children); } + private static AetheriaRuntimeSurfaceComponent Row( + string id, + params AetheriaRuntimeSurfaceComponent[] children) + { + return Node(id, "inspector.kv", Array.Empty<(string Key, string Value)>(), children); + } + private static AetheriaRuntimeSurfaceComponent Node( string id, string kind, @@ -259,5 +349,53 @@ namespace GameCult.Aetheria.State.Unity props.ToDictionary(prop => prop.Key, prop => prop.Value, StringComparer.Ordinal), children ?? Array.Empty()); } + + private static AetheriaRuntimeSurfaceComponent BuildDiscoveredVerseNode( + AetheriaRuntimeClientTargetSurfaceState state, + AetheriaRuntimeDiscoveredVerse verse, + int index) + { + var verseLabel = BuildVerseLabel(verse); + var address = verse.DiscoveryEndpoints.FirstOrDefault() ?? ""; + var isSelected = string.Equals(state.TargetKind, AetheriaRuntimeClientTargetKinds.CultMeshVerse, StringComparison.Ordinal) && + string.Equals(state.TargetVerseId, verse.VerseId, StringComparison.Ordinal); + var buttonLabel = isSelected ? "Selected" : "Select"; + + return Node( + $"aetheria.clientTarget.discovery.verse.{index}", + "inspector.kv", + Array.Empty<(string Key, string Value)>(), + Metric($"aetheria.clientTarget.discovery.verse.{index}.label", "Verse", verseLabel), + Metric($"aetheria.clientTarget.discovery.verse.{index}.authority", "Authority", verse.AuthorityModel), + Metric($"aetheria.clientTarget.discovery.verse.{index}.transport", "Transport", verse.TransportVersion), + Metric($"aetheria.clientTarget.discovery.verse.{index}.endpoint", "Endpoint", address), + Text( + $"aetheria.clientTarget.discovery.verse.{index}.description", + string.IsNullOrWhiteSpace(verse.Description) + ? "No public description." + : verse.Description), + Node( + $"aetheria.clientTarget.discovery.verse.{index}.action", + "control.button", + new[] + { + ("label", buttonLabel), + ("command", AetheriaRuntimeClientTargetCommands.SelectDiscoveredVerse), + ("verseId", verse.VerseId ?? ""), + ("title", verse.DisplayName ?? ""), + ("cultMeshAddress", address), + ("discoveryEndpoints", string.Join(", ", verse.DiscoveryEndpoints ?? Array.Empty())) + })); + } + + private static string BuildVerseLabel(AetheriaRuntimeDiscoveredVerse verse) + { + if (string.IsNullOrWhiteSpace(verse.DisplayName)) + return string.IsNullOrWhiteSpace(verse.VerseId) ? "Unknown Verse" : verse.VerseId; + + return string.IsNullOrWhiteSpace(verse.VerseId) || string.Equals(verse.DisplayName, verse.VerseId, StringComparison.Ordinal) + ? verse.DisplayName + : $"{verse.DisplayName} ({verse.VerseId})"; + } } } diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateBoot.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateBoot.cs index 0a7c38d28..4008698b8 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateBoot.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeStateBoot.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Linq; namespace GameCult.Aetheria.State.Unity { @@ -15,7 +16,11 @@ namespace GameCult.Aetheria.State.Unity string stateFilePath, bool stateFileExists, bool supportsLocalStateFileRead, - string failureMessage) + string failureMessage, + string[] discoveryEndpoints, + AetheriaRuntimeDiscoveredVerse[] discoveredVerses, + string lastDiscoveryAtUtc, + string lastDiscoveryError) { ClientTargetPath = clientTargetPath; TargetKind = targetKind; @@ -27,6 +32,10 @@ namespace GameCult.Aetheria.State.Unity StateFileExists = stateFileExists; SupportsLocalStateFileRead = supportsLocalStateFileRead; FailureMessage = failureMessage; + DiscoveryEndpoints = discoveryEndpoints ?? Array.Empty(); + DiscoveredVerses = discoveredVerses ?? Array.Empty(); + LastDiscoveryAtUtc = lastDiscoveryAtUtc ?? ""; + LastDiscoveryError = lastDiscoveryError ?? ""; } public string ClientTargetPath { get; } @@ -39,6 +48,10 @@ namespace GameCult.Aetheria.State.Unity public bool StateFileExists { get; } public bool SupportsLocalStateFileRead { get; } public string FailureMessage { get; } + public string[] DiscoveryEndpoints { get; } + public AetheriaRuntimeDiscoveredVerse[] DiscoveredVerses { get; } + public string LastDiscoveryAtUtc { get; } + public string LastDiscoveryError { get; } public string TargetLabel => string.IsNullOrWhiteSpace(Title) @@ -104,7 +117,11 @@ namespace GameCult.Aetheria.State.Unity stateFilePath, supportsLocalStateFileRead && File.Exists(stateFilePath), supportsLocalStateFileRead, - failureMessage); + failureMessage, + target.DiscoveryEndpoints?.Where(value => !string.IsNullOrWhiteSpace(value)).ToArray() ?? Array.Empty(), + target.DiscoveredVerses ?? Array.Empty(), + target.LastDiscoveryAtUtc ?? "", + target.LastDiscoveryError ?? ""); } private static string BuildTargetLabel(string title, string verseId) diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseDiscovery.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseDiscovery.cs new file mode 100644 index 000000000..746484eb7 --- /dev/null +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseDiscovery.cs @@ -0,0 +1,91 @@ +using System; +using System.Linq; +using GameCult.Mesh; + +#nullable enable + +namespace GameCult.Aetheria.State.Unity +{ + public static class AetheriaRuntimeVerseDiscovery + { + public static AetheriaRuntimeClientTargetDocument RefreshClientTarget( + string clientTargetPath, + string defaultStateFilePath) + { + var discoveredAtUtc = DateTime.UtcNow.ToString("O"); + var target = AetheriaRuntimeClientTargetStore.ReadOrInitialize(clientTargetPath, defaultStateFilePath); + var endpoints = target.DiscoveryEndpoints? + .Where(value => !string.IsNullOrWhiteSpace(value)) + .Distinct(StringComparer.Ordinal) + .ToArray() + ?? Array.Empty(); + + if (endpoints.Length == 0) + { + return AetheriaRuntimeClientTargetStore.Update( + clientTargetPath, + defaultStateFilePath, + document => + { + document.DiscoveryEndpoints = endpoints; + document.DiscoveredVerses = Array.Empty(); + document.LastDiscoveryAtUtc = discoveredAtUtc; + document.LastDiscoveryError = "No CultMesh discovery endpoints are configured."; + document.UpdatedAtUtc = discoveredAtUtc; + }); + } + + try + { + using var catalog = CultMesh.CreateVerseCatalog(); + var discoveryClient = CultMesh.CreateVerseDiscoveryClient(); + discoveryClient.DiscoverAsync(catalog, endpoints) + .GetAwaiter() + .GetResult(); + + var discoveredVerses = catalog.Verses + .Select(verse => new AetheriaRuntimeDiscoveredVerse + { + VerseId = verse.VerseId ?? "", + DisplayName = verse.DisplayName ?? "", + AuthorityModel = verse.AuthorityModel.ToString(), + TransportVersion = verse.Compatibility.TransportVersion ?? "", + RulesHash = verse.Compatibility.RulesHash ?? "", + Description = verse.Description ?? "", + DiscoveryEndpoints = verse.DiscoveryEndpoints.ToArray(), + AuthorityRuntimeIds = verse.AuthorityRuntimeIds.ToArray(), + ParentVerseId = verse.ParentVerseId ?? "" + }) + .OrderBy(verse => verse.DisplayName, StringComparer.OrdinalIgnoreCase) + .ThenBy(verse => verse.VerseId, StringComparer.Ordinal) + .ToArray(); + + return AetheriaRuntimeClientTargetStore.Update( + clientTargetPath, + defaultStateFilePath, + document => + { + document.DiscoveryEndpoints = endpoints; + document.DiscoveredVerses = discoveredVerses; + document.LastDiscoveryAtUtc = discoveredAtUtc; + document.LastDiscoveryError = ""; + document.UpdatedAtUtc = discoveredAtUtc; + }); + } + catch (Exception ex) + { + return AetheriaRuntimeClientTargetStore.Update( + clientTargetPath, + defaultStateFilePath, + document => + { + document.DiscoveryEndpoints = endpoints; + document.DiscoveredVerses = Array.Empty(); + document.LastDiscoveryAtUtc = discoveredAtUtc; + document.LastDiscoveryError = ex.Message ?? ex.GetType().Name; + document.UpdatedAtUtc = discoveredAtUtc; + }); + } + } + } +}