Attached Parse method to websocket receive

This commit is contained in:
Heath Volmer
2018-03-07 12:44:58 -07:00
parent 62e5e6f176
commit 359bd508e5
3 changed files with 3 additions and 16 deletions

View File

@@ -486,7 +486,6 @@ namespace PepperDash.Essentials
ResetOrStartHearbeatTimer(); ResetOrStartHearbeatTimer();
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@@ -498,8 +497,7 @@ namespace PepperDash.Essentials
WebSocketClient.WEBSOCKET_RESULT_CODES err) WebSocketClient.WEBSOCKET_RESULT_CODES err)
{ {
var rx = System.Text.Encoding.UTF8.GetString(data, 0, (int)length); var rx = System.Text.Encoding.UTF8.GetString(data, 0, (int)length);
ParseStreamRx(rx);
Debug.Console(0, this, "WS RECEIVED {0}", rx);
WSClient.ReceiveAsync(); WSClient.ReceiveAsync();
return 1; return 1;
} }
@@ -509,16 +507,9 @@ namespace PepperDash.Essentials
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
void SSEClient_LineReceived(object sender, GenericCommMethodReceiveTextArgs e) void ParseStreamRx(string message)
{ {
if(e.Text.IndexOf("data:") > -1)
{
SseMessageLengthBeforeFailureCount += e.Text.Length;
var message = e.Text.Substring(6);
Debug.Console(1, this, "Message RX: '{0}'", message); Debug.Console(1, this, "Message RX: '{0}'", message);
try try
{ {
var messageObj = JObject.Parse(message); var messageObj = JObject.Parse(message);
@@ -536,13 +527,10 @@ namespace PepperDash.Essentials
else if (type == "close") else if (type == "close")
{ {
WSClient.Disconnect(); WSClient.Disconnect();
//SseClient.Disconnect();
ServerHeartbeatCheckTimer.Stop(); ServerHeartbeatCheckTimer.Stop();
// Start the reconnect timer // Start the reconnect timer
StartReconnectTimer(); StartReconnectTimer();
//ServerReconnectTimer = new CTimer(ConnectSseClient, null, ServerReconnectInterval, ServerReconnectInterval);
//ServerReconnectTimer.Reset(ServerReconnectInterval, ServerReconnectInterval);
} }
else else
{ {
@@ -634,7 +622,6 @@ namespace PepperDash.Essentials
SseMessageLengthBeforeFailureCount = 0; SseMessageLengthBeforeFailureCount = 0;
Debug.Console(1, this, "Unable to parse message: {0}", err); Debug.Console(1, this, "Unable to parse message: {0}", err);
} }
}
} }
} }
} }