com.amanotes.gdk 0.2.46 → 0.2.47

package/Runtime/AmaGDK.IAP.cs

@@ -97,9 +97,9 @@ namespace Amanotes.Core
 
         public partial class IAP //Internal
         {
-            private static IIAPAdapter _adapter;
-            internal static readonly IAPData localData = new IAPData().LoadJsonFromFile();
-            internal static IIAPAdapter Adapter
+            private static IAPAdapter _adapter;
+            internal static IAPData localData;
+            internal static IAPAdapter Adapter
             {
                 get
                 {
@@ -109,31 +109,22 @@ namespace Amanotes.Core
                 }
             }
             
-            private static IAPAdapterConfig _adapterConfig;
-            internal static IAPAdapterConfig AdapterConfig
-            {
-                get
-                {
-                    if (_adapterConfig != null) return _adapterConfig;
-                    LogWarning("[IAP] Adapter config is not available.");
-                    return null;
-                }
-            }
 
             internal static Dictionary<string, ProductInfo> dicProducts = new Dictionary<string, ProductInfo>();
-
-            internal static void Init()
+            
+            internal static bool InitModule()
             {
-                _adapter = Internal.Adapter.GetSingleAdapter<IIAPAdapter>();
-                var adapterContext = _adapter as AdapterContext;
-                
-                if (adapterContext == null) return;
-                _adapterConfig = adapterContext.GetAdapterConfig<IAPAdapterConfig>();
+                _adapter = Adapter2.GetAdapter<IAPAdapter>();
+                if (_adapter == null) return false;
+                localData = new IAPData().LoadJsonFromFile();
+                return true;
+            }
 
-                if (!adapterContext.IsReady) return;
+            internal static void StartModule()
+            {
+                if (_adapter == null) return;
                 localData.Sync();
-                if (_adapterConfig.autoGetProducts)
-                    GetProducts();
+                if (Config.iap.autoGetProducts) GetProducts();
             }
             
             internal static void ExecuteInNextFrame(Action method)
@@ -311,7 +302,7 @@ namespace Amanotes.Core
         internal static void ClearOldProductConfig()
         {
             if (isCleanUpConfig) return;
-            AdapterConfig?.products.Clear();
+            AmaGDK.Config.iap.products.Clear();
             isCleanUpConfig = true;
         }
         
@@ -319,9 +310,9 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
-            var ls = AdapterConfig?.products;
+            var ls = AmaGDK.Config.iap.products;
             if (ls == null) return null;
-            foreach (var pId in subs)
+            foreach (string pId in subs)
             {
                 ls.Add(new ProductInfo { id = pId, type = ProductType.Subscription });
             }
@@ -332,9 +323,9 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
-            var ls = AdapterConfig?.products;
+            var ls = AmaGDK.Config.iap.products;
             if (ls == null) return null;
-            foreach (var pId in cons)
+            foreach (string pId in cons)
             {
                 ls.Add(new ProductInfo { id = pId, type = ProductType.Consumable });
             }
@@ -345,9 +336,9 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
-            var ls = AdapterConfig?.products;
+            var ls = AmaGDK.Config.iap.products;
             if (ls == null) return null;
-            foreach (var pId in nons)
+            foreach (string pId in nons)
             {
                 ls.Add(new ProductInfo { id = pId, type = ProductType.NonConsumable });
             }
@@ -405,14 +396,20 @@ namespace Amanotes.Core
 namespace Amanotes.Core.Internal
 {
     [Serializable]
-    public class IAPAdapterConfig
+    public class IAPConfig
     {
+        // [Header("-----     MODULE CONFIG      -----")]
         public bool autoInit;
         [SerializeField] internal bool allPurchaseSuccessInEditor;
         [SerializeField] internal List<ProductInfo> products;
         [SerializeField] internal bool autoGetProducts;
     }
     
+    public partial class ConfigAsset
+    {
+        [SerializeField] public IAPConfig iap;
+    }
+    
     public interface ISetupBuilder { }
             
     public class SetupContext: ISetupBuilder
@@ -424,7 +421,7 @@ namespace Amanotes.Core.Internal
 
         public void GetProducts()
         {
-            var ls = AdapterConfig?.products;
+            var ls = AmaGDK.Config.iap.products;
             if (ls == null || ls.Count == 0)
             {
                 LogWarning("There is no IAP product");
@@ -517,7 +514,7 @@ namespace Amanotes.Core.Internal
         public void Purchase(ProductInfo productInfo)
         {
 #if UNITY_EDITOR
-            if (AdapterConfig.allPurchaseSuccessInEditor)
+            if (AmaGDK.Config.iap.allPurchaseSuccessInEditor)
             {
                 DoOnSuccess(new PurchaseSuccess
                 {
@@ -554,20 +551,22 @@ namespace Amanotes.Core.Internal
         }
     }
 
-    public interface IIAPAdapter
+    public abstract class IAPAdapter : Adapter2
     {
-        void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onSuccess = null, Action<string> onFail = null);
-        void Purchase(ProductInfo productInfo, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
-        void PurchaseDiscount(ProductInfo productInfo, string discountId, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
-        void RestorePurchase(Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
-        List<string> GetActiveSubscriptions();
-        List<string> GetPurchasedProducts();
-        string GetActiveSubscriptionId();
-        string GetSubscriptionPeriodType();
-        DateTime? GetSubscriptionLastPurchaseDate();
-        DateTime? GetSubscriptionExpiredDate();
-        DateTime? GetUnsubscribedDate();
-        HashSet<PurchaseRecord> GetPurchaseHistory();
-        DateTime? GetLastPurchaseDate(string productAndPlanId);
+        protected IAPConfig iapConfig => AmaGDK.Config.iap;
+        
+        public abstract void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onSuccess = null, Action<string> onFail = null);
+        public abstract void  Purchase(ProductInfo productInfo, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
+        public abstract void  PurchaseDiscount(ProductInfo productInfo, string discountId, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
+        public abstract void  RestorePurchase(Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
+        public abstract List<string> GetActiveSubscriptions();
+        public abstract List<string> GetPurchasedProducts();
+        public abstract string GetActiveSubscriptionId();
+        public abstract string GetSubscriptionPeriodType();
+        public abstract DateTime? GetSubscriptionLastPurchaseDate();
+        public abstract DateTime? GetSubscriptionExpiredDate();
+        public abstract DateTime? GetUnsubscribedDate();
+        public abstract HashSet<PurchaseRecord> GetPurchaseHistory();
+        public abstract DateTime? GetLastPurchaseDate(string productAndPlanId);
     }
-}
+}

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Text;
 using UnityEngine;
 using Amanotes.Core.Internal;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
 #if UNITY_EDITOR
@@ -65,9 +66,9 @@ namespace Amanotes.Core
             {
 #if UNITY_EDITOR
                 //Override value in editor environment
-                if (adapterConfig.embedRemoteConfig.overrideInEditor)
+                if (Config.remoteConfig.embedRemoteConfig.overrideInEditor)
                 {
-                    foreach (var c in adapterConfig.embedRemoteConfig.overrideConfig)
+                    foreach (var c in Config.remoteConfig.embedRemoteConfig.overrideConfig)
                         if (c.key == key)
                             return (T)Convert.ChangeType(c.value, typeof(T));
                 }
@@ -89,9 +90,13 @@ namespace Amanotes.Core
 
             public static void SetActiveEmbedConfig(string id)
             {
-                if (adapterConfig == null || adapterConfig.embedRemoteConfig == null)
+                if (Config.remoteConfig == null || Config.remoteConfig.embedRemoteConfig == null)
+                {
                     LogWarning("[RemoteConfig] No embed remote config available");
-                adapterConfig.embedRemoteConfig.SetActiveConfig(id);
+                    return;
+                }
+                
+                Config.remoteConfig.embedRemoteConfig.SetActiveConfig(id);
             }
         }
 
@@ -100,7 +105,6 @@ namespace Amanotes.Core
             internal enum FetchState
             {
                 None,
-                ResolveDependencies,
                 CheckInternet,
                 Fetch,
                 SaveCache,
@@ -117,8 +121,8 @@ namespace Amanotes.Core
             static string base64Prefix = "base64:";
             const string VERSION_PREFIX = "version:";
             static int EmbedVersion =>
-                adapterConfig != null && adapterConfig.embedRemoteConfig != null
-                    ? adapterConfig.embedRemoteConfig.version
+                Config.remoteConfig != null && Config.remoteConfig.embedRemoteConfig != null
+                    ? Config.remoteConfig.embedRemoteConfig.version
                     : 1;
 
             static FetchState _state = FetchState.None;
@@ -126,8 +130,7 @@ namespace Amanotes.Core
 
             static readonly Dictionary<FetchState, Action[]> fetchSM = new Dictionary<FetchState, Action[]>
             {
-                { FetchState.None,                new Action[]{ ResolveDependency }},
-                { FetchState.ResolveDependencies, new Action[]{ LoadCache, CheckInternet}},
+                { FetchState.None,                new Action[]{ CheckInternet}},
                 { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},
                 { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},
                 { FetchState.SaveCache,           new Action[]{ SetDone }},
@@ -135,10 +138,10 @@ namespace Amanotes.Core
                 { FetchState.LoadEmbedConfig,      new Action[]{ SetFail, SetDone}}
             };
 
-            internal static IRemoteConfig adapter;
-            internal static RemoteConfigConfig adapterConfig;
-            internal static Action<bool> onAdapterInitCompleteCallback;
+            internal static RemoteConfigAdapter adapter;
 
+            internal static Action<bool> onAdapterInitCompleteCallback;
+            
             internal static void NextState(bool result = true)
             {
                 if (!fetchSM.TryGetValue(_state, out var actions))
@@ -155,21 +158,7 @@ namespace Amanotes.Core
 
                 actions[result ? 1 : 0]();
             }
-
-            static void ResolveDependency()
-            {
-                _state = FetchState.ResolveDependencies;
-                adapter = Adapter.GetSingleAdapter<IRemoteConfig>();
-                if (adapter == null)
-                {
-                    NextState(false);
-                    return;
-                }
-                
-                adapterConfig = (adapter as AdapterContext)?.GetAdapterConfig<RemoteConfigConfig>();
-                adapter.ResolveDependencies(NextState);
-            }
-
+            
             static void CheckInternet()
             {
                 _state = FetchState.CheckInternet;
@@ -196,6 +185,8 @@ namespace Amanotes.Core
 
             static void SaveCache()
             {
+                Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
+                
                 _state = FetchState.SaveCache;
                 StringBuilder sb = new StringBuilder();
                 
@@ -210,15 +201,19 @@ namespace Amanotes.Core
                 string filePath = GDKFileUtils.GetPath(fileName);
                 GDKFileUtils.Save(filePath, sb.ToString());
                 Log($"[RemoteConfig] Saved remote config to {filePath}");
+                Profiler.EndSample();
                 NextState();
             }
 
             static void LoadCache()
             {
+                Profiler.BeginSample("AmaGDK.RemoteConfig.LoadCache()");
+                
                 _state = FetchState.LoadCache;
 
                 if (!HasCache)
                 {
+                    Profiler.EndSample();
                     NextState(false);
                     return;
                 }
@@ -268,10 +263,12 @@ namespace Amanotes.Core
                 {
                     LogWarning($"[RemoteConfig] Error on LoadCache: {ex.Message}");
                     _cacheExisted = false;
+                    Profiler.EndSample();
                     NextState(false);
                     return;
                 }
 
+                Profiler.EndSample();
                 NextState(true);
             }
 
@@ -279,13 +276,13 @@ namespace Amanotes.Core
             {
                 _state = FetchState.LoadEmbedConfig;
                 
-                if (adapterConfig == null || adapterConfig.embedRemoteConfig == null)
+                if (_config.remoteConfig == null || _config.remoteConfig.embedRemoteConfig == null)
                 {
                     NextState(false);
                     return;
                 }
 
-                var config = adapterConfig.embedRemoteConfig.ActiveConfig;
+                var config = _config.remoteConfig.embedRemoteConfig.ActiveConfig;
 
                 if (config == null || config.items.Length == 0)
                 {
@@ -343,7 +340,7 @@ namespace Amanotes.Core
 
     public static class RemoteConfigExtension
     {
-        public static void InitRemoteConfigModule(this IRemoteConfig ap, Action<bool> onCompleteCallback)
+        public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
         {
             if (AmaGDK.RemoteConfig.State != AmaGDK.RemoteConfig.FetchState.None)
             {
@@ -361,15 +358,21 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class RemoteConfigConfig
     {
-        [SerializeField]
-        internal EmbedRemoteConfigAsset embedRemoteConfig;
+        // [Header("-----     MODULE CONFIG      -----")]
+
         public float firstFetchTimeOutInSeconds = 10;
         public float defaultTimeOutInSeconds = 3;
+        [SerializeField] internal EmbedRemoteConfigAsset embedRemoteConfig;
     }
     
-    public interface IRemoteConfig
+    public partial class ConfigAsset
+    {
+        [SerializeField] public RemoteConfigConfig remoteConfig;
+    }
+
+    public abstract class RemoteConfigAdapter : Adapter2
     {
-        void ResolveDependencies(Action<bool> onComplete);
-        void FetchConfig(bool isFirstTime, Action<bool, Dictionary<string, string>> onComplete);
+        protected RemoteConfigConfig moduleConfig => AmaGDK.Config.remoteConfig;
+        public abstract void FetchConfig(bool isFirstTime, Action<bool, Dictionary<string, string>> onComplete);
     }
 }

package/Runtime/AmaGDK.UserProfile.cs

@@ -40,6 +40,7 @@ namespace Amanotes.Core
                 }
                 private set
                 {
+                    if (_userId == value) return;    
                     _userId = value;
                     OnUserIdChanged?.Invoke(_userId);
                     Save();
@@ -133,30 +134,34 @@ namespace Amanotes.Core
             private const float WAIT_TIME = 0.5f;
             private WaitForSecondsRealtime waitForDuration = new WaitForSecondsRealtime(WAIT_TIME);
 
-            internal IEnumerator Init()
+            internal void InitModule()
             {
                 User.LoadJsonFromFile();
+                
+                // Always get the latest advertising id
                 GetAdvertisingId();
-
-                float time = 0;
-                while (!User.IsAmaDeviceIdExist())
-                {
-                    yield return waitForDuration;
-                    time += WAIT_TIME;
-                    if (time <= TIME_OUT) continue;
-                    Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
-                    break;
-                }
             }
-
+            
+            internal void StartModule()
+            {
+                UpdateUserId();
+            }
+            
+            // internal IEnumerator Init()
+            // {
+            //     float time = 0;
+            //     while (!User.IsAmaDeviceIdExist())
+            //     {
+            //         yield return waitForDuration;
+            //         time += WAIT_TIME;
+            //         if (time <= TIME_OUT) continue;
+            //         Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
+            //         break;
+            //     }
+            // }
+            
             internal void UpdateUserId()
             {
-                if (!string.IsNullOrWhiteSpace(_userId))
-                {
-                    OnUserIdChanged?.Invoke(_userId);
-                    return;
-                }
-                
 #if UNITY_ANDROID
                 if (!string.IsNullOrWhiteSpace(_gaid))
                 {
@@ -233,13 +238,15 @@ namespace Amanotes.Core
                         AndroidId = SystemInfo.deviceUniqueIdentifier;
                         break;
                     default:
-                        Logging.LogWarning($"Unsupported platform: {Application.platform}");
+                        // Logging.Log($"[UserProfile] There is no advertising ID on {Application.platform}");
                         break;
                 }
             }
             
             private void GetAdvertisingId()
             {
+                float time = Time.realtimeSinceStartup;
+                
                 AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
                 {
                     SetAdvertisingID(advertisingId);                
@@ -269,6 +276,7 @@ namespace Amanotes.Core
                             AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
                             break;
                     }
+                    
                     Logging.Log($"Generate AmaDeviceId completed: {_amaDeviceId}");
                     User.Save();
                 });