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

fix(net): conform character entry and session shutdown

Browse source
This commit is contained in:
Erik 2026-07-21 10:33:03 +02:00
parent bacc7e45a9
commit aea957f845
12 changed files with 1016 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

196
tests/AcDream.Core.Net.Tests/Messages/CharacterListTests.cs
View file

@ -9,10 +9,10 @@ public class CharacterListTests
[Fact]
public void Parse_SingleCharacter_ExtractsGuidAndName()
{
// Hand-assemble a CharacterList body matching ACE's writer format:
// u32 opcode, u32 0, u32 count=1,
// u32 guid, String16L name, u32 deleteDelta,
// u32 0, u32 slotCount, String16L accountName,
// Hand-assemble retail CharacterSet wire layout as emitted by ACE:
// u32 opcode, u32 status=0, u32 activeCount=1,
// u32 guid, String16L name, u32 secondsGreyedOut,
// u32 deletedCount=0, i32 numAllowed, String16L accountName,
// u32 useTurbineChat, u32 hasToD
var w = new PacketWriter(128);
w.WriteUInt32(CharacterList.Opcode);
@ -29,11 +29,13 @@ public class CharacterListTests
var parsed = CharacterList.Parse(w.ToArray());
Assert.Equal(0u, parsed.Status);
Assert.Single(parsed.Characters);
Assert.Empty(parsed.DeletedCharacters);
Assert.Equal(0x50000001u, parsed.Characters[0].Id);
Assert.Equal("+Acdream", parsed.Characters[0].Name);
Assert.Equal(0u, parsed.Characters[0].DeleteTimeDelta);
Assert.Equal(11u, parsed.SlotCount);
Assert.Equal(0u, parsed.Characters[0].SecondsGreyedOut);
Assert.Equal(11, parsed.SlotCount);
Assert.Equal("testaccount", parsed.AccountName);
Assert.True(parsed.UseTurbineChat);
Assert.True(parsed.HasThroneOfDestiny);
@ -69,6 +71,152 @@ public class CharacterListTests
Assert.Equal("Carol", parsed.Characters[2].Name);
}
[Fact]
public void Parse_NonzeroStatusAndDeletedCollection_PreservesRetailLayout()
{
var w = new PacketWriter(160);
w.WriteUInt32(CharacterList.Opcode);
w.WriteUInt32(7); // status
w.WriteUInt32(1); // active count
WriteIdentity(w, 0x50000001u, "Active", 0);
w.WriteUInt32(2); // deleted count, not padding
WriteIdentity(w, 0x50000002u, "Deleted One", 90);
WriteIdentity(w, 0x50000003u, "Deleted Two", 180);
WriteTail(w, 13, "CanonicalAccount", useTurbineChat: true, hasTod: false);
CharacterList.Parsed parsed = CharacterList.Parse(w.ToArray());
Assert.Equal(7u, parsed.Status);
Assert.Single(parsed.Characters);
Assert.Equal("Active", parsed.Characters[0].Name);
Assert.Collection(
parsed.DeletedCharacters,
character =>
{
Assert.Equal(0x50000002u, character.Id);
Assert.Equal("Deleted One", character.Name);
Assert.Equal(90u, character.SecondsGreyedOut);
},
character =>
{
Assert.Equal(0x50000003u, character.Id);
Assert.Equal("Deleted Two", character.Name);
Assert.Equal(180u, character.SecondsGreyedOut);
});
Assert.Equal(13, parsed.SlotCount);
Assert.Equal("CanonicalAccount", parsed.AccountName);
Assert.True(parsed.UseTurbineChat);
Assert.False(parsed.HasThroneOfDestiny);
}
[Fact]
public void TrySelectFirstAvailable_SkipsZeroGuidAndGreyedActiveCharacters()
{
CharacterList.Parsed parsed = BuildParsed(
[
new CharacterList.Character(0, "Empty", 0),
new CharacterList.Character(0x50000001u, "Deleting", 30),
new CharacterList.Character(0x50000002u, "Ready", 0),
],
[new CharacterList.Character(0x50000003u, "Deleted", 0)]);
bool found = CharacterList.TrySelectFirstAvailable(parsed, out var selection);
Assert.True(found);
Assert.Equal(2, selection.ActiveIndex);
Assert.Equal(0x50000002u, selection.Character.Id);
}
[Fact]
public void TrySelectFirstAvailable_RejectsAllGreyedAndNeverReadsDeletedCollection()
{
CharacterList.Parsed parsed = BuildParsed(
[new CharacterList.Character(0x50000001u, "Deleting", 1)],
[new CharacterList.Character(0x50000002u, "Deleted Ready", 0)]);
Assert.False(CharacterList.TrySelectFirstAvailable(parsed, out _));
}
[Fact]
public void Parse_EmptyCollectionsAndNegativeAllowedSentinel_ArePreserved()
{
var w = new PacketWriter(64);
w.WriteUInt32(CharacterList.Opcode);
w.WriteUInt32(0);
w.WriteUInt32(0); // active count
w.WriteUInt32(0); // deleted count
w.WriteUInt32(uint.MaxValue); // retail signed -1 sentinel
w.WriteString16L("Account");
w.WriteUInt32(2); // every nonzero retail int is true
w.WriteUInt32(uint.MaxValue);
CharacterList.Parsed parsed = CharacterList.Parse(w.ToArray());
Assert.Empty(parsed.Characters);
Assert.Empty(parsed.DeletedCharacters);
Assert.Equal(-1, parsed.SlotCount);
Assert.True(parsed.UseTurbineChat);
Assert.True(parsed.HasThroneOfDestiny);
Assert.False(CharacterList.TrySelectFirstAvailable(parsed, out _));
}
[Fact]
public void Parse_CountThatCannotFitRemainingPayload_IsRejected()
{
var active = new PacketWriter(16);
active.WriteUInt32(CharacterList.Opcode);
active.WriteUInt32(0);
active.WriteUInt32(256);
Assert.Throws<FormatException>(() => CharacterList.Parse(active.ToArray()));
var deleted = new PacketWriter(20);
deleted.WriteUInt32(CharacterList.Opcode);
deleted.WriteUInt32(0);
deleted.WriteUInt32(0);
deleted.WriteUInt32(256);
Assert.Throws<FormatException>(() => CharacterList.Parse(deleted.ToArray()));
}
[Fact]
public void Parse_255MinimumSizeIdentities_UsesPayloadBoundNotArbitraryCap()
{
var w = new PacketWriter(4096);
w.WriteUInt32(CharacterList.Opcode);
w.WriteUInt32(0);
w.WriteUInt32(255);
for (uint i = 1; i <= 255; i++)
WriteIdentity(w, i, string.Empty, 0);
w.WriteUInt32(0);
WriteTail(w, 255, "Account", useTurbineChat: true, hasTod: true);
CharacterList.Parsed parsed = CharacterList.Parse(w.ToArray());
Assert.Equal(255, parsed.Characters.Count);
Assert.Equal(255, parsed.SlotCount);
}
[Fact]
public void Parse_EveryTruncatedPrefixOfRetailPayload_Throws()
{
var w = new PacketWriter(160);
w.WriteUInt32(CharacterList.Opcode);
w.WriteUInt32(3);
w.WriteUInt32(1);
WriteIdentity(w, 0x50000001u, "A", 0);
w.WriteUInt32(1);
WriteIdentity(w, 0x50000002u, "Deleted", 22);
WriteTail(w, 11, "Account", useTurbineChat: true, hasTod: true);
byte[] valid = w.ToArray();
for (int length = 0; length < valid.Length; length++)
{
byte[] prefix = valid.AsSpan(0, length).ToArray();
Assert.Throws<FormatException>(() => CharacterList.Parse(prefix));
}
_ = CharacterList.Parse(valid);
}
[Fact]
public void Parse_WrongOpcode_Throws()
{
@ -84,4 +232,40 @@ public class CharacterListTests
BinaryPrimitives.WriteUInt32LittleEndian(bytes, CharacterList.Opcode);
Assert.Throws<FormatException>(() => CharacterList.Parse(bytes));
}
private static void WriteIdentity(
PacketWriter writer,
uint id,
string name,
uint secondsGreyedOut)
{
writer.WriteUInt32(id);
writer.WriteString16L(name);
writer.WriteUInt32(secondsGreyedOut);
}
private static void WriteTail(
PacketWriter writer,
int slotCount,
string accountName,
bool useTurbineChat,
bool hasTod)
{
writer.WriteUInt32(unchecked((uint)slotCount));
writer.WriteString16L(accountName);
writer.WriteUInt32(useTurbineChat ? 1u : 0u);
writer.WriteUInt32(hasTod ? 1u : 0u);
}
private static CharacterList.Parsed BuildParsed(
IReadOnlyList<CharacterList.Character> active,
IReadOnlyList<CharacterList.Character> deleted) =>
new(
Status: 0,
Characters: active,
DeletedCharacters: deleted,
SlotCount: 11,
AccountName: "Account",
UseTurbineChat: true,
HasThroneOfDestiny: true);
}