Read daemon observer from typed reactive documents

This commit is contained in:
Meta Vens 2026-06-28 12:42:54 +01:00
commit 0021fe8d59
2 changed files with 70 additions and 23 deletions

View file

@ -15262,20 +15262,27 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
!daemonObserver.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) ||
!daemonObserver.Contains("AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory)", StringComparison.Ordinal) ||
!daemonObserver.Contains("AetheriaRuntimeObservedDaemonState", StringComparison.Ordinal) ||
!daemonObserver.Contains("AetheriaRuntimeReactiveObservedDaemonState", StringComparison.Ordinal) ||
!daemonObserver.Contains(".ReactiveObservedDaemon()", StringComparison.Ordinal) ||
!daemonObserver.Contains("reactive.TryCurrent(out var observed)", StringComparison.Ordinal) ||
!daemonObserver.Contains("DisposeReactiveObservedDaemonState()", StringComparison.Ordinal))
!daemonObserver.Contains("CultMeshReactiveDocument<AetheriaRuntimeDaemonFrameDocument> _reactiveFrame", StringComparison.Ordinal) ||
!daemonObserver.Contains("CultMeshReactiveDocument<AetheriaRuntimeDaemonSoaViewDocument> _reactiveSoaView", StringComparison.Ordinal) ||
!daemonObserver.Contains("CultMeshReactiveDocument<AetheriaRuntimeZoneRenderDocument> _reactiveZoneRender", StringComparison.Ordinal) ||
!daemonObserver.Contains("state.ReactiveDaemonFrame()", StringComparison.Ordinal) ||
!daemonObserver.Contains("state.ReactiveDaemonSoaView()", StringComparison.Ordinal) ||
!daemonObserver.Contains("state.ReactiveZoneRender()", StringComparison.Ordinal) ||
!daemonObserver.Contains("return new AetheriaRuntimeObservedDaemonState(frame, soaView, zoneRender);", StringComparison.Ordinal) ||
!daemonObserver.Contains("DisposeReactiveObservedDaemonDocuments()", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"AetheriaDaemonObserver no longer samples observed daemon state from the managed reactive Aetheria client documents.");
}
if (daemonObserver.Contains("AetheriaRuntimeStateReader.TryReadObservedDaemonState", StringComparison.Ordinal) ||
daemonObserver.Contains(".ReadAsync(client.State)", StringComparison.Ordinal))
daemonObserver.Contains(".ReadAsync(client.State)", StringComparison.Ordinal) ||
daemonObserver.Contains("AetheriaRuntimeReactiveObservedDaemonState", StringComparison.Ordinal) ||
daemonObserver.Contains(".ReactiveObservedDaemon()", StringComparison.Ordinal) ||
daemonObserver.Contains("reactive.TryCurrent(out var observed)", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"AetheriaDaemonObserver still spelunks observed daemon state through a one-shot reader instead of the reactive Verse client documents.");
"AetheriaDaemonObserver still spelunks observed daemon state through an aggregate reader instead of direct reactive Verse client documents.");
}
if (daemonObserver.Contains("ObserveAsync()", StringComparison.Ordinal))

View file

@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using GameCult.Mesh;
using GameCult.Aetheria.State.Verse;
using UnityEngine;
@ -20,7 +22,10 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
private float _nextPollTime;
private AetheriaDaemonSoaMemoryMap _soaMemoryMap;
private AetheriaDaemonRenderNativeView _renderNativeView;
private AetheriaRuntimeReactiveObservedDaemonState _reactiveObservedDaemonState;
private CultMeshReactiveDocument<AetheriaRuntimeDaemonFrameDocument> _reactiveFrame;
private CultMeshReactiveDocument<AetheriaRuntimeDaemonSoaViewDocument> _reactiveSoaView;
private CultMeshReactiveDocument<AetheriaRuntimeZoneRenderDocument> _reactiveZoneRender;
private bool _triedReactiveSoaView;
public AetheriaRuntimeObservedDaemonState LastObservedState { get; private set; }
public AetheriaRuntimeDaemonObservationResult LastObservation { get; private set; }
@ -84,7 +89,7 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
public void ResetObservation()
{
_cursor.Reset();
DisposeReactiveObservedDaemonState();
DisposeReactiveObservedDaemonDocuments();
DisposeSoaMemoryMap();
LastObservedState = null;
LastObservation = null;
@ -92,16 +97,35 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
private void OnDisable()
{
DisposeReactiveObservedDaemonState();
DisposeReactiveObservedDaemonDocuments();
DisposeSoaMemoryMap();
}
private AetheriaRuntimeObservedDaemonState ReadObservedDaemonState()
{
var reactive = ResolveReactiveObservedDaemonState();
return reactive.TryCurrent(out var observed)
? observed
: null;
try
{
if (!TryResolveReactiveObservedDaemonDocuments())
return null;
var frame = _reactiveFrame?.Current;
var zoneRender = _reactiveZoneRender?.Current;
if (frame == null || zoneRender == null)
return null;
var soaView = _reactiveSoaView?.Current;
if (soaView == null ||
!string.Equals(soaView.Schema, AetheriaRuntimeDaemonSchemas.SoaView, StringComparison.Ordinal))
{
soaView = null;
}
return new AetheriaRuntimeObservedDaemonState(frame, soaView, zoneRender);
}
catch
{
return null;
}
}
private AetheriaClient ResolveClient()
@ -116,17 +140,28 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
return AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot, clientId);
}
private AetheriaRuntimeReactiveObservedDaemonState ResolveReactiveObservedDaemonState()
private bool TryResolveReactiveObservedDaemonDocuments()
{
if (_reactiveObservedDaemonState != null)
var state = ResolveClient()?.Aetheria();
if (state == null)
return false;
_reactiveFrame ??= state.ReactiveDaemonFrame();
_reactiveZoneRender ??= state.ReactiveZoneRender();
if (_reactiveSoaView == null && !_triedReactiveSoaView)
{
return _reactiveObservedDaemonState;
_triedReactiveSoaView = true;
try
{
_reactiveSoaView = state.ReactiveDaemonSoaView();
}
catch (KeyNotFoundException)
{
_reactiveSoaView = null;
}
}
_reactiveObservedDaemonState = ResolveClient()
.State
.ReactiveObservedDaemon();
return _reactiveObservedDaemonState;
return _reactiveFrame != null && _reactiveZoneRender != null;
}
private void RemapSoaView(AetheriaRuntimeObservedDaemonState observed)
@ -165,9 +200,14 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
_soaMemoryMap = null;
}
private void DisposeReactiveObservedDaemonState()
private void DisposeReactiveObservedDaemonDocuments()
{
_reactiveObservedDaemonState?.Dispose();
_reactiveObservedDaemonState = null;
_reactiveFrame?.Dispose();
_reactiveSoaView?.Dispose();
_reactiveZoneRender?.Dispose();
_reactiveFrame = null;
_reactiveSoaView = null;
_reactiveZoneRender = null;
_triedReactiveSoaView = false;
}
}