Remove daemon publication store readers
This commit is contained in:
parent
ecebaf9eb6
commit
9eb42efdd6
3 changed files with 39 additions and 224 deletions
|
|
@ -8704,15 +8704,7 @@ static void RequireDaemonVersePublication(string root)
|
|||
"PublishGameSurface(",
|
||||
"PublishGameTuiSurface(",
|
||||
"PublishEditorSurface(",
|
||||
"PublishEditorTuiSurface(",
|
||||
"TryReadProviderAdvertisement(",
|
||||
"TryReadHealth(",
|
||||
"TryReadCommandBoundary(",
|
||||
"TryReadStarbridgeSessionSummary(",
|
||||
"TryReadGameSurface(",
|
||||
"TryReadGameTuiSurface(",
|
||||
"TryReadEditorSurface(",
|
||||
"TryReadEditorTuiSurface("
|
||||
"PublishEditorTuiSurface("
|
||||
};
|
||||
var storeSource = documentStore + "\n" + daemonPublicationStore;
|
||||
var missingStoreSymbols = requiredStoreSymbols
|
||||
|
|
@ -8725,6 +8717,29 @@ static void RequireDaemonVersePublication(string root)
|
|||
string.Join(", ", missingStoreSymbols));
|
||||
}
|
||||
|
||||
var forbiddenPublicationStoreSymbols = new[]
|
||||
{
|
||||
"TryReadProviderAdvertisement(",
|
||||
"TryReadHealth(",
|
||||
"TryReadVerseAuthorityPolicy(",
|
||||
"TryReadCommandBoundary(",
|
||||
"TryReadAssetManifest(",
|
||||
"TryReadStarbridgeSessionSummary(",
|
||||
"TryReadGameSurface(",
|
||||
"TryReadGameTuiSurface(",
|
||||
"TryReadEditorSurface(",
|
||||
"TryReadEditorTuiSurface("
|
||||
};
|
||||
var publicationStoreReaderHits = forbiddenPublicationStoreSymbols
|
||||
.Where(symbol => daemonPublicationStore.Contains(symbol, StringComparison.Ordinal))
|
||||
.ToArray();
|
||||
if (publicationStoreReaderHits.Length > 0)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"Daemon publication store still exposes file-backed readers instead of passing typed tick-result documents: " +
|
||||
string.Join(", ", publicationStoreReaderHits));
|
||||
}
|
||||
|
||||
var requiredDaemonRegistrySymbols = new[]
|
||||
{
|
||||
"CultMesh.CreateCultCacheDocumentRegistry(DocumentTypes)",
|
||||
|
|
@ -9205,13 +9220,13 @@ static void RequireDaemonVersePublication(string root)
|
|||
|
||||
var requiredTestSymbols = new[]
|
||||
{
|
||||
"TryReadProviderAdvertisement(",
|
||||
"TryReadHealth(",
|
||||
"TryReadCommandBoundary(",
|
||||
"TryReadGameSurface(",
|
||||
"TryReadEditorSurface(",
|
||||
"TryReadGameTuiSurface(",
|
||||
"TryReadEditorTuiSurface(",
|
||||
"var providerAdvertisement = result.ProviderAdvertisement",
|
||||
"var health = result.Health",
|
||||
"var commandBoundary = result.CommandBoundary",
|
||||
"var gameSurface = result.GameSurface",
|
||||
"var editorSurface = result.EditorSurface",
|
||||
"var gameTuiSurface = result.GameTuiSurface",
|
||||
"var editorTuiSurface = result.EditorTuiSurface",
|
||||
"AetheriaRuntimeDaemonSchemas.ProviderAdvertisement",
|
||||
"AetheriaRuntimeDaemonSchemas.CommandBoundary",
|
||||
"AetheriaRuntimeDaemonSchemas.Health",
|
||||
|
|
|
|||
|
|
@ -456,9 +456,7 @@ public class DaemonRuntimeDocumentTests
|
|||
Assert.AreEqual(AetheriaRuntimeDaemonPublicationStore.GetGameTuiSurfacePath(statePath), result.GameTuiSurfacePath);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonPublicationStore.GetEditorSurfacePath(statePath), result.EditorSurfacePath);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonPublicationStore.GetEditorTuiSurfacePath(statePath), result.EditorTuiSurfacePath);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadProviderAdvertisement(
|
||||
statePath,
|
||||
out var providerAdvertisement));
|
||||
var providerAdvertisement = result.ProviderAdvertisement;
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.ProviderAdvertisement, providerAdvertisement.Schema);
|
||||
Assert.AreEqual("aetheria.test", providerAdvertisement.VerseId);
|
||||
Assert.AreEqual("aetheria.daemon", providerAdvertisement.ProviderId);
|
||||
|
|
@ -489,7 +487,7 @@ public class DaemonRuntimeDocumentTests
|
|||
CollectionAssert.Contains(providerAdvertisement.PublishedSchemas, AetheriaRuntimeDaemonSchemas.CommandBoundary);
|
||||
CollectionAssert.Contains(providerAdvertisement.PublishedSchemas, AetheriaRuntimeDaemonSchemas.GameSurface);
|
||||
CollectionAssert.Contains(providerAdvertisement.PublishedSchemas, AetheriaRuntimeDaemonSchemas.EditorSurface);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadHealth(statePath, out var health));
|
||||
var health = result.Health;
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Health, health.Schema);
|
||||
Assert.AreEqual("test-daemon", health.DaemonId);
|
||||
Assert.AreEqual("aetheria.test", health.VerseId);
|
||||
|
|
@ -499,9 +497,7 @@ public class DaemonRuntimeDocumentTests
|
|||
Assert.AreEqual(0, health.RejectedCommandCount);
|
||||
Assert.AreEqual("daemon-published", health.PublicationSource);
|
||||
Assert.AreEqual("cultcache-witness", health.Transport);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadCommandBoundary(
|
||||
statePath,
|
||||
out var commandBoundary));
|
||||
var commandBoundary = result.CommandBoundary;
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.CommandBoundary, commandBoundary.Schema);
|
||||
Assert.AreEqual("aetheria.daemon.commands", commandBoundary.BoundaryId);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonSchemas.Command, commandBoundary.CommandSchema);
|
||||
|
|
@ -510,7 +506,7 @@ public class DaemonRuntimeDocumentTests
|
|||
Assert.IsTrue(commandBoundary.Commands.Any(entry =>
|
||||
entry.Kind == AetheriaRuntimeDaemonCommandKinds.TransferCargoItem &&
|
||||
entry.CommandBody == nameof(AetheriaRuntimeCargoTransferCommand)));
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadGameSurface(statePath, out var gameSurface));
|
||||
var gameSurface = result.GameSurface;
|
||||
Assert.AreEqual("aetheria.daemon", gameSurface.ProviderId);
|
||||
Assert.AreEqual("game.daemon", gameSurface.ProviderKind);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId, gameSurface.Surface.Id);
|
||||
|
|
@ -543,12 +539,12 @@ public class DaemonRuntimeDocumentTests
|
|||
AetheriaRuntimeDaemonStateRefs.CurrentTargetName,
|
||||
out var resolvedTargetName));
|
||||
Assert.AreEqual("Target", resolvedTargetName);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadGameTuiSurface(statePath, out var gameTuiSurface));
|
||||
var gameTuiSurface = result.GameTuiSurface;
|
||||
Assert.AreEqual("aetheria.daemon", gameTuiSurface.ProviderId);
|
||||
Assert.AreEqual("game.daemon", gameTuiSurface.ProviderKind);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId, gameTuiSurface.Surface.Id);
|
||||
Assert.AreEqual(42, gameTuiSurface.Version);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadEditorSurface(statePath, out var editorSurface));
|
||||
var editorSurface = result.EditorSurface;
|
||||
Assert.AreEqual("aetheria.daemon", editorSurface.ProviderId);
|
||||
Assert.AreEqual("editor.daemon", editorSurface.ProviderKind);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId, editorSurface.Surface.Id);
|
||||
|
|
@ -564,7 +560,7 @@ public class DaemonRuntimeDocumentTests
|
|||
command.Transport == "cultmesh"));
|
||||
Assert.IsFalse(editorSurface.Commands.Any(command =>
|
||||
command.Command == "aetheria.daemon.commands.TransferCargoItem"));
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadEditorTuiSurface(statePath, out var editorTuiSurface));
|
||||
var editorTuiSurface = result.EditorTuiSurface;
|
||||
Assert.AreEqual("aetheria.daemon", editorTuiSurface.ProviderId);
|
||||
Assert.AreEqual("editor.daemon", editorTuiSurface.ProviderKind);
|
||||
Assert.AreEqual(AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId, editorTuiSurface.Surface.Id);
|
||||
|
|
@ -827,10 +823,9 @@ public class DaemonRuntimeDocumentTests
|
|||
Assert.AreEqual(0, result.OperationResult.RejectedCommandIds.Count);
|
||||
Assert.AreEqual(-1, run.Zones[0].Entities[0].TargetEntityIndex);
|
||||
CollectionAssert.Contains(result.Frame.AccountedCommandIds, targetCommand.CommandId);
|
||||
Assert.IsTrue(AetheriaRuntimeDaemonPublicationStore.TryReadHealth(statePath, out var health));
|
||||
Assert.AreEqual(1, health.ObservedCommandCount);
|
||||
Assert.AreEqual(0, health.AppliedCommandCount);
|
||||
Assert.AreEqual(0, health.RejectedCommandCount);
|
||||
Assert.AreEqual(1, result.Health.ObservedCommandCount);
|
||||
Assert.AreEqual(0, result.Health.AppliedCommandCount);
|
||||
Assert.AreEqual(0, result.Health.RejectedCommandCount);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
|
|
|||
|
|
@ -191,200 +191,5 @@ namespace GameCult.Aetheria.State.Verse
|
|||
return path;
|
||||
}
|
||||
|
||||
public static bool TryReadProviderAdvertisement(
|
||||
string stateFilePath,
|
||||
out AetheriaRuntimeDaemonProviderAdvertisementDocument document)
|
||||
{
|
||||
var path = GetProviderAdvertisementPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeDaemonProviderAdvertisementDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonProviderAdvertisement(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadHealth(string stateFilePath, out AetheriaRuntimeDaemonHealthDocument document)
|
||||
{
|
||||
var path = GetHealthPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeDaemonHealthDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonHealth(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadVerseAuthorityPolicy(
|
||||
string stateFilePath,
|
||||
out AetheriaRuntimeVerseAuthorityPolicyDocument document)
|
||||
{
|
||||
var path = GetVerseAuthorityPolicyPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeVerseAuthorityPolicyDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadVerseAuthorityPolicy(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadCommandBoundary(
|
||||
string stateFilePath,
|
||||
out AetheriaRuntimeDaemonCommandBoundaryDocument document)
|
||||
{
|
||||
var path = GetCommandBoundaryPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeDaemonCommandBoundaryDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonCommandBoundary(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadAssetManifest(
|
||||
string stateFilePath,
|
||||
out AetheriaRuntimeAssetManifestDocument document)
|
||||
{
|
||||
var path = GetAssetManifestPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeAssetManifestDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadAssetManifest(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadStarbridgeSessionSummary(
|
||||
string stateFilePath,
|
||||
out AetheriaRuntimeStarbridgeSessionSummaryDocument document)
|
||||
{
|
||||
var path = GetStarbridgeSessionSummaryPath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeStarbridgeSessionSummaryDocument();
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadStarbridgeSessionSummary(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadGameSurface(string stateFilePath, out AetheriaRuntimeSurfaceDocument document)
|
||||
{
|
||||
var path = GetGameSurfacePath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeSurfaceDocument(
|
||||
"aetheria.daemon",
|
||||
"game.daemon",
|
||||
"",
|
||||
0,
|
||||
"",
|
||||
new AetheriaRuntimeSurfaceTree(
|
||||
AetheriaRuntimeDaemonGameSurfaceBuilder.SurfaceId,
|
||||
new AetheriaRuntimeSurfaceComponent(
|
||||
"aetheria.daemon.game.empty",
|
||||
"surface",
|
||||
new System.Collections.Generic.Dictionary<string, string>(StringComparer.Ordinal),
|
||||
Array.Empty<AetheriaRuntimeSurfaceComponent>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceStyleToken>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceCommandTemplate>());
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonGameSurface(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadGameTuiSurface(string stateFilePath, out AetheriaRuntimeSurfaceDocument document)
|
||||
{
|
||||
var path = GetGameTuiSurfacePath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeSurfaceDocument(
|
||||
"aetheria.daemon",
|
||||
"game.daemon",
|
||||
"Aetheria Daemon",
|
||||
0,
|
||||
"",
|
||||
new AetheriaRuntimeSurfaceTree(
|
||||
AetheriaRuntimeDaemonGameSurfaceBuilder.TuiSurfaceId,
|
||||
new AetheriaRuntimeSurfaceComponent(
|
||||
"aetheria.daemon.game.tui.missing",
|
||||
"surface",
|
||||
new System.Collections.Generic.Dictionary<string, string>(StringComparer.Ordinal),
|
||||
Array.Empty<AetheriaRuntimeSurfaceComponent>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceStyleToken>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceCommandTemplate>());
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonGameSurface(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadEditorSurface(string stateFilePath, out AetheriaRuntimeSurfaceDocument document)
|
||||
{
|
||||
var path = GetEditorSurfacePath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeSurfaceDocument(
|
||||
"aetheria.daemon",
|
||||
"editor.daemon",
|
||||
"",
|
||||
0,
|
||||
"",
|
||||
new AetheriaRuntimeSurfaceTree(
|
||||
AetheriaRuntimeDaemonEditorSurfaceBuilder.SurfaceId,
|
||||
new AetheriaRuntimeSurfaceComponent(
|
||||
"aetheria.daemon.editor.empty",
|
||||
"surface",
|
||||
new System.Collections.Generic.Dictionary<string, string>(StringComparer.Ordinal),
|
||||
Array.Empty<AetheriaRuntimeSurfaceComponent>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceStyleToken>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceCommandTemplate>());
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonEditorSurface(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool TryReadEditorTuiSurface(string stateFilePath, out AetheriaRuntimeSurfaceDocument document)
|
||||
{
|
||||
var path = GetEditorTuiSurfacePath(stateFilePath);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
document = new AetheriaRuntimeSurfaceDocument(
|
||||
"aetheria.daemon",
|
||||
"editor.daemon",
|
||||
"Aetheria Daemon Editor",
|
||||
0,
|
||||
"",
|
||||
new AetheriaRuntimeSurfaceTree(
|
||||
AetheriaRuntimeDaemonEditorSurfaceBuilder.TuiSurfaceId,
|
||||
new AetheriaRuntimeSurfaceComponent(
|
||||
"aetheria.daemon.editor.tui.missing",
|
||||
"surface",
|
||||
new System.Collections.Generic.Dictionary<string, string>(StringComparer.Ordinal),
|
||||
Array.Empty<AetheriaRuntimeSurfaceComponent>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceStyleToken>()),
|
||||
Array.Empty<AetheriaRuntimeSurfaceCommandTemplate>());
|
||||
return false;
|
||||
}
|
||||
|
||||
document = AetheriaRuntimeCultCacheDocumentStore.ReadDaemonEditorSurface(path);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue