Optimize async command memory usage and add IsRunning property.

Author: ChebanovDD

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/External/UniTask/AsyncCommand.cs

@@ -9,56 +9,56 @@ namespace UnityMvvmToolkit.UniTask
 
     public class AsyncCommand : BaseAsyncCommand, IAsyncCommand
     {
+        private readonly Func<CancellationToken, UniTask> _action;
+
         public AsyncCommand(Func<CancellationToken, UniTask> action, Func<bool> canExecute = null) : base(canExecute)
         {
-            Action = action;
+            _action = action;
         }
 
-        protected Func<CancellationToken, UniTask> Action { get; }
-
         public void Execute()
         {
             ExecuteAsync().Forget();
         }
 
-        public virtual async UniTask ExecuteAsync(CancellationToken cancellationToken = default)
+        public async UniTask ExecuteAsync(CancellationToken cancellationToken = default)
         {
             try
             {
-                ExecuteTask = Action.Invoke(cancellationToken).ToAsyncLazy();
-                await ExecuteTask;
+                IsRunning = true;
+                await _action.Invoke(cancellationToken).ToAsyncLazy();
             }
             finally
             {
-                ExecuteTask = null;
+                IsRunning = false;
             }
         }
     }
 
     public class AsyncCommand<T> : BaseAsyncCommand, IAsyncCommand<T>
     {
+        private readonly Func<T, CancellationToken, UniTask> _action;
+
         public AsyncCommand(Func<T, CancellationToken, UniTask> action, Func<bool> canExecute = null) : base(canExecute)
         {
-            Action = action;
+            _action = action;
         }
 
-        protected Func<T, CancellationToken, UniTask> Action { get; }
-
         public void Execute(T parameter)
         {
             ExecuteAsync(parameter).Forget();
         }
 
-        public virtual async UniTask ExecuteAsync(T parameter, CancellationToken cancellationToken = default)
+        public async UniTask ExecuteAsync(T parameter, CancellationToken cancellationToken = default)
         {
             try
             {
-                ExecuteTask = Action.Invoke(parameter, cancellationToken).ToAsyncLazy();
-                await ExecuteTask;
+                IsRunning = true;
+                await _action.Invoke(parameter, cancellationToken);
             }
             finally
             {
-                ExecuteTask = null;
+                IsRunning = false;
             }
         }
     }

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/External/UniTask/AsyncLazyCommand.cs

@@ -3,55 +3,72 @@
 namespace UnityMvvmToolkit.UniTask
 {
     using System;
+    using Interfaces;
     using System.Threading;
     using Cysharp.Threading.Tasks;
 
-    public class AsyncLazyCommand : AsyncCommand
+    public class AsyncLazyCommand : BaseAsyncLazyCommand, IAsyncCommand
     {
-        public AsyncLazyCommand(Func<CancellationToken, UniTask> action, Func<bool> canExecute = null)
-            : base(action, canExecute)
+        private readonly Func<CancellationToken, UniTask> _action;
+
+        public AsyncLazyCommand(Func<CancellationToken, UniTask> action, Func<bool> canExecute = null) 
+            : base(canExecute)
+        {
+            _action = action;
+        }
+
+        public void Execute()
         {
+            ExecuteAsync().Forget();
         }
 
-        public override async UniTask ExecuteAsync(CancellationToken cancellationToken = default)
+        public async UniTask ExecuteAsync(CancellationToken cancellationToken = default)
         {
             try
             {
-                if (ExecuteTask?.Task.Status.IsCompleted() ?? true)
+                if (IsRunning == false)
                 {
-                    ExecuteTask = Action.Invoke(cancellationToken).ToAsyncLazy();
+                    ExecutionTask = _action.Invoke(cancellationToken).ToAsyncLazy();
                 }
 
-                await ExecuteTask;
+                await ExecutionTask;
             }
             finally
             {
-                ExecuteTask = null;
+                ExecutionTask = null;
             }
         }
     }
 
-    public class AsyncLazyCommand<T> : AsyncCommand<T>
+    public class AsyncLazyCommand<T> : BaseAsyncLazyCommand, IAsyncCommand<T>
     {
-        public AsyncLazyCommand(Func<T, CancellationToken, UniTask> action, Func<bool> canExecute = null)
-            : base(action, canExecute)
+        private readonly Func<T, CancellationToken, UniTask> _action;
+
+        public AsyncLazyCommand(Func<T, CancellationToken, UniTask> action, Func<bool> canExecute = null) 
+            : base(canExecute)
+        {
+            _action = action;
+        }
+
+        public void Execute(T parameter)
         {
+            ExecuteAsync(parameter).Forget();
         }
 
-        public override async UniTask ExecuteAsync(T parameter, CancellationToken cancellationToken = default)
+        public async UniTask ExecuteAsync(T parameter, CancellationToken cancellationToken = default)
         {
             try
             {
-                if (ExecuteTask?.Task.Status.IsCompleted() ?? true)
+                if (IsRunning == false)
                 {
-                    ExecuteTask = Action.Invoke(parameter, cancellationToken).ToAsyncLazy();
+                    ExecutionTask = _action.Invoke(parameter, cancellationToken).ToAsyncLazy();
                 }
 
-                await ExecuteTask;
+                await ExecutionTask;
             }
             finally
             {
-                ExecuteTask = null;
+                ExecutionTask = null;
             }
         }
     }

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/External/UniTask/BaseAsyncCommand.cs

@@ -5,25 +5,24 @@ namespace UnityMvvmToolkit.UniTask
     using Core;
     using System;
     using Interfaces;
-    using Cysharp.Threading.Tasks;
     using System.Runtime.CompilerServices;
 
     public abstract class BaseAsyncCommand : BaseCommand, IBaseAsyncCommand
     {
-        private AsyncLazy _executeTask;
+        private bool _isRunning;
 
         protected BaseAsyncCommand(Func<bool> canExecute) : base(canExecute)
         {
         }
 
         public bool DisableOnExecution { get; set; }
 
-        protected AsyncLazy ExecuteTask
+        public virtual bool IsRunning
         {
-            get => _executeTask;
-            set
+            get => _isRunning;
+            protected set
             {
-                _executeTask = value;
+                _isRunning = value;
                 RaiseCanExecuteChanged();
             }
         }
@@ -36,7 +35,7 @@ public override bool CanExecute()
                 return base.CanExecute();
             }
 
-            return base.CanExecute() && (ExecuteTask?.Task.Status.IsCompleted() ?? true);
+            return IsRunning == false && base.CanExecute();
         }
     }
 }

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/External/UniTask/BaseAsyncLazyCommand.cs

@@ -0,0 +1,30 @@
+#if UNITYMVVMTOOLKIT_UNITASK_SUPPORT
+
+namespace UnityMvvmToolkit.UniTask
+{
+    using System;
+    using Cysharp.Threading.Tasks;
+
+    public abstract class BaseAsyncLazyCommand : BaseAsyncCommand
+    {
+        private AsyncLazy _executionTask;
+
+        protected BaseAsyncLazyCommand(Func<bool> canExecute) : base(canExecute)
+        {
+        }
+
+        public override bool IsRunning => ExecutionTask is { Task: { Status: UniTaskStatus.Pending } };
+
+        protected AsyncLazy ExecutionTask
+        {
+            get => _executionTask;
+            set
+            {
+                _executionTask = value;
+                RaiseCanExecuteChanged();
+            }
+        }
+    }
+}
+
+#endif

src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/External/UniTask/BaseAsyncLazyCommand.cs.meta

@@ -4,6 +4,7 @@ namespace UnityMvvmToolkit.UniTask.Interfaces
 {
     public interface IBaseAsyncCommand
     {
+        bool IsRunning { get; }
         bool DisableOnExecution { get; set; }
     }
 }