ConfigLoader - add additional params

Runtime/Snipe.Unity/Config/SnipeConfigLoader.cs

@@ -21,16 +21,9 @@ public SnipeConfigLoader(string projectID, IApplicationInfo appInfo)
 			_url = "https://config.snipe.dev/api/v1/configStrings";
 		}
 
-		public async UniTask<Dictionary<string, object>> Load()
+		public async UniTask<Dictionary<string, object>> Load(Dictionary<string, object> additionalParams = null)
 		{
-			string requestParamsJson = "{" +
-				$"\"project\":\"{_projectID}\"," +
-				$"\"deviceID\":\"{_appInfo.DeviceIdentifier}\"," +
-				$"\"identifier\":\"{_appInfo.ApplicationIdentifier}\"," +
-				$"\"version\":\"{_appInfo.ApplicationVersion}\"," +
-				$"\"platform\":\"{_appInfo.ApplicationPlatform}\"," +
-				$"\"packageVersion\":\"{PackageInfo.VERSION_CODE}\"" +
-				"}";
+			string requestParamsJson = BuildRequestParamsJson(additionalParams);
 
 			Dictionary<string, object> config = null;
 
@@ -81,5 +74,28 @@ public async UniTask<Dictionary<string, object>> Load()
 
 			return config;
 		}
+
+		private string BuildRequestParamsJson(Dictionary<string, object> additionalParams)
+		{
+			var requestParams = new Dictionary<string, object>
+			{
+				{ "project", _projectID },
+				{ "deviceID", _appInfo.DeviceIdentifier },
+				{ "identifier", _appInfo.ApplicationIdentifier },
+				{ "version", _appInfo.ApplicationVersion },
+				{ "platform", _appInfo.ApplicationPlatform },
+				{ "packageVersion", PackageInfo.VERSION_CODE }
+			};
+
+			if (additionalParams != null)
+			{
+				foreach (var param in additionalParams)
+				{
+					requestParams[param.Key] = param.Value;
+				}
+			}
+
+			return JSON.ToJSON(requestParams);
+		}
 	}
 }

Runtime/Snipe.Unity/Config/SnipeConfigLoadingService.cs

@@ -1,13 +1,17 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using Cysharp.Threading.Tasks;
+using fastJSON;
+using UnityEngine;
 
 namespace MiniIT.Snipe
 {
 	public interface ISnipeConfigLoadingService
 	{
 		Dictionary<string, object> Config { get; }
-		UniTask<Dictionary<string, object>> Load(CancellationToken cancellationToken = default);
+		UniTask<Dictionary<string, object>> Load();
+		void Reset();
 	}
 
 	public class SnipeConfigLoadingService : ISnipeConfigLoadingService
@@ -20,12 +24,14 @@ public class SnipeConfigLoadingService : ISnipeConfigLoadingService
 		private SnipeConfigLoader _loader;
 		private readonly string _projectID;
 
+		private CancellationTokenSource _loadingCancellation;
+
 		public SnipeConfigLoadingService(string projectID)
 		{
 			_projectID = projectID;
 		}
 
-		public async UniTask<Dictionary<string, object>> Load(CancellationToken cancellationToken = default)
+		public async UniTask<Dictionary<string, object>> Load()
 		{
 			if (_config != null)
 			{
@@ -34,29 +40,54 @@ public async UniTask<Dictionary<string, object>> Load(CancellationToken cancella
 
 			if (_loading)
 			{
-				await UniTask.WaitWhile(() => _config == null, PlayerLoopTiming.Update, cancellationToken);
+				await UniTask.WaitWhile(() => _config == null, PlayerLoopTiming.Update, _loadingCancellation.Token);
 				return _config;
 			}
 
+			_loadingCancellation ??= new CancellationTokenSource();
 			_loading = true;
 
 			if (_loader == null)
 			{
-				await UniTask.WaitUntil(() => SnipeServices.IsInitialized, PlayerLoopTiming.Update, cancellationToken)
+				await UniTask.WaitUntil(() => SnipeServices.IsInitialized, PlayerLoopTiming.Update, _loadingCancellation.Token)
 					.SuppressCancellationThrow();
 
-				if (cancellationToken.IsCancellationRequested)
+				if (_loadingCancellation.Token.IsCancellationRequested)
 				{
 					return _config;
 				}
 
 				_loader ??= new SnipeConfigLoader(_projectID, SnipeServices.ApplicationInfo);
 			}
 
-			_config = await _loader.Load();
+			var loadedAdditionalParams = await LoadAdditionalParamsAsync();
+
+			_config = await _loader.Load(loadedAdditionalParams);
 			_loading = false;
 
 			return _config;
 		}
+
+		public void Reset()
+		{
+			_loadingCancellation.Cancel();
+			_loadingCancellation.Dispose();
+			_loadingCancellation = null;
+			_config = null;
+			_loading = false;
+		}
+
+		private async UniTask<Dictionary<string, object>> LoadAdditionalParamsAsync()
+		{
+			string filePath = Path.Combine(Application.persistentDataPath, string.Format("additionalParams{0}.json", Application.version));
+
+			if (!File.Exists(filePath))
+			{
+				return new Dictionary<string, object>();
+			}
+
+			string json = await File.ReadAllTextAsync(filePath);
+			return (Dictionary<string, object>)JSON.Parse(json);
+		}
 	}
 }