com.amanotes.gdk 0.2.81-alpha.14 → 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;
 
@@ -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;
@@ -311,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>()
             {
@@ -358,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()

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

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

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.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.14";
+        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;
 
@@ -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/package.json

@@ -1,20 +1,32 @@
 {
-    "name": "com.amanotes.gdk",
-    "version": "0.2.81-alpha.14",
-    "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"
+      ]
+    }
+  ]
 }