flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net.git synced 2026-08-20 04:42:57 +00:00
Code Issues Releases Wiki Activity

Added some extra checks

Browse Source
This commit is contained in:
Jan Korf
2019-05-28 09:38:05 +02:00
parent 4ec4159455
commit 4e4ce047b4
4 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CryptoExchange.Net/Sockets/BaseSocket.cs
+27 -9
View File
@@ -75,8 +75,32 @@ namespace CryptoExchange.Net.Sockets
private void HandleByteData(byte[] data)
{
var message = DataInterpreterBytes(data);
Handle(messageHandlers, message);
if (DataInterpreterBytes == null)
throw new Exception("Byte interpreter not set while receiving byte data");
try
{
var message = DataInterpreterBytes(data);
Handle(messageHandlers, message);
}
catch (Exception ex)
{
log.Write(LogVerbosity.Error, $"{Id} Something went wrong while processing a byte message from the socket: {ex}");
}
}
private void HandleStringData(string data)
{
try
{
if (DataInterpreterString != null)
data = DataInterpreterString(data);
Handle(messageHandlers, data);
}
catch (Exception ex)
{
log.Write(LogVerbosity.Error, $"{Id} Something went wrong while processing a string message from the socket: {ex}");
}
}
public event Action OnClose
@@ -201,13 +225,7 @@ namespace CryptoExchange.Net.Sockets
socket.Opened += (o, s) => Handle(openHandlers);
socket.Closed += (o, s) => Handle(closeHandlers);
socket.Error += (o, s) => Handle(errorHandlers, s.Exception);
socket.MessageReceived += (o, s) =>
{
string data = s.Message;
if (DataInterpreterString != null)
data = DataInterpreterString(data);
Handle(messageHandlers, data);
};
socket.MessageReceived += (o, s) => HandleStringData(s.Message);
socket.DataReceived += (o, s) => HandleByteData(s.Data);
}
CryptoExchange.Net/Sockets/SocketConnection.cs
+4 -3
View File
@@ -91,9 +91,10 @@ namespace CryptoExchange.Net.Sockets
public void ProcessMessage(string data)
{
log.Write(LogVerbosity.Debug, $"Socket {Socket.Id} received data: " + data);
var tokenData = JToken.Parse(data);
var tokenData = data.ToJToken(log);
if (tokenData == null)
return;
foreach (var pendingRequest in pendingRequests.ToList())
{
if (pendingRequest.Check(tokenData))