com.amanotes.gdk 0.2.49 → 0.2.51

package/Runtime/AmaGDK.Analytics.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -39,10 +40,7 @@ namespace Amanotes.Core
                     this.eventName = eventName;
                 }
 
-                public bool IsFunnelEvent
-                {
-                    get { return !string.IsNullOrEmpty(funnelSignature); }
-                }
+                public bool IsFunnelEvent => !string.IsNullOrEmpty(funnelSignature);
 
                 public bool IsAdapterForbidden(string adapterId)
                 {
@@ -71,31 +69,22 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName)
             {
-                NormalizeEventName(ref eventName, true);
-                if (localData.GetEventDetail(eventName) == null && localData.eventDetails.Count >= 500)
-                {
-                    LogWarning($" - You have reported 500 types of events. New event <{eventName}> will be ignored.");
-                    return null;
-                }
-                var result = new EventParams(eventName);
+                var result = PrepareEvent(eventName);
                 eventQueue.Enqueue(result);
                 return result;
             }
 
             public static IEventParamsBuilder LogEvent(string eventName, Dictionary<string, object> parameters)
             {
-                if (parameters == null) return LogEvent(eventName);
-                return LogEvent(eventName).AddParam(parameters);
+                var result = PrepareEvent(eventName, parameters);
+                eventQueue.Enqueue(result);
+                return result;
             }
 
             public static IEventParamsBuilder LogEvent(string eventName, params (string, object)[] parameters)
             {
-                IEventParamsBuilder result = LogEvent(eventName);
-                if (parameters == null) return result;
-                for (var i = 0; i < parameters.Length; i++)
-                {
-                    result.AddParam(parameters[i].Item1, parameters[i].Item2);
-                }
+                var result = PrepareEvent(eventName, parameters);
+                eventQueue.Enqueue(result);
                 return result;
             }
 
@@ -113,6 +102,24 @@ namespace Amanotes.Core
             {
                 return LogEvent(eventName, parameters).SetAsFunnel(signature);
             }
+            
+            public static void LogEventImmediately(string eventName)
+            {
+                var eventParams = PrepareEvent(eventName);
+                LogEventImmediately(eventParams);
+            }
+
+            public static void LogEventImmediately(string eventName, Dictionary<string, object> parameters)
+            {
+                var eventParams = PrepareEvent(eventName, parameters);
+                LogEventImmediately(eventParams);
+            }
+
+            public static void LogEventImmediately(string eventName, params (string, object)[] parameters)
+            {
+                var eventParams = PrepareEvent(eventName, parameters);
+                LogEventImmediately(eventParams);
+            }
 
             public static int GetAccumulatedCount(string eventName, bool withinSession = false)
             {
@@ -128,12 +135,18 @@ namespace Amanotes.Core
 
             public static void SetUserId(string userId)
             {
-                actionQueue.Enqueue(() => InternalSetUserId(userId));
+                foreach (AnalyticsAdapter s in listAdapters)
+                {
+                    s.SetUserId(userId);
+                }
             }
 
             public static void SetUserProperty(string key, string value)
             {
-                actionQueue.Enqueue(() => InternalSetUserProperty(key, value));
+                foreach (AnalyticsAdapter s in listAdapters)
+                {
+                    s.SetUserProperty(key, value);
+                }
             }
 
             private static IntegrityFlag MergeData(List<string> funnelEvents, Dictionary<string, int> eventCountMap, bool sumEventCount)
@@ -237,8 +250,7 @@ namespace Amanotes.Core
 
             internal static readonly Dictionary<string, EventConfig> sendAtCount = new Dictionary<string, EventConfig>();
             internal static Predicate<EventParams> logEventHook;
-            internal static readonly Queue<EventParams> eventQueue = new Queue<EventParams>();
-            internal static readonly Queue<Action> actionQueue = new Queue<Action>();
+            internal static readonly ConcurrentQueue<EventParams> eventQueue = new ConcurrentQueue<EventParams>();
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
             internal static readonly SessionStat sessionStat = new SessionStat();
@@ -298,68 +310,109 @@ namespace Amanotes.Core
                 // TODO: Refactor Resolve Early Calls
                 onFrameUpdate -= ProcessEventQueue;
                 onFrameUpdate += ProcessEventQueue;
-                
-                onFrameUpdate -= ProcessActionQueue;
-                onFrameUpdate += ProcessActionQueue;
             }
-    
+            
+            internal static EventParams PrepareEvent(string eventName)
+            {
+                PrepareEventCheck(eventName);
+                var result = new EventParams(eventName);
+                PostPrepareEventProcess(result);
+                return result;
+            }
+
+            internal static EventParams PrepareEvent(string eventName, Dictionary<string, object> parameters)
+            {
+                if (parameters == null) return PrepareEvent(eventName);
+                PrepareEventCheck(eventName);
+                var result = new EventParams(eventName);
+                result.AddParam(parameters);
+                PostPrepareEventProcess(result);
+                return result;
+            }
+
+            internal static EventParams PrepareEvent(string eventName, params (string, object)[] parameters)
+            {
+                if (parameters == null) return PrepareEvent(eventName);
+                PrepareEventCheck(eventName);
+                var result = new EventParams(eventName);
+                for (var i = 0; i < parameters.Length; i++)
+                {
+                    result.AddParam(parameters[i].Item1, parameters[i].Item2);
+                }
+                PostPrepareEventProcess(result);
+                return result;
+            }
+
             internal static void ProcessEventQueue()
             {
                 if (eventQueue.Count <= 0) return;
 
                 Profiler.BeginSample("AmaGDK.Analytics.ProcessEventQueue()");
-                AnalyticsConfig config = Config.analytics;
-                bool showAnalyticsLog = config.showAnalyticsLog;
-                sessionStat.ClearLastFrameEventInfo();
+                
+                sessionStat.savedEventStatsInLastFrame.Clear();
+                
+                while (eventQueue.TryDequeue(out var eventData))
+                {
+                    var (eventNameToSend, inUseAdapterIDs) = LogEventActually(eventData);
+                    if (string.IsNullOrEmpty(eventNameToSend) || inUseAdapterIDs == null) continue;
+                    sessionStat.Add(eventNameToSend, eventData, inUseAdapterIDs);
+                }
+
+                localData.SaveIfDirty();
+                sessionStat.Save();
+				Profiler.EndSample();
+            }
 
-                while (eventQueue.Count > 0)
+            internal static (string eventNameToSend, List<string> inUseAdapterIDs) LogEventActually(EventParams eventParams)
+            {
+                if (eventParams == null) return ("", null);
+                if (!ShouldSendEvent(eventParams)) return ("", null);
+                var (countInSession, totalCount) = localData.IncreaseCounter(eventParams);
+                if (eventParams.accumulated || eventParams.parameters.ContainsKey("accumulated_count"))
                 {
-                    var eventData = eventQueue.Dequeue();
-                    if (!ShouldSendEvent(eventData)) continue;
-                    
-                    var (countInSession, totalCount) = localData.IncreaseCounter(eventData);
-                    if (eventData.accumulated || eventData.parameters.ContainsKey("accumulated_count"))
-                    {
-                        UpdateAccumulatedCount(eventData, countInSession, totalCount);
-                    }
+                    UpdateAccumulatedCount(eventParams, countInSession, totalCount);
+                }
+
+                string eventNameToSend = GetEventNameToSend(eventParams.eventName, countInSession, totalCount);
+                AnalyticsConfig config = Config.analytics;
+                if (config.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-                    if (!eventData.parameters.ContainsKey("ama_device_id"))
-                        eventData.AddParam("ama_device_id", User.AmaDeviceId);
+                if (config.showAnalyticsLog)
+                {
+                    Debug.Log($"AmaGDK [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
+                }
                     
-                    string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
-                    if (config.normalizeEventName) NormalizeEventName(ref eventNameToSend);
+                config.quality.CheckEventQuality(eventParams.eventName, eventParams.parameters);
 
-                    if (showAnalyticsLog)
+                var inUseAdapterIDs = new List<string>();
+                foreach (AnalyticsAdapter m in listAdapters)
+                {
+                    if (eventParams.overrideConfig)
                     {
-                        Debug.Log($"AmaGDK [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                        // IMPORTANT NOTE:
+                        //
+                        // Once set overrideConfig, we should skip the adapter config completely!!!
+                        //
+                        if (eventParams.IsAdapterForbidden(m.adapterId)) continue;
                     }
-                    
-                    config.quality.CheckEventQuality(eventData.eventName, eventData.parameters);
-
-                    var inUseAdapterIDs = new List<string>();
-                    foreach (AnalyticsAdapter m in listAdapters)
+                    else // Do not remove else
                     {
-                        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);
+                        if (m.IsForbidden(eventParams.eventName)) continue;
                     }
-                    sessionStat.Add(eventNameToSend, eventData, inUseAdapterIDs);
+                    m.LogEvent(eventNameToSend, eventParams.parameters);
+                    inUseAdapterIDs.Add(m.adapterId);
                 }
 
-                localData.SaveIfDirty();
+                return (eventNameToSend, inUseAdapterIDs);
+            }
+
+            internal static void LogEventImmediately(EventParams eventParams)
+            {
+                var (eventNameToSend, inUseAdapterIDs) = LogEventActually(eventParams);
+                if (string.IsNullOrEmpty(eventNameToSend) || inUseAdapterIDs == null) return;
+                sessionStat.Add(eventNameToSend, eventParams, inUseAdapterIDs);
                 sessionStat.Save();
-				Profiler.EndSample();
+                localData.SaveIfDirty();
             }
 
             internal static void UpdateAccumulatedCount(EventParams eventData, int countInSession, int totalCount)
@@ -411,7 +464,7 @@ namespace Amanotes.Core
 
             internal static void NormalizeKeyString(ref string key, StringBuilder warningLog, bool dryRun)
             {
-                Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
+                Profiler.BeginSample("AmaGDK.Analytics.NormalizeKeyString()");
                 {
                     if (string.IsNullOrWhiteSpace(key))
                     {
@@ -465,6 +518,22 @@ namespace Amanotes.Core
                 }
                 Profiler.EndSample();
             }
+
+            internal static void PrepareEventCheck(string eventName)
+            {
+                NormalizeEventName(ref eventName, true);
+                
+                if (localData.GetEventDetail(eventName) == null && localData.eventDetails.Count >= 500)
+                {
+                    LogWarning($" - You have reported 500 types of events. New event <{eventName}> will be ignored.");
+                }
+            }
+
+            internal static void PostPrepareEventProcess(EventParams eventData)
+            {
+                if (!eventData.parameters.ContainsKey("ama_device_id"))
+                    eventData.AddParam("ama_device_id", User.AmaDeviceId);
+            }
             
             internal static bool ShouldSendEvent(EventParams eventData)
             {
@@ -489,33 +558,6 @@ namespace Amanotes.Core
 
                 return true;
             }
-            
-            
-            internal static void ProcessActionQueue()
-            {
-                if (actionQueue.Count <= 0) return;
-                while (actionQueue.Count > 0)
-                {
-                    var action = actionQueue.Dequeue();
-                    action.Invoke();
-                }
-            }
-            
-            internal static void InternalSetUserId(string userId)
-            {
-                foreach (AnalyticsAdapter s in listAdapters)
-                {
-                    s.SetUserId(userId);
-                }
-            }
-
-            internal static void InternalSetUserProperty(string key, string value)
-            {
-                foreach (AnalyticsAdapter s in listAdapters)
-                {
-                    s.SetUserProperty(key, value);
-                }
-            }
         }
 
         //PERSISTENT DATA
@@ -645,7 +687,7 @@ namespace Amanotes.Core
                         migrationLog.count++;
                         Log($"Analytics data was migrated {migrationLog.count} times");
 
-                        if (migrationLog.count == 2) LogEvent("migration_error").AddParam(migrationLog.ToDictionary());
+                        if (migrationLog.count == 2) LogEvent("migration_error", migrationLog.ToDictionary());
                     }
 
                     _dirty = true;
@@ -659,17 +701,13 @@ namespace Amanotes.Core
                 private readonly string fileName = nameof(SessionStat) + DateTime.Now.ToString("_yyMMdd_HHmmss") + ".tsv";
                 private StringBuilder contents = new StringBuilder();
                 private bool isFirstSave = true;
-                public List<EventStat> lastFrameEventStats = new List<EventStat>();
+                private readonly ConcurrentQueue<EventStat> lastFrameEventStats = new ConcurrentQueue<EventStat>();
+                internal readonly ConcurrentQueue<EventStat> savedEventStatsInLastFrame = new ConcurrentQueue<EventStat>();
 
                 internal void Add(string eventNameToSend, EventParams eventParams, List<string> adapterIDs)
                 {
                     var eventStat = new EventStat(eventNameToSend, eventParams, adapterIDs);
-                    lastFrameEventStats.Add(eventStat);
-                }
-
-                internal void ClearLastFrameEventInfo()
-                {
-                    lastFrameEventStats.Clear();
+                    lastFrameEventStats.Enqueue(eventStat);
                 }
 
                 internal void Save()
@@ -682,14 +720,17 @@ namespace Amanotes.Core
                         contents = contents.AppendLine(TSV_HEADER_ROW);
                         isFirstSave = false;
                     }
-                    foreach (EventStat stat in lastFrameEventStats)
+                    while (lastFrameEventStats.TryDequeue(out var stat))
                     {
                         contents.AppendLine(stat.ToTsv());
+                        savedEventStatsInLastFrame.Enqueue(stat);
                     }
 
                     GDKFileUtils.SaveAppend(fileName, contents.ToString());
                 }
             }
+            
+            
         }
     }
 
@@ -771,7 +812,7 @@ namespace Amanotes.Core
             return ap;
         }
 
-        public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, string key, object value)
+        internal static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, string key, object value)
         {
             if (ap == null) return null;
             if (!IsValidKeyValue(ap, ref key, ref value)) return ap;
@@ -795,7 +836,7 @@ namespace Amanotes.Core
             return ap;
         }
 
-        public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, Dictionary<string, object> dictParams)
+        internal static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, Dictionary<string, object> dictParams)
         {
             if (ap == null) return null;
             if (dictParams == null)
@@ -814,7 +855,7 @@ namespace Amanotes.Core
             return ap;
         }
 
-        public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, params (string key, object value)[] parameters)
+        internal static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, params (string key, object value)[] parameters)
         {
             if (ap == null) return null;
             if (parameters.Length == 0)

package/Runtime/AmaGDK.UserProfile.cs

@@ -200,14 +200,14 @@ namespace Amanotes.Core
 #elif UNITY_IOS
                 IDFV = SystemInfo.deviceUniqueIdentifier;
 #endif
-                
-                // Always get the latest advertising id
-                GetAdvertisingId();
+                GetAmaDeviceId();
+                UpdateUserId();
             }
             
             internal void StartModule()
             {
-                UpdateUserId();
+                // Always get the latest advertising id
+                GetAdvertisingId();
                 Logging.Log($"[UserProfile] user_id: {_userId}");
             }
 
@@ -231,39 +231,43 @@ namespace Amanotes.Core
                     GDKUtils.DelayCall(0, () =>
                     {
                         SetAdvertisingID(advertisingId);                
-                        switch (Application.platform)
-                        {
-                            case RuntimePlatform.IPhonePlayer:
-                                string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
-                                if (string.IsNullOrEmpty(v))
-                                {
-                                    v = Guid.NewGuid().ToString();
-                                    KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
-                                }
-                                AmaDeviceId = v;
-                                break;
-                
-                            case RuntimePlatform.Android:
-                                string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
-                                if (string.IsNullOrEmpty(cachedAmaDeviceId))
-                                {
-                                    cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
-                                    PlayerPrefs.SetString(AMA_DEVICE_ID_KEY, cachedAmaDeviceId);
-                                }
-                                AmaDeviceId = cachedAmaDeviceId;
-                                break;
-            
-                            default:
-                                AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
-                                break;
-                        }
-                    
-                        Logging.Log($"[UserProfile] ama_device_id: {_amaDeviceId}");
                         Save();
                     });
                 });
             }
 
+            private void GetAmaDeviceId()
+            {
+                if (!string.IsNullOrEmpty(AmaDeviceId)) return;
+                switch (Application.platform)
+                {
+                    case RuntimePlatform.IPhonePlayer:
+                        string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
+                        if (string.IsNullOrEmpty(v))
+                        {
+                            v = Guid.NewGuid().ToString();
+                            KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
+                        }
+                        AmaDeviceId = v;
+                        break;
+                
+                    case RuntimePlatform.Android:
+                        string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                        if (string.IsNullOrEmpty(cachedAmaDeviceId))
+                        {
+                            cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                        }
+                        AmaDeviceId = cachedAmaDeviceId;
+                        break;
+            
+                    default:
+                        AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                        break;
+                }
+                Logging.Log($"[UserProfile] Generate ama_device_id: {_amaDeviceId}");
+                Save();
+            }
+
             private string ValidateId (string id, string pattern)
             {
                 if (string.IsNullOrWhiteSpace(id)) return null;

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.49";
+        public const string VERSION = "0.2.51";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -182,12 +182,12 @@ namespace Amanotes.Core
             }
             
             float startTime = Time.realtimeSinceStartup;
-            yield return InitHook();
             
             dispatcher.Dispatch(Event.GDK_INIT_START);
             var sb = new StringBuilder();
             InitModules();
             
+            yield return InitHook();
             yield return WaitForManualInit();
             yield return InitAdapters(sb);
             

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -39,6 +39,7 @@ namespace Amanotes.Core.Internal
 #endif
 
         public const string PACKAGE_PATH = BASE_PATH + "Packages/";
+        public const string EXTRA_PATH = BASE_PATH + "Extra/";
         public const string AMAGDK_PREFAB = BASE_PATH + "Runtime/AmaGDK.prefab";
         public const string AMAGDK_CONFIG_PACKAGE = PACKAGE_PATH + "AmaGDKConfig.unitypackage";
 

package/package.json

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