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

refactor(runtime): own interaction transactions

Browse source 
Move use throttling, appraisal identity, queued interactions, and exact post-arrival pickup state beneath RuntimeActionState. Keep App as the picker, movement, transport, and retained-presentation adapter while preserving retail send and UseDone ordering. Add reset, disposal, GUID-reuse, callback-reentrancy, and transport-failure coverage.

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Erik 2026-07-26 11:13:09 +02:00
parent be73bccf5a
commit f5f7b4177f
31 changed files with 1365 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

95
tests/AcDream.App.Tests/Input/OutboundInteractionQueueTests.cs
View file

@ -1,95 +0,0 @@
using AcDream.App.Input;
namespace AcDream.App.Tests.Input;
public sealed class OutboundInteractionQueueTests
{
[Fact]
public void Drain_PreservesInputOrder()
{
var queue = new OutboundInteractionQueue();
var actual = new List<string>();
queue.Enqueue(() => actual.Add("use-corpse"));
queue.Enqueue(() => actual.Add("pickup-item"));
queue.Drain();
Assert.Equal(new[] { "use-corpse", "pickup-item" }, actual);
Assert.Equal(0, queue.Count);
}
[Fact]
public void Drain_ReentrantEnqueueWaitsForNextFrame()
{
var queue = new OutboundInteractionQueue();
var actual = new List<string>();
queue.Enqueue(() =>
{
actual.Add("first");
queue.Enqueue(() => actual.Add("next-frame"));
});
queue.Drain();
Assert.Equal(new[] { "first" }, actual);
Assert.Equal(1, queue.Count);
queue.Drain();
Assert.Equal(new[] { "first", "next-frame" }, actual);
Assert.Equal(0, queue.Count);
}
[Fact]
public void Clear_DropsPendingSessionActions()
{
var queue = new OutboundInteractionQueue();
bool invoked = false;
queue.Enqueue(() => invoked = true);
queue.Clear();
queue.Drain();
Assert.False(invoked);
}
[Fact]
public void Drain_ReentrantClearStopsTheCapturedBatch()
{
var queue = new OutboundInteractionQueue();
var actual = new List<string>();
queue.Enqueue(() =>
{
actual.Add("first");
queue.Clear();
});
queue.Enqueue(() => actual.Add("stale"));
queue.Drain();
Assert.Equal(new[] { "first" }, actual);
Assert.Equal(0, queue.Count);
}
[Fact]
public void Drain_ReentrantClearAndEnqueueDefersTheNewEpoch()
{
var queue = new OutboundInteractionQueue();
var actual = new List<string>();
queue.Enqueue(() =>
{
actual.Add("first");
queue.Clear();
queue.Enqueue(() => actual.Add("new-session"));
});
queue.Enqueue(() => actual.Add("stale"));
queue.Drain();
Assert.Equal(new[] { "first" }, actual);
Assert.Equal(1, queue.Count);
queue.Drain();
Assert.Equal(new[] { "first", "new-session" }, actual);
}
}

20
tests/AcDream.App.Tests/Interaction/SelectionInteractionControllerTests.cs
View file

@ -8,6 +8,7 @@ using AcDream.Core.Net.Messages;
using AcDream.Core.Physics;
using AcDream.Core.Selection;
using AcDream.Core.World;
using AcDream.Runtime.Gameplay;
using AcDream.UI.Abstractions.Input;
namespace AcDream.App.Tests.Interaction;
@ -69,7 +70,7 @@ public sealed class SelectionInteractionControllerTests
}
}
private sealed class Transport : ISelectionInteractionTransport
private sealed class Transport : IRuntimeInteractionTransport
{
private uint _sequence;
public bool IsInWorld { get; set; } = true;
@ -160,7 +161,7 @@ public sealed class SelectionInteractionControllerTests
});
Items = new ItemInteractionController(
Objects,
new InventoryTransactionState(Objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(Objects)),
new InteractionState(),
() => Player,
sendUse: null,
@ -464,6 +465,21 @@ public sealed class SelectionInteractionControllerTests
Assert.Equal(new[] { Target }, stale.Transport.Uses);
}
[Fact]
public void HiddenTargetCancelsQueuedUseBeforeFrameDrain()
{
var h = new Harness();
h.Selection.Select(Target, SelectionChangeSource.World);
h.Controller.HandleInputAction(InputAction.UseSelected);
h.Controller.OnEntityHidden(Target);
h.Controller.DrainOutbound();
Assert.Null(h.Selection.SelectedObjectId);
Assert.Empty(h.Transport.Uses);
Assert.Equal(0, h.Items.BusyCount);
}
[Fact]
public void PickupInputWaitsForFrameDrainThenUsesPendingDestination()
{

8
tests/AcDream.App.Tests/Runtime/CurrentGameRuntimeAdapterTests.cs
View file

@ -681,7 +681,7 @@ public sealed class CurrentGameRuntimeAdapterTests
EntityObjects);
Objects = EntityObjects.Objects;
Communication = new RuntimeCommunicationState();
Actions = new RuntimeActionState();
Actions = new RuntimeActionState(InventoryState.Transactions);
MovementInput = new DispatcherMovementInputSource();
GameplayInput = new GameplayInputFrameController(
dispatcher: null,
@ -701,7 +701,7 @@ public sealed class CurrentGameRuntimeAdapterTests
_items = new ItemInteractionController(
Objects,
InventoryState.Transactions,
Actions.Transactions,
Actions.Interaction,
() => PlayerGuid,
sendUse: null,
@ -766,11 +766,11 @@ public sealed class CurrentGameRuntimeAdapterTests
{
Runtime.Dispose();
Character.Dispose();
InventoryState.Dispose();
Communication.Dispose();
_session.Dispose();
_items.Dispose();
Actions.Dispose();
InventoryState.Dispose();
Entities.Clear();
}
}
@ -1149,7 +1149,7 @@ public sealed class CurrentGameRuntimeAdapterTests
}
private sealed class SelectionTransport(Func<bool> isInWorld)
: ISelectionInteractionTransport
: IRuntimeInteractionTransport
{
public bool IsInWorld => isInWorld();

18
tests/AcDream.App.Tests/Runtime/RuntimeActionOwnershipTests.cs
View file

@ -15,7 +15,11 @@ public sealed class RuntimeActionOwnershipTests
string program = ReadAppSource(root, "Program.cs");
Assert.Contains(
"private readonly RuntimeActionState _runtimeActions = new();",
"private readonly RuntimeActionState _runtimeActions;",
gameWindow,
StringComparison.Ordinal);
Assert.Contains(
"_runtimeActions = new RuntimeActionState(_runtimeInventory.Transactions);",
gameWindow,
StringComparison.Ordinal);
Assert.Contains(
@ -54,6 +58,9 @@ public sealed class RuntimeActionOwnershipTests
Assert.Empty(Regex.Matches(
production,
@"\bnew\s+(?:AcDream\.Runtime\.Gameplay\.)?InteractionState\s*\("));
Assert.Empty(Regex.Matches(
production,
@"\bnew\s+(?:AcDream\.Runtime\.Gameplay\.)?RuntimeInteractionTransactionState\s*\("));
Assert.Equal(
1,
Regex.Matches(
@ -94,14 +101,19 @@ public sealed class RuntimeActionOwnershipTests
"GameWindowLifetime.cs");
Assert.Contains("d.Actions.Interaction,", ui, StringComparison.Ordinal);
Assert.Contains("d.Actions.Transactions,", ui, StringComparison.Ordinal);
Assert.Contains("d.Actions.Selection", ui, StringComparison.Ordinal);
Assert.Contains("d.Actions.Combat", ui, StringComparison.Ordinal);
Assert.Contains("d.Actions.Selection", session, StringComparison.Ordinal);
Assert.Contains("d.Actions.Combat", session, StringComparison.Ordinal);
Assert.Contains("_domain.Actions.Combat", liveSession, StringComparison.Ordinal);
Assert.Contains(
"_domain.Actions.Transactions.CompleteUse(error)",
liveSession,
StringComparison.Ordinal);
Assert.Contains("_actions.Selection", commands, StringComparison.Ordinal);
Assert.Contains(
"InteractionState interactionState,",
"RuntimeInteractionTransactionState runtimeTransactions,",
itemInteraction,
StringComparison.Ordinal);
Assert.DoesNotContain(
@ -114,8 +126,8 @@ public sealed class RuntimeActionOwnershipTests
StringComparison.Ordinal);
AssertAppearsInOrder(
shutdown,
"\"runtime inventory state\"",
"\"runtime action state\"",
"\"runtime inventory state\"",
"\"runtime entity/object lifetime\"");
Assert.False(File.Exists(Path.Combine(
root,

7
tests/AcDream.App.Tests/Runtime/RuntimeInventoryOwnershipTests.cs
View file

@ -46,7 +46,7 @@ public sealed class RuntimeInventoryOwnershipTests
"ItemInteractionController.cs");
Assert.Contains(
"d.Inventory.Transactions",
"d.Actions.Transactions",
ui,
StringComparison.Ordinal);
Assert.DoesNotContain(
@ -62,7 +62,7 @@ public sealed class RuntimeInventoryOwnershipTests
itemInteraction,
StringComparison.Ordinal);
Assert.Contains(
"InventoryTransactionState transactions,",
"RuntimeInteractionTransactionState runtimeTransactions,",
itemInteraction,
StringComparison.Ordinal);
Assert.Contains(
@ -70,7 +70,7 @@ public sealed class RuntimeInventoryOwnershipTests
session,
StringComparison.Ordinal);
Assert.Contains(
"_domain.Inventory.Transactions.CompleteUse(error)",
"_domain.Actions.Transactions.CompleteUse(error)",
session,
StringComparison.Ordinal);
Assert.DoesNotContain(
@ -79,6 +79,7 @@ public sealed class RuntimeInventoryOwnershipTests
StringComparison.Ordinal);
AssertAppearsInOrder(
shutdown,
"\"runtime action state\"",
"\"runtime inventory state\"",
"\"runtime entity/object lifetime\"");
}

8
tests/AcDream.App.Tests/UI/CursorFeedbackControllerTests.cs
View file

@ -153,7 +153,7 @@ public sealed class CursorFeedbackControllerTests
var objects = SeedTargetObjects();
var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -190,7 +190,7 @@ public sealed class CursorFeedbackControllerTests
objects.Get(Source)!.TargetType = (uint)ItemType.Misc; // a tool that targets items
var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -230,7 +230,7 @@ public sealed class CursorFeedbackControllerTests
var objects = SeedTargetObjects();
var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -260,7 +260,7 @@ public sealed class CursorFeedbackControllerTests
var objects = SeedTargetObjects();
var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,

10
tests/AcDream.App.Tests/UI/ItemInteractionControllerTests.cs
View file

@ -1,6 +1,7 @@
using AcDream.App.UI;
using AcDream.Core.Combat;
using AcDream.Core.Items;
using AcDream.Runtime.Gameplay;
namespace AcDream.App.Tests.UI;
@ -32,6 +33,7 @@ public sealed class ItemInteractionControllerTests
public readonly CombatState Combat = new();
public readonly StackSplitQuantityState SplitQuantity = new();
public readonly InventoryTransactionState SharedTransactions;
public readonly RuntimeInteractionTransactionState RuntimeTransactions;
public uint SelectedObject;
public bool NonCombatMode;
public bool DragOnPlayerOpensSecureTrade = true;
@ -56,10 +58,12 @@ public sealed class ItemInteractionControllerTests
});
Objects.MoveItem(Pack, Player, 0);
SharedTransactions = new InventoryTransactionState(Objects);
RuntimeTransactions = new RuntimeInteractionTransactionState(
SharedTransactions);
Controller = new ItemInteractionController(
Objects,
SharedTransactions,
RuntimeTransactions,
new InteractionState(),
playerGuid: () => Player,
sendUse: requestUse is null ? Uses.Add : null,
@ -338,10 +342,12 @@ public sealed class ItemInteractionControllerTests
var objects = new ClientObjectTable();
using var transactions =
new InventoryTransactionState(new ClientObjectTable());
using var runtimeTransactions =
new RuntimeInteractionTransactionState(transactions);
Assert.Throws<ArgumentException>(() => new ItemInteractionController(
objects,
transactions,
runtimeTransactions,
new InteractionState(),
playerGuid: () => Player,
sendUse: null,

2
tests/AcDream.App.Tests/UI/Layout/AppraisalUiControllerTests.cs
View file

@ -858,7 +858,7 @@ public sealed class AppraisalUiControllerTests
List<uint> sent)
=> new(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => 0x50000002u,
sendUse: null,

2
tests/AcDream.App.Tests/UI/Layout/ExternalContainerControllerTests.cs
View file

@ -106,7 +106,7 @@ public sealed class ExternalContainerControllerTests
Interaction = new ItemInteractionController(
Objects,
new InventoryTransactionState(Objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(Objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: Uses.Add,

24
tests/AcDream.App.Tests/UI/Layout/InventoryControllerTests.cs
View file

@ -508,7 +508,7 @@ public class InventoryControllerTests
var appraisals = new List<uint>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -546,7 +546,7 @@ public class InventoryControllerTests
objects.Get(0xA)!.Useability = 0x000A0008u;
var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -716,7 +716,7 @@ public class InventoryControllerTests
var pickups = new List<(uint item, uint container, int placement)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -762,7 +762,7 @@ public class InventoryControllerTests
var eventOrder = new List<(string Kind, uint Item, ulong Token)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -815,7 +815,7 @@ public class InventoryControllerTests
var eventOrder = new List<(string Kind, uint Item)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -874,7 +874,7 @@ public class InventoryControllerTests
var messages = new List<string>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -944,7 +944,7 @@ public class InventoryControllerTests
var messages = new List<string>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -1008,7 +1008,7 @@ public class InventoryControllerTests
var merges = new List<(uint Source, uint Target, uint Amount)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -1069,7 +1069,7 @@ public class InventoryControllerTests
var splits = new List<(uint Item, uint Container, uint Placement, uint Amount)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -1117,7 +1117,7 @@ public class InventoryControllerTests
var puts = new List<(uint Item, uint Container, int Placement)>();
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -1158,7 +1158,7 @@ public class InventoryControllerTests
SeedContained(objects, loot, chest, slot: 0, type: ItemType.Misc);
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,
@ -1198,7 +1198,7 @@ public class InventoryControllerTests
SeedContained(objects, loot, chest, slot: 0, type: ItemType.Misc);
using var interaction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: null,

2
tests/AcDream.App.Tests/UI/Layout/PaperdollControllerTests.cs
View file

@ -52,7 +52,7 @@ public class PaperdollControllerTests
{
var itemInteraction = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
() => Player,
sendUse: null,

18
tests/AcDream.App.Tests/UI/Layout/ToolbarControllerTests.cs
View file

@ -265,7 +265,7 @@ public class ToolbarControllerTests
var useWithTarget = new List<(uint Source, uint Target)>();
var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
playerGuid: () => player,
sendUse: null,
@ -332,7 +332,7 @@ public class ToolbarControllerTests
var directPuts = new List<(uint Item, uint Container, int Placement)>();
using var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
playerGuid: () => player,
sendUse: null,
@ -382,7 +382,7 @@ public class ToolbarControllerTests
var messages = new List<string>();
using var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
playerGuid: () => player,
sendUse: null,
@ -512,7 +512,7 @@ public class ToolbarControllerTests
uint selected = item;
var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
() => player,
sendUse: uses.Add,
@ -571,7 +571,7 @@ public class ToolbarControllerTests
var selection = new SelectionState();
using var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
() => player,
sendUse: null,
@ -637,7 +637,7 @@ public class ToolbarControllerTests
var wields = new List<(uint Item, uint Location)>();
using var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
() => player,
sendUse: null,
@ -804,7 +804,7 @@ public class ToolbarControllerTests
var appraisals = new List<uint>();
using var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
playerGuid: () => player,
sendUse: null,
@ -854,7 +854,7 @@ public class ToolbarControllerTests
uint sentTarget = 0;
var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
() => player,
sendUse: null,
@ -897,7 +897,7 @@ public class ToolbarControllerTests
repo.MoveItem(item, pack, 0);
var interaction = new ItemInteractionController(
repo,
new InventoryTransactionState(repo),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(repo)),
new InteractionState(),
() => player,
sendUse: null,

6
tests/AcDream.App.Tests/UI/RetailItemConfirmationControllerTests.cs
View file

@ -18,7 +18,7 @@ public sealed class RetailItemConfirmationControllerTests
var uses = new List<uint>();
var items = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: uses.Add,
@ -54,7 +54,7 @@ public sealed class RetailItemConfirmationControllerTests
var uses = new List<uint>();
var items = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: uses.Add,
@ -84,7 +84,7 @@ public sealed class RetailItemConfirmationControllerTests
var messages = new List<string>();
var items = new ItemInteractionController(
objects,
new InventoryTransactionState(objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: uses.Add,

4
tests/AcDream.App.Tests/UI/RetailUiInteractionFlowTests.cs
View file

@ -163,7 +163,7 @@ public sealed class RetailUiInteractionFlowTests
{
var interaction = new ItemInteractionController(
Objects,
new InventoryTransactionState(Objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(Objects)),
new InteractionState(),
playerGuid: () => Player,
sendUse: Uses.Add,
@ -199,7 +199,7 @@ public sealed class RetailUiInteractionFlowTests
{
itemInteraction ??= new ItemInteractionController(
Objects,
new InventoryTransactionState(Objects),
new AcDream.Runtime.Gameplay.RuntimeInteractionTransactionState(new InventoryTransactionState(Objects)),
new InteractionState(),
() => Player,
sendUse: null,

6
tests/AcDream.Runtime.Tests/GameRuntimeContractTests.cs
View file

@ -179,7 +179,8 @@ public sealed class GameRuntimeContractTests
TrackedTargetHealthCount: 1,
InteractionRevision: 16,
InteractionMode: InteractionModeKind.Use,
InteractionSourceObjectId: 0u),
InteractionSourceObjectId: 0u,
InteractionTransactions: default),
default,
default);
@ -190,7 +191,8 @@ public sealed class GameRuntimeContractTests
Assert.Contains("character=5:6:7:8:0:0", entry.Text);
Assert.Contains("social=9:10:11", entry.Text);
Assert.Contains(
"actions=14:50000001:15:4:1:16:1:00000000",
"actions=14:50000001:15:4:1:16:1:00000000:0:00000000:" +
"00000000:00000000:00000000:0:0",
entry.Text);
}

32
tests/AcDream.Runtime.Tests/Gameplay/RuntimeActionStateTests.cs
View file

@ -1,4 +1,5 @@
using AcDream.Core.Combat;
using AcDream.Core.Items;
using AcDream.Core.Selection;
using AcDream.Runtime.Gameplay;
@ -9,7 +10,8 @@ public sealed class RuntimeActionStateTests
[Fact]
public void ViewProjectsTheExactCanonicalChildrenAndRevisions()
{
using var actions = new RuntimeActionState();
using var inventory = NewInventoryTransactions();
using var actions = new RuntimeActionState(inventory);
actions.Selection.Select(
0x50000001u,
@ -38,7 +40,8 @@ public sealed class RuntimeActionStateTests
[Fact]
public void ResetSessionConvergesEveryChildAfterObserverFailures()
{
var actions = new RuntimeActionState();
using var inventory = NewInventoryTransactions();
var actions = new RuntimeActionState(inventory);
actions.Selection.Select(
0x50000001u,
SelectionChangeSource.World);
@ -69,7 +72,8 @@ public sealed class RuntimeActionStateTests
[Fact]
public void DisposeIsTerminalAndConvergedAfterObserverFailures()
{
var actions = new RuntimeActionState();
using var inventory = NewInventoryTransactions();
var actions = new RuntimeActionState(inventory);
actions.Selection.Select(
0x50000001u,
SelectionChangeSource.World);
@ -94,8 +98,10 @@ public sealed class RuntimeActionStateTests
[Fact]
public void InstancesAreFullyIsolated()
{
using var first = new RuntimeActionState();
using var second = new RuntimeActionState();
using var firstInventory = NewInventoryTransactions();
using var secondInventory = NewInventoryTransactions();
using var first = new RuntimeActionState(firstInventory);
using var second = new RuntimeActionState(secondInventory);
first.Selection.Select(
0x50000001u,
@ -114,7 +120,21 @@ public sealed class RuntimeActionStateTests
0,
0,
InteractionModeKind.None,
0u),
0u,
new RuntimeInteractionTransactionSnapshot(
IsDisposed: false,
Revision: 0,
LastUseSourceId: 0u,
LastUseTargetId: 0u,
AwaitingAppraisalId: 0u,
CurrentAppraisalId: 0u,
OutboundCount: 0,
HasPendingPickup: false,
PendingPickupToken: 0u,
DispatchFailureCount: 0)),
second.View.Snapshot);
}
private static InventoryTransactionState NewInventoryTransactions() =>
new(new ClientObjectTable());
}

6
tests/AcDream.Runtime.Tests/Gameplay/RuntimeGameplayOwnershipTests.cs
View file

@ -15,7 +15,7 @@ public sealed class RuntimeGameplayOwnershipTests
var inventory = new RuntimeInventoryState(entities);
var character = new RuntimeCharacterState();
var communication = new RuntimeCommunicationState();
var actions = new RuntimeActionState();
var actions = new RuntimeActionState(inventory.Transactions);
inventory.Shortcuts.Changed += static () => { };
inventory.Shortcuts.Load([new ShortcutEntry(1, 2u, 3u)]);
inventory.ItemMana.OnQueryItemManaResponse(2u, 0.5f, true);
@ -114,7 +114,7 @@ public sealed class RuntimeGameplayOwnershipTests
var inventory = new RuntimeInventoryState(entities);
var character = new RuntimeCharacterState();
var communication = new RuntimeCommunicationState();
var actions = new RuntimeActionState();
var actions = new RuntimeActionState(inventory.Transactions);
inventory.ExternalContainers.RequestOpen(0x70000001u);
inventory.ExternalContainers.ApplyViewContents(0x70000001u);
@ -132,10 +132,10 @@ public sealed class RuntimeGameplayOwnershipTests
communication.Chat.OnSystemMessage("failure-isolated event", 0u);
Assert.Equal(1, communication.DispatchFailureCount);
actions.Dispose();
Assert.Throws<AggregateException>(inventory.Dispose);
Assert.Throws<AggregateException>(character.Dispose);
communication.Dispose();
actions.Dispose();
RuntimeGameplayOwnershipSnapshot retired =
RuntimeGameplayOwnership.Capture(

447
tests/AcDream.Runtime.Tests/Gameplay/RuntimeInteractionTransactionStateTests.cs Normal file
View file

@ -0,0 +1,447 @@
using AcDream.Core.Items;
using AcDream.Runtime.Gameplay;
namespace AcDream.Runtime.Tests.Gameplay;
public sealed class RuntimeInteractionTransactionStateTests
{
private const uint Item = 0x70000001u;
private const uint Container = 0x50000001u;
[Fact]
public void UseThrottleMatchesRetailStrictBoundaryAndResets()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
Assert.True(state.TryConsumeUseThrottle(1_000));
Assert.False(state.TryConsumeUseThrottle(1_199));
Assert.True(state.TryConsumeUseThrottle(1_200));
state.ResetSession();
Assert.True(state.TryConsumeUseThrottle(1_200));
}
[Fact]
public void OrdinaryUseTransfersBusyReferenceToAuthoritativeUseDone()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
var transport = new Transport();
ItemUseRequestReservation reservation =
state.BeginUseRequestReservation();
RuntimeInteractionDispatchResult result = state.TryDispatchUse(
Item,
ownedByPlayer: false,
useable: true,
reservation,
transport,
out uint sequence);
Assert.Equal(RuntimeInteractionDispatchResult.Dispatched, result);
Assert.Equal(1u, sequence);
Assert.Equal(1, inventory.BusyCount);
Assert.Equal(new[] { Item }, transport.Uses);
RuntimeInteractionTransactionSnapshot snapshot =
state.CaptureOwnership();
Assert.Equal(Item, snapshot.LastUseSourceId);
Assert.Equal(0u, snapshot.LastUseTargetId);
reservation.CancelBeforeDispatch();
Assert.Equal(1, inventory.BusyCount);
state.CompleteUse(0u);
Assert.Equal(0, inventory.BusyCount);
}
[Theory]
[InlineData(false, true, RuntimeInteractionDispatchResult.NotInWorld)]
[InlineData(true, false, RuntimeInteractionDispatchResult.NotUseable)]
public void RejectedUseReleasesOnlyItsReservation(
bool inWorld,
bool useable,
RuntimeInteractionDispatchResult expected)
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
var transport = new Transport { IsInWorld = inWorld };
ItemUseRequestReservation reservation =
state.BeginUseRequestReservation();
RuntimeInteractionDispatchResult result = state.TryDispatchUse(
Item,
ownedByPlayer: false,
useable,
reservation,
transport,
out _);
Assert.Equal(expected, result);
Assert.Equal(0, inventory.BusyCount);
Assert.Empty(transport.Uses);
}
[Fact]
public void TargetedUseRecordsExactSourceAndTarget()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
var sent = new List<(uint Source, uint Target)>();
Assert.True(state.TryDispatchTargetedUse(
Item,
Container,
(source, target) => sent.Add((source, target)),
incrementBusy: true));
Assert.Equal(new[] { (Item, Container) }, sent);
Assert.Equal(1, inventory.BusyCount);
RuntimeInteractionTransactionSnapshot snapshot =
state.CaptureOwnership();
Assert.Equal(Item, snapshot.LastUseSourceId);
Assert.Equal(Container, snapshot.LastUseTargetId);
}
[Fact]
public void ReentrantResetPreventsTargetedUseStateResurrection()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
var sent = new List<(uint Source, uint Target)>();
Assert.False(state.TryDispatchTargetedUse(
Item,
Container,
(source, target) =>
{
sent.Add((source, target));
state.ResetSession();
},
incrementBusy: true));
Assert.Equal(new[] { (Item, Container) }, sent);
Assert.Equal(0, inventory.BusyCount);
RuntimeInteractionTransactionSnapshot snapshot =
state.CaptureOwnership();
Assert.Equal(0u, snapshot.LastUseSourceId);
Assert.Equal(0u, snapshot.LastUseTargetId);
}
[Fact]
public void AppraisalReplacementKeepsOneBusyReferenceAndExactCurrentId()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
var sent = new List<uint>();
Assert.True(state.TryRequestAppraisal(Item, sent.Add));
Assert.True(state.TryRequestAppraisal(Container, sent.Add));
Assert.Equal(1, inventory.BusyCount);
Assert.False(state.AcceptAppraisalResponse(Item).Accepted);
RuntimeAppraisalResponseAcceptance first =
state.AcceptAppraisalResponse(Container);
Assert.True(first.Accepted);
Assert.True(first.FirstResponse);
Assert.Equal(Container, state.CurrentAppraisalId);
Assert.Equal(0, inventory.BusyCount);
Assert.True(state.RefreshCurrentAppraisal(sent.Add));
Assert.Equal(new[] { Item, Container, Container }, sent);
Assert.True(state.CancelObjectAppraisalForSpell(sent.Add));
Assert.Equal(0u, state.CurrentAppraisalId);
Assert.Equal(0u, sent[^1]);
}
[Fact]
public void AppraisalTransportFailureRollsBackOnlyItsBusyReference()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
Assert.Throws<InvalidOperationException>(() =>
state.TryRequestAppraisal(
Item,
static _ => throw new InvalidOperationException("transport")));
RuntimeInteractionTransactionSnapshot snapshot =
state.CaptureOwnership();
Assert.Equal(0u, snapshot.AwaitingAppraisalId);
Assert.Equal(0u, snapshot.CurrentAppraisalId);
Assert.Equal(0, inventory.BusyCount);
}
[Fact]
public void OutboundQueueIsTypedFifoAndReentrantWorkWaitsForNextDrain()
{
using var inventory = NewInventory(out ClientObjectTable objects);
using var state = new RuntimeInteractionTransactionState(inventory);
var item = new ClientObject { ObjectId = Item };
objects.AddOrUpdate(item);
RuntimeInteractionIdentity identity = new(Item, 12u, item);
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Activate,
identity));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Use,
identity));
var seen = new List<RuntimeQueuedInteractionKind>();
state.DrainOutbound(value =>
{
seen.Add(value.Kind);
if (value.Kind == RuntimeQueuedInteractionKind.Activate)
{
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Pickup,
identity));
}
});
Assert.Equal(
new[]
{
RuntimeQueuedInteractionKind.Activate,
RuntimeQueuedInteractionKind.Use,
},
seen);
Assert.Equal(1, state.OutboundCount);
state.DrainOutbound(value => seen.Add(value.Kind));
Assert.Equal(RuntimeQueuedInteractionKind.Pickup, seen[^1]);
Assert.Equal(0, state.OutboundCount);
}
[Fact]
public void ReentrantSessionResetStopsTheCapturedFrameSuffix()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
RuntimeInteractionIdentity identity = new(Item, 12u, null);
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Activate,
identity));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Use,
identity));
var seen = new List<RuntimeQueuedInteractionKind>();
state.DrainOutbound(interaction =>
{
seen.Add(interaction.Kind);
state.ResetSession();
});
Assert.Equal(
new[] { RuntimeQueuedInteractionKind.Activate },
seen);
Assert.Equal(0, state.OutboundCount);
Assert.Equal(0, inventory.BusyCount);
}
[Fact]
public void DispatchFailureIsRecordedWithoutLosingLaterQueuedWork()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
RuntimeInteractionIdentity identity = new(Item, 12u, null);
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Activate,
identity));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Use,
identity));
Assert.Throws<InvalidOperationException>(() =>
state.DrainOutbound(static _ =>
throw new InvalidOperationException("observer")));
Assert.Equal(1, state.DispatchFailureCount);
Assert.Equal(1, state.OutboundCount);
var seen = new List<RuntimeQueuedInteractionKind>();
state.DrainOutbound(value => seen.Add(value.Kind));
Assert.Equal(new[] { RuntimeQueuedInteractionKind.Use }, seen);
}
[Fact]
public void HiddenAndDeletedCancellationPreservesOtherIdentityOrder()
{
using var inventory = NewInventory(out _);
using var state = new RuntimeInteractionTransactionState(inventory);
const uint reusedGuid = Item;
const uint otherGuid = 0x70000002u;
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Activate,
new RuntimeInteractionIdentity(reusedGuid, 11u, null)));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Use,
new RuntimeInteractionIdentity(otherGuid, 21u, null)));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Pickup,
new RuntimeInteractionIdentity(reusedGuid, 12u, null)));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Activate,
new RuntimeInteractionIdentity(otherGuid, 22u, null)));
Assert.Equal(1, state.CancelQueuedInteractions(reusedGuid, 11u));
Assert.Equal(3, state.OutboundCount);
Assert.Equal(1, state.CancelQueuedInteractions(reusedGuid));
Assert.Equal(2, state.OutboundCount);
var seen = new List<(uint Guid, uint? LocalId)>();
state.DrainOutbound(interaction => seen.Add(
(interaction.Identity.ServerGuid,
interaction.Identity.LocalEntityId)));
Assert.Equal(
new[]
{
(otherGuid, (uint?)21u),
(otherGuid, (uint?)22u),
},
seen);
}
[Fact]
public void PostArrivalPickupRequiresItsExactApproachAndReservationTokens()
{
using var inventory = NewInventory(out ClientObjectTable objects);
using var state = new RuntimeInteractionTransactionState(inventory);
objects.AddOrUpdate(new ClientObject { ObjectId = Item });
Assert.True(inventory.TryReserve(
InventoryRequestKind.Pickup,
Item,
out PendingInventoryRequest request));
var approach = new RuntimeInteractionApproachToken(3u, 7u);
Assert.True(state.TryArmPostArrivalPickup(
Item,
localEntityId: 12u,
Container,
placement: 0,
request.Token,
approach,
out RuntimePendingPickup pending));
Assert.False(state.TryResolveApproachCompletion(
new RuntimeInteractionApproachToken(3u, 8u),
natural: true,
out _));
Assert.True(state.TryResolveApproachCompletion(
approach,
natural: true,
out RuntimePendingPickup ready));
Assert.Equal(pending.Token, ready.Token);
var transport = new Transport();
Assert.True(state.TryDispatchPickup(ready, transport, out uint sequence));
Assert.Equal(1u, sequence);
Assert.Equal(new[] { (Item, Container, 0) }, transport.Pickups);
Assert.True(inventory.TryGetPending(out PendingInventoryRequest sent));
Assert.True(sent.Dispatched);
}
[Fact]
public void CancellationResetAndDisposalConvergeTheCompleteLedger()
{
using var inventory = NewInventory(out ClientObjectTable objects);
var state = new RuntimeInteractionTransactionState(inventory);
objects.AddOrUpdate(new ClientObject { ObjectId = Item });
Assert.True(inventory.TryReserve(
InventoryRequestKind.Pickup,
Item,
out PendingInventoryRequest request));
Assert.True(state.TryArmPostArrivalPickup(
Item,
localEntityId: 12u,
Container,
placement: 0,
request.Token,
new RuntimeInteractionApproachToken(1u, 1u),
out _));
state.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Pickup,
new RuntimeInteractionIdentity(Item, 12u, objects.Get(Item))));
state.IncrementBusyCount();
state.ResetSession();
Assert.Equal(0, inventory.BusyCount);
Assert.False(inventory.HasPendingRequest);
Assert.Equal(0, state.OutboundCount);
Assert.False(state.HasPendingPickup);
state.Dispose();
Assert.True(state.CaptureOwnership().IsConverged);
state.Dispose();
}
[Fact]
public void InstancesDoNotShareThrottleQueueAppraisalOrPickupState()
{
using var firstInventory = NewInventory(out _);
using var secondInventory = NewInventory(out _);
using var first =
new RuntimeInteractionTransactionState(firstInventory);
using var second =
new RuntimeInteractionTransactionState(secondInventory);
Assert.True(first.TryConsumeUseThrottle(100));
first.TryRequestAppraisal(Item, static _ => { });
first.Enqueue(new RuntimeQueuedInteraction(
RuntimeQueuedInteractionKind.Use,
new RuntimeInteractionIdentity(Item, 1u, null)));
RuntimeInteractionTransactionSnapshot snapshot =
second.CaptureOwnership();
Assert.Equal(0u, snapshot.AwaitingAppraisalId);
Assert.Equal(0, snapshot.OutboundCount);
Assert.Equal(0, secondInventory.BusyCount);
Assert.True(second.TryConsumeUseThrottle(100));
}
private static InventoryTransactionState NewInventory(
out ClientObjectTable objects)
{
objects = new ClientObjectTable();
return new InventoryTransactionState(objects);
}
private sealed class Transport : IRuntimeInteractionTransport
{
private uint _sequence;
public bool IsInWorld { get; set; } = true;
public List<uint> Uses { get; } = [];
public List<(uint Item, uint Container, int Placement)> Pickups { get; } = [];
public bool TrySendUse(uint serverGuid, out uint sequence)
{
if (!IsInWorld)
{
sequence = 0u;
return false;
}
sequence = ++_sequence;
Uses.Add(serverGuid);
return true;
}
public bool TrySendPickup(
uint itemGuid,
uint destinationContainerId,
int placement,
out uint sequence)
{
if (!IsInWorld)
{
sequence = 0u;
return false;
}
sequence = ++_sequence;
Pickups.Add((itemGuid, destinationContainerId, placement));
return true;
}
}
}