com.amanotes.gdk 0.2.19 → 0.2.20

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.2.20 - 2023-10-05]
+### Update RevenueCat 5.3.0
+
 ## [0.2.19 - 2023-09-12]
 ### Add `ama_device_id` to all events
 

package/Editor/UserProfile.PostBuild.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1ea28b311cdc648ef9cd322abd1797b5
+guid: 293341d9acee543a8b692edae57f0aa8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Editor/UserProfileDependencies.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2e155e09a97324557b3803886b0dcfd7
+guid: 55c96ab69ed9b471ebc383f02b0e4538
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Packages/{RevenueCatAdapter_v5.1.3.unitypackage.meta → RevenueCatAdapter_v5.3.0.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec14a271afdcc4c72b0d1305fbd9db8c
+guid: 7549d4283e5844b68b594b1dcb4add02
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/AmaGDK.IAP.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using UnityEngine;
 using Amanotes.Core.Internal;
 
@@ -14,15 +15,21 @@ namespace Amanotes.Core
         public partial class IAP //Public
         {
             public static bool IsVIP => !string.IsNullOrEmpty(localData.activeSubscriptionId);
-
             public static string ActiveSubscriptionId => localData.activeSubscriptionId;
-
+            public static string SubscriptionPeriodType => localData.subscriptionPeriodType;
+            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 ISetupBuilder GetProducts()
+            private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
+            
+            public static ISetupBuilder GetProducts(bool appendExistingList = false)
             {
-                IAPExtension.isCleanUpConfig = false;
-                dicProducts.Clear();
+                if (!appendExistingList)
+                {
+                    IAPExtension.isCleanUpConfig = false;
+                    dicProducts.Clear();    
+                }
                 var result = new SetupContext();
                 ExecuteInNextFrame(result.GetProducts);
                 return result;
@@ -31,7 +38,13 @@ namespace Amanotes.Core
             public static IPurchaseBuilder Purchase(string productId)
             {
                 var result = new PurchaseContext();
-                ExecuteInNextFrame(() => result.Purchase(productId));
+                if (!dicProducts.ContainsKey(productId))
+                {
+                    LogWarning($"[IAP] Product {productId} is not found");
+                    result.onFail?.Invoke(new PurchaseError($"Product {productId} is not found"));
+                    return result;
+                }
+                ExecuteInNextFrame(() => result.Purchase(dicProducts[productId]));
                 return result;
             }
 
@@ -46,7 +59,7 @@ namespace Amanotes.Core
             {
                 if (!dicProducts.ContainsKey(productId))
                 {
-                    LogWarning($"[IAP] Not found product with id <{productId}>. Make sure you have called Setup() first.");
+                    LogWarning($"[IAP] Not found product with id <{productId}>. Make sure you have called GetProducts() first.");
                     return null;
                 }
 
@@ -73,6 +86,13 @@ namespace Amanotes.Core
             {
                 return Adapter?.GetPurchaseHistory();
             }
+
+            public static DateTime? GetLastPurchaseDate(string productId)
+            {
+                var product = GetProduct(productId);
+                if (product == null) return null;
+                return Adapter?.GetLastPurchaseDate(product.productAndPlanId);
+            }
         }
 
         public partial class IAP //Internal
@@ -134,12 +154,68 @@ namespace Amanotes.Core
             internal class IAPData : IJsonFile
             {
                 public string activeSubscriptionId;
+                public string subscriptionPeriodType;
+                public string subscriptionLastPurchaseDate;
+                public string subscriptionExpiredDate;
+                public string unsubscribedDate;
                 public List<string> purchasedProducts;
+                
+                private DateTime? _subscriptionLastPurchaseDate;
+                public DateTime? SubscriptionLastPurchaseDate
+                {
+                    get
+                    {
+                        if (_subscriptionLastPurchaseDate != null) return _subscriptionLastPurchaseDate;
+                        if (DateTime.TryParseExact(subscriptionLastPurchaseDate, DATE_FORMAT,
+                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
+                        {
+                            _subscriptionLastPurchaseDate = pd;
+                        }
+                        return _subscriptionLastPurchaseDate;
+                    }
+                }
+                
+                private DateTime? _subscriptionExpiredDate;
+                public DateTime? SubscriptionExpiredDate
+                {
+                    get
+                    {
+                        if (_subscriptionExpiredDate != null) return _subscriptionExpiredDate;
+                        if (DateTime.TryParseExact(subscriptionExpiredDate, DATE_FORMAT,
+                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
+                        {
+                            _subscriptionExpiredDate = pd;
+                        }
+                        return _subscriptionExpiredDate;
+                    }
+                }
+                
+                private DateTime? _unsubscribedDate;
+                public DateTime? UnsubscribedDate
+                {
+                    get
+                    {
+                        if (_unsubscribedDate != null) return _unsubscribedDate;
+                        if (DateTime.TryParseExact(unsubscribedDate, DATE_FORMAT,
+                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
+                        {
+                            _unsubscribedDate = pd;
+                        }
+                        return _unsubscribedDate;
+                    }
+                }
 
                 public void Sync()
                 {
                     activeSubscriptionId = Adapter?.GetActiveSubscriptionId();
+                    subscriptionPeriodType = Adapter?.GetSubscriptionPeriodType();
                     purchasedProducts = Adapter?.GetPurchasedProducts();
+                    _subscriptionLastPurchaseDate = Adapter?.GetSubscriptionLastPurchaseDate();
+                    subscriptionLastPurchaseDate = _subscriptionLastPurchaseDate?.ToString(DATE_FORMAT);
+                    _subscriptionExpiredDate = Adapter?.GetSubscriptionExpiredDate();
+                    subscriptionExpiredDate = _subscriptionExpiredDate?.ToString(DATE_FORMAT);
+                    _unsubscribedDate = Adapter?.GetUnsubscribedDate();
+                    unsubscribedDate = _unsubscribedDate?.ToString(DATE_FORMAT);
                     this.SaveJsonToFile();
                 }
             }
@@ -158,6 +234,7 @@ namespace Amanotes.Core
     {
         public string id;
         public ProductType type;
+        [HideInInspector] public string productAndPlanId;
         [HideInInspector] public string title;
         [HideInInspector] public string description;
         [HideInInspector] public float price;
@@ -186,8 +263,9 @@ namespace Amanotes.Core
         {
         }
         
-        public PurchaseError(string errorMessage)
+        public PurchaseError(string errorMessage, string productId = null)
         {
+            this.productId = productId;
             error = errorMessage;
         }
     }
@@ -241,9 +319,11 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
+            var ls = AdapterConfig?.products;
+            if (ls == null) return null;
             foreach (var pId in subs)
             {
-                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.Subscription });
+                ls.Add(new ProductInfo { id = pId, type = ProductType.Subscription });
             }
             return sc;
         }
@@ -252,9 +332,11 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
+            var ls = AdapterConfig?.products;
+            if (ls == null) return null;
             foreach (var pId in cons)
             {
-                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.Consumable });
+                ls.Add(new ProductInfo { id = pId, type = ProductType.Consumable });
             }
             return sc;
         }
@@ -263,9 +345,11 @@ namespace Amanotes.Core
         {
             if (sc == null) return null;
             ClearOldProductConfig();
+            var ls = AdapterConfig?.products;
+            if (ls == null) return null;
             foreach (var pId in nons)
             {
-                AdapterConfig?.products.Add(new ProductInfo { id = pId, type = ProductType.NonConsumable });
+                ls.Add(new ProductInfo { id = pId, type = ProductType.NonConsumable });
             }
             return sc;
         }
@@ -339,18 +423,29 @@ namespace Amanotes.Core.Internal
 
         public void GetProducts()
         {
-            if (AdapterConfig?.products.Count == 0)
+            var ls = AdapterConfig?.products;
+            if (ls == null || ls.Count == 0)
             {
                 LogWarning("There is no IAP product");
                 return;
-            }                
+            }
+            
+#if UNITY_EDITOR
+            foreach (var p in ls)
+            {
+                if (dicProducts.ContainsKey(p.id)) dicProducts[p.id] = p;
+                else dicProducts.Add(p.id, p);
+            }
+            onSuccess?.Invoke(dicProducts);
+            return;
+#endif
             
             getProdQueue.Clear();
             var subs = new List<string>();
             var cons = new List<string>();
             var nons = new List<string>();
             
-            foreach (var p in AdapterConfig.products)
+            foreach (var p in ls)
             {
                 switch (p.type)
                 {
@@ -393,9 +488,10 @@ namespace Amanotes.Core.Internal
             {
                 AmaGDK.IAP.Adapter?.GetProducts(lsProduct.ToArray(), type, (pList) =>
                 {
-                    foreach (var pI in pList)
+                    foreach (var p in pList)
                     {
-                        dicProducts.Add(pI.id, pI);    
+                        if (dicProducts.ContainsKey(p.id)) dicProducts[p.id] = p;
+                        else dicProducts.Add(p.id, p);  
                     }
                     ExecuteInNextFrame(GetNextProductsInQueue);
                 }, error => onFail?.Invoke(error));
@@ -416,20 +512,14 @@ namespace Amanotes.Core.Internal
         public Action<PurchaseError> onFail;
         public string discountId;
 
-        public void Purchase(string productId)
+        public void Purchase(ProductInfo productInfo)
         {
-            if (!dicProducts.ContainsKey(productId))
-            {
-                LogWarning($"[IAP] Product {productId} is not found");
-                return;
-            }
-            
 #if UNITY_EDITOR
             if (AdapterConfig.allPurchaseSuccessInEditor)
             {
                 DoOnSuccess(new PurchaseSuccess
                 {
-                    productIds = new[] { productId },
+                    productIds = new[] { productInfo.id },
                     isSandbox = true
                 });
                 return;
@@ -438,11 +528,11 @@ namespace Amanotes.Core.Internal
 
             if (!string.IsNullOrWhiteSpace(discountId))
             {
-                AmaGDK.IAP.Adapter?.PurchaseDiscount(productId, dicProducts[productId].type, discountId, DoOnSuccess, DoOnFail);
+                AmaGDK.IAP.Adapter?.PurchaseDiscount(productInfo, discountId, DoOnSuccess, DoOnFail);
                 return;
             }
 
-            AmaGDK.IAP.Adapter?.Purchase(productId, dicProducts[productId].type, DoOnSuccess, DoOnFail);
+            AmaGDK.IAP.Adapter?.Purchase(productInfo, DoOnSuccess, DoOnFail);
         }
 
         public void RestorePurchase()
@@ -465,12 +555,17 @@ namespace Amanotes.Core.Internal
     public interface IIAPAdapter
     {
         void GetProducts(string[] productIds, ProductType productType, Action<ProductInfo[]> onSuccess = null, Action<string> onFail = null);
-        void Purchase(string productId, ProductType productType, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
-        void PurchaseDiscount(string productId, ProductType productType, string discountId, Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> 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);
     }
-}
+}

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.19";
+        public const string VERSION = "0.2.20";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -62,7 +62,7 @@ namespace Amanotes.Core
             }
 
             float time = 0;
-            float timeout = 3;
+            float timeout = 10;
 
             var counter = 0;
             const int INIT_TOLERANCE = 10 * 60;

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.java.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 703161d03cf9f4dc9a95125c44430ebe
+guid: abf1efb2d0f644148901211ecbce462f
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/UserProfile/Plugins/Android.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9aa069386a2746d2affa79fe86ce7a6
+guid: 0d9bff6463df741a099d04c5694bc689
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.19",
+    "version": "0.2.20",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",