Refactoring

master
ogoun 3 weeks ago
parent 73f3bef5d7
commit 1692324219

@ -127,7 +127,7 @@ namespace ZeroLevel.Network
public void Request(Frame frame, Action<byte[]> callback, Action<string> fail = null!) public void Request(Frame frame, Action<byte[]> callback, Action<string> fail = null!)
{ {
if (Status != SocketClientStatus.Working) throw new Exception($"[SocketClient.Request] Socket status: {Status}"); if (Status != SocketClientStatus.Working) throw new Exception($"[SocketClient.Request] Socket status: {Status}");
var data = NetworkPacketFactory.Reqeust(MessageSerializer.Serialize(frame), out int id); var data = NetworkPacketFactory.Request(MessageSerializer.Serialize(frame), out int id);
_requests.RegisterForFrame(id, callback, fail); _requests.RegisterForFrame(id, callback, fail);
Send(id, true, data); Send(id, true, data);
} }
@ -178,8 +178,11 @@ namespace ZeroLevel.Network
} }
else else
{ {
// TODO or not TODO if (count == 0)
Thread.Sleep(1); {
Broken(); // Закрытие соединения
return;
}
} }
StartReceive(); StartReceive();
} }
@ -345,6 +348,8 @@ namespace ZeroLevel.Network
{ {
Log.Error(ex, "[SocketClient.Dispose]"); Log.Error(ex, "[SocketClient.Dispose]");
} }
_receiveThread?.Join(500);
_sendingThread?.Join(500);
} }
} }
} }

@ -28,7 +28,7 @@ namespace ZeroLevel.Network
return packet; return packet;
} }
public static byte[] Reqeust(byte[] data, out int requestId) public static byte[] Request(byte[] data, out int requestId)
{ {
var packet = new byte[data.Length + 6 + 4]; var packet = new byte[data.Length + 6 + 4];
packet[0] = (MAGIC | MAGIC_REQUEST); packet[0] = (MAGIC | MAGIC_REQUEST);

@ -39,8 +39,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="System.Text.Json" Version="9.0.4" /> <PackageReference Include="System.Text.Json" Version="9.0.5" />
<PackageReference Include="YamlDotNet" Version="16.3.0" /> <PackageReference Include="YamlDotNet" Version="16.3.0" />
</ItemGroup> </ItemGroup>

Loading…
Cancel
Save

Powered by TurnKey Linux.