erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(runtime): move session lifetime and ordered transport

Browse source 
Move the canonical WorldSession generation, connect/enter/tick/stop transaction, inbound subscription owner, and retryable teardown acknowledgements into AcDream.Runtime. Keep App as a borrowing graphical host with a single inertable command projection and no mirrored session state.

Validated by 79 Runtime tests, 3,776 App tests with three existing skips, the Release solution build, and 8,428 complete Release tests with five existing skips.

Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-25 19:39:24 +02:00
parent ecc4816c5a
commit 7593078774
37 changed files with 884 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/AcDream.App/Combat/LiveCombatModeCommandController.cs
View file

@ -3,6 +3,7 @@ using AcDream.App.Net;
using AcDream.App.UI;
using AcDream.Core.Combat;
using AcDream.Core.Items;
using AcDream.Runtime.Session;
namespace AcDream.App.Combat;

3
src/AcDream.App/Composition/FrameRootComposition.cs
View file

@ -7,6 +7,7 @@ using AcDream.App.Runtime;
using AcDream.App.Settings;
using AcDream.App.Update;
using AcDream.App.World;
using AcDream.Runtime.Session;
using AcDream.Core.Combat;
using AcDream.Core.Lighting;
using AcDream.Core.Physics;
@ -59,7 +60,7 @@ internal sealed record FrameRootResult(
RenderFrameOrchestrator Render,
FrameRootRuntimeBindings RuntimeBindings,
IDisposable FrameGraphPublication,
AcDream.App.Net.LiveSessionHost SessionHost,
LiveSessionHost SessionHost,
CurrentGameRuntimeAdapter GameRuntime);
internal interface IGameWindowFrameRootPublication

41
src/AcDream.App/Composition/SessionPlayerComposition.cs
View file

@ -26,6 +26,7 @@ using AcDream.Core.Player;
using AcDream.Core.Social;
using AcDream.Core.Spells;
using AcDream.Core.World;
using AcDream.Runtime.Session;
using Silk.NET.Windowing;
namespace AcDream.App.Composition;
@ -437,13 +438,17 @@ internal sealed class SessionPlayerCompositionPhase
static () => new LiveSessionController(),
static value => value.Dispose());
LiveSessionController liveSession = liveSessionLease.Resource;
var liveSessionCommands = new LiveSessionCommandSurface();
var liveSessionSource = new LiveSessionAppSource(
liveSession,
liveSessionCommands);
bindings.Adopt(
"retained-UI live session",
interaction.LateBindings.Session.Bind(liveSession));
interaction.LateBindings.Session.Bind(liveSessionSource));
var localPhysicsTimestamps =
new LiveSessionLocalPhysicsTimestampPublisher(
d.PlayerIdentity,
liveSession);
liveSessionSource);
Fault(SessionPlayerCompositionPoint.LiveSessionCreated);
var teardown = new LiveEntityRuntimeTeardownController(
@ -520,7 +525,7 @@ internal sealed class SessionPlayerCompositionPhase
d.PlayerHost,
d.PlayerIdentity,
d.UpdateClock,
liveSession,
liveSessionSource,
localPhysicsTimestamps.Publish,
d.MovementDiagnostics);
var liveness = new LiveEntityLivenessController(
@ -569,8 +574,8 @@ internal sealed class SessionPlayerCompositionPhase
d.Settings,
d.PlayerController,
d.PlayerOutbound,
liveSession,
liveSession,
liveSessionSource,
liveSessionSource,
d.CombatFeedback)));
Fault(SessionPlayerCompositionPoint.CombatOperationsBound);
@ -585,7 +590,7 @@ internal sealed class SessionPlayerCompositionPhase
d.ChaseCameraInput,
d.MovementInput,
d.PlayerOutbound,
liveSession,
liveSessionSource,
host.MouseLookCursor,
new EnvironmentInputMonotonicClock())
: null;
@ -606,7 +611,7 @@ internal sealed class SessionPlayerCompositionPhase
d.Options.LiveMode,
d.PlayerMode,
d.PlayerController,
liveSession,
liveSessionSource,
d.WorldOrigin,
networkUpdates,
new FlyCameraStreamingObserverSource(host.CameraController),
@ -663,7 +668,7 @@ internal sealed class SessionPlayerCompositionPhase
d.PlayerHost,
localPlayerProjection,
d.PlayerOutbound,
liveSession);
liveSessionSource);
var localPlayerFrame = new RetailLocalPlayerFrameController(
localPlayerFrameRuntime,
d.MovementInput);
@ -703,7 +708,7 @@ internal sealed class SessionPlayerCompositionPhase
localPlayerShadow,
d.PlayerApproachCompletions,
gameplayInput,
liveSession,
liveSessionSource,
d.MovementDiagnostics,
d.PlayerSkills,
d.ViewportAspect);
@ -714,11 +719,11 @@ internal sealed class SessionPlayerCompositionPhase
devTools.LateBindings.PlayerModeCommands.BindOwned(playerMode));
bindings.Adopt(
"developer command bus",
devTools.CommandBus.BindOwned(liveSession));
devTools.CommandBus.BindOwned(liveSessionSource));
}
var playerModeAutoEntry = new PlayerModeAutoEntry(
new LivePlayerModeAutoEntryContext(
liveSession,
liveSessionSource,
live.LiveEntities,
d.PlayerIdentity,
worldReveal,
@ -750,7 +755,7 @@ internal sealed class SessionPlayerCompositionPhase
d.ChaseCameraInput,
d.WorldOrigin,
liveSpatialReconciler),
new LocalPlayerTeleportSession(liveSession),
new LocalPlayerTeleportSession(liveSessionSource),
new LocalPlayerTeleportPresentation(portalTunnel)));
var teleportLease = scope.Own(
"local-player teleport",
@ -845,8 +850,16 @@ internal sealed class SessionPlayerCompositionPhase
live.Presentation,
d.RemoteMovementObservations,
live.RenderSceneShadow),
liveSessionCommands,
d.Log);
LiveSessionHost sessionHost = sessionRuntimeFactory.Create(liveSession);
LiveSessionHost sessionHost = sessionRuntimeFactory.Create(
liveSession,
new LiveSessionConnectOptions(
d.Options.LiveMode,
d.Options.LiveHost,
d.Options.LivePort,
d.Options.LiveUser ?? string.Empty,
d.Options.LivePass ?? string.Empty));
Fault(SessionPlayerCompositionPoint.SessionHostCreated);
Action<string>? debugToast = d.SettingsDevTools.DevTools is { } devOwner
@ -867,9 +880,9 @@ internal sealed class SessionPlayerCompositionPhase
"live combat-mode commands",
d.CombatModeCommands.BindOwned(combatCommand));
var gameRuntime = new CurrentGameRuntimeAdapter(
d.Options,
liveSession,
sessionHost,
liveSessionCommands,
d.PlayerIdentity,
live.LiveEntities,
d.Objects,

1
src/AcDream.App/Net/LiveEntitySessionController.cs
View file

@ -4,6 +4,7 @@ using AcDream.App.Streaming;
using AcDream.App.World;
using AcDream.Core.Net;
using AcDream.Core.Net.Messages;
using AcDream.Runtime.Session;
namespace AcDream.App.Net;

102
src/AcDream.App/Net/LiveSessionAppSource.cs Normal file
View file

@ -0,0 +1,102 @@
using AcDream.Core.Net;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions;
namespace AcDream.App.Net;
/// <summary>
/// Borrowed graphical view over the canonical Runtime live-session owner.
/// This adapter stores no generation, transport, or in-world state.
/// </summary>
internal sealed class LiveSessionAppSource
: ILiveInWorldSource,
ILiveWorldSessionSource,
ILiveUiSessionTarget
{
private readonly LiveSessionController _session;
private readonly LiveSessionCommandSurface _commands;
public LiveSessionAppSource(
LiveSessionController session,
LiveSessionCommandSurface commands)
{
_session = session ?? throw new ArgumentNullException(nameof(session));
_commands = commands ?? throw new ArgumentNullException(nameof(commands));
}
public bool IsInWorld => _session.IsInWorld;
public WorldSession? CurrentSession => _session.CurrentSession;
public ICommandBus Commands => _commands;
}
/// <summary>
/// Stable App command projection over one borrowed generation route. The
/// retained UI may keep this surface, while the displaced route itself becomes
/// inert before inbound subscriptions detach.
/// </summary>
internal sealed class LiveSessionCommandSurface : ICommandBus
{
private readonly object _gate = new();
private LiveSessionCommandRouter? _active;
public ILiveSessionCommandRouting Attach(LiveSessionCommandRouter route)
{
ArgumentNullException.ThrowIfNull(route);
lock (_gate)
{
if (_active is not null)
{
throw new InvalidOperationException(
"A graphical live-session command route is already attached.");
}
_active = route;
return new RouteLease(this, route);
}
}
public void Publish<T>(T command) where T : notnull
{
LiveSessionCommandRouter? route;
lock (_gate)
route = _active;
route?.Publish(command);
}
private void Release(LiveSessionCommandRouter expected)
{
expected.Dispose();
lock (_gate)
{
if (ReferenceEquals(_active, expected))
_active = null;
}
}
private sealed class RouteLease(
LiveSessionCommandSurface owner,
LiveSessionCommandRouter route)
: ILiveSessionCommandRouting
{
private readonly object _gate = new();
private LiveSessionCommandSurface? _owner = owner;
public void Activate() => route.Activate();
public void Dispose()
{
lock (_gate)
{
if (_owner is null)
return;
// Retain the owner until the route has physically become
// inert so a failed teardown remains retryable.
_owner.Release(route);
_owner = null;
}
}
}
}

20
src/AcDream.App/Net/LiveSessionCommandRouter.cs
View file

@ -1,6 +1,7 @@
using AcDream.App.UI;
using AcDream.Core.Chat;
using AcDream.Core.Net.Messages;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions;
namespace AcDream.App.Net;
@ -304,23 +305,4 @@ internal static class TurbineChatRouting
: new TurbineResolution(Room, ChatType, Name);
}
/// <summary>
/// Derive the retail-facing channel label from the inbound Turbine chat
/// type, retaining the numeric-room fallback for unknown extensions.
/// </summary>
public static string DisplayName(uint roomId, uint chatType) =>
(TurbineChat.ChatType)chatType switch
{
TurbineChat.ChatType.Allegiance => "Allegiance",
TurbineChat.ChatType.General => "General",
TurbineChat.ChatType.Trade => "Trade",
TurbineChat.ChatType.Lfg => "LFG",
TurbineChat.ChatType.Roleplay => "Roleplay",
TurbineChat.ChatType.Society => "Society",
TurbineChat.ChatType.SocietyCelHan => "Celestial Hand",
TurbineChat.ChatType.SocietyEldWeb => "Eldrytch Web",
TurbineChat.ChatType.SocietyRadBlo => "Radiant Blood",
TurbineChat.ChatType.Olthoi => "Olthoi",
_ => $"Room 0x{roomId:X8}",
};
}

18
src/AcDream.App/Net/LiveSessionRuntimeFactory.cs
View file

@ -23,6 +23,7 @@ using AcDream.Core.Social;
using AcDream.Core.Spells;
using AcDream.Core.World;
using AcDream.Content;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions.Panels.Chat;
using AcDream.UI.Abstractions.Panels.Vitals;
using DatReaderWriter;
@ -101,6 +102,7 @@ internal sealed class LiveSessionRuntimeFactory
private readonly LiveSessionUiRuntime _ui;
private readonly LiveSessionInteractionRuntime _interaction;
private readonly LiveSessionWorldRuntime _world;
private readonly LiveSessionCommandSurface _commands;
private readonly Action<string> _log;
public LiveSessionRuntimeFactory(
@ -109,6 +111,7 @@ internal sealed class LiveSessionRuntimeFactory
LiveSessionUiRuntime ui,
LiveSessionInteractionRuntime interaction,
LiveSessionWorldRuntime world,
LiveSessionCommandSurface commands,
Action<string> log)
{
_player = player ?? throw new ArgumentNullException(nameof(player));
@ -117,18 +120,22 @@ internal sealed class LiveSessionRuntimeFactory
_interaction = interaction
?? throw new ArgumentNullException(nameof(interaction));
_world = world ?? throw new ArgumentNullException(nameof(world));
_commands = commands ?? throw new ArgumentNullException(nameof(commands));
_log = log ?? throw new ArgumentNullException(nameof(log));
}
public LiveSessionHost Create(LiveSessionController controller)
public LiveSessionHost Create(
LiveSessionController controller,
LiveSessionConnectOptions connectOptions)
{
ArgumentNullException.ThrowIfNull(controller);
ArgumentNullException.ThrowIfNull(connectOptions);
return new LiveSessionHost(controller, new LiveSessionHostBindings(
Routing: new(
CreateEventRouter,
session => new LiveSessionCommandRouter(
CreateCommandBindings(session))),
Reset: CreateResetBindings(),
session => _commands.Attach(new LiveSessionCommandRouter(
CreateCommandBindings(session)))),
Reset: LiveSessionResetManifest.Create(CreateResetBindings()).Execute,
Selection: new(
SetPlayerIdentity: id => _player.Identity.ServerGuid = id,
SetVitalsIdentity: id => _ui.Vitals?.SetLocalPlayerGuid(id),
@ -149,7 +156,8 @@ internal sealed class LiveSessionRuntimeFactory
Connected: () =>
_domain.Chat.OnSystemMessage(
"connected — character list received",
chatType: 1)));
chatType: 1)),
connectOptions);
}
private LiveSessionResetBindings CreateResetBindings() => new()

12
src/AcDream.App/Rendering/DevToolsFramePresenter.cs
View file

@ -181,7 +181,7 @@ internal sealed class DevToolsCameraMenuOperations : IDevToolsCameraMenuOperatio
/// <summary>Resolves the reconnect-safe command bus at draw time.</summary>
internal sealed class DevToolsCommandBusSource : IDevToolsCommandBusSource
{
private LiveSessionController? _session;
private ILiveUiSessionTarget? _session;
private bool _deactivated;
public ICommandBus Current =>
@ -189,7 +189,7 @@ internal sealed class DevToolsCommandBusSource : IDevToolsCommandBusSource
? session.Commands
: NullCommandBus.Instance;
public void Bind(LiveSessionController session)
public void Bind(ILiveUiSessionTarget session)
{
ArgumentNullException.ThrowIfNull(session);
ObjectDisposedException.ThrowIf(_deactivated, this);
@ -199,7 +199,7 @@ internal sealed class DevToolsCommandBusSource : IDevToolsCommandBusSource
_session = session;
}
public IDisposable BindOwned(LiveSessionController session)
public IDisposable BindOwned(ILiveUiSessionTarget session)
{
ArgumentNullException.ThrowIfNull(session);
ObjectDisposedException.ThrowIf(_deactivated, this);
@ -213,7 +213,7 @@ internal sealed class DevToolsCommandBusSource : IDevToolsCommandBusSource
return new Binding(this, session);
}
public void Unbind(LiveSessionController session)
public void Unbind(ILiveUiSessionTarget session)
{
ArgumentNullException.ThrowIfNull(session);
if (ReferenceEquals(_session, session))
@ -229,11 +229,11 @@ internal sealed class DevToolsCommandBusSource : IDevToolsCommandBusSource
private sealed class Binding : IDisposable
{
private DevToolsCommandBusSource? _owner;
private readonly LiveSessionController _expected;
private readonly ILiveUiSessionTarget _expected;
public Binding(
DevToolsCommandBusSource owner,
LiveSessionController expected)
ILiveUiSessionTarget expected)
{
_owner = owner;
_expected = expected;

10
src/AcDream.App/Rendering/GameWindow.cs
View file

@ -6,6 +6,7 @@ using AcDream.App.Rendering.Wb;
using AcDream.App.Settings;
using AcDream.App.World;
using AcDream.Content;
using AcDream.Runtime.Session;
using DatReaderWriter;
using Silk.NET.Input;
using Silk.NET.Maths;
@ -502,10 +503,11 @@ public sealed class GameWindow :
// Phase 4.7: optional live connection to an ACE server. Enabled only when
// ACDREAM_LIVE=1 is in the environment — fully backward compatible with
// the offline rendering pipeline.
// Slice 3: the controller is the sole App owner. Outbound feature
// callbacks resolve this borrowed handle at call time and never cache it.
private AcDream.App.Net.LiveSessionController? _liveSessionController;
private AcDream.App.Net.LiveSessionHost? _liveSessionHost;
// Runtime owns the canonical session generation and transport lifetime.
// The window retains only the composition handles needed for startup and
// shutdown; graphical feature callbacks borrow state through App adapters.
private LiveSessionController? _liveSessionController;
private LiveSessionHost? _liveSessionHost;
private AcDream.Core.Net.WorldSession? LiveSession =>
_liveSessionHost?.CurrentSession;
private readonly AcDream.App.World.LiveWorldOriginState _liveWorldOrigin = new();

1
src/AcDream.App/Rendering/GameWindowLifetime.cs
View file

@ -16,6 +16,7 @@ using AcDream.App.World;
using AcDream.Content;
using AcDream.Core.Audio;
using AcDream.Core.Physics;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions.Input;
using DatReaderWriter;
using Silk.NET.Input;

6
src/AcDream.App/Runtime/CurrentGameRuntimeAdapter.cs
View file

@ -8,6 +8,8 @@ using AcDream.Core.Chat;
using AcDream.Core.Items;
using AcDream.Core.Selection;
using AcDream.Runtime;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions;
namespace AcDream.App.Runtime;
@ -28,9 +30,9 @@ internal sealed class CurrentGameRuntimeAdapter
private bool _disposed;
public CurrentGameRuntimeAdapter(
RuntimeOptions options,
LiveSessionController session,
LiveSessionHost sessionHost,
ICommandBus commands,
LocalPlayerIdentityState playerIdentity,
LiveEntityRuntime entities,
ClientObjectTable objects,
@ -59,9 +61,9 @@ internal sealed class CurrentGameRuntimeAdapter
chat,
clock);
_commands = new CurrentGameRuntimeCommandAdapter(
options,
session,
sessionHost,
commands,
_view,
selectionState,
selection,

93
src/AcDream.App/Runtime/CurrentGameRuntimeCommandAdapter.cs
View file

@ -4,6 +4,7 @@ using AcDream.App.Interaction;
using AcDream.App.Net;
using AcDream.Core.Selection;
using AcDream.Runtime;
using AcDream.Runtime.Session;
using AcDream.UI.Abstractions;
using AcDream.UI.Abstractions.Input;
@ -21,9 +22,9 @@ internal sealed class CurrentGameRuntimeCommandAdapter
IRuntimeChatCommands,
IRuntimePortalCommands
{
private readonly RuntimeOptions _options;
private readonly LiveSessionController _session;
private readonly LiveSessionHost _sessionHost;
private readonly ICommandBus _commands;
private readonly CurrentGameRuntimeViewAdapter _view;
private readonly SelectionState _selectionState;
private readonly SelectionInteractionController _selection;
@ -32,9 +33,9 @@ internal sealed class CurrentGameRuntimeCommandAdapter
private readonly ICurrentGameRuntimeEventSink _events;
public CurrentGameRuntimeCommandAdapter(
RuntimeOptions options,
LiveSessionController session,
LiveSessionHost sessionHost,
ICommandBus commands,
CurrentGameRuntimeViewAdapter view,
SelectionState selectionState,
SelectionInteractionController selection,
@ -42,9 +43,9 @@ internal sealed class CurrentGameRuntimeCommandAdapter
ILiveCombatModeCommand combat,
ICurrentGameRuntimeEventSink events)
{
_options = options ?? throw new ArgumentNullException(nameof(options));
_session = session ?? throw new ArgumentNullException(nameof(session));
_sessionHost = sessionHost ?? throw new ArgumentNullException(nameof(sessionHost));
_commands = commands ?? throw new ArgumentNullException(nameof(commands));
_view = view ?? throw new ArgumentNullException(nameof(view));
_selectionState = selectionState
?? throw new ArgumentNullException(nameof(selectionState));
@ -63,8 +64,8 @@ internal sealed class CurrentGameRuntimeCommandAdapter
if (gate != RuntimeCommandStatus.Accepted)
return RejectedStart(gate);
LiveSessionStartResult direct = _sessionHost.Start(_options);
RuntimeSessionStartResult result = Convert(direct);
RuntimeSessionStartResult result =
_sessionHost.Start(expectedGeneration);
_events.EmitCommand(
RuntimeCommandDomain.Session,
operation: 0,
@ -83,8 +84,8 @@ internal sealed class CurrentGameRuntimeCommandAdapter
if (gate != RuntimeCommandStatus.Accepted)
return RejectedStart(gate);
LiveSessionStartResult direct = _sessionHost.Reconnect(_options);
RuntimeSessionStartResult result = Convert(direct);
RuntimeSessionStartResult result =
_sessionHost.Reconnect(expectedGeneration);
_events.EmitCommand(
RuntimeCommandDomain.Session,
operation: 1,
@ -109,43 +110,15 @@ internal sealed class CurrentGameRuntimeCommandAdapter
RuntimeTeardownStage.None);
}
try
{
_session.Stop();
RuntimeGenerationToken current = _view.Generation;
RuntimeTeardownStage completed =
_session.CurrentSession is null && !_session.IsInWorld
? RuntimeTeardownStage.Complete
: RuntimeTeardownStage.CommandsInert
| RuntimeTeardownStage.InboundDetached;
var acknowledgement = new RuntimeTeardownAcknowledgement(
expectedGeneration,
current,
RuntimeCommandStatus.Accepted,
completed);
_events.EmitCommand(
RuntimeCommandDomain.Session,
operation: 2,
RuntimeCommandStatus.Accepted);
_events.EmitLifecycle(previous);
return acknowledgement;
}
catch (Exception error)
{
var acknowledgement = new RuntimeTeardownAcknowledgement(
expectedGeneration,
_view.Generation,
RuntimeCommandStatus.Rejected,
RuntimeTeardownStage.None,
error);
_events.EmitCommand(
RuntimeCommandDomain.Session,
operation: 2,
RuntimeCommandStatus.Rejected,
text: error.GetType().Name);
_events.EmitLifecycle(previous);
return acknowledgement;
}
RuntimeTeardownAcknowledgement acknowledgement =
_sessionHost.Stop(expectedGeneration);
_events.EmitCommand(
RuntimeCommandDomain.Session,
operation: 2,
acknowledgement.Status,
text: acknowledgement.Error?.GetType().Name ?? string.Empty);
_events.EmitLifecycle(previous);
return acknowledgement;
}
public RuntimeCommandResult Execute(
@ -252,7 +225,7 @@ internal sealed class CurrentGameRuntimeCommandAdapter
return Result(RuntimeCommandStatus.Unsupported);
}
_session.Commands.Publish(new SendChatCmd(
_commands.Publish(new SendChatCmd(
channel,
command.TargetName,
command.Text));
@ -293,7 +266,7 @@ internal sealed class CurrentGameRuntimeCommandAdapter
return Result(RuntimeCommandStatus.Unsupported);
}
_session.Commands.Publish(new ExecuteClientCommandCmd(
_commands.Publish(new ExecuteClientCommandCmd(
commandId.Value,
string.Empty));
_events.EmitCommand(
@ -328,34 +301,6 @@ internal sealed class CurrentGameRuntimeCommandAdapter
: RuntimeSessionStartStatus.Inactive,
_view.Generation);
private RuntimeSessionStartResult Convert(LiveSessionStartResult result)
{
RuntimeSessionStartStatus status = result.Status switch
{
LiveSessionStartStatus.Disabled => RuntimeSessionStartStatus.Disabled,
LiveSessionStartStatus.MissingCredentials =>
RuntimeSessionStartStatus.MissingCredentials,
LiveSessionStartStatus.NoCharacters =>
RuntimeSessionStartStatus.NoCharacters,
LiveSessionStartStatus.Connected =>
RuntimeSessionStartStatus.Connected,
LiveSessionStartStatus.Deferred =>
RuntimeSessionStartStatus.Deferred,
LiveSessionStartStatus.Failed =>
RuntimeSessionStartStatus.Failed,
_ => throw new ArgumentOutOfRangeException(
nameof(result),
result.Status,
"Unknown live-session start result."),
};
return new RuntimeSessionStartResult(
status,
_view.Generation,
result.Selection?.CharacterId ?? 0u,
result.Selection?.CharacterName ?? string.Empty,
result.Error);
}
private static RuntimeCommandStatus ToCommandStatus(
RuntimeSessionStartStatus status) =>
status switch

4
src/AcDream.App/Runtime/CurrentGameRuntimeViewAdapter.cs
View file

@ -5,6 +5,7 @@ using AcDream.App.World;
using AcDream.Core.Chat;
using AcDream.Core.Items;
using AcDream.Runtime;
using AcDream.Runtime.Session;
namespace AcDream.App.Runtime;
@ -58,8 +59,7 @@ internal sealed class CurrentGameRuntimeViewAdapter : IGameRuntimeView
internal bool IsActive => _active && !_session.IsDisposalComplete;
public RuntimeGenerationToken Generation =>
new(_session.SessionGeneration);
public RuntimeGenerationToken Generation => _session.Generation;
public RuntimeLifecycleSnapshot Lifecycle
{

4
src/AcDream.App/Streaming/LocalPlayerTeleportController.cs
View file

@ -290,9 +290,9 @@ internal interface ILocalPlayerTeleportSession
internal sealed class LocalPlayerTeleportSession : ILocalPlayerTeleportSession
{
private readonly LiveSessionController _session;
private readonly ILiveWorldSessionSource _session;
public LocalPlayerTeleportSession(LiveSessionController session) =>
public LocalPlayerTeleportSession(ILiveWorldSessionSource session) =>
_session = session ?? throw new ArgumentNullException(nameof(session));
public void SendLoginComplete() =>

5
src/AcDream.App/Update/LiveObjectFrameController.cs
View file

@ -19,11 +19,6 @@ internal interface ILiveObjectFramePhase
void Tick(float deltaSeconds);
}
internal interface ILiveSessionFramePhase
{
void Tick();
}
internal interface IPostNetworkCommandFramePhase
{
void RunPostNetworkCommandPhase();

5
src/AcDream.App/World/RetailLiveFrameCoordinator.cs
View file

@ -1,4 +1,5 @@
using AcDream.App.Update;
using AcDream.Runtime.Session;
using AcDream.App.Input;
using AcDream.App.Net;
using AcDream.App.Streaming;
@ -21,7 +22,7 @@ internal sealed class RetailLiveFrameCoordinator : IRetailLiveFramePhase
{
private readonly ILiveObjectFramePhase _objects;
private readonly GpuWorldState _worldState;
private readonly ILiveSessionFramePhase _session;
private readonly IRuntimeLiveSessionFramePhase _session;
private readonly IPostNetworkCommandFramePhase _localPlayer;
private readonly ILiveSpatialReconcilePhase _spatialReconciler;
private readonly IWorldGenerationAvailability _availability;
@ -30,7 +31,7 @@ internal sealed class RetailLiveFrameCoordinator : IRetailLiveFramePhase
public RetailLiveFrameCoordinator(
ILiveObjectFramePhase objects,
GpuWorldState worldState,
ILiveSessionFramePhase session,
IRuntimeLiveSessionFramePhase session,
IPostNetworkCommandFramePhase localPlayer,
ILiveSpatialReconcilePhase spatialReconciler,
IWorldGenerationAvailability? availability = null,

1
src/AcDream.Core.Net/AcDream.Core.Net.csproj
View file

@ -13,5 +13,6 @@
<ItemGroup>
<InternalsVisibleTo Include="AcDream.Core.Net.Tests" />
<InternalsVisibleTo Include="AcDream.App.Tests" />
<InternalsVisibleTo Include="AcDream.Runtime.Tests" />
</ItemGroup>
</Project>

25
src/AcDream.Runtime/Session/LiveSessionContracts.cs Normal file
View file

@ -0,0 +1,25 @@
using AcDream.Core.Net;
namespace AcDream.Runtime.Session;
public sealed record LiveSessionConnectOptions(
bool Enabled,
string Host,
int Port,
string User,
string Password);
public interface IRuntimeLiveSessionFramePhase
{
void Tick();
}
public interface ILiveSessionEventRouting : IDisposable
{
void Attach();
}
public interface ILiveSessionCommandRouting : IDisposable
{
void Activate();
}

149
src/AcDream.App/Net/LiveSessionController.cs → src/AcDream.Runtime/Session/LiveSessionController.cs
View file

@ -2,12 +2,10 @@ using System.Net;
using System.Net.Sockets;
using AcDream.Core.Net;
using AcDream.Core.Net.Messages;
using AcDream.App.Update;
using AcDream.UI.Abstractions;
namespace AcDream.App.Net;
namespace AcDream.Runtime.Session;
internal enum LiveSessionStartStatus
public enum LiveSessionStartStatus
{
Disabled,
MissingCredentials,
@ -17,23 +15,23 @@ internal enum LiveSessionStartStatus
Failed,
}
internal sealed record LiveSessionCharacterSelection(
public sealed record LiveSessionCharacterSelection(
int ActiveIndex,
uint CharacterId,
string CharacterName,
string AccountName);
internal sealed record LiveSessionStartResult(
public sealed record LiveSessionStartResult(
LiveSessionStartStatus Status,
LiveSessionCharacterSelection? Selection = null,
Exception? Error = null);
/// <summary>
/// Narrow App composition boundary for one exact WorldSession generation.
/// The host owns domain sinks and presentation state; the controller owns the
/// connect/enter/stop transaction and never reaches into GameWindow state.
/// Runtime boundary for the domain and presentation sinks attached to one
/// exact <see cref="WorldSession"/> generation. The controller owns the
/// connect/enter/stop transaction and never reaches into graphical state.
/// </summary>
internal interface ILiveSessionLifecycleHost
public interface ILiveSessionLifecycleHost
{
LiveSessionBinding BindSession(WorldSession session);
void ResetSessionState();
@ -49,7 +47,7 @@ internal interface ILiveSessionLifecycleHost
/// retryable: outbound commands become inert before inbound subscriptions are
/// detached.
/// </summary>
internal sealed class LiveSessionBinding : IDisposable
public sealed class LiveSessionBinding : IDisposable
{
private readonly Action _activateCommands;
private readonly Action _deactivateCommands;
@ -60,20 +58,19 @@ internal sealed class LiveSessionBinding : IDisposable
public LiveSessionBinding(
WorldSession session,
ICommandBus commands,
Action activateCommands,
Action deactivateCommands,
Action detachEvents)
{
Session = session ?? throw new ArgumentNullException(nameof(session));
Commands = commands ?? throw new ArgumentNullException(nameof(commands));
_activateCommands = activateCommands ?? throw new ArgumentNullException(nameof(activateCommands));
_deactivateCommands = deactivateCommands ?? throw new ArgumentNullException(nameof(deactivateCommands));
_detachEvents = detachEvents ?? throw new ArgumentNullException(nameof(detachEvents));
}
public WorldSession Session { get; }
public ICommandBus Commands { get; }
public bool CommandsDeactivated => _commandsDeactivated;
public bool EventsDetached => _eventsDetached;
public void ActivateCommands()
{
@ -102,7 +99,7 @@ internal sealed class LiveSessionBinding : IDisposable
}
}
internal interface ILiveSessionOperations
public interface ILiveSessionOperations
{
IPEndPoint ResolveEndpoint(string host, int port);
WorldSession CreateSession(IPEndPoint endpoint);
@ -153,17 +150,14 @@ internal sealed class ProductionLiveSessionOperations : ILiveSessionOperations
}
/// <summary>
/// Sole owner of the App lifetime for a live WorldSession: endpoint resolution,
/// Sole runtime owner of a live WorldSession lifetime: endpoint resolution,
/// complete pre-Connect routing, character validation/entry, active command
/// publication, exact-generation Tick, graceful replacement, and convergent
/// teardown. Retail wire behavior remains inside WorldSession.
/// </summary>
internal sealed class LiveSessionController
public sealed class LiveSessionController
: IDisposable,
ILiveSessionFramePhase,
ILiveInWorldSource,
ILiveWorldSessionSource,
ILiveUiSessionTarget
IRuntimeLiveSessionFramePhase
{
private sealed class SessionScope(
WorldSession session,
@ -175,17 +169,29 @@ internal sealed class LiveSessionController
public ILiveSessionLifecycleHost Host { get; } = host;
public LiveSessionBinding? Binding { get; set; }
public bool HostAttached { get; set; }
public RuntimeTeardownStage CompletedStages { get; private set; }
public void DrainTeardown(ILiveSessionOperations operations)
{
if (_teardownStage == 0)
{
Binding?.Dispose();
try
{
Binding?.Dispose();
}
finally
{
if (Binding is null || Binding.CommandsDeactivated)
CompletedStages |= RuntimeTeardownStage.CommandsInert;
if (Binding is null || Binding.EventsDetached)
CompletedStages |= RuntimeTeardownStage.InboundDetached;
}
_teardownStage = 1;
}
if (_teardownStage == 1)
{
operations.DisposeSession(Session);
CompletedStages |= RuntimeTeardownStage.TransportDisposed;
_teardownStage = 2;
}
if (_teardownStage == 2)
@ -197,6 +203,7 @@ internal sealed class LiveSessionController
if (_teardownStage == 3)
{
Host.ResetSessionState();
CompletedStages |= RuntimeTeardownStage.HostReset;
_teardownStage = 4;
}
}
@ -213,7 +220,7 @@ internal sealed class LiveSessionController
private sealed record PendingOperation(
PendingKind Kind,
RuntimeOptions? Options = null,
LiveSessionConnectOptions? Options = null,
ILiveSessionLifecycleHost? Host = null);
private readonly object _gate = new();
@ -227,6 +234,7 @@ internal sealed class LiveSessionController
private bool _disposeRequested;
private bool _disposed;
private ulong _generation;
private RuntimeTeardownStage _lastTeardownStages;
private LiveSessionCharacterSelection? _activeSelection;
public LiveSessionController()
@ -234,7 +242,7 @@ internal sealed class LiveSessionController
{
}
internal LiveSessionController(ILiveSessionOperations operations)
public LiveSessionController(ILiveSessionOperations operations)
{
_operations = operations ?? throw new ArgumentNullException(nameof(operations));
}
@ -244,17 +252,6 @@ internal sealed class LiveSessionController
get { lock (_gate) return _scope?.Session; }
}
public ICommandBus Commands
{
get
{
lock (_gate)
return _inWorld && _scope?.Binding is { } binding
? binding.Commands
: NullCommandBus.Instance;
}
}
public bool IsInWorld
{
get { lock (_gate) return _inWorld; }
@ -265,13 +262,18 @@ internal sealed class LiveSessionController
get { lock (_gate) return _generation; }
}
internal bool IsDisposalComplete
public RuntimeGenerationToken Generation
{
get { lock (_gate) return new RuntimeGenerationToken(_generation); }
}
public bool IsDisposalComplete
{
get { lock (_gate) return _disposed; }
}
internal LiveSessionStartResult Start(
RuntimeOptions options,
public LiveSessionStartResult Start(
LiveSessionConnectOptions options,
ILiveSessionLifecycleHost host)
{
ArgumentNullException.ThrowIfNull(options);
@ -287,8 +289,8 @@ internal sealed class LiveSessionController
}
}
internal LiveSessionStartResult Reconnect(
RuntimeOptions options,
public LiveSessionStartResult Reconnect(
LiveSessionConnectOptions options,
ILiveSessionLifecycleHost host)
{
ArgumentNullException.ThrowIfNull(options);
@ -305,7 +307,7 @@ internal sealed class LiveSessionController
}
}
internal void Stop()
public void Stop()
{
lock (_gate)
{
@ -320,6 +322,50 @@ internal sealed class LiveSessionController
}
}
public RuntimeTeardownAcknowledgement Stop(
RuntimeGenerationToken expectedGeneration)
{
lock (_gate)
{
RuntimeGenerationToken current = new(_generation);
if (_disposed)
{
return new RuntimeTeardownAcknowledgement(
expectedGeneration,
current,
RuntimeCommandStatus.Inactive,
_lastTeardownStages);
}
if (expectedGeneration != current)
{
return new RuntimeTeardownAcknowledgement(
expectedGeneration,
current,
RuntimeCommandStatus.StaleGeneration,
RuntimeTeardownStage.None);
}
try
{
Stop();
return new RuntimeTeardownAcknowledgement(
expectedGeneration,
new RuntimeGenerationToken(_generation),
RuntimeCommandStatus.Accepted,
_lastTeardownStages);
}
catch (Exception error)
{
return new RuntimeTeardownAcknowledgement(
expectedGeneration,
new RuntimeGenerationToken(_generation),
RuntimeCommandStatus.Rejected,
_retiredScope?.CompletedStages ?? _lastTeardownStages,
error);
}
}
}
public void Tick()
{
lock (_gate)
@ -368,7 +414,7 @@ internal sealed class LiveSessionController
}
private LiveSessionStartResult ReconnectCore(
RuntimeOptions options,
LiveSessionConnectOptions options,
ILiveSessionLifecycleHost host)
{
ILiveSessionLifecycleHost? oldHost =
@ -388,7 +434,7 @@ internal sealed class LiveSessionController
}
private LiveSessionStartResult StartCore(
RuntimeOptions options,
LiveSessionConnectOptions options,
ILiveSessionLifecycleHost host,
bool resetHost)
{
@ -408,18 +454,18 @@ internal sealed class LiveSessionController
return new LiveSessionStartResult(LiveSessionStartStatus.Failed, Error: error);
}
if (!options.LiveMode)
if (!options.Enabled)
return new LiveSessionStartResult(LiveSessionStartStatus.Disabled);
if (string.IsNullOrEmpty(options.LiveUser) || string.IsNullOrEmpty(options.LivePass))
if (string.IsNullOrEmpty(options.User) || string.IsNullOrEmpty(options.Password))
return new LiveSessionStartResult(LiveSessionStartStatus.MissingCredentials);
SessionScope? scope = null;
try
{
IPEndPoint endpoint = _operations.ResolveEndpoint(options.LiveHost, options.LivePort);
IPEndPoint endpoint = _operations.ResolveEndpoint(options.Host, options.Port);
if (_generation != generation)
return new LiveSessionStartResult(LiveSessionStartStatus.Deferred);
Console.WriteLine($"live: connecting to {endpoint} as {options.LiveUser}");
Console.WriteLine($"live: connecting to {endpoint} as {options.User}");
WorldSession session = _operations.CreateSession(endpoint);
scope = new SessionScope(session, host);
_scope = scope;
@ -438,11 +484,11 @@ internal sealed class LiveSessionController
if (!IsCurrent(scope, generation))
return new LiveSessionStartResult(LiveSessionStartStatus.Deferred);
host.ReportConnecting(options.LiveHost, options.LivePort, options.LiveUser);
host.ReportConnecting(options.Host, options.Port, options.User);
if (!IsCurrent(scope, generation))
return new LiveSessionStartResult(LiveSessionStartStatus.Deferred);
_operations.Connect(session, options.LiveUser, options.LivePass);
_operations.Connect(session, options.User, options.Password);
if (!IsCurrent(scope, generation))
return new LiveSessionStartResult(LiveSessionStartStatus.Deferred);
host.ReportConnected();
@ -526,6 +572,8 @@ internal sealed class LiveSessionController
}
DrainRetiredScope();
DrainPendingInitialReset();
if (_retiredScope is null && _pendingInitialResetHost is null)
_lastTeardownStages = RuntimeTeardownStage.Complete;
}
private void DrainRetiredScope()
@ -534,7 +582,10 @@ internal sealed class LiveSessionController
return;
retired.DrainTeardown(_operations);
if (retired.IsTeardownComplete)
{
_lastTeardownStages = retired.CompletedStages;
_retiredScope = null;
}
}
private void ResetHostBeforeStart(

16
src/AcDream.App/Net/LiveSessionEventRouter.cs → src/AcDream.Runtime/Session/LiveSessionEventRouter.cs
View file

@ -7,9 +7,9 @@ using AcDream.Core.Player;
using AcDream.Core.Social;
using AcDream.Core.Spells;
namespace AcDream.App.Net;
namespace AcDream.Runtime.Session;
internal sealed record LiveEntitySessionSink(
public sealed record LiveEntitySessionSink(
Action<WorldSession.EntitySpawn> Spawned,
Action<DeleteObject.Parsed> Deleted,
Action<PickupEvent.Parsed> PickedUp,
@ -23,11 +23,11 @@ internal sealed record LiveEntitySessionSink(
Action<PlayPhysicsScript> PlayPhysicsScript,
Action<PlayPhysicsScriptType> PlayPhysicsScriptType);
internal sealed record LiveEnvironmentSessionSink(
public sealed record LiveEnvironmentSessionSink(
Action<uint> EnvironChanged,
Action<double> ServerTimeUpdated);
internal sealed record LiveInventorySessionBindings(
public sealed record LiveInventorySessionBindings(
ClientObjectTable Objects,
LocalPlayerState LocalPlayer,
Func<uint> PlayerGuid,
@ -38,7 +38,7 @@ internal sealed record LiveInventorySessionBindings(
ExternalContainerState? ExternalContainers,
Action<AppraiseInfoParser.Parsed>? OnAppraisal = null);
internal sealed record LiveCharacterSessionBindings(
public sealed record LiveCharacterSessionBindings(
CombatState Combat,
Spellbook Spellbook,
Func<uint, IReadOnlyDictionary<uint, uint>, uint>? ResolveSkillFormulaBonus,
@ -48,7 +48,7 @@ internal sealed record LiveCharacterSessionBindings(
Action<uint, uint>? OnCharacterOptions,
Func<double>? ClientTime);
internal sealed record LiveSocialSessionBindings(
public sealed record LiveSocialSessionBindings(
ChatLog Chat,
TurbineChatState TurbineChat,
FriendsState? Friends,
@ -58,7 +58,7 @@ internal sealed record LiveSocialSessionBindings(
/// Owns every inbound subscription for one exact live session. Domain state
/// remains in the supplied sinks; this class owns only routing and teardown.
/// </summary>
internal sealed class LiveSessionEventRouter : ILiveSessionEventRouting
public sealed class LiveSessionEventRouter : ILiveSessionEventRouting
{
private readonly LiveSessionSubscriptionSet _subscriptions = new();
private readonly Action<int>? _constructionCheckpoint;
@ -267,7 +267,7 @@ internal sealed class LiveSessionEventRouter : ILiveSessionEventRouting
message.RoomId,
message.SenderName,
message.Message,
TurbineChatRouting.DisplayName(message.RoomId, message.ChatType));
TurbineChatDisplayNames.Resolve(message.RoomId, message.ChatType));
}
private static void Validate(

129
src/AcDream.App/Net/LiveSessionHost.cs → src/AcDream.Runtime/Session/LiveSessionHost.cs
View file

@ -1,24 +1,13 @@
using System.Runtime.ExceptionServices;
using AcDream.Core.Net;
using AcDream.UI.Abstractions;
namespace AcDream.App.Net;
namespace AcDream.Runtime.Session;
internal interface ILiveSessionEventRouting : IDisposable
{
void Attach();
}
internal interface ILiveSessionCommandRouting : ICommandBus, IDisposable
{
void Activate();
}
internal sealed record LiveSessionRoutingFactories(
public sealed record LiveSessionRoutingFactories(
Func<WorldSession, ILiveSessionEventRouting> CreateEvents,
Func<WorldSession, ILiveSessionCommandRouting> CreateCommands);
internal sealed record LiveSessionSelectionBindings(
public sealed record LiveSessionSelectionBindings(
Action<uint> SetPlayerIdentity,
Action<uint> SetVitalsIdentity,
Action<uint> SetChatIdentity,
@ -26,27 +15,28 @@ internal sealed record LiveSessionSelectionBindings(
Action<uint> SetVanishProbeIdentity,
Action ClearCombat);
internal sealed record LiveSessionEnteredWorldBindings(
public sealed record LiveSessionEnteredWorldBindings(
Action<string> SetActiveCharacter,
Action RestoreLayout,
Action SyncToolbar,
Action<string> LoadCharacterSettings,
Action ArmPlayerModeAutoEntry);
internal sealed record LiveSessionHostBindings(
public sealed record LiveSessionHostBindings(
LiveSessionRoutingFactories Routing,
LiveSessionResetBindings Reset,
Action Reset,
LiveSessionSelectionBindings Selection,
LiveSessionEnteredWorldBindings EnteredWorld,
Action<string, int, string> Connecting,
Action Connected);
/// <summary>
/// App composition owner for the one canonical <see cref="LiveSessionController"/>.
/// It owns callback ordering and per-generation route factories, but never
/// mirrors session, generation, identity, routing, or command state.
/// Runtime host for the one canonical <see cref="LiveSessionController"/>.
/// It owns callback ordering and per-generation route factories supplied by
/// composition, but never mirrors session, generation, identity, routing, or
/// command state.
/// </summary>
internal sealed class LiveSessionHost
public sealed class LiveSessionHost : IRuntimeSessionCommands
{
private sealed class PendingRouteRollback(
ILiveSessionCommandRouting? commands,
@ -90,18 +80,21 @@ internal sealed class LiveSessionHost
}
private readonly LiveSessionController _controller;
private readonly LiveSessionConnectOptions? _connectOptions;
private readonly LiveSessionRoutingFactories _routing;
private readonly LiveSessionSelectionBindings _selection;
private readonly LiveSessionEnteredWorldBindings _enteredWorld;
private readonly LiveSessionResetPlan _resetPlan;
private readonly Action _reset;
private readonly LiveSessionLifecycleHost _lifecycle;
private PendingRouteRollback? _pendingRouteRollback;
public LiveSessionHost(
LiveSessionController controller,
LiveSessionHostBindings bindings)
LiveSessionHostBindings bindings,
LiveSessionConnectOptions? connectOptions = null)
{
_controller = controller ?? throw new ArgumentNullException(nameof(controller));
_connectOptions = connectOptions;
ArgumentNullException.ThrowIfNull(bindings);
_routing = bindings.Routing ?? throw new ArgumentNullException(nameof(bindings.Routing));
_selection = bindings.Selection ?? throw new ArgumentNullException(nameof(bindings.Selection));
@ -109,11 +102,12 @@ internal sealed class LiveSessionHost
?? throw new ArgumentNullException(nameof(bindings.EnteredWorld));
ArgumentNullException.ThrowIfNull(_routing.CreateEvents);
ArgumentNullException.ThrowIfNull(_routing.CreateCommands);
ArgumentNullException.ThrowIfNull(bindings.Reset);
ArgumentNullException.ThrowIfNull(bindings.Connecting);
ArgumentNullException.ThrowIfNull(bindings.Connected);
Validate(_selection, _enteredWorld);
_resetPlan = LiveSessionResetManifest.Create(bindings.Reset);
_reset = bindings.Reset;
_lifecycle = new LiveSessionLifecycleHost(new LiveSessionLifecycleBindings(
Bind: BindSession,
Reset: ResetSessionState,
@ -124,15 +118,48 @@ internal sealed class LiveSessionHost
}
public WorldSession? CurrentSession => _controller.CurrentSession;
public ICommandBus Commands => _controller.Commands;
public bool IsInWorld => _controller.IsInWorld;
public LiveSessionStartResult Start(RuntimeOptions options) =>
public LiveSessionStartResult Start(LiveSessionConnectOptions options) =>
_controller.Start(options, _lifecycle);
public LiveSessionStartResult Reconnect(RuntimeOptions options) =>
public LiveSessionStartResult Reconnect(LiveSessionConnectOptions options) =>
_controller.Reconnect(options, _lifecycle);
public RuntimeSessionStartResult Start(
RuntimeGenerationToken expectedGeneration)
{
if (!TryValidate(expectedGeneration, out RuntimeSessionStartResult rejected))
return rejected;
if (_connectOptions is null)
{
return new RuntimeSessionStartResult(
RuntimeSessionStartStatus.Inactive,
_controller.Generation);
}
return Convert(_controller.Start(_connectOptions, _lifecycle));
}
public RuntimeSessionStartResult Reconnect(
RuntimeGenerationToken expectedGeneration)
{
if (!TryValidate(expectedGeneration, out RuntimeSessionStartResult rejected))
return rejected;
if (_connectOptions is null)
{
return new RuntimeSessionStartResult(
RuntimeSessionStartStatus.Inactive,
_controller.Generation);
}
return Convert(_controller.Reconnect(_connectOptions, _lifecycle));
}
public RuntimeTeardownAcknowledgement Stop(
RuntimeGenerationToken expectedGeneration) =>
_controller.Stop(expectedGeneration);
private LiveSessionBinding BindSession(WorldSession session)
{
DrainPendingRouteRollback();
@ -150,7 +177,6 @@ internal sealed class LiveSessionHost
"The live-session command factory returned null.");
return new LiveSessionBinding(
session,
commands,
activateCommands: commands.Activate,
deactivateCommands: commands.Dispose,
detachEvents: events.Dispose);
@ -168,7 +194,7 @@ internal sealed class LiveSessionHost
// state below. Treat physical route convergence as the same hard
// barrier used by normal LiveSessionBinding teardown.
DrainPendingRouteRollback();
_resetPlan.Execute();
_reset();
}
private void ApplySelection(LiveSessionCharacterSelection selection)
@ -239,4 +265,49 @@ internal sealed class LiveSessionHost
ArgumentNullException.ThrowIfNull(entered.LoadCharacterSettings);
ArgumentNullException.ThrowIfNull(entered.ArmPlayerModeAutoEntry);
}
private bool TryValidate(
RuntimeGenerationToken expectedGeneration,
out RuntimeSessionStartResult rejected)
{
RuntimeGenerationToken current = _controller.Generation;
if (expectedGeneration != current)
{
rejected = new RuntimeSessionStartResult(
RuntimeSessionStartStatus.StaleGeneration,
current);
return false;
}
rejected = default;
return true;
}
private RuntimeSessionStartResult Convert(LiveSessionStartResult result)
{
RuntimeSessionStartStatus status = result.Status switch
{
LiveSessionStartStatus.Disabled => RuntimeSessionStartStatus.Disabled,
LiveSessionStartStatus.MissingCredentials =>
RuntimeSessionStartStatus.MissingCredentials,
LiveSessionStartStatus.NoCharacters =>
RuntimeSessionStartStatus.NoCharacters,
LiveSessionStartStatus.Connected =>
RuntimeSessionStartStatus.Connected,
LiveSessionStartStatus.Deferred =>
RuntimeSessionStartStatus.Deferred,
LiveSessionStartStatus.Failed =>
RuntimeSessionStartStatus.Failed,
_ => throw new ArgumentOutOfRangeException(
nameof(result),
result.Status,
"Unknown live-session start result."),
};
return new RuntimeSessionStartResult(
status,
_controller.Generation,
result.Selection?.CharacterId ?? 0u,
result.Selection?.CharacterName ?? string.Empty,
result.Error);
}
}

12
src/AcDream.App/Net/LiveSessionLifecycleHost.cs → src/AcDream.Runtime/Session/LiveSessionLifecycleHost.cs
View file

@ -1,8 +1,8 @@
using AcDream.Core.Net;
namespace AcDream.App.Net;
namespace AcDream.Runtime.Session;
internal sealed record LiveSessionLifecycleBindings(
public sealed record LiveSessionLifecycleBindings(
Func<WorldSession, LiveSessionBinding> Bind,
Action Reset,
Action<string, int, string> Connecting,
@ -11,11 +11,11 @@ internal sealed record LiveSessionLifecycleBindings(
Action<LiveSessionCharacterSelection> Entered);
/// <summary>
/// Focused adapter between the session lifetime owner and App composition.
/// It tracks only the exact borrowed session attached to the host; domain and
/// presentation state remain behind the supplied lifecycle callbacks.
/// Focused adapter between the session lifetime owner and its composition
/// callbacks. It tracks only the exact borrowed session attached to the host;
/// domain and presentation state remain behind the supplied callbacks.
/// </summary>
internal sealed class LiveSessionLifecycleHost : ILiveSessionLifecycleHost
public sealed class LiveSessionLifecycleHost : ILiveSessionLifecycleHost
{
private readonly LiveSessionLifecycleBindings _bindings;
private WorldSession? _boundSession;

22
src/AcDream.Runtime/Session/TurbineChatDisplayNames.cs Normal file
View file

@ -0,0 +1,22 @@
using AcDream.Core.Net.Messages;
namespace AcDream.Runtime.Session;
internal static class TurbineChatDisplayNames
{
public static string Resolve(uint roomId, uint chatType) =>
(TurbineChat.ChatType)chatType switch
{
TurbineChat.ChatType.Allegiance => "Allegiance",
TurbineChat.ChatType.General => "General",
TurbineChat.ChatType.Trade => "Trade",
TurbineChat.ChatType.Lfg => "LFG",
TurbineChat.ChatType.Roleplay => "Roleplay",
TurbineChat.ChatType.Society => "Society",
TurbineChat.ChatType.SocietyCelHan => "Celestial Hand",
TurbineChat.ChatType.SocietyEldWeb => "Eldrytch Web",
TurbineChat.ChatType.SocietyRadBlo => "Radiant Blood",
TurbineChat.ChatType.Olthoi => "Olthoi",
_ => $"Room 0x{roomId:X8}",
};
}