com.amanotes.gdk 0.2.13 → 0.2.16

package/Runtime/AmaGDK.IAP.cs

@@ -0,0 +1,423 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Amanotes.Core.Internal;
+
+using static Amanotes.Core.AmaGDK.IAP;
+using static Amanotes.Core.Internal.Logging;
+
+namespace Amanotes.Core
+{
+    public partial class AmaGDK //In-app purchase
+    {
+        public partial class IAP //Public
+        {
+            public static bool IsVIP => !string.IsNullOrEmpty(localData.activeSubscriptionId);
+
+            public static string ActiveSubscriptionId => localData.activeSubscriptionId;
+
+            public static Dictionary<string, ProductInfo> AllProducts => dicProducts;
+
+            public static ISetupBuilder GetProducts()
+            {
+                var result = new SetupContext();
+                ExecuteInNextFrame(result.GetProducts);
+                return result;
+            }
+
+            public static IPurchaseBuilder Purchase(string productId)
+            {
+                var result = new PurchaseContext();
+                ExecuteInNextFrame(() => result.Purchase(productId));
+                return result;
+            }
+
+            public static IPurchaseBuilder RestorePurchase()
+            {
+                var result = new PurchaseContext();
+                ExecuteInNextFrame(result.RestorePurchase);
+                return result;
+            }
+
+            public static ProductInfo GetProduct(string productId)
+            {
+                if (!dicProducts.ContainsKey(productId))
+                {
+                    LogWarning($"[IAP] Not found product with id <{productId}>. Make sure you have called Setup() first.");
+                    return null;
+                }
+
+                return dicProducts[productId];
+            }
+
+            public static List<string> GetActiveSubscriptions()
+            {
+                return IAPAdapter?.GetActiveSubscriptions();
+            }
+
+            public static List<string> GetPurchasedProductIds()
+            {
+                return localData.purchasedProducts;
+            }
+
+            public static bool IsPurchased(string productId)
+            {
+                var purchasedProductIds = GetPurchasedProductIds();
+                return purchasedProductIds != null && purchasedProductIds.Contains(productId);
+            }
+        }
+
+        public partial class IAP //Internal
+        {
+            internal static IIAPAdapter adapter;
+            internal static readonly IAPData localData = new IAPData().LoadJsonFromFile();
+            internal static IIAPAdapter IAPAdapter
+            {
+                get
+                {
+                    if (adapter != null) return adapter;
+                    LogWarning("[IAP] Adapter is not available.");
+                    return null;
+                }
+            }
+            
+            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()
+            {
+                adapter = Adapter.GetSingleAdapter<IIAPAdapter>();
+                var adapterContext = adapter as AdapterContext;
+                
+                if (adapterContext == null) return;
+                _adapterConfig = adapterContext?.GetAdapterConfig<IAPAdapterConfig>();
+
+                if (!adapterContext.IsReady) return;
+                localData.Sync();
+                if (_adapterConfig.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
+        {
+            [Serializable]
+            internal class IAPData : IJsonFile
+            {
+                public string activeSubscriptionId;
+                public List<string> purchasedProducts;
+
+                public void Sync()
+                {
+                    activeSubscriptionId = adapter.GetActiveSubscriptionId();
+                    purchasedProducts = adapter.GetPurchasedProducts();
+                    this.SaveJsonToFile();
+                }
+            }
+        }
+    }
+    
+    public enum ProductType
+    {
+        Subscription,
+        Consumable,
+        NonConsumable
+    }
+    
+    [Serializable]
+    public class ProductInfo
+    {
+        public string id;
+        public ProductType type;
+        [HideInInspector] public string title;
+        [HideInInspector] public string description;
+        [HideInInspector] public float price;
+        [HideInInspector] public string currencyCode;
+        [HideInInspector] public string[] discountIds;
+    }
+
+    public class PurchaseSuccess
+    {
+        public string productId;
+        public string transactionId;
+        public string receipt;
+        public string purchaseToken;
+    }
+
+    public class PurchaseError
+    {
+        public string productId;
+        public bool isCancelled;
+        public string error;
+
+        public PurchaseError()
+        {
+        }
+        
+        public PurchaseError(string errorMessage)
+        {
+            error = errorMessage;
+        }
+    }
+
+    public static class IAPExtension
+    {
+        //GetProducts extensions
+        public static ISetupBuilder SetSubscriptions(this ISetupBuilder sc, params string[] subs)
+        {
+            if (sc == null) return null;
+
+            foreach (var pId in subs)
+            {
+                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.Subscription });
+            }
+            return sc;
+        }
+        
+        public static ISetupBuilder SetConsumables(this ISetupBuilder sc, params string[] cons)
+        {
+            if (sc == null) return null;
+
+            foreach (var pId in cons)
+            {
+                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.Consumable });
+            }
+            return sc;
+        }
+        
+        public static ISetupBuilder SetNonComsumables(this ISetupBuilder sc, params string[] nons)
+        {
+            if (sc == null) return null;
+
+            foreach (var pId in nons)
+            {
+                AdapterConfig?.products.Add(new ProductInfo() { id = pId, type = ProductType.NonConsumable });
+            }
+            return sc;
+        }
+
+        public static ISetupBuilder OnSuccess(this ISetupBuilder sc, Action<Dictionary<string, ProductInfo>> callback)
+        {
+            if (sc == null) return null;
+
+            var setupContext = sc as SetupContext;
+            setupContext.onSuccess = callback; 
+            return sc;
+        }
+        
+        public static ISetupBuilder OnFail(this ISetupBuilder sc, Action<string> callback)
+        {
+            if (sc == null) return null;
+
+            var setupContext = sc as SetupContext;
+            setupContext.onFail = callback; 
+            return sc;
+        }
+
+        //Purchase extensions
+        public static IPurchaseBuilder OnSuccess(this IPurchaseBuilder pb, Action<PurchaseSuccess> callback)
+        {
+            if (pb == null) return null;
+
+            var purchaseContext = pb as PurchaseContext;
+            purchaseContext.onSuccess = callback; 
+            return pb;
+        }
+        
+        public static IPurchaseBuilder OnFail(this IPurchaseBuilder pb, Action<PurchaseError> callback)
+        {
+            if (pb == null) return null;
+
+            var purchaseContext = pb as PurchaseContext;
+            purchaseContext.onFail = callback; 
+            return pb;
+        }
+
+        public static IPurchaseBuilder SetDiscount(this IPurchaseBuilder pb, string discountId)
+        {
+            if (pb == null) return null;
+
+            var purchaseContext = pb as PurchaseContext;
+            purchaseContext.discountId = discountId; 
+            return pb;
+        }
+    }
+}
+
+namespace Amanotes.Core.Internal
+{
+    [Serializable]
+    public class IAPAdapterConfig
+    {
+        [SerializeField] internal bool allPurchaseSuccessInEditor;
+        [SerializeField] internal List<ProductInfo> products;
+        [SerializeField] internal bool autoGetProducts;
+    }
+    
+    public interface ISetupBuilder { }
+            
+    public class SetupContext: ISetupBuilder
+    {
+        public Action<Dictionary<string, ProductInfo>> onSuccess;
+        public Action<string> onFail;
+
+        private readonly Queue<(List<string> pIds, ProductType pType)> getProdQueue = new Queue<(List<string> pIds, ProductType pType)>();
+
+        public void GetProducts()
+        {
+            if (AdapterConfig?.products.Count == 0)
+            {
+                LogWarning("There is no IAP product");
+                return;
+            }                
+            
+            getProdQueue.Clear();
+            var subs = new List<string>();
+            var cons = new List<string>();
+            var nons = new List<string>();
+            
+            foreach (var p in AdapterConfig.products)
+            {
+                switch (p.type)
+                {
+                    case ProductType.Subscription:
+                        subs.Add(p.id);
+                        break;
+                    case ProductType.Consumable:
+                        cons.Add(p.id);
+                        break;
+                    case ProductType.NonConsumable:
+                        nons.Add(p.id);
+                        break;
+                    default:
+                        LogWarning($"[IAP] Product <{p.id}> has not specified ProductType.");
+                        break;
+                }
+            }
+            
+            getProdQueue.Enqueue((subs, ProductType.Subscription));
+            getProdQueue.Enqueue((cons, ProductType.Consumable));
+            getProdQueue.Enqueue((nons, ProductType.NonConsumable));
+            GetNextProductsInQueue();
+        }
+
+        void GetNextProductsInQueue()
+        {
+            if (getProdQueue.Count <= 0)
+            {
+                onSuccess?.Invoke(dicProducts);
+                return;
+            }
+            
+            var item = getProdQueue.Dequeue();
+            GetProductsByType(item.pIds, item.pType);
+        }
+        
+        void GetProductsByType(List<string> lsProduct, ProductType type)
+        {
+            try
+            {
+                IAPAdapter?.GetProducts(lsProduct.ToArray(), type, (pList) =>
+                {
+                    foreach (var pI in pList)
+                    {
+                        dicProducts.Add(pI.id, pI);    
+                    }
+                    ExecuteInNextFrame(GetNextProductsInQueue);
+                });
+            }
+            catch (Exception e)
+            {
+                LogWarning($"[IAP] Error on getting products of type <{type}>. Error detail:\n{e.Message}");
+                onFail?.Invoke(e.Message);
+                throw;
+            }
+        }
+    }
+    
+    public interface IPurchaseBuilder { }
+
+    public class PurchaseContext : IPurchaseBuilder
+    {
+        public Action<PurchaseSuccess> onSuccess;
+        public Action<PurchaseError> onFail;
+        public string discountId;
+
+        public void Purchase(string productId)
+        {
+            if (!dicProducts.ContainsKey(productId))
+            {
+                LogWarning($"[IAP] Product {productId} is not found");
+                return;
+            }
+            
+#if UNITY_EDITOR
+            if (AdapterConfig.allPurchaseSuccessInEditor)
+            {
+                DoOnSuccess(new PurchaseSuccess
+                {
+                    productId = productId
+                });
+                return;
+            }
+#endif
+
+            if (!string.IsNullOrWhiteSpace(discountId))
+            {
+                IAPAdapter?.PurchaseDiscount(productId, dicProducts[productId].type, discountId, DoOnSuccess, DoOnFail);
+                return;
+            }
+
+            IAPAdapter?.Purchase(productId, dicProducts[productId].type, DoOnSuccess, DoOnFail);
+        }
+
+        public void RestorePurchase()
+        {
+            IAPAdapter?.RestorePurchase(DoOnSuccess, DoOnFail);
+        }
+
+        void DoOnSuccess(PurchaseSuccess success)
+        {
+            localData.Sync();
+            onSuccess?.Invoke(success);
+        }
+
+        void DoOnFail(PurchaseError error)
+        {
+            onFail?.Invoke(error);
+        }
+    }
+
+    public interface IIAPAdapter
+    {
+        void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onComplete);
+        void Purchase(string productId, ProductType productType, Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
+        void PurchaseDiscount(string productId, ProductType productType, string discountId, Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
+        void RestorePurchase(Action<PurchaseSuccess> onSuccess, Action<PurchaseError> onFail);
+        List<string> GetActiveSubscriptions();
+        List<string> GetPurchasedProducts();
+        string GetActiveSubscriptionId();
+    }
+}

package/Runtime/AmaGDK.IAP.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a49a40b8b04e3450b9dac915b22533de
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -16,8 +16,7 @@ namespace Amanotes.Core
     {
         public enum RemoteConfigSource
         {
-            DefaultAsset,
-            DefaultFile,
+            EmbedConfig,
             Cache,
             Internet
         }
@@ -26,7 +25,7 @@ namespace Amanotes.Core
         public partial class RemoteConfig //Public
         {
             public static Action<bool> onFetchCompleted;
-            public static Dictionary<string, string> DictConfig { get { return dictConfig; } }
+            public static Dictionary<string, string> DictConfig => dictConfig;
             public static RemoteConfigSource Source { private set; get; }
             static bool? _cacheExisted = null;
             public static bool HasCache
@@ -64,6 +63,15 @@ namespace Amanotes.Core
 
             public static T Get<T>(string key, T defaultValue = default(T))
             {
+#if UNITY_EDITOR
+                //Override value in editor environment
+                if (adapterConfig.embedRemoteConfig.overrideInEditor)
+                {
+                    foreach (var c in adapterConfig.embedRemoteConfig.overrideConfig)
+                        if (c.key == key)
+                            return (T)Convert.ChangeType(c.value, typeof(T));
+                }
+#endif
                 if (dictConfig.ContainsKey(key))
                     return (T)Convert.ChangeType(dictConfig[key], typeof(T));
                 return defaultValue;
@@ -78,6 +86,13 @@ namespace Amanotes.Core
             {
                 return JsonUtils.DictionaryToJson(dictConfig);
             }
+
+            public static void SetActiveEmbedConfig(string id)
+            {
+                if (adapterConfig == null || adapterConfig.embedRemoteConfig == null)
+                    LogWarning("[RemoteConfig] No embed remote config available");
+                adapterConfig.embedRemoteConfig.SetActiveConfig(id);
+            }
         }
 
         public partial class RemoteConfig //Internal
@@ -91,7 +106,7 @@ namespace Amanotes.Core
                 SaveCache,
 
                 LoadCache,
-                LoadDefaultAsset,
+                LoadEmbedConfig,
 
                 Success,
                 Fail
@@ -100,9 +115,15 @@ namespace Amanotes.Core
             static Dictionary<string, string> dictConfig = new Dictionary<string, string>();
             static string fileName = $"{nameof(RemoteConfig)}.kv";            
             static string base64Prefix = "base64:";
+            const string VERSION_PREFIX = "version:";
+            static int EmbedVersion =>
+                adapterConfig != null && adapterConfig.embedRemoteConfig != null
+                    ? adapterConfig.embedRemoteConfig.version
+                    : 1;
 
             static FetchState _state = FetchState.None;
-            internal static FetchState State { get { return _state; } }
+            internal static FetchState State => _state;
+
             static readonly Dictionary<FetchState, Action[]> fetchSM = new Dictionary<FetchState, Action[]>
             {
                 { FetchState.None,                new Action[]{ ResolveDependency }},
@@ -110,8 +131,8 @@ namespace Amanotes.Core
                 { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},
                 { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},
                 { FetchState.SaveCache,           new Action[]{ SetDone }},
-                { FetchState.LoadCache,           new Action[]{ LoadDefaultAsset, SetDone}},
-                { FetchState.LoadDefaultAsset,    new Action[]{ SetFail, SetDone}}
+                { FetchState.LoadCache,           new Action[]{ LoadEmbedConfig, SetDone}},
+                { FetchState.LoadEmbedConfig,      new Action[]{ SetFail, SetDone}}
             };
 
             internal static IRemoteConfig adapter;
@@ -177,27 +198,14 @@ namespace Amanotes.Core
             {
                 _state = FetchState.SaveCache;
                 StringBuilder sb = new StringBuilder();
-
-                
-                bool needUpdateDefault = Application.isEditor && adapterConfig.autoUpdateDefaultValue;
-                List<KeyValue> list = needUpdateDefault ? new List<KeyValue>() : null;
                 
+                //Add embedded remote config version to force load from embedded config after app update
+                sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");
+
                 foreach (var c in dictConfig)
                 {
                     sb.AppendLine($"{c.Key}\t{Encode(c.Value)}");
-                    if (!needUpdateDefault) continue;
-                    list.Add(new KeyValue() { key = c.Key, value = c.Value });
-                }
-                
-                #if UNITY_EDITOR
-                if (needUpdateDefault)
-                {
-                    list.Sort((item1, item2) => string.Compare(item1.key, item2.key, StringComparison.Ordinal));
-                    adapterConfig.defaultValue = list.ToArray();
-                    EditorUtility.SetDirty(_config);
-                    Log($"[RemoteConfig] Updated default remote config!");
                 }
-                #endif
                 
                 string filePath = GDKFileUtils.GetPath(fileName);
                 GDKFileUtils.Save(filePath, sb.ToString());
@@ -220,15 +228,32 @@ namespace Amanotes.Core
                     dictConfig.Clear();
                     using (StreamReader sr = new StreamReader(GDKFileUtils.GetPath(fileName)))
                     {
+                        //Check new app update
+                        string firstLine = sr.ReadLine();
+                        if (firstLine == null)
+                        {
+                            NextState(false);
+                            return;
+                        }
+                        if (ShouldClearCache(firstLine))
+                        {
+                            GDKFileUtils.Delete(fileName);
+                            string oldVersion = firstLine.StartsWith(VERSION_PREFIX) ? firstLine : "<none>";
+                            Log($"[RemoteConfig] Cached remote config cleared due to embed version changed:\n{oldVersion} -> {EmbedVersion}");
+                            NextState(false);
+                            return;
+                        }
+                        
+                        //Read key-value
                         string line;
-                        int lineIdx = 0;
+                        int lineNo = 1;
                         while ((line = sr.ReadLine()) != null)
                         {
-                            lineIdx++;
+                            lineNo++;
                             var idx = line.IndexOf('\t');
                             if (idx == -1)
                             {
-                                LogWarning($"[RemoteConfig] Cannot get (key, value) at line {lineIdx} of cache");
+                                LogWarning($"[RemoteConfig] Cannot get (key, value) at line {lineNo} of cache. Content:\n<{line}>");
                                 continue;
                             }
                             string key = line.Substring(0, idx);
@@ -250,24 +275,30 @@ namespace Amanotes.Core
                 NextState(true);
             }
 
-            static void LoadDefaultAsset()
+            static void LoadEmbedConfig()
             {
-                _state = FetchState.LoadDefaultAsset;
+                _state = FetchState.LoadEmbedConfig;
+                
+                if (adapterConfig == null || adapterConfig.embedRemoteConfig == null)
+                {
+                    NextState(false);
+                    return;
+                }
 
-                var defaultValue = ((AdapterContext)adapter).GetAdapterConfig<RemoteConfigConfig>().defaultValue;
+                var config = adapterConfig.embedRemoteConfig.ActiveConfig;
 
-                if (defaultValue.Length == 0)
+                if (config == null || config.items.Length == 0)
                 {
                     NextState(false);
                     return;
                 }
 
-                foreach (var item in defaultValue)
+                foreach (var item in config.items)
                 {
                     dictConfig.Add(item.key, item.value);
                 }
-                Source = RemoteConfigSource.DefaultAsset;
-                Log("[RemoteConfig] Load from default asset");
+                Source = RemoteConfigSource.EmbedConfig;
+                Log("[RemoteConfig] Load from embed asset");
                 NextState(true);
             }
 
@@ -301,6 +332,12 @@ namespace Amanotes.Core
                 s = s.Remove(0, base64Prefix.Length);
                 return Encoding.UTF8.GetString(Convert.FromBase64String(s));
             }
+
+            static bool ShouldClearCache(string cacheVersion)
+            {
+                if (!cacheVersion.StartsWith(VERSION_PREFIX)) return true;
+                return cacheVersion != VERSION_PREFIX + EmbedVersion;
+            }
         }
     }
 
@@ -324,19 +361,12 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class RemoteConfigConfig
     {
-        public bool autoUpdateDefaultValue;
-        public KeyValue[] defaultValue;
+        [SerializeField]
+        internal EmbedRemoteConfigAsset embedRemoteConfig;
         public float firstFetchTimeOutInSeconds = 10;
         public float defaultTimeOutInSeconds = 3;
     }
-
-    [Serializable]
-    public class KeyValue
-    {
-        public string key;
-        public string value;
-    }
-
+    
     public interface IRemoteConfig
     {
         void ResolveDependencies(Action<bool> onComplete);

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.13";
+        public const string VERSION = "0.2.14";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -109,6 +109,7 @@ namespace Amanotes.Core
             AmaPassport.Init();
             Analytics.Init();
             Ads.Init();
+            IAP.Init();
 
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
@@ -242,7 +243,7 @@ namespace Amanotes.Core
         public void ChangeDevMode()
         {
             string variableName = "GDK_HOME";
-            string output = RunShellCommand($"source ~/.zshrc && echo ${variableName}");
+            string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
             output = output.Trim();
 
             if (string.IsNullOrEmpty(output))