feat(runtime): own character selection flow
This commit is contained in:
parent
6c4cd2bbc6
commit
0e82cbf700
20 changed files with 2396 additions and 33 deletions
|
|
@ -57,10 +57,13 @@ public sealed class LiveSessionControllerTests
|
|||
public bool ThrowOnCreate { get; set; }
|
||||
public bool ThrowOnCharacters { get; set; }
|
||||
public bool ThrowOnEnterWorld { get; set; }
|
||||
public CharacterError.Parsed? EnterWorldRejection { get; set; }
|
||||
public bool ThrowOnTick { get; set; }
|
||||
public bool FailDisposeOnce { get; set; }
|
||||
public List<WorldSession> Sessions { get; } = [];
|
||||
public Dictionary<WorldSession, int> DisposeCounts { get; } = [];
|
||||
public List<(string Account, int ActiveIndex)> DeleteRequests { get; } = [];
|
||||
public List<uint> RestoreRequests { get; } = [];
|
||||
public int EnterWorldCount { get; private set; }
|
||||
public int TickCount { get; private set; }
|
||||
|
||||
|
|
@ -98,15 +101,35 @@ public sealed class LiveSessionControllerTests
|
|||
return Characters;
|
||||
}
|
||||
|
||||
public void StartCharacterSelectionReceive(WorldSession session) =>
|
||||
calls.Add("start-character-selection-receive");
|
||||
|
||||
public void EnterWorld(WorldSession session, int activeCharacterIndex)
|
||||
{
|
||||
calls.Add($"enter:{activeCharacterIndex}");
|
||||
EnterWorldCount++;
|
||||
OnEnterWorld?.Invoke();
|
||||
if (EnterWorldRejection is { } rejection)
|
||||
throw new CharacterSelectionRejectedException(rejection);
|
||||
if (ThrowOnEnterWorld)
|
||||
throw new InvalidOperationException("enter failure");
|
||||
}
|
||||
|
||||
public void DeleteCharacter(
|
||||
WorldSession session,
|
||||
string accountName,
|
||||
int activeCharacterIndex)
|
||||
{
|
||||
calls.Add($"delete:{activeCharacterIndex}");
|
||||
DeleteRequests.Add((accountName, activeCharacterIndex));
|
||||
}
|
||||
|
||||
public void RestoreCharacter(WorldSession session, uint characterId)
|
||||
{
|
||||
calls.Add($"restore:{characterId:X8}");
|
||||
RestoreRequests.Add(characterId);
|
||||
}
|
||||
|
||||
public void Tick(WorldSession session)
|
||||
{
|
||||
calls.Add("tick");
|
||||
|
|
@ -340,6 +363,179 @@ public sealed class LiveSessionControllerTests
|
|||
Assert.True(calls.IndexOf("roster") < calls.IndexOf("selected"));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Start_GraphicalNoSelectorStopsBeforeEnterWorldThenTypedEnterContinuesSameScope()
|
||||
{
|
||||
var calls = new List<string>();
|
||||
var operations = new TestOperations(calls);
|
||||
var host = new TestHost(calls);
|
||||
var controller = new LiveSessionController(operations);
|
||||
|
||||
LiveSessionStartResult result = controller.Start(
|
||||
LiveOptions(awaitSelection: true),
|
||||
host);
|
||||
|
||||
Assert.Equal(
|
||||
LiveSessionStartStatus.AwaitingCharacterSelection,
|
||||
result.Status);
|
||||
Assert.False(controller.IsInWorld);
|
||||
Assert.NotNull(controller.CurrentSession);
|
||||
Assert.Equal(0, operations.EnterWorldCount);
|
||||
Assert.False(host.CommandBuses[0].Active);
|
||||
RuntimeGenerationToken generation = controller.Generation;
|
||||
Assert.Equal(
|
||||
RuntimeCharacterSelectionLifecycle.AwaitingSelection,
|
||||
controller.CharacterSelection.Snapshot.Lifecycle);
|
||||
|
||||
// Greyed entries remain highlightable but cannot enter.
|
||||
Assert.True(controller.Highlight(generation, 0x50000001u).Accepted);
|
||||
Assert.Equal(
|
||||
RuntimeCommandStatus.Rejected,
|
||||
controller.Enter(generation).Status);
|
||||
Assert.True(controller.Highlight(generation, 0x50000002u).Accepted);
|
||||
Assert.True(controller.Enter(generation).Accepted);
|
||||
|
||||
Assert.True(controller.IsInWorld);
|
||||
Assert.Equal(1, operations.EnterWorldCount);
|
||||
Assert.Contains("enter:1", calls);
|
||||
Assert.True(host.CommandBuses[0].Active);
|
||||
Assert.Same(operations.Sessions[0], controller.CurrentSession);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Start_ExplicitSelectorStillEntersWhenGraphicalPauseFlagIsSet()
|
||||
{
|
||||
var calls = new List<string>();
|
||||
var operations = new TestOperations(calls);
|
||||
var host = new TestHost(calls);
|
||||
var controller = new LiveSessionController(operations);
|
||||
|
||||
LiveSessionStartResult result = controller.Start(
|
||||
LiveOptions(
|
||||
selector: new LiveSessionCharacterSelector(
|
||||
CharacterId: 0x50000002u),
|
||||
awaitSelection: true),
|
||||
host);
|
||||
|
||||
Assert.Equal(LiveSessionStartStatus.Connected, result.Status);
|
||||
Assert.True(controller.IsInWorld);
|
||||
Assert.Equal(1, operations.EnterWorldCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void EnterRejection_SurfacesErrorAndKeepsExactPreWorldScopeRetryable()
|
||||
{
|
||||
var calls = new List<string>();
|
||||
var operations = new TestOperations(calls)
|
||||
{
|
||||
EnterWorldRejection = new CharacterError.Parsed(
|
||||
(uint)CharacterError.Code.EnterGameCharacterLocked),
|
||||
};
|
||||
var host = new TestHost(calls);
|
||||
var controller = new LiveSessionController(operations);
|
||||
Assert.Equal(
|
||||
LiveSessionStartStatus.AwaitingCharacterSelection,
|
||||
controller.Start(LiveOptions(awaitSelection: true), host).Status);
|
||||
RuntimeGenerationToken generation = controller.Generation;
|
||||
WorldSession session = controller.CurrentSession!;
|
||||
|
||||
Assert.Equal(
|
||||
RuntimeCommandStatus.Rejected,
|
||||
controller.Enter(generation).Status);
|
||||
Assert.Same(session, controller.CurrentSession);
|
||||
Assert.Equal(generation, controller.Generation);
|
||||
Assert.False(controller.IsInWorld);
|
||||
RuntimeCharacterSelectionSnapshot rejected =
|
||||
controller.CharacterSelection.Snapshot;
|
||||
Assert.Equal(
|
||||
RuntimeCharacterSelectionLifecycle.AwaitingSelection,
|
||||
rejected.Lifecycle);
|
||||
Assert.Equal(
|
||||
CharacterError.Code.EnterGameCharacterLocked,
|
||||
rejected.Error!.Value.Code);
|
||||
|
||||
operations.EnterWorldRejection = null;
|
||||
Assert.True(controller.Enter(generation).Accepted);
|
||||
Assert.True(controller.IsInWorld);
|
||||
Assert.Same(session, controller.CurrentSession);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CharacterCommands_UseWireSlotAndRestoreNeverWaitsForReply()
|
||||
{
|
||||
var calls = new List<string>();
|
||||
var operations = new TestOperations(calls);
|
||||
var host = new TestHost(calls);
|
||||
var controller = new LiveSessionController(operations);
|
||||
Assert.Equal(
|
||||
LiveSessionStartStatus.AwaitingCharacterSelection,
|
||||
controller.Start(LiveOptions(awaitSelection: true), host).Status);
|
||||
RuntimeGenerationToken generation = controller.Generation;
|
||||
|
||||
Assert.True(controller.Highlight(generation, 0x50000002u).Accepted);
|
||||
Assert.True(controller.RequestDelete(generation).Accepted);
|
||||
Assert.Equal(0x50000002u,
|
||||
controller.CharacterSelection.Snapshot.PendingDeleteCharacterId);
|
||||
Assert.True(controller.Cancel(generation).Accepted);
|
||||
Assert.True(controller.RequestDelete(generation).Accepted);
|
||||
Assert.True(controller.ConfirmDelete(generation).Accepted);
|
||||
Assert.Equal([("Canonical", 1)], operations.DeleteRequests);
|
||||
Assert.False(controller.CharacterSelection.Snapshot.Buttons.CanEnter);
|
||||
controller.CharacterSelectionState.ApplyDeleteAcknowledged();
|
||||
controller.CharacterSelectionState.ApplyRoster(new LiveSessionRosterReport(
|
||||
"Canonical",
|
||||
11,
|
||||
[
|
||||
new(0x50000001u, "Grey", 10u),
|
||||
new(0x50000002u, "Ready", 1u),
|
||||
]));
|
||||
|
||||
Assert.True(controller.Highlight(generation, 0x50000001u).Accepted);
|
||||
RuntimeCommandResult restore = await Task.Run(
|
||||
() => controller.Restore(generation))
|
||||
.WaitAsync(TimeSpan.FromSeconds(5));
|
||||
Assert.True(restore.Accepted);
|
||||
Assert.Equal([0x50000001u], operations.RestoreRequests);
|
||||
// ACE may send no response for an unknown guid. The synchronous
|
||||
// command has already returned and does not gate later commands.
|
||||
Assert.True(controller.Highlight(generation, 0x50000002u).Accepted);
|
||||
controller.Tick();
|
||||
Assert.Equal(1, operations.TickCount);
|
||||
Assert.False(controller.IsInWorld);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CharacterCommands_AreGenerationGatedAcrossReconnectAndStop()
|
||||
{
|
||||
var calls = new List<string>();
|
||||
var operations = new TestOperations(calls);
|
||||
var host = new TestHost(calls);
|
||||
var controller = new LiveSessionController(operations);
|
||||
controller.Start(LiveOptions(awaitSelection: true), host);
|
||||
RuntimeGenerationToken first = controller.Generation;
|
||||
|
||||
LiveSessionStartResult reconnect = controller.Reconnect(
|
||||
LiveOptions(awaitSelection: true),
|
||||
host);
|
||||
|
||||
Assert.Equal(
|
||||
LiveSessionStartStatus.AwaitingCharacterSelection,
|
||||
reconnect.Status);
|
||||
Assert.Equal(
|
||||
RuntimeCommandStatus.StaleGeneration,
|
||||
controller.Highlight(first, 0x50000002u).Status);
|
||||
RuntimeGenerationToken second = controller.Generation;
|
||||
Assert.True(controller.Highlight(second, 0x50000002u).Accepted);
|
||||
controller.Stop();
|
||||
Assert.Equal(
|
||||
RuntimeCommandStatus.StaleGeneration,
|
||||
controller.Enter(second).Status);
|
||||
Assert.Equal(
|
||||
RuntimeCharacterSelectionLifecycle.Inactive,
|
||||
controller.CharacterSelection.Snapshot.Lifecycle);
|
||||
Assert.Equal(0, controller.CharacterSelection.Snapshot.RosterCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Start_DisabledAndMissingCredentialsResetButNeverConstructSession()
|
||||
{
|
||||
|
|
@ -1232,7 +1428,8 @@ public sealed class LiveSessionControllerTests
|
|||
bool live = true,
|
||||
string? user = "user",
|
||||
LiveSessionCharacterSelector? selector = null,
|
||||
bool probe = false) =>
|
||||
bool probe = false,
|
||||
bool awaitSelection = false) =>
|
||||
new(
|
||||
live,
|
||||
"127.0.0.1",
|
||||
|
|
@ -1240,7 +1437,8 @@ public sealed class LiveSessionControllerTests
|
|||
user ?? string.Empty,
|
||||
"password",
|
||||
selector,
|
||||
probe);
|
||||
probe,
|
||||
awaitSelection);
|
||||
|
||||
private static CharacterList.Parsed AvailableCharacters() => new(
|
||||
0u,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue