Added try/catch inside send heartbeat to avoid channel closed exception

spotware · Mar 12, 2022 · f10a484 · f10a484
1 parent d4fcdf1
commit f10a484
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/OpenAPI.Net/OpenAPI.Net.csproj b/src/OpenAPI.Net/OpenAPI.Net.csproj
@@ -9,7 +9,7 @@
     <PackageTags>cTrader, Open API, Spotware</PackageTags>
     <Description>A .NET RX library for Spotware Open API</Description>
     <PackageId>Spotware.OpenAPI.Net</PackageId>
-    <Version>1.3.9-rc0</Version>
+    <Version>1.3.9</Version>
     <Platforms>AnyCPU</Platforms>
     <Company>Spotware</Company>
     <Authors>Spotware</Authors>

diff --git a/src/OpenAPI.Net/OpenClient.cs b/src/OpenAPI.Net/OpenClient.cs
@@ -169,8 +169,7 @@ public IDisposable Subscribe(IObserver<IMessage> observer)
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <exception cref="InvalidOperationException">If getting message payload type fails</exception>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message.GetPayloadType(), message.ToByteString(), clientMsgId);
 
@@ -185,8 +184,7 @@ public async Task SendMessage<T>(T message, string clientMsgId = null) where T :
         /// <param name="payloadType">Message Payload Type (ProtoPayloadType)</param>
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message, payloadType, clientMsgId);
 
@@ -201,8 +199,7 @@ public async Task SendMessage<T>(T message, ProtoPayloadType payloadType, string
         /// <param name="payloadType">Message Payload Type (ProtoOAPayloadType)</param>
         /// <param name="clientMsgId">The client message ID (optional)</param>
         /// <returns>Task</returns>
-        public async Task SendMessage<T>(T message, ProtoOAPayloadType payloadType, string clientMsgId = null) where T :
-            IMessage
+        public async Task SendMessage<T>(T message, ProtoOAPayloadType payloadType, string clientMsgId = null) where T : IMessage
         {
             var protoMessage = MessageFactory.GetMessage(message, payloadType, clientMsgId);
 
@@ -457,7 +454,14 @@ private async void SendHeartbeat()
         {
             if (IsDisposed || DateTimeOffset.Now - LastSentMessageTime < _heartbeatInerval) return;
 
-            await SendMessage(_heartbeatEvent, ProtoPayloadType.HeartbeatEvent).ConfigureAwait(false);
+            try
+            {
+                await SendMessage(_heartbeatEvent, ProtoPayloadType.HeartbeatEvent).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                OnError(ex);
+            }
         }
 
         /// <summary>