Merge pull request #104 from PaulNonatomic/develop

Develop

Author: PaulNonatomic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.8.2-beta] - Sept 09, 2024
+- Added TryGetData and HasData methods to the SharedData class
+
+## [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/Data/SharedData.cs

@@ -10,6 +10,8 @@ public interface ISharedData
 		event Action OnDataCleared;
 
 		T GetData<T>(string key);
+		bool TryGetData<T>(string key, out T value);
+		bool HasData(string key);
 		void SetData<T>(string key, T value);
 		void ClearData();
 	}
@@ -30,9 +32,9 @@ public T GetData<T>(string key)
 			{
 				if (!_data.TryGetValue(key, out var value)) return default;
 
-				if (value is T tValue)
+				if (value is T typedValue)
 				{
-					return tValue;
+					return typedValue;
 				}
 
 				throw new InvalidOperationException($"Attempted to retrieve type {typeof(T)} but data is of type {value.GetType()}");
@@ -42,6 +44,41 @@ public T GetData<T>(string key)
 				_lock.ExitReadLock();
 			}
 		}
+		
+		public bool TryGetData<T>(string key, out T value)
+		{
+			_lock.EnterReadLock();
+			
+			try
+			{
+				if (_data.TryGetValue(key, out var objValue) && objValue is T typedValue)
+				{
+					value = typedValue;
+					return true;
+				}
+				
+				value = default;
+				return false;
+			}
+			finally
+			{
+				_lock.ExitReadLock();
+			}
+		}
+		
+		public bool HasData(string key)
+		{
+			_lock.EnterReadLock();
+			
+			try
+			{
+				return _data.ContainsKey(key);
+			}
+			finally
+			{
+				_lock.ExitReadLock();
+			}
+		}
 
 		public void SetData<T>(string key, T value)
 		{

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();
-			}
 		}
 	}
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.nonatomic.visualstatemachinev2",
-  "version": "0.8.0-beta",
+  "version": "0.8.2-beta",
   "displayName": "Visual State Machine V2",
   "description": "Visual State Machine V2",
   "unity": "2022.3",