Update async extensions

Author: Dimonik333

Assets/CatCode/Commands/CommandAsyncExtensions.cs

@@ -63,6 +63,47 @@ void OnCancel()
             }
         }
 
+        public static Awaitable ExecuteToAwaitable(this ICommand command, CancellationToken token)
+        {
+            var tcs = new AwaitableCompletionSource();
+            CancellationTokenRegistration ctr = default;
+
+            if (command.State == CommandState.Finished)
+                tcs.SetResult();
+            else
+            {
+                ctr = token.Register(OnCancel);
+                command.Finished += OnFinished;
+                command.Stopped += OnStopped;
+                command.Execute();
+            }
+            return tcs.Awaitable;
+
+            void OnFinished()
+            {
+                Dispose();
+                tcs.TrySetResult();
+            }
+
+            void OnStopped()
+            {
+                Dispose();
+                tcs.TrySetCanceled();
+            }
+
+            void OnCancel()
+            {
+                Dispose();
+                tcs.TrySetCanceled();
+            }
+
+            void Dispose()
+            {
+                command.Finished -= OnFinished;
+                command.Stopped -= OnStopped;
+                ctr.Dispose();
+            }
+        }
 
         public static Task StartToTask(this ICommand command, CancellationToken token)
         {
@@ -113,5 +154,41 @@ void OnCancel()
                 tcs.TrySetCanceled();
             }
         }
+
+        public static Task ExecuteToTask(this ICommand command, CancellationToken token)
+        {
+            if (command.State == CommandState.Finished)
+                return Task.CompletedTask;
+
+            var tcs = new TaskCompletionSource<bool>();
+            CancellationTokenRegistration ctr = default;
+            ctr = token.Register(OnCancel);
+            command.Finished += OnFinished;
+            command.Stopped += OnStoppped;
+            command.Execute();
+            return tcs.Task;
+
+            void OnFinished()
+            {
+                DisposeAndUnsubscribe();
+                tcs.TrySetResult(true);
+            }
+            void OnStoppped()
+            {
+                DisposeAndUnsubscribe();
+                tcs.TrySetCanceled();
+            }
+            void OnCancel()
+            {
+                DisposeAndUnsubscribe();
+                tcs.TrySetCanceled();
+            }
+            void DisposeAndUnsubscribe()
+            {
+                command.Finished -= OnStoppped;
+                command.Finished -= OnFinished;
+                ctr.Dispose();
+            }
+        }
     }
 }