Move Eve settings state onto managed pointers
This commit is contained in:
parent
29ea52722c
commit
7043db8f4b
4 changed files with 188 additions and 101 deletions
|
|
@ -86,7 +86,7 @@ while (!stopped.Task.IsCompleted)
|
|||
if (publishWitnesses)
|
||||
{
|
||||
nextApiPublicationUtc = DateTimeOffset.UtcNow.Add(options.ApiPublicationInterval);
|
||||
discoveryHost.Update(await node.GetVerseHostSettingsAsync().ConfigureAwait(false));
|
||||
discoveryHost.Update(await node.VerseHostSettings().ReadAsync().ConfigureAwait(false));
|
||||
await PublishRuntimeSessionAsync(node, options, startedAtUtc, "running").ConfigureAwait(false);
|
||||
}
|
||||
if (tick.Frame.FrameId % 120 == 0)
|
||||
|
|
@ -839,48 +839,52 @@ static async Task AcceptEveCommandsAsync(AetheriaStateNode node, AetheriaDaemonH
|
|||
var now = DateTimeOffset.UtcNow.ToString("O");
|
||||
try
|
||||
{
|
||||
var existingStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
|
||||
var existingStatus = await node.EveCommandAcceptanceStatus().ReadAsync().ConfigureAwait(false);
|
||||
var report = await AetheriaEveCommandBridge.AcceptObservedAsync(
|
||||
node,
|
||||
existingStatus?.AccountedCommandIds)
|
||||
.ConfigureAwait(false);
|
||||
await node.PutEveCommandAcceptanceStatusAsync(new AetheriaEveCommandAcceptanceStatus
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
StatePath = node.StatePath,
|
||||
LastPollAtUtc = now,
|
||||
LastAcceptedAtUtc = report.AcceptedCommandIds.Length > 0 ? now : "",
|
||||
ObservedBeforeAccept = commandCountBefore,
|
||||
CommandsAccepted = report.AcceptedCommandIds.Length,
|
||||
CommandsRejected = report.RejectedCommands,
|
||||
AppliedCatalogRefreshes = report.AcceptedCatalogRefreshes,
|
||||
AppliedOperationsRefreshes = report.AcceptedOperationsRefreshes,
|
||||
AppliedPlayerSettingsCommands = report.AcceptedPlayerSettingsCommands,
|
||||
AppliedInputSettingsCommands = report.AcceptedInputSettingsCommands,
|
||||
AppliedLoadoutTemplateCommands = report.AcceptedLoadoutTemplateCommands,
|
||||
AppliedVerseHostCommands = report.AcceptedVerseHostCommands,
|
||||
AccountedCommandIds = report.AccountedCommandIds,
|
||||
LastRejectedCommand = report.LastRejectedCommand,
|
||||
LastRejectedReason = report.LastRejectedReason,
|
||||
ConsecutiveFailures = 0,
|
||||
Status = report.RejectedCommands > 0 ? "rejected" : "ok"
|
||||
}).ConfigureAwait(false);
|
||||
await node.EveCommandAcceptanceStatus()
|
||||
.ReplaceAsync(new AetheriaEveCommandAcceptanceStatus
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
StatePath = node.StatePath,
|
||||
LastPollAtUtc = now,
|
||||
LastAcceptedAtUtc = report.AcceptedCommandIds.Length > 0 ? now : "",
|
||||
ObservedBeforeAccept = commandCountBefore,
|
||||
CommandsAccepted = report.AcceptedCommandIds.Length,
|
||||
CommandsRejected = report.RejectedCommands,
|
||||
AppliedCatalogRefreshes = report.AcceptedCatalogRefreshes,
|
||||
AppliedOperationsRefreshes = report.AcceptedOperationsRefreshes,
|
||||
AppliedPlayerSettingsCommands = report.AcceptedPlayerSettingsCommands,
|
||||
AppliedInputSettingsCommands = report.AcceptedInputSettingsCommands,
|
||||
AppliedLoadoutTemplateCommands = report.AcceptedLoadoutTemplateCommands,
|
||||
AppliedVerseHostCommands = report.AcceptedVerseHostCommands,
|
||||
AccountedCommandIds = report.AccountedCommandIds,
|
||||
LastRejectedCommand = report.LastRejectedCommand,
|
||||
LastRejectedReason = report.LastRejectedReason,
|
||||
ConsecutiveFailures = 0,
|
||||
Status = report.RejectedCommands > 0 ? "rejected" : "ok"
|
||||
})
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
var existing = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
|
||||
await node.PutEveCommandAcceptanceStatusAsync(new AetheriaEveCommandAcceptanceStatus
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
StatePath = node.StatePath,
|
||||
LastPollAtUtc = now,
|
||||
LastAcceptedAtUtc = existing?.LastAcceptedAtUtc ?? "",
|
||||
ObservedBeforeAccept = commandCountBefore,
|
||||
AccountedCommandIds = existing?.AccountedCommandIds ?? [],
|
||||
ConsecutiveFailures = (existing?.ConsecutiveFailures ?? 0) + 1,
|
||||
LastError = ex.ToString(),
|
||||
Status = "error"
|
||||
}).ConfigureAwait(false);
|
||||
var existing = await node.EveCommandAcceptanceStatus().ReadAsync().ConfigureAwait(false);
|
||||
await node.EveCommandAcceptanceStatus()
|
||||
.ReplaceAsync(new AetheriaEveCommandAcceptanceStatus
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
StatePath = node.StatePath,
|
||||
LastPollAtUtc = now,
|
||||
LastAcceptedAtUtc = existing?.LastAcceptedAtUtc ?? "",
|
||||
ObservedBeforeAccept = commandCountBefore,
|
||||
AccountedCommandIds = existing?.AccountedCommandIds ?? [],
|
||||
ConsecutiveFailures = (existing?.ConsecutiveFailures ?? 0) + 1,
|
||||
LastError = ex.ToString(),
|
||||
Status = "error"
|
||||
})
|
||||
.ConfigureAwait(false);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
|
@ -891,19 +895,22 @@ static async Task PublishStateSurfacesAsync(
|
|||
string updatedAtUtc)
|
||||
{
|
||||
var verseHost = await EnsureVerseHostSettingsAsync(node, options, updatedAtUtc).ConfigureAwait(false);
|
||||
var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false);
|
||||
var runtimeSession = await node.GetRuntimeSessionAsync(options.DaemonId).ConfigureAwait(false);
|
||||
var playerSettings = await node.GetPlayerSettingsAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
var eveStatus = await node.EveCommandAcceptanceStatus().ReadAsync().ConfigureAwait(false);
|
||||
var runtimeSession = await node.RuntimeSession(options.DaemonId).ReadAsync().ConfigureAwait(false);
|
||||
var playerSettings = await node.PlayerSettings().ReadAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
var playerSettingsUpdatedAt = string.IsNullOrWhiteSpace(playerSettings.LastUpdatedAtUtc)
|
||||
? updatedAtUtc
|
||||
: playerSettings.LastUpdatedAtUtc;
|
||||
|
||||
await node.PutOperationsSurfaceAsync(
|
||||
AetheriaOperationsSurfaceProjector.Build(eveStatus, verseHost, runtimeSession)).ConfigureAwait(false);
|
||||
await node.PutPlayerSettingsSurfaceAsync(
|
||||
AetheriaPlayerSettingsSurfaceProjector.Build(playerSettings, playerSettingsUpdatedAt)).ConfigureAwait(false);
|
||||
await node.PutProviderAdvertisementAsync(
|
||||
AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc)).ConfigureAwait(false);
|
||||
await node.OperationsSurface()
|
||||
.ReplaceAsync(AetheriaOperationsSurfaceProjector.Build(eveStatus, verseHost, runtimeSession))
|
||||
.ConfigureAwait(false);
|
||||
await node.PlayerSettingsSurface()
|
||||
.ReplaceAsync(AetheriaPlayerSettingsSurfaceProjector.Build(playerSettings, playerSettingsUpdatedAt))
|
||||
.ConfigureAwait(false);
|
||||
await node.ProviderAdvertisementSurface()
|
||||
.ReplaceAsync(AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc))
|
||||
.ConfigureAwait(false);
|
||||
await node.FlushAsync().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
|
|
@ -914,14 +921,16 @@ static async Task PublishRuntimeSessionAsync(
|
|||
string status)
|
||||
{
|
||||
var now = DateTimeOffset.UtcNow.ToString("O");
|
||||
await node.PutRuntimeSessionAsync(new AetheriaRuntimeSession
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
Role = "verse-daemon",
|
||||
StartedAtUtc = startedAtUtc,
|
||||
LastSeenAtUtc = now,
|
||||
Status = status
|
||||
}).ConfigureAwait(false);
|
||||
await node.RuntimeSession(options.DaemonId)
|
||||
.ReplaceAsync(new AetheriaRuntimeSession
|
||||
{
|
||||
RuntimeId = options.DaemonId,
|
||||
Role = "verse-daemon",
|
||||
StartedAtUtc = startedAtUtc,
|
||||
LastSeenAtUtc = now,
|
||||
Status = status
|
||||
})
|
||||
.ConfigureAwait(false);
|
||||
await PublishStateSurfacesAsync(node, options, now).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
|
|
@ -960,7 +969,7 @@ static async Task EnsureTradeValuePolicyAsync(AetheriaStateNode node, string now
|
|||
|
||||
static async Task EnsurePlayableRunDocumentsAsync(AetheriaStateNode node, string now)
|
||||
{
|
||||
var settings = await node.GetPlayerSettingsAsync().ConfigureAwait(false);
|
||||
var settings = await node.PlayerSettings().ReadAsync().ConfigureAwait(false);
|
||||
if (!string.IsNullOrWhiteSpace(settings?.ActiveRunKey))
|
||||
{
|
||||
var existingRun = await ReadRuntimeRunCheckpointAsync(node).ConfigureAwait(false);
|
||||
|
|
@ -980,7 +989,9 @@ static async Task EnsurePlayableRunDocumentsAsync(AetheriaStateNode node, string
|
|||
settings.PlayerName = string.IsNullOrWhiteSpace(settings.PlayerName) ? "Codex RTS" : settings.PlayerName;
|
||||
settings.TutorialPassed = true;
|
||||
settings.LastUpdatedAtUtc = now;
|
||||
await node.PutPlayerSettingsAsync(settings).ConfigureAwait(false);
|
||||
await node.PlayerSettings()
|
||||
.ReplaceAsync(settings)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
await node.PutRunStateAsync(runKey, new AetheriaRunState
|
||||
{
|
||||
|
|
@ -1363,7 +1374,7 @@ static async Task EnsureVerseAuthorityPolicyAsync(
|
|||
|
||||
static async Task<AetheriaRuntimeRunCheckpointCommit?> ReadRuntimeRunCheckpointAsync(AetheriaStateNode node)
|
||||
{
|
||||
var settings = await node.GetPlayerSettingsAsync().ConfigureAwait(false);
|
||||
var settings = await node.PlayerSettings().ReadAsync().ConfigureAwait(false);
|
||||
if (string.IsNullOrWhiteSpace(settings?.ActiveRunKey))
|
||||
return null;
|
||||
|
||||
|
|
@ -1790,7 +1801,7 @@ static async Task<AetheriaVerseHostSettings> EnsureVerseHostSettingsAsync(
|
|||
AetheriaDaemonHostOptions options,
|
||||
string now)
|
||||
{
|
||||
var existing = await node.GetVerseHostSettingsAsync().ConfigureAwait(false);
|
||||
var existing = await node.VerseHostSettings().ReadAsync().ConfigureAwait(false);
|
||||
var normalized = AetheriaVerseHostSettingsNormalizer.Normalize(existing);
|
||||
normalized.ServiceId = options.DaemonId;
|
||||
normalized.VerseId = options.VerseId;
|
||||
|
|
@ -1801,7 +1812,9 @@ static async Task<AetheriaVerseHostSettings> EnsureVerseHostSettingsAsync(
|
|||
!AetheriaVerseHostSettingsNormalizer.Equivalent(existing, normalized))
|
||||
{
|
||||
normalized.LastUpdatedAtUtc = now;
|
||||
await node.PutVerseHostSettingsAsync(normalized).ConfigureAwait(false);
|
||||
await node.VerseHostSettings()
|
||||
.ReplaceAsync(normalized)
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
return normalized;
|
||||
|
|
|
|||
|
|
@ -6615,7 +6615,8 @@ static void RequirePlayerSettingsEveSurface(string root)
|
|||
|
||||
if (!bridge.Contains("AcceptedPlayerSettingsCommands", StringComparison.Ordinal) ||
|
||||
!bridge.Contains("ExecutePlayerSettingsCommandAsync", StringComparison.Ordinal) ||
|
||||
!bridge.Contains("PutPlayerSettingsSurfaceAsync", StringComparison.Ordinal) ||
|
||||
!bridge.Contains("PlayerSettingsSurface()", StringComparison.Ordinal) ||
|
||||
!bridge.Contains(".ReplaceAsync(AetheriaPlayerSettingsSurfaceProjector.Build", StringComparison.Ordinal) ||
|
||||
!bridge.Contains("SetPlayerName", StringComparison.Ordinal) ||
|
||||
!bridge.Contains("command.PlayerSettings.PlayerName", StringComparison.Ordinal))
|
||||
{
|
||||
|
|
@ -6630,7 +6631,8 @@ static void RequirePlayerSettingsEveSurface(string root)
|
|||
"Provider advertisement no longer publishes the player-settings Eve surface and commands.");
|
||||
}
|
||||
|
||||
if (!daemonHost.Contains("PutPlayerSettingsSurfaceAsync", StringComparison.Ordinal) ||
|
||||
if (!daemonHost.Contains("PlayerSettingsSurface()", StringComparison.Ordinal) ||
|
||||
!daemonHost.Contains(".ReplaceAsync(AetheriaPlayerSettingsSurfaceProjector.Build", StringComparison.Ordinal) ||
|
||||
!daemonHost.Contains("AetheriaPlayerSettingsSurfaceProjector.Build", StringComparison.Ordinal))
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
|
|
@ -6922,13 +6924,14 @@ static void RequireVerseHostSettingsAuthority(string root)
|
|||
"Aetheria document registry does not register typed verse-host settings.");
|
||||
}
|
||||
|
||||
if (!node.Contains("PutVerseHostSettingsAsync", StringComparison.Ordinal) ||
|
||||
!node.Contains("GetVerseHostSettingsAsync", StringComparison.Ordinal) ||
|
||||
if (!node.Contains("public CultMeshMutableStatePointer<AetheriaVerseHostSettings> VerseHostSettings()", StringComparison.Ordinal) ||
|
||||
!node.Contains("public CultMeshMutableStatePointer<AetheriaPlayerSettings> PlayerSettings()", StringComparison.Ordinal) ||
|
||||
!node.Contains("public CultMeshMutableStatePointer<AetheriaEveCommandAcceptanceStatus> EveCommandAcceptanceStatus()", StringComparison.Ordinal) ||
|
||||
!node.Contains("public CultMeshNode MeshNode => _node;", StringComparison.Ordinal) ||
|
||||
!node.Contains("global:aetheria.verse_host_settings.v1", StringComparison.Ordinal))
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"Aetheria state node does not expose typed verse-host settings get/put ports.");
|
||||
"Aetheria state node does not expose typed verse-host/settings managed state pointers.");
|
||||
}
|
||||
|
||||
var forbiddenHardcodedProviderSymbols = new[]
|
||||
|
|
@ -6972,8 +6975,9 @@ static void RequireVerseHostSettingsAuthority(string root)
|
|||
"discoveryHost.Update",
|
||||
"ReadOption(args, \"--verse-id\")",
|
||||
"ReadOption(args, \"--cultmesh-address\")",
|
||||
"GetVerseHostSettingsAsync",
|
||||
"PutVerseHostSettingsAsync",
|
||||
"node.VerseHostSettings().ReadAsync()",
|
||||
"node.VerseHostSettings()",
|
||||
".ReplaceAsync(normalized)",
|
||||
"AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc)"
|
||||
};
|
||||
var missingDaemonHostSymbols = requiredDaemonHostSymbols
|
||||
|
|
@ -7961,8 +7965,9 @@ static void RequireVerseSettingsShellAndBridge(string root)
|
|||
"AetheriaRuntimeEveCommandKind.VerseHostRefresh",
|
||||
"AetheriaRuntimeEveCommandKind.CycleVerseHostVisibility",
|
||||
"ExecuteVerseHostCommandAsync",
|
||||
"PutVerseHostSettingsAsync",
|
||||
"PutProviderAdvertisementAsync",
|
||||
"node.VerseHostSettings()",
|
||||
".ReplaceAsync(normalized)",
|
||||
"node.ProviderAdvertisementSurface()",
|
||||
"AetheriaOperationsSurfaceProjector.Build(",
|
||||
"switch (command.Kind)"
|
||||
};
|
||||
|
|
@ -9002,6 +9007,13 @@ static void RequireDaemonVersePublication(string root)
|
|||
"ReadObservedDaemonCommands()",
|
||||
"currentFrame?.AccountedCommandIds ?? Array.Empty<string>()",
|
||||
"AetheriaRuntimeDaemonTickRunner.Tick(",
|
||||
"node.EveCommandAcceptanceStatus().ReadAsync()",
|
||||
"node.EveCommandAcceptanceStatus()",
|
||||
"node.RuntimeSession(options.DaemonId)",
|
||||
"node.PlayerSettings().ReadAsync()",
|
||||
"node.OperationsSurface()",
|
||||
"node.PlayerSettingsSurface()",
|
||||
"node.ProviderAdvertisementSurface()",
|
||||
"AetheriaProviderAdvertisementProjector.Build(verseHost, node.StatePath, updatedAtUtc)",
|
||||
"AetheriaOperationsSurfaceProjector.Build(eveStatus, verseHost, runtimeSession)",
|
||||
"AetheriaPlayerSettingsSurfaceProjector.Build(playerSettings, playerSettingsUpdatedAt)",
|
||||
|
|
|
|||
|
|
@ -49,20 +49,22 @@ public static class AetheriaEveCommandBridge
|
|||
{
|
||||
case AetheriaRuntimeEveCommandKind.CatalogRefresh:
|
||||
var catalog = await node.RuntimeCatalog().LatestAsync().ConfigureAwait(false);
|
||||
await node.PutCatalogSurfaceAsync(
|
||||
AetheriaCatalogSurfaceProjector.Build(catalog, command.IssuedAtUtc)).ConfigureAwait(false);
|
||||
await node.CatalogSurface()
|
||||
.ReplaceAsync(AetheriaCatalogSurfaceProjector.Build(catalog, command.IssuedAtUtc))
|
||||
.ConfigureAwait(false);
|
||||
report.AcceptedCatalogRefreshes++;
|
||||
break;
|
||||
case AetheriaRuntimeEveCommandKind.OperationsRefresh:
|
||||
var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false) ??
|
||||
var eveStatus = await node.EveCommandAcceptanceStatus().ReadAsync().ConfigureAwait(false) ??
|
||||
EmptyEveCommandAcceptanceStatus(node.StatePath, command.IssuedAtUtc);
|
||||
var verseHostSettings = await node.GetVerseHostSettingsAsync().ConfigureAwait(false);
|
||||
var runtimeSession = await node.GetRuntimeSessionAsync(eveStatus.RuntimeId).ConfigureAwait(false);
|
||||
await node.PutOperationsSurfaceAsync(
|
||||
AetheriaOperationsSurfaceProjector.Build(
|
||||
var verseHostSettings = await node.VerseHostSettings().ReadAsync().ConfigureAwait(false);
|
||||
var runtimeSession = await node.RuntimeSession(eveStatus.RuntimeId).ReadAsync().ConfigureAwait(false);
|
||||
await node.OperationsSurface()
|
||||
.ReplaceAsync(AetheriaOperationsSurfaceProjector.Build(
|
||||
eveStatus,
|
||||
verseHostSettings,
|
||||
runtimeSession)).ConfigureAwait(false);
|
||||
runtimeSession))
|
||||
.ConfigureAwait(false);
|
||||
report.AcceptedOperationsRefreshes++;
|
||||
break;
|
||||
case AetheriaRuntimeEveCommandKind.PlayerSettingsRefresh:
|
||||
|
|
@ -133,7 +135,7 @@ public static class AetheriaEveCommandBridge
|
|||
AetheriaStateNode node,
|
||||
AetheriaRuntimeEveCommandDocument command)
|
||||
{
|
||||
var settings = await node.GetPlayerSettingsAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
var settings = await node.PlayerSettings().ReadAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
settings.Gameplay ??= new AetheriaPlayerGameplaySettings();
|
||||
settings.Graphics ??= new AetheriaPlayerGraphicsSettings();
|
||||
var persistSettings = false;
|
||||
|
|
@ -179,11 +181,13 @@ public static class AetheriaEveCommandBridge
|
|||
if (persistSettings)
|
||||
{
|
||||
settings.LastUpdatedAtUtc = command.IssuedAtUtc;
|
||||
await node.PutPlayerSettingsAsync(settings).ConfigureAwait(false);
|
||||
await node.PlayerSettings()
|
||||
.ReplaceAsync(settings)
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
await node.PutPlayerSettingsSurfaceAsync(
|
||||
AetheriaPlayerSettingsSurfaceProjector.Build(settings, command.IssuedAtUtc))
|
||||
await node.PlayerSettingsSurface()
|
||||
.ReplaceAsync(AetheriaPlayerSettingsSurfaceProjector.Build(settings, command.IssuedAtUtc))
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
|
|
@ -191,7 +195,7 @@ public static class AetheriaEveCommandBridge
|
|||
AetheriaStateNode node,
|
||||
AetheriaRuntimeEveCommandDocument command)
|
||||
{
|
||||
var settings = await node.GetPlayerSettingsAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
var settings = await node.PlayerSettings().ReadAsync().ConfigureAwait(false) ?? new AetheriaPlayerSettings();
|
||||
settings.Input ??= new AetheriaPlayerInputSettings();
|
||||
var persistSettings = false;
|
||||
|
||||
|
|
@ -242,7 +246,9 @@ public static class AetheriaEveCommandBridge
|
|||
if (persistSettings)
|
||||
{
|
||||
settings.LastUpdatedAtUtc = command.IssuedAtUtc;
|
||||
await node.PutPlayerSettingsAsync(settings).ConfigureAwait(false);
|
||||
await node.PlayerSettings()
|
||||
.ReplaceAsync(settings)
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -250,7 +256,7 @@ public static class AetheriaEveCommandBridge
|
|||
AetheriaStateNode node,
|
||||
AetheriaRuntimeEveCommandDocument command)
|
||||
{
|
||||
var settings = await node.GetVerseHostSettingsAsync().ConfigureAwait(false) ?? new AetheriaVerseHostSettings();
|
||||
var settings = await node.VerseHostSettings().ReadAsync().ConfigureAwait(false) ?? new AetheriaVerseHostSettings();
|
||||
var normalized = AetheriaVerseHostSettingsNormalizer.Normalize(settings);
|
||||
var persistSettings = false;
|
||||
|
||||
|
|
@ -265,20 +271,24 @@ public static class AetheriaEveCommandBridge
|
|||
if (persistSettings)
|
||||
{
|
||||
normalized.LastUpdatedAtUtc = command.IssuedAtUtc;
|
||||
await node.PutVerseHostSettingsAsync(normalized).ConfigureAwait(false);
|
||||
await node.VerseHostSettings()
|
||||
.ReplaceAsync(normalized)
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
var eveStatus = await node.GetEveCommandAcceptanceStatusAsync().ConfigureAwait(false) ??
|
||||
var eveStatus = await node.EveCommandAcceptanceStatus().ReadAsync().ConfigureAwait(false) ??
|
||||
EmptyEveCommandAcceptanceStatus(node.StatePath, command.IssuedAtUtc);
|
||||
var runtimeSession = await node.GetRuntimeSessionAsync(eveStatus.RuntimeId).ConfigureAwait(false);
|
||||
var runtimeSession = await node.RuntimeSession(eveStatus.RuntimeId).ReadAsync().ConfigureAwait(false);
|
||||
|
||||
await node.PutOperationsSurfaceAsync(
|
||||
AetheriaOperationsSurfaceProjector.Build(
|
||||
await node.OperationsSurface()
|
||||
.ReplaceAsync(AetheriaOperationsSurfaceProjector.Build(
|
||||
eveStatus,
|
||||
normalized,
|
||||
runtimeSession)).ConfigureAwait(false);
|
||||
await node.PutProviderAdvertisementAsync(
|
||||
AetheriaProviderAdvertisementProjector.Build(normalized, node.StatePath, command.IssuedAtUtc)).ConfigureAwait(false);
|
||||
runtimeSession))
|
||||
.ConfigureAwait(false);
|
||||
await node.ProviderAdvertisementSurface()
|
||||
.ReplaceAsync(AetheriaProviderAdvertisementProjector.Build(normalized, node.StatePath, command.IssuedAtUtc))
|
||||
.ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private static async Task ExecuteLoadoutTemplateCommandAsync(
|
||||
|
|
|
|||
|
|
@ -184,6 +184,47 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
|
|||
return MutableDocumentPointer<EveSurfaceState>(AetheriaRuntimeVerseRecordKeys.DaemonEditorTuiSurface);
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<EveSurfaceState> CatalogSurface()
|
||||
{
|
||||
return MutableDocumentPointer<EveSurfaceState>(new CultRecordKey(AetheriaCatalogSurfaceProjector.SurfaceKey));
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<EveSurfaceState> OperationsSurface()
|
||||
{
|
||||
return MutableDocumentPointer<EveSurfaceState>(new CultRecordKey(AetheriaOperationsSurfaceProjector.SurfaceKey));
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<EveSurfaceState> PlayerSettingsSurface()
|
||||
{
|
||||
return MutableDocumentPointer<EveSurfaceState>(new CultRecordKey(AetheriaPlayerSettingsSurfaceProjector.SurfaceKey));
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<EveProviderAdvertisementState> ProviderAdvertisementSurface()
|
||||
{
|
||||
return MutableDocumentPointer<EveProviderAdvertisementState>(
|
||||
new CultRecordKey(AetheriaProviderAdvertisementProjector.AdvertisementKey));
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<AetheriaRuntimeSession> RuntimeSession(string runtimeId)
|
||||
{
|
||||
return MutableDocumentPointer<AetheriaRuntimeSession>(RuntimeSessionKey(runtimeId));
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<AetheriaPlayerSettings> PlayerSettings()
|
||||
{
|
||||
return MutableDocumentPointer<AetheriaPlayerSettings>(PlayerSettingsKey);
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<AetheriaVerseHostSettings> VerseHostSettings()
|
||||
{
|
||||
return MutableDocumentPointer<AetheriaVerseHostSettings>(VerseHostSettingsKey);
|
||||
}
|
||||
|
||||
public CultMeshMutableStatePointer<AetheriaEveCommandAcceptanceStatus> EveCommandAcceptanceStatus()
|
||||
{
|
||||
return MutableDocumentPointer<AetheriaEveCommandAcceptanceStatus>(EveCommandAcceptanceStatusKey);
|
||||
}
|
||||
|
||||
public Task<CultRecordHandle<AetheriaWorldState>> PutWorldAsync(AetheriaWorldState world)
|
||||
{
|
||||
return Database.PutAsync(new CultRecordKey("global:aetheria.world_state.v1"), world);
|
||||
|
|
@ -573,23 +614,22 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
|
|||
|
||||
public Task<CultRecordHandle<AetheriaRuntimeSession>> PutRuntimeSessionAsync(AetheriaRuntimeSession session)
|
||||
{
|
||||
return Database.PutAsync(new CultRecordKey($"runtime:{session.RuntimeId}:aetheria.runtime_session.v1"), session);
|
||||
return Database.PutAsync(RuntimeSessionKey(session.RuntimeId), session);
|
||||
}
|
||||
|
||||
public Task<AetheriaRuntimeSession?> GetRuntimeSessionAsync(string runtimeId)
|
||||
{
|
||||
return Database.GetAsync<AetheriaRuntimeSession>(
|
||||
new CultRecordKey($"runtime:{runtimeId}:aetheria.runtime_session.v1"));
|
||||
return Database.GetAsync<AetheriaRuntimeSession>(RuntimeSessionKey(runtimeId));
|
||||
}
|
||||
|
||||
public Task<CultRecordHandle<AetheriaPlayerSettings>> PutPlayerSettingsAsync(AetheriaPlayerSettings settings)
|
||||
{
|
||||
return Database.PutAsync(new CultRecordKey("global:aetheria.player_settings.v1"), settings);
|
||||
return Database.PutAsync(PlayerSettingsKey, settings);
|
||||
}
|
||||
|
||||
public Task<AetheriaPlayerSettings?> GetPlayerSettingsAsync()
|
||||
{
|
||||
return Database.GetAsync<AetheriaPlayerSettings>(new CultRecordKey("global:aetheria.player_settings.v1"));
|
||||
return Database.GetAsync<AetheriaPlayerSettings>(PlayerSettingsKey);
|
||||
}
|
||||
|
||||
public Task<CultRecordHandle<AetheriaLoadoutTemplate>> PutLoadoutTemplateAsync(
|
||||
|
|
@ -639,25 +679,23 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
|
|||
public Task<CultRecordHandle<AetheriaVerseHostSettings>> PutVerseHostSettingsAsync(
|
||||
AetheriaVerseHostSettings settings)
|
||||
{
|
||||
return Database.PutAsync(new CultRecordKey("global:aetheria.verse_host_settings.v1"), settings);
|
||||
return Database.PutAsync(VerseHostSettingsKey, settings);
|
||||
}
|
||||
|
||||
public Task<AetheriaVerseHostSettings?> GetVerseHostSettingsAsync()
|
||||
{
|
||||
return Database.GetAsync<AetheriaVerseHostSettings>(
|
||||
new CultRecordKey("global:aetheria.verse_host_settings.v1"));
|
||||
return Database.GetAsync<AetheriaVerseHostSettings>(VerseHostSettingsKey);
|
||||
}
|
||||
|
||||
public Task<CultRecordHandle<AetheriaEveCommandAcceptanceStatus>> PutEveCommandAcceptanceStatusAsync(
|
||||
AetheriaEveCommandAcceptanceStatus status)
|
||||
{
|
||||
return Database.PutAsync(new CultRecordKey("global:aetheria.eve_command_acceptance_status.v1"), status);
|
||||
return Database.PutAsync(EveCommandAcceptanceStatusKey, status);
|
||||
}
|
||||
|
||||
public Task<AetheriaEveCommandAcceptanceStatus?> GetEveCommandAcceptanceStatusAsync()
|
||||
{
|
||||
return Database.GetAsync<AetheriaEveCommandAcceptanceStatus>(
|
||||
new CultRecordKey("global:aetheria.eve_command_acceptance_status.v1"));
|
||||
return Database.GetAsync<AetheriaEveCommandAcceptanceStatus>(EveCommandAcceptanceStatusKey);
|
||||
}
|
||||
|
||||
public Task FlushAsync(bool soft = false)
|
||||
|
|
@ -679,6 +717,20 @@ public sealed class AetheriaStateNode : IAsyncDisposable, IDisposable
|
|||
return string.IsNullOrWhiteSpace(token) ? "empty" : token;
|
||||
}
|
||||
|
||||
private static CultRecordKey RuntimeSessionKey(string runtimeId)
|
||||
{
|
||||
return new CultRecordKey($"runtime:{runtimeId}:aetheria.runtime_session.v1");
|
||||
}
|
||||
|
||||
private static CultRecordKey PlayerSettingsKey { get; } =
|
||||
new("global:aetheria.player_settings.v1");
|
||||
|
||||
private static CultRecordKey VerseHostSettingsKey { get; } =
|
||||
new("global:aetheria.verse_host_settings.v1");
|
||||
|
||||
private static CultRecordKey EveCommandAcceptanceStatusKey { get; } =
|
||||
new("global:aetheria.eve_command_acceptance_status.v1");
|
||||
|
||||
private CultMeshMutableStatePointer<T> MutableDocumentPointer<T>(CultRecordKey key) where T : class
|
||||
{
|
||||
return CultMesh.MutableStatePointer(
|
||||
|
|
|
|||
Loading…
Reference in a new issue