com.amanotes.gdk 0.2.48 → 0.2.50

package/Runtime/AmaGDK.Analytics.cs

@@ -26,6 +26,7 @@ namespace Amanotes.Core
                 public string funnelSignature;
                 public bool accumulated;
                 public bool withinSession;
+                public bool doNotIncreaseCounter;
 
                 public bool overrideConfig;
                 public HashSet<string> ignoreAdapterIds = new HashSet<string>();
@@ -241,11 +242,15 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
             internal static readonly SessionStat sessionStat = new SessionStat();
-            internal static AnalyticsAdapter primaryAdapter;
-            internal static readonly HashSet<string> blackListPrefixes = new HashSet<string>() {
-                "firebase_", "google_", "ga_"
+
+            internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
+            {
+                { "firebase_", "frb_" },
+                { "google_", "ggl_" },
+                { "ga_", "gga_" }
             };
-            internal static readonly HashSet<string> blackListEvents = new HashSet<string>()
+
+            internal static readonly HashSet<string> reservedEvents = new HashSet<string>()
             {
                 "ad_activeview",
                 "ad_click",
@@ -284,8 +289,6 @@ namespace Amanotes.Core
             {
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter2.GetAllAdapter<AnalyticsAdapter>());
-                if (listAdapters.Count != 0)
-                    primaryAdapter = listAdapters.Find(a => a.adapterId == AdapterID.FIREBASE_ANALYTICS) ?? listAdapters[0];
             }
 
             internal static void StartModule()
@@ -320,19 +323,34 @@ namespace Amanotes.Core
                         UpdateAccumulatedCount(eventData, countInSession, totalCount);
                     }
 
-                    eventData.AddParam("ama_device_id", User.AmaDeviceId);
+                    if (!eventData.parameters.ContainsKey("ama_device_id"))
+                        eventData.AddParam("ama_device_id", User.AmaDeviceId);
                     
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     if (config.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-                    if (showAnalyticsLog) Debug.Log($"AmaGDK | [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                    if (showAnalyticsLog)
+                    {
+                        Debug.Log($"AmaGDK [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                    }
                     
                     config.quality.CheckEventQuality(eventData.eventName, eventData.parameters);
 
                     var inUseAdapterIDs = new List<string>();
                     foreach (AnalyticsAdapter m in listAdapters)
                     {
-                        if (IsAdapterForbidden(m, eventData)) continue;
+                        if (eventData.overrideConfig)
+                        {
+                            // IMPORTANT NOTE:
+                            //
+                            // Once set overrideConfig, we should skip the adapter config completely!!!
+                            //
+                            if (eventData.IsAdapterForbidden(m.adapterId)) continue;
+                        }
+                        else // Do not remove else
+                        {
+                            if (m.IsForbidden(eventData.eventName)) continue;
+                        }
                         m.LogEvent(eventNameToSend, eventData.parameters);
                         inUseAdapterIDs.Add(m.adapterId);
                     }
@@ -356,35 +374,18 @@ namespace Amanotes.Core
                 }
 
                 int.TryParse(eventData.parameters[ACCUMULATED_COUNT].ToString(), out int oriAccCount);
-                if (oriAccCount == countByGDK)
-                {
-                    eventData.AddParam(ACCUMULATED_COUNT, countByGDK);
-                }
-                else
+                if (oriAccCount != countByGDK)
                 {
                     LogWarning($"[Analytics] event <{eventData.eventName}> has difference in accumulated count. Original count: {oriAccCount}. AmaGDK count: {countByGDK}");
+                    if (Config.analytics.migrateAccumulatedCount && !eventData.withinSession)
+                    {
+                        Log($"[Analytics] Update event count of event <{eventData.eventName}> from {countByGDK} to {oriAccCount}");
+                        eventData.EventDetail.totalCount = oriAccCount;
+                        localData._dirty = true;
+                    }
                 }
             }
 
-            internal static bool IsAdapterForbidden(AnalyticsAdapter adapter, EventParams eventData)
-            {
-                if (adapter == null) return false;
-                if (eventData.overrideConfig)
-                {
-                    // IMPORTANT NOTE:
-                    //
-                    // Once set overrideConfig, we should skip the adapter config completely!!!
-                    //
-                    if (eventData.IsAdapterForbidden(adapter.adapterId)) return true;
-                }
-                else // Do not remove else
-                {
-                    if (adapter.IsForbidden(eventData.eventName)) return true;
-                }
-
-                return false;
-            }
-
             internal static string GetEventNameToSend(string eventName, int countInSession, int totalCount)
             {
                 if (!sendAtCount.TryGetValue(eventName, out var config)) return eventName;
@@ -401,14 +402,14 @@ namespace Amanotes.Core
                     StringBuilder sb = tmpWarningSB;
                     sb.Clear();
                     NormalizeKeyString(ref eventName, sb, dryRun);
-                    if (blackListEvents.Contains(eventName))
+                    if (reservedEvents.Contains(eventName))
                         sb.AppendLine($" - EventName <{eventName}> is reserved and should not be used");
                     if (sb.Length > 0 && dryRun) LogWarningOnce($"Warning for event name <{eventName}>:\n{sb}", $"NormalizeEventName<{eventName}>");    
                 }
                 Profiler.EndSample();
             }
 
-            internal static void NormalizeKeyString(ref string key, StringBuilder warningLog, bool dryRun = false)
+            internal static void NormalizeKeyString(ref string key, StringBuilder warningLog, bool dryRun)
             {
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
                 {
@@ -418,47 +419,53 @@ namespace Amanotes.Core
                         Profiler.EndSample();
                         return;
                     }
+
+                    var sb = new StringBuilder();
                     
                     string normalizedString = key.Trim()
                         .Replace(' ', '_')
                         .Replace('-', '_');
-
                     if (key != normalizedString)
                     {
-                        if (!dryRun)
-                        {
-                            key = normalizedString;
-                        } else
-                        {
-                            warningLog.AppendLine($" - Malformed name (should not contains <space> or <dash>): <{key}>");
-                        }
+                        sb.Append($" - Malformed name (should not contains <space> or <dash>): <{key}>");    
                     }
 
                     var r = new Regex("^[a-zA-Z0-9_]*$");
                     if (!r.IsMatch(normalizedString))
                     {
-                        warningLog.AppendLine($" - Name may only contain alphanumeric characters and underscores");
+                        normalizedString = Regex.Replace(normalizedString, "[^a-zA-Z0-9_]", "");
+                        sb.Append(" - Name may only contain alphanumeric characters and underscores");
                     }
 
-                    if (!char.IsLetter(key[0]))
+                    if (!char.IsLetter(normalizedString[0]))
                     {
-                        warningLog.AppendLine($" - Name must start with a letter: <{key}> ");
+                        normalizedString = "E" + normalizedString;
+                        sb.Append($" - Name must start with a letter: <{key}> ");
                     }
 
-                    foreach (var prefix in blackListPrefixes)
+                    foreach (var prefix in reservedPrefixes)
                     {
-                        if (!normalizedString.StartsWith(prefix)) continue;
-                        warningLog.AppendLine($" - <{key}> starts with reserved prefix <{prefix}>");
+                        if (!normalizedString.StartsWith(prefix.Key)) continue;
+                        normalizedString = prefix.Value + normalizedString.Remove(0, prefix.Key.Length);
+                        sb.AppendLine($" - <{key}> starts with reserved prefix <{prefix}>");
                     }
 
-                    if (key.Length > 40)
+                    if (normalizedString.Length > 40)
+                    {
+                        sb.AppendLine($" - Name is too long ({key.Length} > 40): <{key}> ");
+                        normalizedString = normalizedString.Substring(0, 40);
+                    }
+                    
+                    if (dryRun)
                     {
-                        warningLog.AppendLine($" - Name is too long ({key.Length} > 40): <{key}> ");
+                        warningLog.Append(sb);
+                    } else {
+                        key = normalizedString;
                     }
                 }
                 Profiler.EndSample();
             }
-
+            
             internal static bool ShouldSendEvent(EventParams eventData)
             {
                 //Funnel event
@@ -609,8 +616,7 @@ namespace Amanotes.Core
                 internal (int countInSession, int totalCount) IncreaseCounter(EventParams eventParams)
                 {
                     EventDetail result = GetEventDetail(eventParams.eventName, true);
-                    if (IsAdapterForbidden(primaryAdapter, eventParams))
-                        return (result.countInSession, result.totalCount);
+                    if (eventParams.doNotIncreaseCounter) return (result.countInSession, result.totalCount);
                     result.countInSession++;
                     result.totalCount++;
                     _dirty = true;
@@ -708,6 +714,15 @@ namespace Amanotes.Core
             return ap;
         }
 
+        public static IEventParamsBuilder SkipAccumulatedCount(this IEventParamsBuilder ap)
+        {
+            if (ap == null) return null;
+            
+            var data = ap as EventParams;
+            data!.doNotIncreaseCounter = true;
+            return ap;
+        }
+
         public static IEventParamsBuilder Except(this IEventParamsBuilder ap, params string[] analyticIds)
         {
             if (ap == null) return null;
@@ -759,7 +774,7 @@ namespace Amanotes.Core
         public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, string key, object value)
         {
             if (ap == null) return null;
-            if (!IsValidKeyValue(ap, key, value)) return ap;
+            if (!IsValidKeyValue(ap, ref key, ref value)) return ap;
 
             var eventParams = ap as EventParams;
             Dictionary<string, object> parameters = eventParams?.parameters;
@@ -789,10 +804,12 @@ namespace Amanotes.Core
                 return ap;
             }
 
-            foreach (KeyValuePair<string, object> kvp in dictParams)
+            foreach (var kvp in dictParams)
             {
-                if (IsValidKeyValue(ap, kvp.Key, kvp.Value))
-                    ap.AddParam(kvp.Key, kvp.Value);
+                var key = kvp.Key;
+                var value = kvp.Value;
+                if (IsValidKeyValue(ap, ref key, ref value))
+                    ap.AddParam(key, value);
             }
             return ap;
         }
@@ -808,33 +825,48 @@ namespace Amanotes.Core
 
             foreach (var kvp in parameters)
             {
-                if (IsValidKeyValue(ap, kvp.key, kvp.value))
-                    ap.AddParam(kvp.key, kvp.value);
+                var key = kvp.key;
+                var value = kvp.value;
+                if (IsValidKeyValue(ap, ref key, ref value))
+                    ap.AddParam(key, value);
             }
             return ap;
         }
 
         //https://firebase.google.com/docs/reference/android/com/google/firebase/analytics/FirebaseAnalytics.Param
-        private static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
+        private static bool IsValidKeyValue(IEventParamsBuilder ap, ref string key, ref object value)
         {
             string eventName = (ap as EventParams)?.eventName;
             
             StringBuilder sb = tmpWarningSB;
             sb.Clear();
-            NormalizeKeyString(ref key, sb);
-            if (sb.Length > 0) LogWarningOnce($"Warning for event <{eventName}>, param <{key}>:\n{sb}", $"NormalizeParamKey<{eventName}>");
+            NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
+            
+            if (sb.Length > 0) LogWarningOnce($"Warning for event <{eventName}>, param <{key}>:\n{sb}", $"NormalizeParamKey <{eventName}>");
             
             if (string.IsNullOrWhiteSpace(key))
             {
                 LogWarning($"Param key is empty. Event name: {eventName}!");
                 return false;
             }
+            
             if (value == null)
             {
-                LogWarning($"Param value of key <{key}> is null. Event name: {eventName}!");
+                LogWarning($"Param value is null. Event name: {eventName}, key: {key}!");
                 return false;
             }
 
+            if (value.GetType() == typeof(string))
+            {
+                var v = value.ToString();
+                var strLimit = 100;
+                if (v.Length > strLimit)
+                {
+                    value = v.Substring(0, strLimit);
+                    LogWarning($"Param value exceeds the length limit ({strLimit}). Event name: {eventName}, key: {key}!");    
+                }
+            }
+
             return true;
         }
     }
@@ -848,6 +880,7 @@ namespace Amanotes.Core.Internal
         public bool showAnalyticsLog = true;
         public bool normalizeEventName = true;
         public bool checkMigrationIntegrity = true;
+        public bool migrateAccumulatedCount = true;
         public bool enableEventStat;
         public AnalyticQualityConfig quality;
     }

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