com.amanotes.gdk 0.2.81-alpha.13 → 0.2.81-alpha.17

package/Extra/ABLab.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 092a3e310bfa5423db4dc58ea256a62a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using Amanotes.Core.Internal;
-
+using Cysharp.Threading.Tasks;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.AmaGDK;
 
@@ -93,7 +93,7 @@ namespace Amanotes.Core
             
             internal void Save()
             {
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
         }
 
@@ -108,8 +108,7 @@ namespace Amanotes.Core
             public static bool allowAdRequest = true;
 
             // internal use
-            private static readonly Lazy<AdsData> _localData = new Lazy<AdsData>(() => new AdsData().LoadJsonFromFile());
-            internal static AdsData localData => _localData.Value;
+            internal static AdsData localData;
 
             internal protected static AdShowContext context;
             internal protected static AdAdapter _adapter;
@@ -154,14 +153,18 @@ namespace Amanotes.Core
 
         public partial class Ads // Public
         {
-            internal static bool InitModule()
+            internal static async UniTask InitModule()
             {
+                await UniTask.SwitchToThreadPool();
                 if (Adapter2.GetAllAdapter<AdAdapter>().Count > 1)
                 {
                     GDKUtils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
                 }
                 _adapter = Adapter2.GetAdapter<AdAdapter>();
-                return _adapter != null;
+                if(_adapter != null)
+                {
+                    localData = new AdsData().LoadJsonFromFile();
+                }
             }
             
             internal static void StartModule()

package/Runtime/AmaGDK.Analytics.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
 using Amanotes.Core.Internal;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Profiling;
 using static Amanotes.Core.AmaGDK.Analytics;
@@ -130,12 +131,11 @@ namespace Amanotes.Core
                 if (Config.analytics.autoFlushEventDetail)
                 {
                     LogWarning("[Analytics] This function FlushEventDetails() is not supposed to be called manually!");
-                    return;
                 }
                 
                 if (!localData._dirty) return;
                 localData._dirty = false;
-                localData.SaveJsonToFile();
+                localData.SaveJsonToFile(false);
             }
 
             public static IEventParamsBuilder LogFunnelEvent(string eventName, string signature = "")
@@ -312,10 +312,7 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static SessionStat sessionStat;
             internal static readonly GDKPool.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
-
-            private static readonly Lazy<AnalyticsData> _localData = new Lazy<AnalyticsData>(
-                () => new AnalyticsData().LoadJsonFromFile().BuildCache());
-            internal static AnalyticsData localData => _localData.Value;
+            internal static AnalyticsData localData;
             
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {
@@ -359,14 +356,19 @@ namespace Amanotes.Core
                 "user_engagement"
             };
 
-            internal static void InitModule()
+            internal static async UniTask InitModule()
             {
+                await UniTask.SwitchToThreadPool();
                 if (Config.analytics.enableEventStat)
                 {
                     sessionStat = new SessionStat();
                 }
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter2.GetAllAdapter<AnalyticsAdapter>());
+                if (listAdapters.Count > 0)
+                {
+                    localData = new AnalyticsData().LoadJsonFromFile().BuildCache();
+                }
             }
 
             internal static void StartModule()
@@ -648,7 +650,12 @@ namespace Amanotes.Core
             internal static void PostPrepareEventProcess(EventParams eventData)
             {
                 if (!eventData.parameters.ContainsKey("ama_device_id"))
-                    eventData.AddParam("ama_device_id", User.AmaDeviceId);
+                {
+                    if (!string.IsNullOrWhiteSpace(User.AmaDeviceId))
+                    {
+                        eventData.AddParam("ama_device_id", User.AmaDeviceId);    
+                    }
+                }
             }
             
             internal static bool ShouldSendEvent(EventParams eventData)
@@ -715,10 +722,13 @@ namespace Amanotes.Core
                 {
                     sb.Append(eventNameToSend);
                     sb.Append("\t");
-                    for (var i = 0; i < adapters.Count; i++)
+                    if (adapters != null && adapters.Count > 0)
                     {
-                        sb.Append(adapters[i]);
-                        if (i < adapters.Count - 1) sb.Append(",");
+                        for (var i = 0; i < adapters.Count; i++)
+                        {
+                            sb.Append(adapters[i]);
+                            if (i < adapters.Count - 1) sb.Append(",");
+                        }    
                     }
                     sb.Append("\t");
                     sb.AppendLine(eventParamsInJSON);
@@ -843,7 +853,7 @@ namespace Amanotes.Core
                     if (!Config.analytics.autoFlushEventDetail) return;
                     if (!_dirty) return;
                     _dirty = false;
-                    this.SaveJsonToFile();
+                    this.SaveJsonToFile(false);
                 }
 
                 internal void UpdateMigrationLog()

package/Runtime/AmaGDK.IAP.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using UnityEngine;
 using Amanotes.Core.Internal;
-
+using Cysharp.Threading.Tasks;
 using static Amanotes.Core.AmaGDK.IAP;
 using static Amanotes.Core.GDKDebug;
 
@@ -176,12 +176,13 @@ namespace Amanotes.Core
 
             private static bool IsModuleReady => _syncTaskTracker.HasCompleted && _getProductsTaskTracker.HasCompleted;
             private static Action _onModuleReady;
-            internal static bool InitModule()
+            internal static async UniTask InitModule()
             {
+                await UniTask.SwitchToThreadPool();
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
-                if (_adapter == null) return false;
+                if (_adapter == null)
+                    return;
                 localData = new IAPData().LoadJsonFromFile();
-                return true;
             }
 
             internal static void StartModule()
@@ -281,7 +282,7 @@ namespace Amanotes.Core
                     subscriptionExpiredDate = _subscriptionExpiredDate?.ToString(DATE_FORMAT);
                     _unsubscribedDate = Adapter.GetUnsubscribedDate();
                     unsubscribedDate = _unsubscribedDate?.ToString(DATE_FORMAT);
-                    this.SaveJsonToFile();
+                    this.SaveJsonToFile(false);
                 }
             }
         }

package/Runtime/AmaGDK.Mono.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -78,7 +79,18 @@ namespace Amanotes.Core.Internal
         {
             StartCoroutine(DelayCallRoutine(seconds, action));
         }
-        
+
+        public static async UniTask TimeoutTask(float timeoutInSecs, Func<bool> completeCheckFunc)
+        {
+            float time = Time.realtimeSinceStartup;
+            while (completeCheckFunc() == false)
+            {
+                await UniTask.Yield();
+                if (Time.realtimeSinceStartup - time > timeoutInSecs)
+                    return;
+            }
+        }
+
         public static IEnumerator Timeout(float timeoutInSecs, Func<bool> completeCheckFunc)
         {
             float time = Time.realtimeSinceStartup;
@@ -88,6 +100,12 @@ namespace Amanotes.Core.Internal
                 if (Time.realtimeSinceStartup - time > timeoutInSecs) yield break;
             }
         }
+
+        private static async UniTask DelayCallRoutineTask(float seconds, Action callback)
+        {
+            await UniTask.Delay(TimeSpan.FromSeconds(seconds));
+            callback();
+        }
         
         private static IEnumerator DelayCallRoutine(float seconds, Action callback)
         {

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Text;
 using UnityEngine;
 using Amanotes.Core.Internal;
+using Cysharp.Threading.Tasks;
 using UnityEngine.Profiling;
 using UnityEngine.Serialization;
 using static Amanotes.Core.GDKDebug;
@@ -173,8 +174,9 @@ namespace Amanotes.Core
                 actions[result ? 1 : 0]();
             }
             
-            internal static void InitModule()
+            internal static async UniTask InitModule()
             {
+                await UniTask.SwitchToThreadPool();
                 adapter = Adapter2.GetAdapter<RemoteConfigAdapter>();
             }
 
@@ -235,7 +237,7 @@ namespace Amanotes.Core
                 }
                 
                 string filePath = GDKFileUtils.GetPath(fileName);
-                GDKFileUtils.Save(filePath, sb.ToString());
+                GDKFileUtils.Save(filePath, sb.ToString(), false);
                 GDKPool.Return(sb);
                 
                 Log($"[RemoteConfig] Saved remote config to {filePath}");

package/Runtime/AmaGDK.Singleton.cs

@@ -1,6 +1,7 @@
 
 using Amanotes.Core.Internal;
 using System.Threading;
+using Cysharp.Threading.Tasks;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
 
@@ -23,7 +24,7 @@ namespace Amanotes.Core
             mainThreadId = Thread.CurrentThread.ManagedThreadId;
             DontDestroyOnLoad(this);
 
-            GDKUtils.StartCoroutine(InitRoutine());
+            InitRoutine().Forget();
         }
     }
 }

package/Runtime/AmaGDK.UserProfile.cs

@@ -33,14 +33,14 @@ namespace Amanotes.Core
             private bool _dirty = false;
             private void Save()
             {
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
             
             private void SaveIfDirty()
             {
                 if (!_dirty) return;
                 _dirty = false;
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
         }
 

package/Runtime/AmaGDK.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "AmaGDK",
     "rootNamespace": "",
-    "references": [],
+    "references": [
+        "UniTask"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,

package/Runtime/AmaGDK.cs

@@ -15,6 +15,7 @@ using Amanotes.Core.Internal;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
 using System.Threading.Tasks;
+using Cysharp.Threading.Tasks;
 
 
 #if UNITY_EDITOR
@@ -27,7 +28,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "v0.2.81-alpha.13";
+        public const string VERSION = "v0.2.81-alpha.17";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;
@@ -81,8 +82,8 @@ namespace Amanotes.Core
                 return _config;
             }
         }
-        
-        IEnumerator InitHook()
+
+        async UniTask InitHook()
         {
             // dispatcher.Dispatch(Event.GDK_HOOK_START);
             if (_onHookStart!= null) GDKUtils.SafeInvokeAndClear(ref _onHookStart);
@@ -91,24 +92,23 @@ namespace Amanotes.Core
             {
                 Log($"[Hook] No hook registered!");
                 if (_onHookEnd!= null) GDKUtils.SafeInvokeAndClear(ref _onHookEnd);
-                yield break;
+                return;
             }
-            
+
             //TODO: Sort Hook by orderId
             var hookCompleted = false;
-            
+
             float stTime = Time.realtimeSinceStartup;
             Hook.TriggerHooks(() =>
             {
                 hookCompleted = true;
             });
-            yield return new WaitUntil(() => hookCompleted);
+            await UniTask.WaitUntil(() => hookCompleted);
             float elapsed = Time.realtimeSinceStartup - stTime;
             Log($"[Hook] {nHooks} hooks complete after {elapsed} secs");
             if (_onHookEnd!= null) GDKUtils.SafeInvokeAndClear(ref _onHookEnd);
         }
-        
-        IEnumerator WaitForManualInit()
+        async UniTask WaitForManualInit()
         {
             var counter = 0;
             const int INIT_TOLERANCE = 10 * 60;
@@ -117,7 +117,7 @@ namespace Amanotes.Core
             while (!_allowInit)
             {
                 counter++;
-                yield return null;
+                await UniTask.Yield();
 
                 if (counter > INIT_TOLERANCE && counter % INIT_WARN_CYCLE == 1)
                 {
@@ -126,17 +126,20 @@ namespace Amanotes.Core
             }
         }
 
-        void InitModules()
+        async UniTask InitModules()
         {
             Profiler.BeginSample("AmaGDK.InitModules()");
             {
                 User.InitModule();
-                Consent.InitModule();
-                Analytics.InitModule();
-                Ads.InitModule();
-                IAP.InitModule();
-                RemoteConfig.InitModule();
-                if (Config.enableAudioModule) Audio.InitModule();
+                if (Config.enableAudioModule)
+                {
+                    Audio.InitModule();
+                }
+                await Consent.InitModule();
+                await Analytics.InitModule();
+                await Ads.InitModule();
+                await IAP.InitModule();
+                await RemoteConfig.InitModule();
             }
             Profiler.EndSample();
         }
@@ -154,13 +157,13 @@ namespace Amanotes.Core
             Profiler.EndSample();
         }
 
-        IEnumerator InitAdapters(StringBuilder sb)
+        async UniTask InitAdapters(StringBuilder sb)
         {
             // sort on priority
             List<Adapter2> listAdapters = Adapter2.adapterMap
                 .Values.ToList();
             listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
-            
+
             foreach (Adapter2 adapter in listAdapters)
             {
                 if (!adapter.enabled)
@@ -168,7 +171,7 @@ namespace Amanotes.Core
                     Log($"Adapter <{adapter.adapterId} is disabled!");
                     continue;
                 }
-                
+
                 // Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder} | {adapter.status}");
                 var startTime = Time.realtimeSinceStartup;
                 Profiler.BeginSample($"AmaGDK.adapter.InitSDK-{adapter.adapterId}");
@@ -178,9 +181,9 @@ namespace Amanotes.Core
                 if (adapter.status != Status.Ready)
                 {
                     var beginTime = Time.realtimeSinceStartup;
-                    yield return GDKUtils.Timeout(adapter.Timeout,() => adapter.status != Status.Initialize);
-                    var endTime = Time.realtimeSinceStartup; 
-                        
+                    await GDKUtils.TimeoutTask(adapter.Timeout,() => adapter.status != Status.Initialize);
+                    var endTime = Time.realtimeSinceStartup;
+
                     if (adapter.status == Status.Initialize)
                     {
                         LogWarning($"{adapter.adapterId} init time out: {adapter.Timeout:#0.00}");
@@ -189,65 +192,66 @@ namespace Amanotes.Core
                         Log($"{adapter.adapterId} init took: {(endTime-beginTime):#0.00} s");
                     }
                 }
-                
+
                 GDKUtils.SafeInvoke(_onAdapterReady, adapter.adapterId);
                 sb.AppendLine($"[{(adapter.IsReady ? " OK " : "FAIL")}] {adapter.adapterId} (~ {Time.realtimeSinceStartup - startTime:#0.00}s)");
-                
+
                 // Wait for postprocessing of each adapter
-                yield return null;
+                await UniTask.Yield();
             }
         }
-        
-        IEnumerator InitRoutine()
+
+        public async UniTask InitRoutine()
         {
             _allowInit = _allowInit || autoInit;
-            
+
             if (Config == null)
             {
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
-            
+
             var startTime = Time.realtimeSinceStartup;
             var sb = GDKPool.GetStringBuilder();
 
-            InitModules();
-            
+            await InitModules();
+            await UniTask.SwitchToMainThread();
             var moduleTime = Time.realtimeSinceStartup - startTime;
             sb.Append($"- InitModules() took (~ {moduleTime:#0.00}s)\n");
-            
-            yield return InitHook(); //Google CMP takes long at first time (~ 1.7s)
-            
+
+            await InitHook(); //Google CMP takes long at first time (~ 1.7s)
+
             var hookTime = Time.realtimeSinceStartup - moduleTime - startTime;
             sb.Append($"- InitHook() took (~ {hookTime:#0.00}s)\n\n");
-            
+
             _status = Status.Initialize;
             GDKUtils.SafeInvokeAndClear(ref _onGDKInit);
-            
-            if (!_allowInit) yield return WaitForManualInit();
-            yield return InitAdapters(sb);
-            
+
+            if (!_allowInit)
+                await WaitForManualInit();
+            await InitAdapters(sb);
+
             StartModules();
-            
+
             ConfigGeoLocation();
             if (Config.enableServerTime)
             {
                 ServerTime.UpdateTime();
             }
-            
+
             ForceQuit.Init();
-            
+
             _status = Status.Ready;
             GDKUtils.SafeInvokeAndClear(ref _onGDKReady);
 
             float initDuration = Time.realtimeSinceStartup - startTime;
 
-            yield return LogEvent_GDKInitAsync(Mathf.RoundToInt(initDuration));
+            await LogEvent_GDKInitAsync(Mathf.RoundToInt(initDuration));
+
 
-            
             sb.Append($"\nMapping UserId: {User.UserId}\n");
             ForceLog($"v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
             GDKPool.Return(sb);
-            
+
             // also clear callbacks
             _onAdapterReady = null;
         }
@@ -272,7 +276,7 @@ namespace Amanotes.Core
             }
         }
 
-        public static async Task<Dictionary<string, object>> ParseThirdPartyVersionsAsync()
+        public static async UniTask<Dictionary<string, object>> ParseThirdPartyVersionsAsync()
         {
             Dictionary<string, object> thirdPartyVersions = new Dictionary<string, object>();
             string fileContent = await GDKFileUtils.LoadFromStreamingAssets("SDKVersion.txt");
@@ -325,7 +329,7 @@ namespace Amanotes.Core
             }
         }
 
-        private static async Task LogEvent_GDKInitAsync(int initDuration)
+        private static async UniTask LogEvent_GDKInitAsync(int initDuration)
         {
             var BToMB = 1.0 / (1024 * 1024);
             var reservedMemory = Math.Round(Profiler.GetTotalReservedMemoryLong() * BToMB, 2); // in MB

package/Runtime/Consent/AmaGDK.Consent.cs

@@ -1,5 +1,6 @@
 using System;
 using Amanotes.Core.Internal;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 using static Amanotes.Core.GDKDebug;
 
@@ -76,7 +77,7 @@ namespace Amanotes.Core
                     ConsentHook.ATTRequest(isAllowed =>
                     {
                         data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
-                        data.SaveJsonToFile();
+                        data.SaveJsonToFile(false);
                         onComplete?.Invoke(allowedATT);
                     });
                 }
@@ -119,7 +120,7 @@ namespace Amanotes.Core
                     {
                         data.canShowAds = canShowAd;
                         data.consentAlreadyShown = true;
-                        data.SaveJsonToFile();
+                        data.SaveJsonToFile(false);
                         onComplete?.Invoke(canShowAd);
                     }, onError);
                 }
@@ -170,8 +171,7 @@ namespace Amanotes.Core
 
         public static partial class Consent //Internal
         {
-            private static readonly Lazy<ConsentData> _data = new Lazy<ConsentData>(() => new ConsentData().LoadJsonFromFile());
-            private static ConsentData data => _data.Value;
+            private static ConsentData data;
             private static Action _onConsentComplete;
             
             internal static bool checkedATT => data.att >= Status.Allowed;
@@ -185,13 +185,14 @@ namespace Amanotes.Core
                 NotAllowed
             }
 
-            internal static bool InitModule()
+            internal static async UniTask InitModule()
             {
+                await UniTask.SwitchToThreadPool();
                 if (_config.autoGetConsent)
                 {
                     RequestAllConsents(null);
                 }
-                return true;
+                data = new ConsentData().LoadJsonFromFile();
             }
         }
     }

package/Runtime/Core/GDKDebug.cs

@@ -11,7 +11,8 @@ namespace Amanotes.Core
         Warning,
         Verbose
     }
-
+    
+    #if GDK_REMOVE_STACKTRACE
     internal readonly struct NoStackTrace : IDisposable
     {
         internal readonly LogType logType;
@@ -41,10 +42,13 @@ namespace Amanotes.Core
             
         }
     }
+    #endif
     
     public class GDKDebug
     {
+        #if GDK_REMOVE_STACKTRACE
         internal static readonly IDisposable NoStackTraceNull = new NoStackTraceNull();
+        #endif
         
         public static Action<string> logNonfatalErrorHook = null;
         private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
@@ -59,7 +63,9 @@ namespace Amanotes.Core
                 if (!logWarningDict.Add(key)) return;
             }
             
+            #if GDK_REMOVE_STACKTRACE
             using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
+            #endif
             {
                 Debug.LogWarning($"AmaGDK {message}"); 
             }
@@ -67,7 +73,9 @@ namespace Amanotes.Core
         public static void LogWarning(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Warning) return;
+            #if GDK_REMOVE_STACKTRACE
             using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
+            #endif
             {
                 Debug.LogWarning($"AmaGDK {message}");
             }
@@ -75,7 +83,9 @@ namespace Amanotes.Core
         public static void LogError(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Error) return;
+            #if GDK_REMOVE_STACKTRACE
             using (GDKUtils.isOnMainThread ? NoStackTrace.Error: NoStackTraceNull)
+            #endif
             {
                 Debug.LogError($"AmaGDK {message}");
             }
@@ -100,7 +110,9 @@ namespace Amanotes.Core
         public static void Log(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Verbose) return;
+            #if GDK_REMOVE_STACKTRACE
             using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
+            #endif
             {
                 Debug.Log($"AmaGDK {message}");   
             }
@@ -108,7 +120,9 @@ namespace Amanotes.Core
         
         public static void ForceLog(string message)
         {
+            #if GDK_REMOVE_STACKTRACE
             using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
+            #endif
             {
                 Debug.Log($"AmaGDK {message}");
             }

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -200,7 +200,7 @@ namespace Amanotes.Core.Internal
             return GDKFileUtils.LoadJsonFromFile(instance);
         }
 
-        internal static void SaveJsonToFile<T>(this T instance, bool immediately = true) where T: IJsonFile
+        internal static void SaveJsonToFile<T>(this T instance, bool immediately) where T: IJsonFile
         {
             GDKFileUtils.SaveJsonToFile(instance, immediately);
         }

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -34,7 +34,7 @@ namespace Amanotes.Core.Internal
             internal void SaveIfDirty(bool forceSave = false)
             {
                 if (!isDirty && !forceSave) return;
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
                 isDirty = false;
             }
         }

package/Runtime/Utils/GDKFileUtils.cs

@@ -1,6 +1,11 @@
+// #define GDK_DEBUG_FILE_IO
+
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Networking;
@@ -11,64 +16,145 @@ namespace Amanotes.Core.Internal
     public static class GDKFileUtils
     {
         private static string _basePath;
+        private static readonly ConcurrentDictionary<string, string> _pendingWrites =
+            new ConcurrentDictionary<string, string>();
+        private static readonly List<KeyValuePair<string, string>> _itemsToWrite =
+            new List<KeyValuePair<string, string>>(8);
+
+        private static readonly object _fileLock = new object();
+        private static int _isProcessing = 0;
+
         public static string basePath
         {
             get
             {
                 if (!string.IsNullOrEmpty(_basePath)) return _basePath;
+
                 _basePath = Application.isEditor
                     ? Path.Combine(Directory.GetCurrentDirectory(), "Library", "AmaGDK")
                     : Path.Combine(Application.persistentDataPath, "AmaGDK");
 
-                if (!Directory.Exists(_basePath)) Directory.CreateDirectory(_basePath);
+                try
+                {
+                    if (!Directory.Exists(_basePath))
+                    {
+                        Directory.CreateDirectory(_basePath);
+                    }
+                } catch (Exception ex)
+                {
+                    LogError($"[GDKFileUtils] Failed to create directory: {ex.Message}");
+                    _basePath = Application.persistentDataPath;
+                }
+
                 return _basePath;
             }
         }
-        
+
         internal static string GetPath(string fileName)
         {
-            return Path.Combine(basePath, fileName);
+            if (string.IsNullOrEmpty(fileName)) return null;
+            return Path.Combine(basePath, Path.GetFileName(fileName));
         }
 
         internal static bool Exist(string fileName)
         {
-            return File.Exists(GetPath(fileName));
+            if (string.IsNullOrEmpty(fileName)) return false;
+
+            string path = GetPath(fileName);
+            if (string.IsNullOrEmpty(path)) return false;
+
+            lock (_fileLock)
+            {
+                return File.Exists(path);
+            }
+        }
+
+        internal static int writePendingCount => _pendingWrites.Count;
+        internal static bool HasAnyWritePending => _pendingWrites.Count > 0;
+        internal static bool IsWritePending(string fileName)
+        {
+            return !string.IsNullOrEmpty(fileName) && _pendingWrites.ContainsKey(fileName);
         }
-        
-        public static void Save(string fileName, string content, bool immediately = true)
+
+        public static void Save(string fileName, string content, bool immediately)
         {
-            if (string.IsNullOrWhiteSpace(fileName))
+            if (string.IsNullOrEmpty(fileName)) return;
+
+            if (immediately)
             {
-                LogWarningOnce("File name must be not null or empty");
+                _pendingWrites.TryRemove(fileName, out _);
+                WriteFileDirectly(fileName, content);
                 return;
             }
 
-            if (string.IsNullOrWhiteSpace(content))
+            // Just replace any existing content
+            _pendingWrites[fileName] = content;
+
+            // Use atomic CompareExchange to ensure only one Task runs at a time
+            CheckSpawnThread();
+        }
+
+        private static void CheckSpawnThread()
+        {
+            if (Interlocked.CompareExchange(ref _isProcessing, 1, 0) == 0)
             {
-                LogWarningOnce($"Content for {fileName} is empty");
+                Task.Factory.StartNew(ProcessWriteQueue, TaskCreationOptions.None);
             }
-            
-            ThreadWrite(fileName, content, immediately);
         }
 
-        private static void ThreadWrite(string fileName, string content, bool immediately)
+        private static void ProcessWriteQueue()
         {
-            // Only write on main thread if immediately is true
-            if (!immediately && GDKUtils.isOnMainThread)
+            try
             {
-                Task.Run(()=>ThreadWrite(fileName, content, true))
-                    .ConfigureAwait(false);
-                return;
+                // var w = Stopwatch.StartNew();
+                while (!_pendingWrites.IsEmpty)
+                {
+                    // Blocking delay so batching actually occurs
+                    // In this case, it's actually better than await Task.Delay(500), why?
+                    Thread.Sleep(500);
+                
+                    _itemsToWrite.Clear();
+                    _itemsToWrite.AddRange(_pendingWrites);
+                    _pendingWrites.Clear();
+                
+                    lock (_fileLock)
+                    {
+                        foreach (var kvp in _itemsToWrite)
+                        {
+                            WriteFileDirectly(kvp.Key, kvp.Value);
+                        }
+                    }
+                }
+                
+                // w.Stop();
+                // LogWarning($"Process time: {w.ElapsedTicks} ticks | {w.ElapsedMilliseconds} milliseconds");
+            }
+            catch (Exception e)
+            {
+                LogError($"[GDKFileUtils] Write queue error: {e.Message}");
+            } finally
+            {
+                Interlocked.Exchange(ref _isProcessing, 0);
+                if (!_pendingWrites.IsEmpty) CheckSpawnThread(); // until next time!
             }
+        }
+
+        // Write directly to file without temp files
+        private static void WriteFileDirectly(string fileName, string content)
+        {
+            if (string.IsNullOrEmpty(fileName)) return;
             
             string filePath = GetPath(fileName);
-            try
+            if (string.IsNullOrEmpty(filePath)) return;
+            
+            // Lock only for the duration of actual I/O
+            lock (_fileLock)
             {
                 File.WriteAllText(filePath, content);
-            }
-            catch (Exception ex)
-            {
-                LogWarningOnce($"Exception in ThreadWrite(): {filePath}\n{ex}");
+                
+                #if GDK_DEBUG_FILE_IO
+                Log($"WriteFileDirectly threadId={Thread.CurrentThread.ManagedThreadId}: {fileName} -> {content}");
+                #endif
             }
         }
 
@@ -76,23 +162,28 @@ namespace Amanotes.Core.Internal
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce("File name must be not null or empty");
+                LogWarningOnce("File name must not be null or empty");
                 return;
             }
-            
+
+            // Check if `contents` is null or empty
             if (contents == null || !contents.GetEnumerator().MoveNext())
             {
                 LogWarningOnce($"Content for {fileName} is empty");
             }
 
             string path = GetPath(fileName);
-            try
-            {
-                File.AppendAllLines(path, contents);
-            }
-            catch (Exception ex)
+
+            // Concurrency-safe write
+            lock (_fileLock)
             {
-                LogWarningOnce(path + "\n" + ex);
+                try
+                {
+                    File.AppendAllLines(path, contents);
+                } catch (Exception ex)
+                {
+                    LogWarningOnce(path + "\n" + ex);
+                }
             }
         }
 
@@ -100,147 +191,192 @@ namespace Amanotes.Core.Internal
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce("File name must be not null or empty");
+                LogWarningOnce("File name must not be null or empty");
                 return;
             }
 
+            // Check if `content` is null or empty
             if (string.IsNullOrWhiteSpace(content))
             {
                 LogWarningOnce($"Content for {fileName} is empty");
             }
 
             string path = GetPath(fileName);
-            try
-            {
-                File.AppendAllText(path, content);
-            }
-            catch (Exception ex)
+
+            // Concurrency-safe write
+            lock (_fileLock)
             {
-                LogWarningOnce(path + "\n" + ex);
+                try
+                {
+                    File.AppendAllText(path, content);
+                } catch (Exception ex)
+                {
+                    LogWarningOnce(path + "\n" + ex);
+                }
             }
         }
 
         public static string Load(string fileName)
         {
-            var content = "";
+            if (string.IsNullOrEmpty(fileName)) return string.Empty;
 
-            if (string.IsNullOrWhiteSpace(fileName))
+            // If there's a pending in-memory write, return that content first
+            if (_pendingWrites.TryGetValue(fileName, out var inMemoryContent))
             {
-                LogWarningOnce("File name must be not null or empty");
-                return content;
+                return inMemoryContent;
             }
 
             string path = GetPath(fileName);
-            if (!File.Exists(path)) return content;
+            if (string.IsNullOrEmpty(path)) return string.Empty;
 
-            try
-            {
-                content = File.ReadAllText(path);
-            }
-            catch (Exception ex)
+            lock (_fileLock)
             {
-                LogWarningOnce(path + "\n" + ex);
+                try
+                {
+                    return !File.Exists(path) ? string.Empty : File.ReadAllText(path);
+                } catch (Exception ex)
+                {
+                    LogError($"[GDKFileUtils] Failed to read {fileName}: {ex.Message}");
+                    return string.Empty;
+                }
             }
-
-            return content;
         }
 
         public static async Task<string> LoadFromStreamingAssets(string fileName)
         {
+            if (string.IsNullOrEmpty(fileName)) return null;
             string filePath = Path.Combine(Application.streamingAssetsPath, fileName);
 
-            // Android
             if (Application.platform == RuntimePlatform.Android)
             {
-                using (UnityWebRequest request = UnityWebRequest.Get(filePath))
+                using (var request = UnityWebRequest.Get(filePath))
                 {
-                    var operation = request.SendWebRequest();
-                    while (!operation.isDone)
+                    try
                     {
-                        await Task.Yield();
-                    }
-                    if (request.result != UnityWebRequest.Result.Success)
+                        var operation = request.SendWebRequest();
+                        while (!operation.isDone)
+                        {
+                            await Task.Yield();
+                        }
+
+                        return request.result != UnityWebRequest.Result.Success
+                            ? null
+                            : request.downloadHandler.text;
+                    } catch (Exception ex)
                     {
-                        LogWarning($"Error reading file: {request.error}");
+                        LogError($"[GDKFileUtils] StreamingAssets load error: {ex.Message}");
                         return null;
                     }
-                    return request.downloadHandler.text;
                 }
             }
 
-            // Other
-            try
-            {
-                return File.ReadAllText(filePath);
-            }
-            catch (Exception e)
+            lock (_fileLock)
             {
-                LogWarning($"Error reading file: {e.Message}");
+                try
+                {
+                    return File.ReadAllText(filePath);
+                } catch (Exception ex)
+                {
+                    LogError($"[GDKFileUtils] StreamingAssets load error: {ex.Message}");
+                    return null;
+                }
             }
-            return null;
         }
 
-
         internal static void Delete(string fileName)
         {
+            if (string.IsNullOrEmpty(fileName)) return;
+            
+            _pendingWrites.TryRemove(fileName, out _);
+
             string path = GetPath(fileName);
-            if (!File.Exists(path)) return;
+            if (string.IsNullOrEmpty(path)) return;
 
-            try
+            lock (_fileLock)
             {
-                File.Delete(path);
-            }
-            catch (Exception ex)
-            {
-                LogWarningOnce(path + "\n" + ex);
+                try
+                {
+                    if (File.Exists(path))
+                    {
+                        File.Delete(path);
+                    }
+                } catch (Exception ex)
+                {
+                    LogError($"[GDKFileUtils] Delete error: {ex.Message}");
+                }
             }
         }
-        
+
         public static void ClearCacheData()
         {
-            var sb = GDKPool.GetStringBuilder();
-            sb.AppendLine("[AmaGDK] All cached data & stats cleared");
+            _pendingWrites.Clear();
+
+            if (!Directory.Exists(basePath)) return;
             
-            if (!Directory.Exists(basePath))
+            lock (_fileLock)
             {
-                sb.AppendLine("Cache path not exists: " + basePath);
-                return;
+                foreach (string file in Directory.GetFiles(basePath))
+                {
+                    try
+                    {
+                        File.Delete(file);
+                    } catch (Exception ex)
+                    {
+                        LogWarning($"[GDKFileUtils] Failed to delete {file}: {ex.Message}");
+                    }
+                }
             }
-            
-            string[] filePaths = Directory.GetFiles(basePath);
-            foreach (string path in filePaths)
+        }
+
+        // Synchronously flush everything
+        public static void Shutdown()
+        {
+            // Write out all pending items directly
+            foreach (var kvp in _pendingWrites)
             {
-                Delete(path);
-                sb.AppendLine($"[deleted] - {path}");
+                try
+                {
+                    WriteFileDirectly(kvp.Key, kvp.Value);
+                } catch (Exception ex)
+                {
+                    LogError($"[GDKFileUtils] Shutdown write error: {ex.Message}");
+                }
             }
-            Debug.Log(sb);
+
+            _pendingWrites.Clear();
         }
-        
-        public static T LoadJsonFromFile<T>(T instance) where T: new()
+
+        public static T LoadJsonFromFile<T>(T instance) where T : new()
         {
             instance ??= new T();
-            
-            string fileName = instance.GetType().Name;
-            string json = Load(fileName);
-            if (!string.IsNullOrEmpty(json))
+
+            try
             {
-                try
+                string json = Load(instance.GetType().Name);
+                if (!string.IsNullOrEmpty(json))
                 {
                     JsonUtility.FromJsonOverwrite(json, instance);
-                } catch (Exception e)
-                {
-                    LogWarning("LoadJsonFromFile error: " + fileName + "\n" + e);
                 }
+            } catch (Exception ex)
+            {
+                LogError($"[GDKFileUtils] JSON load error: {ex.Message}");
             }
-            
+
             return instance;
         }
-        
-        public static void SaveJsonToFile<T>(T instance, bool immediately = true)
+
+        public static void SaveJsonToFile<T>(T instance, bool immediately)
         {
-            string fileName = instance.GetType().Name;
-            string json = JsonUtility.ToJson(instance);
-            ThreadWrite(fileName, json, immediately);
+            if (instance == null) return;
+
+            try
+            {
+                string json = JsonUtility.ToJson(instance);
+                Save(instance.GetType().Name, json, immediately);
+            } catch (Exception ex)
+            {
+                LogError($"[GDKFileUtils] JSON save error: {ex.Message}");
+            }
         }
     }
 }

package/package.json

@@ -1,20 +1,32 @@
 {
-    "name": "com.amanotes.gdk",
-    "version": "0.2.81-alpha.13",
-    "displayName": "AmaGDK",
-    "description": "Amanotes Game Development Kit",
-    "unity": "2019.4",
-    "keywords": [
-        "Amanotes",
-        "Amanotes GDK",
-        "vh-name:AmaGDK"
-    ],
-    "author": {
-        "name": "Amanotes",
-        "email": "tech.support@amanotes.com",
-        "url": "https://amanotes.com"
-    },
-    "changelogUrl": "https://amagdk.notion.site/Change-Log-6dfd4b67d64f496bbd9eb04ccb4ef95a",
-    "documentationUrl": "https://amagdk.notion.site/amagdk/Ama-GDK-a73596617ab247b6a43c8f12a1581415",
-    "license": "MIT"
+  "name": "com.amanotes.gdk",
+  "version": "0.2.81-alpha.17",
+  "displayName": "AmaGDK",
+  "description": "Amanotes Game Development Kit",
+  "unity": "2019.4",
+  "keywords": [
+    "Amanotes",
+    "Amanotes GDK",
+    "vh-name:AmaGDK"
+  ],
+  "author": {
+    "name": "Amanotes",
+    "email": "tech.support@amanotes.com",
+    "url": "https://amanotes.com"
+  },
+  "changelogUrl": "https://amagdk.notion.site/Change-Log-6dfd4b67d64f496bbd9eb04ccb4ef95a",
+  "documentationUrl": "https://amagdk.notion.site/amagdk/Ama-GDK-a73596617ab247b6a43c8f12a1581415",
+  "license": "MIT",
+  "dependencies": {
+    "com.cysharp.unitask": "2.5.10"
+  },
+  "scopedRegistries": [
+    {
+      "name": "OpenUPM",
+      "url": "https://package.openupm.com",
+      "scopes": [
+        "com.cysharp"
+      ]
+    }
+  ]
 }