Improve exception catching in the background tasks

Author: skibitsky

WalletConnectSharp.Core/Controllers/HeartBeat.cs

@@ -1,3 +1,4 @@
+using WalletConnectSharp.Common.Logging;
 using WalletConnectSharp.Core.Interfaces;
 
 namespace WalletConnectSharp.Core.Controllers
@@ -76,7 +77,14 @@ public Task InitAsync(CancellationToken cancellationToken = default)
             {
                 while (!token.IsCancellationRequested)
                 {
-                    Pulse();
+                    try
+                    {
+                        Pulse();
+                    }
+                    catch (Exception ex)
+                    {
+                        WCLogger.LogError(ex);
+                    }
 
                     await Task.Delay(Interval, token);
                 }

WalletConnectSharp.Core/Controllers/Relayer.cs

@@ -277,7 +277,11 @@ protected virtual async void OnProviderPayload(string payloadJson)
 
         protected virtual async Task<bool> ShouldIgnoreMessageEvent(MessageEvent messageEvent)
         {
-            if (!(await Subscriber.IsSubscribed(messageEvent.Topic))) return true;
+            var isSubscribed = await Subscriber.IsSubscribed(messageEvent.Topic);
+            if (!isSubscribed)
+            {
+                return true;
+            }
 
             var exists = Messages.Has(messageEvent.Topic, messageEvent.Message);
             return exists;

WalletConnectSharp.Core/Controllers/Subscriber.cs

@@ -522,31 +522,43 @@ public async Task Unsubscribe(string topic, UnsubscribeOptions opts = null)
         /// Determines whether the given topic is subscribed or not
         /// </summary>
         /// <param name="topic">The topic to check</param>
+        /// <param name="cancellationToken">A token to cancel the operation.</param>
         /// <returns>Return true if the topic is subscribed, false otherwise</returns>
-        public Task<bool> IsSubscribed(string topic)
+        public async Task<bool> IsSubscribed(string topic, CancellationToken cancellationToken = default)
         {
-            if (Topics.Contains(topic)) return Task.FromResult(true);
-
-            return Task.Run(async delegate()
+            if (Topics.Contains(topic))
             {
-                var startTime = DateTimeOffset.Now.ToUnixTimeSeconds();
+                return true;
+            }
+
+            var startTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+            const int timeoutMilliseconds = 5_000;
+            const int delayMilliseconds = 20;
 
-                while (true)
+            try
+            {
+                while (!cancellationToken.IsCancellationRequested)
                 {
                     if (!pending.ContainsKey(topic) && Topics.Contains(topic))
                     {
                         return true;
                     }
 
-                    var currentTime = DateTimeOffset.Now.ToUnixTimeSeconds();
-                    if (currentTime - startTime >= 5)
+                    var elapsedMilliseconds = DateTimeOffset.Now.ToUnixTimeMilliseconds() - startTime;
+                    if (elapsedMilliseconds >= timeoutMilliseconds)
                     {
                         return false;
                     }
 
-                    await Task.Delay(20);
+                    await Task.Delay(delayMilliseconds, cancellationToken);
                 }
-            });
+            }
+            catch (OperationCanceledException)
+            {
+                return false;
+            }
+
+            return false;
         }
 
         protected virtual async Task<string[]> RpcBatchSubscribe(string[] topics, ProtocolOptions relay)

WalletConnectSharp.Core/Interfaces/ISubscriber.cs

@@ -71,7 +71,8 @@ public interface ISubscriber : IModule
         /// Determines whether the given topic is subscribed or not
         /// </summary>
         /// <param name="topic">The topic to check</param>
+        /// /// <param name="cancellationToken">A token to cancel the operation.</param>
         /// <returns>Return true if the topic is subscribed, false otherwise</returns>
-        public Task<bool> IsSubscribed(string topic);
+        public Task<bool> IsSubscribed(string topic, CancellationToken cancellationToken = default);
     }
 }