warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Core cleanup, adds event loop synchronization, and fixes gumps (#429)

Browse source 
- [X] Cleans up gump packets
- [X] Adds event loop task synchronization
- [X] Moves timer pause and cleans up the delay task timer class
- [X] Cleans up the conserve cpu
- [X] Renames variables to make them consistent with the new style
- [X] Removes process delta recursion checking.
- [X] Properly diposes net states. This fixes edge cases that may cause hanging connections to stay open longer than they should.
- [X] Fixes an issue with gump items not compiling properly

Users can now utilize `Timer.Pause()` since the code will be executed on the proper thread.

```cs
public void async void Talk()
{
    _canTalk = false;
    await Timer.Pause(Utility.RandomMinMax(5000, 8000)); // Talk after 5-8 seconds
    DoTalk();
    await Timer.Pause(Utility.RandomMinMax(12000, 25000)); // Reset ability to talk after 12-25 seconds
    _canTalk = true;
}
```
This commit is contained in:
Kamron Batman 2021-01-25 21:06:46 -08:00 • committed by GitHub
parent 07751654b7
commit 6f0e1a22f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 763 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/Server/Network/Packets/IncomingAccountPackets.cs
View file

@ -283,9 +283,6 @@ namespace Server.Network
m.NetState?.Dispose();
// TODO: Make this wait one tick so we don't have to call it unnecessarily
NetState.ProcessDisposedQueue();
state.SendClientVersionRequest();
state.BlockAllPackets = true;
@ -395,8 +392,8 @@ namespace Server.Network
if (
!m_AuthIDWindow.TryGetValue(authID, out var ap) ||
state.m_AuthID != 0 && authID != state.m_AuthID ||
state.m_AuthID == 0 && authID != state.m_Seed
state._authId != 0 && authID != state._authId ||
state._authId == 0 && authID != state._seed
)
{
state.WriteConsole("Invalid client detected, disconnecting");
@ -445,19 +442,19 @@ namespace Server.Network
{
var si = info[index];
state.m_AuthID = GenerateAuthID(state);
state._authId = GenerateAuthID(state);
state.SentFirstPacket = false;
state.SendPlayServerAck(si, state.m_AuthID);
state.SendPlayServerAck(si, state._authId);
}
}
public static void LoginServerSeed(NetState state, CircularBufferReader reader, ref int packetLength)
{
state.m_Seed = reader.ReadInt32();
state._seed = reader.ReadInt32();
state.Seeded = true;
if (state.m_Seed == 0)
if (state._seed == 0)
{
state.WriteConsole("Invalid client detected, disconnecting");
state.Dispose();

2
Projects/Server/Network/Packets/IncomingPackets.cs
View file

@ -106,7 +106,7 @@ namespace Server.Network
return -1;
}
ns.m_Seed = seed;
ns._seed = seed;
ns.Seeded = true;
return 4;

152
Projects/Server/Network/Packets/OutgoingGumpPackets.cs
View file

@ -43,8 +43,12 @@ namespace Server.Network
ns.Send(writer.Span);
}
private static readonly byte[] _layoutBuffer = GC.AllocateUninitializedArray<byte>(0x20000);
private static readonly byte[] _stringsBuffer = GC.AllocateUninitializedArray<byte>(0x20000);
private static readonly byte[] _packBuffer = GC.AllocateUninitializedArray<byte>(0x20000);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void WritePacked(ref SpanWriter writer, ReadOnlySpan<byte> span)
private static void WritePacked(ReadOnlySpan<byte> span, ref SpanWriter writer)
{
var length = span.Length;
@ -54,21 +58,38 @@ namespace Server.Network
return;
}
var wantLength = 1 + span.Length * 1024 / 1000;
var wantLength = Zlib.MaxPackSize(length);
var packBuffer = _packBuffer;
byte[] rentedBuffer = null;
wantLength += 4095;
wantLength &= ~4095;
if (wantLength > packBuffer.Length)
{
packBuffer = rentedBuffer = ArrayPool<byte>.Shared.Rent(wantLength);
}
var packBuffer = ArrayPool<byte>.Shared.Rent(wantLength);
var packLength = wantLength;
Zlib.Pack(packBuffer, ref packLength, span, length, ZlibQuality.Default);
var error = Zlib.Pack(packBuffer, ref packLength, span, length, ZlibQuality.Default);
if (error != ZlibError.Okay)
{
Utility.PushColor(ConsoleColor.Red);
Console.WriteLine("Core: Gump compression failed {0}", error);
Utility.PopColor();
writer.Write(4);
writer.Write(0);
return;
}
writer.Write(4 + packLength);
writer.Write(length);
writer.Write(packBuffer.AsSpan(0, packLength));
ArrayPool<byte>.Shared.Return(packBuffer);
if (rentedBuffer != null)
{
ArrayPool<byte>.Shared.Return(rentedBuffer);
}
}
public static void SendDisplayGump(this NetState ns, Gump gump, out int switches, out int entries)
@ -83,7 +104,57 @@ namespace Server.Network
var packed = ns.Unpack;
var writer = new SpanWriter(512, true);
var layoutWriter = new SpanWriter(_layoutBuffer);
if (!gump.Draggable)
{
layoutWriter.Write(Gump.NoMove);
}
if (!gump.Closable)
{
layoutWriter.Write(Gump.NoClose);
}
if (!gump.Disposable)
{
layoutWriter.Write(Gump.NoDispose);
}
if (!gump.Resizable)
{
layoutWriter.Write(Gump.NoResize);
}
var stringsList = new OrderedHashSet<string>(11);
foreach (var entry in gump.Entries)
{
entry.AppendTo(ref layoutWriter, stringsList, ref entries, ref switches);
}
var stringsWriter = new SpanWriter(_stringsBuffer);
foreach (var str in stringsList)
{
var s = str ?? "";
stringsWriter.Write((ushort)s.Length);
stringsWriter.WriteBigUni(s);
}
int maxLength;
if (packed)
{
var worstLayoutLength = Zlib.MaxPackSize(layoutWriter.BytesWritten);
var worstStringsLength = Zlib.MaxPackSize(stringsWriter.BytesWritten);
maxLength = 40 + worstLayoutLength + worstStringsLength;
}
else
{
maxLength = 23 + layoutWriter.BytesWritten + stringsWriter.BytesWritten;
}
var writer = new SpanWriter(stackalloc byte[maxLength]);
writer.Write((byte)(packed ? 0xDD : 0xB0)); // Packet ID
writer.Seek(2, SeekOrigin.Current);
@ -92,77 +163,26 @@ namespace Server.Network
writer.Write(gump.X);
writer.Write(gump.Y);
var spanWriter = new SpanWriter(512, true);
if (!gump.Draggable)
{
spanWriter.Write(Gump.NoMove);
}
if (!gump.Closable)
{
spanWriter.Write(Gump.NoClose);
}
if (!gump.Disposable)
{
spanWriter.Write(Gump.NoDispose);
}
if (!gump.Resizable)
{
spanWriter.Write(Gump.NoResize);
}
var stringsList = new OrderedHashSet<string>(11);
foreach (var entry in gump.Entries)
{
entry.AppendTo(ref spanWriter, stringsList, ref entries, ref switches);
}
if (packed)
{
spanWriter.Write((byte)0); // Layout text terminator
WritePacked(ref writer, spanWriter.Span);
}
else
{
writer.Write((ushort)spanWriter.BytesWritten);
writer.Write(spanWriter.Span);
}
layoutWriter.Write((byte)0); // Layout text terminator
WritePacked(layoutWriter.Span, ref writer);
if (packed)
{
writer.Write(stringsList.Count);
WritePacked(stringsWriter.Span, ref writer);
}
else
{
writer.Write((ushort)layoutWriter.BytesWritten);
writer.Write(layoutWriter.Span);
writer.Write((ushort)stringsList.Count);
}
spanWriter.Seek(0, SeekOrigin.Begin);
foreach (var str in stringsList)
{
var s = str ?? "";
spanWriter.Write((ushort)s.Length);
spanWriter.WriteBigUni(s);
}
if (packed)
{
WritePacked(ref writer, spanWriter.Span);
}
else
{
writer.Write(spanWriter.Span);
writer.Write(stringsWriter.Span);
}
writer.WritePacketLength();
ns.Send(writer.Span);
spanWriter.Dispose(); // Can't use using and refs, so we dispose manually
}
public static void SendDisplaySignGump(this NetState ns, Serial serial, int gumpId, string unknown, string caption)