Tons of minor fixes

This commit is contained in:
derek.holloway committed 2026-08-03 10:01:31 -07:00
1 parent 873a6fa455
commit 37a6b5d59b
12 files changed
+219 -147

No files matched your search

+19 -11
View File
@@ -9,16 +9,17 @@ using System.Threading.Tasks;
namespace Mistox.Client {
public class mTCPClient : IDisposable {
TcpClient _connection;
MistoxClient _parent;
private readonly TcpClient _connection;
private readonly MistoxClient _parent;
private readonly SemaphoreSlim _sendLock = new SemaphoreSlim(1, 1);
public mTCPClient( MistoxClient parent, IPEndPoint ServerAddress ) {
_connection = new TcpClient( AddressFamily.InterNetwork );
_connection.NoDelay = true;
_connection.Connect( ServerAddress );
_parent.InvokeOnServerConnected();
Thread RThread = new Thread(async () => { await ReceiveThread(); });
RThread.Start();
// Start the receive thread
Task.Run(ReceiveThread);
}
async Task ReceiveThread() {
@@ -32,19 +33,21 @@ namespace Mistox.Client {
await ns.ReadExactlyAsync(headerBuffer, 0, 3);
// Parse the header
byte packetbyte = headerBuffer[0];
ushort dataLength = (ushort)((headerBuffer[1] << 8) | headerBuffer[2]);
DataPacketHeader Header = new DataPacketHeader {
Type = headerBuffer[0],
DataLength = (ushort)((headerBuffer[1] << 8) | headerBuffer[2])
};
// Make sure the data looks valid
if (dataLength > payloadBuffer.Length) {
if (Header.DataLength > payloadBuffer.Length) {
throw new Exception("Incoming TCP payload is too large for the pre-allocated buffer.");
}
// Read off the data
await ns.ReadExactlyAsync(payloadBuffer, 0, dataLength);
await ns.ReadExactlyAsync(payloadBuffer, 0, Header.DataLength);
// Create the dataobject
dynamic dataobject = DataPacket.Deserialize( packetbyte, dataLength, payloadBuffer.AsMemory(DataPacket.HeaderLength, dataLength) );
dynamic dataobject = DataPacket.Deserialize( Header, payloadBuffer.AsMemory(DataPacket.HeaderLength, Header.DataLength) );
// Return the object
_parent.InvokeOnReceived(dataobject);
@@ -60,13 +63,18 @@ namespace Mistox.Client {
public async Task Send<T>(T packet) {
byte[] data = DataPacket.Serialize( packet );
await _connection.GetStream().WriteAsync( data, 0, data.Length );
await _sendLock.WaitAsync();
try {
await _connection.GetStream().WriteAsync( data, 0, data.Length );
} finally {
_sendLock.Release();
}
}
public void Dispose() {
_parent.InvokeOnServerDisconnected();
_connection.Close();
_connection = null;
_connection.Dispose();
}
}
}