feat: add CancellationToken to ITonClient params (fix #8)

Author: justdmitry

TonLibDotNet/ITonClient.cs

@@ -20,7 +20,7 @@ public interface ITonClient
         /// Will do nothing, if already connected.
         /// </remarks>
         /// <returns>Information about blockchain params, e.g. <see cref="OptionsConfigInfo.DefaultWalletId">DefaultWalletId</see>.</returns>
-        Task<OptionsInfo?> InitIfNeeded();
+        Task<OptionsInfo?> InitIfNeeded(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// De-initialize TonClient. Next call to <see cref="InitIfNeeded"/> will choose LiteServer again and connect to it.
@@ -38,9 +38,9 @@ public interface ITonClient
         ///   InitIfNeeded();
         /// </code>
         /// </remarks>
-        Task<OptionsInfo?> Reinit();
+        Task<OptionsInfo?> Reinit(CancellationToken cancellationToken = default);
 
-        Task<TResponse> Execute<TResponse>(RequestBase<TResponse> request)
+        Task<TResponse> Execute<TResponse>(RequestBase<TResponse> request, CancellationToken cancellationToken = default)
             where TResponse : TypeBase;
 
         [Obsolete("Use TonUtils.Coins.FromNano()")]

TonLibDotNet/TonClient.cs

@@ -63,13 +63,13 @@ public static void RegisterAssembly(System.Reflection.Assembly assembly)
         }
 
         /// <inheritdoc />
-        public async Task<OptionsInfo?> InitIfNeeded()
+        public async Task<OptionsInfo?> InitIfNeeded(CancellationToken cancellationToken = default)
         {
             if (needReinit)
             {
                 logger.LogDebug("Reinitializing...");
 
-                if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout))
+                if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout, cancellationToken))
                 {
                     throw new TimeoutException("Failed while waiting for semaphore");
                 }
@@ -95,14 +95,14 @@ public static void RegisterAssembly(System.Reflection.Assembly assembly)
             var localConfigSource = tonOptions.UseMainnet ? tonOptions.ConfigPathLocalMainnet : tonOptions.ConfigPathLocalTestnet;
             if (!string.IsNullOrEmpty(localConfigSource))
             {
-                fullConfig = await File.ReadAllTextAsync(localConfigSource);
+                fullConfig = await File.ReadAllTextAsync(localConfigSource, cancellationToken);
                 logger.LogDebug("Used local config file: {Name}", localConfigSource);
             }
             else
             {
                 var remoteConfigSource = tonOptions.UseMainnet ? tonOptions.ConfigPathMainnet : tonOptions.ConfigPathTestnet;
                 using var httpClient = new HttpClient();
-                fullConfig = await httpClient.GetStringAsync(remoteConfigSource).ConfigureAwait(false);
+                fullConfig = await httpClient.GetStringAsync(remoteConfigSource, cancellationToken).ConfigureAwait(false);
                 logger.LogDebug("Used internet config file: {Url}", remoteConfigSource);
             }
 
@@ -115,7 +115,7 @@ public static void RegisterAssembly(System.Reflection.Assembly assembly)
 
             tonOptions.Options.Config.ConfigJson = jdoc.ToJsonString();
 
-            OptionsInfo = await Execute(new Init(tonOptions.Options));
+            OptionsInfo = await Execute(new Init(tonOptions.Options), cancellationToken);
             return OptionsInfo;
         }
 
@@ -127,19 +127,19 @@ public virtual void Deinit()
         }
 
         /// <inheritdoc />
-        public Task<OptionsInfo?> Reinit()
+        public Task<OptionsInfo?> Reinit(CancellationToken cancellationToken = default)
         {
             Deinit();
-            return InitIfNeeded();
+            return InitIfNeeded(cancellationToken);
         }
 
         /// <inheritdoc />
-        public async Task<TResponse> Execute<TResponse>(RequestBase<TResponse> request)
+        public async Task<TResponse> Execute<TResponse>(RequestBase<TResponse> request, CancellationToken cancellationToken = default)
             where TResponse : TypeBase
         {
             if (client == null)
             {
-                if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout))
+                if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout, cancellationToken))
                 {
                     throw new TimeoutException("Failed while waiting for semaphore");
                 }
@@ -169,14 +169,14 @@ public async Task<TResponse> Execute<TResponse>(RequestBase<TResponse> request)
                 throw new InvalidOperationException($"Must call {nameof(InitIfNeeded)}() first");
             }
 
-            if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout))
+            if (!await syncRoot.WaitAsync(tonOptions.ConcurrencyTimeout, cancellationToken))
             {
                 throw new TimeoutException("Failed while waiting for semaphore");
             }
 
             try
             {
-                var res = await ExecuteInternalAsync(request);
+                var res = await ExecuteInternalAsync(request, cancellationToken);
 
                 if (request is Init)
                 {
@@ -223,7 +223,7 @@ public void Dispose()
             Dispose(disposing: false);
         }
 
-        protected async Task<TResponse> ExecuteInternalAsync<TResponse>(RequestBase<TResponse> request)
+        protected async Task<TResponse> ExecuteInternalAsync<TResponse>(RequestBase<TResponse> request, CancellationToken cancellationToken = default)
             where TResponse : TypeBase
         {
             if (client == null)
@@ -253,9 +253,13 @@ protected async Task<TResponse> ExecuteInternalAsync<TResponse>(RequestBase<TRes
 
             while (true)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 var respTextPtr = tonlib_client_json_receive(client.Value, tonOptions.TonLibTimeout.TotalSeconds);
                 var respText = Marshal.PtrToStringAnsi(respTextPtr);
 
+                cancellationToken.ThrowIfCancellationRequested();
+
                 if (string.IsNullOrEmpty(respText))
                 {
                     throw new TonClientException(0, "Empty response received");
@@ -303,7 +307,7 @@ protected async Task<TResponse> ExecuteInternalAsync<TResponse>(RequestBase<TRes
                         if (DateTimeOffset.UtcNow < endOfLoop)
                         {
                             var delay = (ssip.ToSeqno - ssip.CurrentSeqno) < 1000 ? 50 : 500;
-                            await Task.Delay(delay);
+                            await Task.Delay(delay, cancellationToken);
                             continue;
                         }
                     }