com.amanotes.gdk 0.2.48 → 0.2.49

package/Runtime/AmaGDK.IAP.cs

@@ -20,7 +20,7 @@ namespace Amanotes.Core
             public static DateTime? SubscriptionLastPurchaseDate => localData.SubscriptionLastPurchaseDate;
             public static DateTime? SubscriptionExpiredDate => localData.SubscriptionExpiredDate;
             public static DateTime? UnsubscribedDate => localData.UnsubscribedDate;
-            public static Dictionary<string, ProductInfo> AllProducts => dicProducts;
+            public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
             
             public static ISetupBuilder GetProducts(bool appendExistingList = false)
@@ -28,42 +28,62 @@ namespace Amanotes.Core
                 if (!appendExistingList)
                 {
                     IAPExtension.isCleanUpConfig = false;
-                    dicProducts.Clear();    
+                    AllProducts.Clear();    
                 }
                 var result = new SetupContext();
-                ExecuteInNextFrame(result.GetProducts);
+                GDKUtils.DelayCall(0f, result.GetProducts);
                 return result;
             }
 
             public static IPurchaseBuilder Purchase(string productId)
             {
                 var result = new PurchaseContext();
-                if (!dicProducts.ContainsKey(productId))
+                GDKUtils.DelayCall(0f, () =>
                 {
-                    LogWarning($"[IAP] Product {productId} is not found");
-                    result.onFail?.Invoke(new PurchaseError($"Product {productId} is not found"));
-                    return result;
-                }
-                ExecuteInNextFrame(() => result.Purchase(dicProducts[productId]));
+                    if (!AllProducts.ContainsKey(productId))
+                    {
+                        LogWarning($"[IAP] Product {productId} is not found");
+                        result.onFail?.Invoke(new PurchaseError($"Product {productId} is not found"));
+                        return;
+                    }
+                    
+#if UNITY_EDITOR
+                    if (Config.iap.allPurchaseSuccessInEditor)
+                    {
+                        var s = new PurchaseSuccess
+                        {
+                            productIds = new[] { productId },
+                            isSandbox = true
+                        };
+                        result.onSuccess?.Invoke(s);
+                    }
+                    else
+                    {
+                        result.onFail?.Invoke(new PurchaseError("Force to fail", productId));
+                    }
+#else
+                    result.Purchase(AllProducts[productId]);
+#endif
+                });
                 return result;
             }
 
             public static IPurchaseBuilder RestorePurchase()
             {
                 var result = new PurchaseContext();
-                ExecuteInNextFrame(result.RestorePurchase);
+                GDKUtils.DelayCall(0f, result.RestorePurchase);
                 return result;
             }
 
             public static ProductInfo GetProduct(string productId)
             {
-                if (!dicProducts.ContainsKey(productId))
+                if (!AllProducts.ContainsKey(productId))
                 {
                     LogWarning($"[IAP] Not found product with id <{productId}>. Make sure you have called GetProducts() first.");
                     return null;
                 }
 
-                return dicProducts[productId];
+                return AllProducts[productId];
             }
 
             public static List<string> GetActiveSubscriptions()
@@ -108,10 +128,7 @@ namespace Amanotes.Core
                     return null;
                 }
             }
-            
 
-            internal static Dictionary<string, ProductInfo> dicProducts = new Dictionary<string, ProductInfo>();
-            
             internal static bool InitModule()
             {
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
@@ -126,17 +143,6 @@ namespace Amanotes.Core
                 localData.Sync();
                 if (Config.iap.autoGetProducts) GetProducts();
             }
-            
-            internal static void ExecuteInNextFrame(Action method)
-            {
-                _instance.StartCoroutine(ExecuteRoutine(method));
-            }
-
-            static IEnumerator ExecuteRoutine(Action method)
-            {
-                yield return null;
-                method?.Invoke();
-            }
         }
         
         public partial class IAP //Persistent
@@ -431,10 +437,10 @@ namespace Amanotes.Core.Internal
 #if UNITY_EDITOR
             foreach (var p in ls)
             {
-                if (dicProducts.ContainsKey(p.id)) dicProducts[p.id] = p;
-                else dicProducts.Add(p.id, p);
+                if (AllProducts.ContainsKey(p.id)) AllProducts[p.id] = p;
+                else AllProducts.Add(p.id, p);
             }
-            onSuccess?.Invoke(dicProducts);
+            onSuccess?.Invoke(AllProducts);
             return;
 #else
             
@@ -473,7 +479,7 @@ namespace Amanotes.Core.Internal
         {
             if (getProdQueue.Count <= 0)
             {
-                onSuccess?.Invoke(dicProducts);
+                onSuccess?.Invoke(AllProducts);
                 return;
             }
             
@@ -489,10 +495,10 @@ namespace Amanotes.Core.Internal
                 {
                     foreach (var p in pList)
                     {
-                        if (dicProducts.ContainsKey(p.id)) dicProducts[p.id] = p;
-                        else dicProducts.Add(p.id, p);  
+                        if (AllProducts.ContainsKey(p.id)) AllProducts[p.id] = p;
+                        else AllProducts.Add(p.id, p);  
                     }
-                    ExecuteInNextFrame(GetNextProductsInQueue);
+                    GDKUtils.DelayCall(0f, GetNextProductsInQueue);
                 }, error => onFail?.Invoke(error));
             }
             catch (Exception e)
@@ -513,18 +519,6 @@ namespace Amanotes.Core.Internal
 
         public void Purchase(ProductInfo productInfo)
         {
-#if UNITY_EDITOR
-            if (AmaGDK.Config.iap.allPurchaseSuccessInEditor)
-            {
-                DoOnSuccess(new PurchaseSuccess
-                {
-                    productIds = new[] { productInfo.id },
-                    isSandbox = true
-                });
-                return;
-            }
-#endif
-
             if (!string.IsNullOrWhiteSpace(discountId))
             {
                 AmaGDK.IAP.Adapter?.PurchaseDiscount(productInfo, discountId, DoOnSuccess, DoOnFail);

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -17,17 +17,22 @@ namespace Amanotes.Core
     {
         public enum RemoteConfigSource
         {
-            EmbedConfig,
+            None,
             Cache,
+            Local,
             Internet
         }
 
+        partial class Event
+        {
+            public const string REMOTE_CONFIG_FETCH_COMPLETE = nameof(REMOTE_CONFIG_FETCH_COMPLETE);
+        }
+
         [Serializable]
         public partial class RemoteConfig //Public
         {
-            public static Action<bool> onFetchCompleted;
-            public static Dictionary<string, string> DictConfig => dictConfig;
-            public static RemoteConfigSource Source { private set; get; }
+            public static RemoteConfigSource Source { private set; get; } = RemoteConfigSource.None;
+            
             static bool? _cacheExisted = null;
             public static bool HasCache
             {
@@ -73,8 +78,8 @@ namespace Amanotes.Core
                             return (T)Convert.ChangeType(c.value, typeof(T));
                 }
 #endif
-                if (dictConfig.ContainsKey(key))
-                    return (T)Convert.ChangeType(dictConfig[key], typeof(T));
+                if (DictConfig.ContainsKey(key))
+                    return (T)Convert.ChangeType(DictConfig[key], typeof(T));
                 return defaultValue;
             }
 
@@ -85,7 +90,7 @@ namespace Amanotes.Core
 
             public static string GetConfigAsJsonString()
             {
-                return JsonUtils.DictionaryToJson(dictConfig);
+                return JsonUtils.DictionaryToJson(DictConfig);
             }
 
             public static void SetActiveEmbedConfig(string id)
@@ -105,7 +110,6 @@ namespace Amanotes.Core
             internal enum FetchState
             {
                 None,
-                CheckInternet,
                 Fetch,
                 SaveCache,
 
@@ -116,7 +120,9 @@ namespace Amanotes.Core
                 Fail
             }
 
-            static Dictionary<string, string> dictConfig = new Dictionary<string, string>();
+            public static Dictionary<string, string> DictConfig { get; private set; } = new Dictionary<string, string>();
+            
+            
             static string fileName = $"{nameof(RemoteConfig)}.kv";            
             static string base64Prefix = "base64:";
             const string VERSION_PREFIX = "version:";
@@ -125,28 +131,25 @@ namespace Amanotes.Core
                     ? Config.remoteConfig.embedRemoteConfig.version
                     : 1;
 
-            static FetchState _state = FetchState.None;
-            internal static FetchState State => _state;
+            static FetchState _fetchState = FetchState.None;
+            internal static FetchState fetchState => _fetchState;
 
             static readonly Dictionary<FetchState, Action[]> fetchSM = new Dictionary<FetchState, Action[]>
             {
-                { FetchState.None,                new Action[]{ CheckInternet}},
-                { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},
+                { FetchState.None,                new Action[]{ Fetch}},
                 { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},
                 { FetchState.SaveCache,           new Action[]{ SetDone }},
                 { FetchState.LoadCache,           new Action[]{ LoadEmbedConfig, SetDone}},
-                { FetchState.LoadEmbedConfig,      new Action[]{ SetFail, SetDone}}
+                { FetchState.LoadEmbedConfig,     new Action[]{ SetFail, SetDone}}
             };
 
             internal static RemoteConfigAdapter adapter;
-
-            internal static Action<bool> onAdapterInitCompleteCallback;
             
             internal static void NextState(bool result = true)
             {
-                if (!fetchSM.TryGetValue(_state, out var actions))
+                if (!fetchSM.TryGetValue(_fetchState, out var actions))
                 {
-                    LogWarning("[RemoteConfig] Invalid / Unsupported state: " + _state);
+                    LogWarning("[RemoteConfig] Invalid / Unsupported state: " + _fetchState);
                     return;
                 }
 
@@ -159,15 +162,37 @@ namespace Amanotes.Core
                 actions[result ? 1 : 0]();
             }
             
-            static void CheckInternet()
+            internal static void InitModule()
             {
-                _state = FetchState.CheckInternet;
-                NextState(Application.internetReachability != NetworkReachability.NotReachable);
+                adapter = Adapter2.GetAdapter<RemoteConfigAdapter>();
+            }
+
+            internal static void StartModule()
+            {
+                if (adapter != null) Fetch();
+            }
+
+            public static void SetFetchCompleteCallback(Action<RemoteConfigSource> callback)
+            {
+                
+                if (_fetchState == FetchState.Success || _fetchState == FetchState.Fail)
+                {
+                    callback?.Invoke(Source);
+                    return;
+                }
+                
+                dispatcher.AddListener(Event.REMOTE_CONFIG_FETCH_COMPLETE, callback, true);
             }
 
             static void Fetch()
             {
-                _state = FetchState.Fetch;
+                if (adapter == null)
+                {
+                    _fetchState = FetchState.None;
+                    return;
+                }
+                
+                _fetchState = FetchState.Fetch;
                 adapter.FetchConfig(HasCache, (isSuccess, result) =>
                 {
                     if (!isSuccess)
@@ -175,8 +200,8 @@ namespace Amanotes.Core
                         NextState(false);
                         return;
                     }
-
-                    dictConfig = result;
+                    
+                    DictConfig = result;
                     Source = RemoteConfigSource.Internet;
                     Log("[RemoteConfig] Load from the internet");
                     NextState(true);
@@ -187,13 +212,13 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
                 
-                _state = FetchState.SaveCache;
+                _fetchState = FetchState.SaveCache;
                 StringBuilder sb = new StringBuilder();
                 
                 //Add embedded remote config version to force load from embedded config after app update
                 sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");
 
-                foreach (var c in dictConfig)
+                foreach (var c in DictConfig)
                 {
                     sb.AppendLine($"{c.Key}\t{Encode(c.Value)}");
                 }
@@ -209,7 +234,7 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.RemoteConfig.LoadCache()");
                 
-                _state = FetchState.LoadCache;
+                _fetchState = FetchState.LoadCache;
 
                 if (!HasCache)
                 {
@@ -220,7 +245,7 @@ namespace Amanotes.Core
 
                 try
                 {
-                    dictConfig.Clear();
+                    DictConfig.Clear();
                     using (StreamReader sr = new StreamReader(GDKFileUtils.GetPath(fileName)))
                     {
                         //Check new app update
@@ -253,10 +278,10 @@ namespace Amanotes.Core
                             }
                             string key = line.Substring(0, idx);
                             string value = line.Substring(idx + 1);
-                            dictConfig.Add(key, Decode(value));
+                            DictConfig.Add(key, Decode(value));
                         }
                     }
-                    Source = RemoteConfigSource.Cache;
+                    Source = RemoteConfigSource.Local;
                     Log("[RemoteConfig] Load from cache");
                 }
                 catch (Exception ex)
@@ -274,7 +299,7 @@ namespace Amanotes.Core
 
             static void LoadEmbedConfig()
             {
-                _state = FetchState.LoadEmbedConfig;
+                _fetchState = FetchState.LoadEmbedConfig;
                 
                 if (_config.remoteConfig == null || _config.remoteConfig.embedRemoteConfig == null)
                 {
@@ -292,25 +317,24 @@ namespace Amanotes.Core
 
                 foreach (var item in config.items)
                 {
-                    dictConfig.Add(item.key, item.value);
+                    DictConfig.Add(item.key, item.value);
                 }
-                Source = RemoteConfigSource.EmbedConfig;
+                Source = RemoteConfigSource.Cache;
                 Log("[RemoteConfig] Load from embed asset");
                 NextState(true);
             }
 
             static void SetDone()
             {
-                _state = FetchState.Success;
-                onAdapterInitCompleteCallback(true);
-                onFetchCompleted?.Invoke(true);
+                _fetchState = FetchState.Success;
+                dispatcher.Dispatch(Event.REMOTE_CONFIG_FETCH_COMPLETE, Source);
             }
 
             static void SetFail()
             {
-                _state = FetchState.Fail;
-                onAdapterInitCompleteCallback(false);
-                onFetchCompleted?.Invoke(false);
+                _fetchState = FetchState.Fail;
+                Source = RemoteConfigSource.None;
+                dispatcher.Dispatch(Event.REMOTE_CONFIG_FETCH_COMPLETE, Source);
             }           
 
             static string Encode(string s)
@@ -338,19 +362,19 @@ namespace Amanotes.Core
         }
     }
 
-    public static class RemoteConfigExtension
-    {
-        public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
-        {
-            if (AmaGDK.RemoteConfig.State != AmaGDK.RemoteConfig.FetchState.None)
-            {
-                LogWarning($"[RemoteConfig] Current state {AmaGDK.RemoteConfig.State.ToString()}\nCannot start to initialize");
-                return;
-            }
-            AmaGDK.RemoteConfig.onAdapterInitCompleteCallback = onCompleteCallback;
-            AmaGDK.RemoteConfig.NextState();
-        }
-    }
+    // public static class RemoteConfigExtension
+    // {
+    //     public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
+    //     {
+    //         if (AmaGDK.RemoteConfig.fetchState != AmaGDK.RemoteConfig.FetchState.None)
+    //         {
+    //             LogWarning($"[RemoteConfig] Current state {AmaGDK.RemoteConfig.fetchState.ToString()}\nCannot start to initialize");
+    //             return;
+    //         }
+    //         
+    //         AmaGDK.RemoteConfig.NextState();
+    //     }
+    // }
 }
 
 namespace Amanotes.Core.Internal