Refactor of CommandState

Author: PaulNonatomic

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.8.1-beta] - Aug 25, 2024
+- Refactored the CommandState (Available when using the ScriptableCommands package) to better handle exceptions and clean up of cancellation tokens.
+
 ## [0.8.0-beta] - Aug 25, 2024
 - Added support for shared data between states. The SharedData object is a generic data store.
   - States can access shared data via `this.SharedData`

Runtime/StateGraph/Extensions/ScriptableCommandExtension/CommandState.cs

@@ -21,24 +21,35 @@ public class CommandState : State
 
 		public override void OnEnterState()
 		{
-			ExecuteCommands();
+			_cts = new CancellationTokenSource();
+			_ = ExecuteCommands();
 		}
 
 		public override void OnExitState()
 		{
-			//...
+			if (_cts == null) return;
+			
+			_cts.Cancel();
+			_cts.Dispose();
+			_cts = null;
 		}
 
-		private async void ExecuteCommands()
+		private async Task ExecuteCommands()
 		{
-			await ExecuteCommandsAsync();
+			try
+			{
+				await ExecuteCommandsAsync();
+			}
+			catch (Exception ex)
+			{
+				Debug.LogError($"Error executing commands: {ex}");
+			}
+			
 			OnComplete?.Invoke();
 		}
 
 		private async Task ExecuteCommandsAsync()
 		{
-			_cts = new CancellationTokenSource();
-
 			try
 			{
 				foreach (var command in _commands)
@@ -50,10 +61,6 @@ private async Task ExecuteCommandsAsync()
 			{
 				Debug.Log("Command execution was cancelled.");
 			}
-			finally
-			{
-				_cts?.Dispose();
-			}
 		}
 	}
 }