com.amanotes.gdk 0.2.50 → 0.2.51

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.51 - 2024-02-23]
+- New feature: GDKCIBuildCommand
+- [Dev] Change Google Mobile Ads SDK version for iOS, 10.9 -> 10.5.0
+- [Analytics] Add LogEventImmediately()
+- [Analytics] Move AddParam() to internal use
+- [Analytics] Replace event Queue by ConcurrentQueue
+- [Ads] Check null Ads._adapter
+- [Ads] Autostart AdEventTracking
+- [Analytics] Update AppsFlyer adapter version
+- [UserProfile] Change logic of getting ama_device_id
+- [Core] Init modules before Hooks
+
 ## [0.2.50 - 2024-02-20]
 - New feature: Modify Android post processor
 - [Fix] remove installer should be skipped in DEV mode

package/Editor/Extra/{GDKAutoBuild.cs → GDKLocalBuild.cs}

@@ -11,13 +11,25 @@ using UnityObject = UnityEngine.Object;
 
 namespace Amanotes.Editor
 {
-    [CreateAssetMenu(menuName = "AmaGDK/Build Config")]
-    public class GDKAutoBuild : ScriptableObject
+    [CreateAssetMenu(menuName = "Ama GDK/Build Config", fileName = "LocalBuild")]
+    public class GDKLocalBuild : ScriptableObject
     {
         private const string DEFAULT_BUILD_FOLDER = "../../_Build";
 
         public KeystoreInfo keystore;
-        public string buildFolder = DEFAULT_BUILD_FOLDER;
+        [SerializeField] private string relativeBuildFolder = DEFAULT_BUILD_FOLDER;
+
+        private string _buildFolder;
+        public string buildFolder
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_buildFolder)) return _buildFolder;
+                _buildFolder = new DirectoryInfo(Path.Combine(Application.dataPath, relativeBuildFolder ?? DEFAULT_BUILD_FOLDER)).FullName;
+                return _buildFolder;
+            }
+        } 
+            
         public Texture2D icon;
 
         public List<BuildInfo> listBuild = new List<BuildInfo>();
@@ -135,8 +147,6 @@ namespace Amanotes.Editor
 
         public void DryRun(BuildInfo info)
         {
-            if (string.IsNullOrEmpty(buildFolder)) buildFolder = DEFAULT_BUILD_FOLDER;
-
             var buildDir = new DirectoryInfo(buildFolder);
             if (!buildDir.Exists) Directory.CreateDirectory(buildDir.FullName);
 
@@ -344,8 +354,13 @@ namespace Amanotes.Editor
 
                     EditorUserBuildSettings.buildAppBundle = isAAB;
                     EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
+                    
+                    #if UNITY_2021_1_OR_NEWER
                     EditorUserBuildSettings.androidCreateSymbols = AndroidCreateSymbols.Disabled;
-
+                    #else
+                    EditorUserBuildSettings.androidCreateSymbolsZip = false;
+                    #endif
+                    
                     string[] listAPKNames = GetAPKNames(buildFolder);
 
                     for (var i = 0; i < listAPKNames.Length; i++)
@@ -508,10 +523,10 @@ namespace Amanotes.Editor
 
 
     [InitializeOnLoad]
-    internal class GDKAutoBuildHelper
+    internal class GDKLocalBuildHelper
     {
-        private static GDKAutoBuild build;
-        static GDKAutoBuildHelper()
+        private static GDKLocalBuild build;
+        static GDKLocalBuildHelper()
         {
             EditorApplication.update -= Update;
             EditorApplication.update += Update;
@@ -530,7 +545,7 @@ namespace Amanotes.Editor
 
             if (build == null)
             {
-                string[] guids = AssetDatabase.FindAssets("t:" + nameof(GDKAutoBuild)); //FindAssets uses tags check documentation for more info
+                string[] guids = AssetDatabase.FindAssets("t:" + nameof(GDKLocalBuild)); //FindAssets uses tags check documentation for more info
                 if (guids.Length == 0)
                 {
                     EditorApplication.update -= Update;
@@ -538,7 +553,7 @@ namespace Amanotes.Editor
                 }
 
                 string path = AssetDatabase.GUIDToAssetPath(guids[0]);
-                build = AssetDatabase.LoadAssetAtPath<GDKAutoBuild>(path);
+                build = AssetDatabase.LoadAssetAtPath<GDKLocalBuild>(path);
                 if (build == null)
                 {
                     EditorApplication.update -= Update;
@@ -558,7 +573,7 @@ namespace Amanotes.Editor
         // [MenuItem("Window/AmaGDK/Build/Select Build Asset &#b", false, 10)]
         public static void SelectBuild()
         {
-            string[] arr = AssetDatabase.FindAssets("t:" + nameof(GDKAutoBuild));
+            string[] arr = AssetDatabase.FindAssets("t:" + nameof(GDKLocalBuild));
 
             if (arr.Length == 0)
             {
@@ -577,9 +592,9 @@ namespace Amanotes.Editor
             EditorGUIUtility.PingObject(obj);
         }
 
-        private static GDKAutoBuild FindAutoBuildAssets(string name = null, bool allowFallback = false)
+        private static GDKLocalBuild FindLocalBuildAssets(string name = null, bool allowFallback = false)
         {
-            string[] arr = AssetDatabase.FindAssets("t:" + nameof(GDKAutoBuild));
+            string[] arr = AssetDatabase.FindAssets("t:" + nameof(GDKLocalBuild));
             if (arr.Length == 0)
             {
                 Debug.LogWarning("There are no Build asset in the project!");
@@ -589,17 +604,17 @@ namespace Amanotes.Editor
             for (var i = 0; i < arr.Length; i++)
             {
                 string path = AssetDatabase.GUIDToAssetPath(arr[i]).Replace("\\", "/");
-                if (string.IsNullOrEmpty(name)) return AssetDatabase.LoadAssetAtPath<GDKAutoBuild>(path);
+                if (string.IsNullOrEmpty(name)) return AssetDatabase.LoadAssetAtPath<GDKLocalBuild>(path);
 
                 string fileName = Path.GetFileName(path);
-                if (fileName.ToLower().Contains(name.ToLower())) return AssetDatabase.LoadAssetAtPath<GDKAutoBuild>(path);
+                if (fileName.ToLower().Contains(name.ToLower())) return AssetDatabase.LoadAssetAtPath<GDKLocalBuild>(path);
             }
 
             if (!allowFallback) return null;
 
             // Fall back to the first one
             string path0 = AssetDatabase.GUIDToAssetPath(arr[0]).Replace("\\", "/");
-            return AssetDatabase.LoadAssetAtPath<GDKAutoBuild>(path0);
+            return AssetDatabase.LoadAssetAtPath<GDKLocalBuild>(path0);
         }
 
         // [MenuItem("Window/AmaGDK/Build/Android", false, 50)] public static void BuildAndroid() { BuildAndroid(false); }
@@ -610,7 +625,7 @@ namespace Amanotes.Editor
 
         private static void BuildAndroid(bool isRelease)
         {
-            GDKAutoBuild buildAsset = FindAutoBuildAssets("android");
+            GDKLocalBuild buildAsset = FindLocalBuildAssets("android");
             if (buildAsset == null)
             {
                 Debug.LogWarning("Build Asset for Android not found!");
@@ -618,26 +633,26 @@ namespace Amanotes.Editor
             }
 
             buildAsset.EnableBuildForTarget(BuildTarget.Android);
-            buildAsset.buildRQ = GDKAutoBuild.BuildRequestTS.Generate();// isRelease
+            buildAsset.buildRQ = GDKLocalBuild.BuildRequestTS.Generate();// isRelease
             buildAsset.ProcessBuild();
         }
 
         private static void BuildIOS(bool isRelease)
         {
-            GDKAutoBuild buildAsset = FindAutoBuildAssets("ios");
+            GDKLocalBuild buildAsset = FindLocalBuildAssets("ios");
             if (buildAsset == null)
             {
                 Debug.LogWarning("Build Asset for iOS not found!");
                 return;
             }
             buildAsset.EnableBuildForTarget(BuildTarget.iOS);
-            buildAsset.buildRQ = GDKAutoBuild.BuildRequestTS.Generate(); //isRelease
+            buildAsset.buildRQ = GDKLocalBuild.BuildRequestTS.Generate(); //isRelease
             buildAsset.ProcessBuild();
         }
     }
 
-    [CustomEditor(typeof(GDKAutoBuild))]
-    public class GDKAutoBuildEditor : UnityEditor.Editor
+    [CustomEditor(typeof(GDKLocalBuild))]
+    public class GDKLocalBuildEditor : UnityEditor.Editor
     {
         public int bIndex;
         public string path;
@@ -671,7 +686,7 @@ namespace Amanotes.Editor
         }
         public override void OnInspectorGUI()
         {
-            var ab = (GDKAutoBuild)target;
+            var ab = (GDKLocalBuild)target;
             if (ab == null) return;
 
             if (productNameStyle == null) Init();
@@ -681,7 +696,7 @@ namespace Amanotes.Editor
             Rect r0 = GUILayoutUtility.GetRect(0, Screen.width, 16f, 16f);
             r0.xMin = 0;
             r0.xMax += 16f;
-            GDKAutoBuild.DrawRect(r0, new Color32(20, 20, 20, 255));
+            GDKLocalBuild.DrawRect(r0, new Color32(20, 20, 20, 255));
 
             if ((Event.current.type == EventType.MouseUp) && r0.Contains(Event.current.mousePosition))
             {
@@ -715,19 +730,19 @@ namespace Amanotes.Editor
 
                 if (GUILayout.Button("Create Default"))
                 {
-                    new GDKAutoBuild.BuildInfo().Read();
+                    new GDKLocalBuild.BuildInfo().Read();
 
-                    ab.listBuild = new List<GDKAutoBuild.BuildInfo>
+                    ab.listBuild = new List<GDKLocalBuild.BuildInfo>
                     {
-                        new GDKAutoBuild.BuildInfo
+                        new GDKLocalBuild.BuildInfo
                         {
                             target = BuildTarget.Android, isAAB = false, splitAPK = true
                         }.Read(),
-                        new GDKAutoBuild.BuildInfo
+                        new GDKLocalBuild.BuildInfo
                         {
                             target = BuildTarget.Android, isAAB = true, splitAPK = true
                         }.Read(),
-                        new GDKAutoBuild.BuildInfo
+                        new GDKLocalBuild.BuildInfo
                         {
                             target = BuildTarget.iOS, isAAB = true, splitAPK = true
                         }.Read()
@@ -740,7 +755,7 @@ namespace Amanotes.Editor
             SerializedProperty prop = serializedObject.FindProperty($"listBuild.Array.data[{bIndex}]");
             prop.isExpanded = true;
 
-            GDKAutoBuild.BuildInfo info = ab.listBuild[bIndex];
+            GDKLocalBuild.BuildInfo info = ab.listBuild[bIndex];
 
             EditorGUI.BeginChangeCheck();
             {
@@ -753,7 +768,7 @@ namespace Amanotes.Editor
             r.width = Screen.width;
             r.height = 16f;
 
-            GDKAutoBuild.DrawRect(r, new Color32(20, 20, 20, 255));
+            GDKLocalBuild.DrawRect(r, new Color32(20, 20, 20, 255));
 
             r.xMin += 12f;
             GUI.Label(r, info.buildName);
@@ -782,7 +797,7 @@ namespace Amanotes.Editor
             var nBuilds = 0;
             for (var i = 0; i < ab.listBuild.Count; i++)
             {
-                GDKAutoBuild.BuildInfo item = ab.listBuild[i];
+                GDKLocalBuild.BuildInfo item = ab.listBuild[i];
 
                 if (!item.enable) continue;
                 nBuilds++;
@@ -800,7 +815,7 @@ namespace Amanotes.Editor
             {
                 if (GUILayout.Button("Build"))
                 {
-                    ab.buildRQ = GDKAutoBuild.BuildRequestTS.Generate(); //ab.runGitPostBuild
+                    ab.buildRQ = GDKLocalBuild.BuildRequestTS.Generate(); //ab.runGitPostBuild
                     ab.ProcessBuild();
                 }
 

package/Runtime/AmaGDK.Adapters.cs

@@ -13,7 +13,7 @@ namespace Amanotes.Core.Internal
         [HideInInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
-        [NonSerialized] internal protected Status status = Status.None;
+        [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
         

package/Runtime/AmaGDK.Ads.cs

@@ -196,11 +196,11 @@ namespace Amanotes.Core
             // internal use
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
 
-            internal protected static AdShowContext context;
-            internal protected static AdAdapter _adapter;
-            internal protected static float _savedVolume = -1;
-            internal protected static float _savedTimeScale = -1;
-            
+            protected internal static AdShowContext context;
+            protected internal static AdAdapter _adapter;
+            protected internal static float _savedVolume = -1;
+            protected internal static float _savedTimeScale = -1;
+
             public static void OnInter_Request(Action callback)
             {
                 dispatcher.AddListener(Event.INTER_REQUEST, callback, false);
@@ -258,8 +258,8 @@ namespace Amanotes.Core
                 }
             }
 
-            public static bool HasInterstitial => _adapter.interstitial.hasAd;
-            public static bool HasRewardedVideo => _adapter.rewardVideo.hasAd;
+            public static bool HasInterstitial => _adapter?.interstitial.hasAd ?? false;
+            public static bool HasRewardedVideo => _adapter?.rewardVideo.hasAd ?? false;
             public static bool IsBannerShowing => _isBannerShowing;
             public static bool IsAdShowing => context != null;
 
@@ -273,6 +273,7 @@ namespace Amanotes.Core
 
             public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
             {
+                if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.Interstitial, placementName, userData);
@@ -284,6 +285,7 @@ namespace Amanotes.Core
 
             public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
             {
+                if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.VideoReward, placementName, userData);
@@ -303,12 +305,8 @@ namespace Amanotes.Core
                 _isBannerShowing = true;
                 _showingBannerPosition = bannerPosition ?? Config.ad.bannerPosition;
 
-                if (_adapter == null)
-                {
-                    return;
-                }
-                
-                
+                if (_adapter == null) return;
+
                 dispatcher.Dispatch(Event.BANNER_SHOW);
                 _adapter.ShowBanner(_showingBannerPosition);
             }
@@ -317,11 +315,13 @@ namespace Amanotes.Core
             {
                 if (!_isBannerShowing) return;
                 _isBannerShowing = false;
+                if (_adapter == null) return;
                 _adapter.HideBanner();
             }
 
             public static void StopWaitForAd()
             {
+                if (_adapter == null) return;
                 if (context == null)
                     return;
                 
@@ -357,6 +357,7 @@ namespace Amanotes.Core
 
             public static void SetUserId(string userId)
             {
+                if (_adapter == null) return;
                 _adapter.SetUserId(userId);
             }
         }
@@ -397,14 +398,14 @@ namespace Amanotes.Core.Internal
         protected AdModuleConfig moduleConfig => Config.ad;
 
         // APIs
-        internal protected abstract AdLogic interstitial { get; }
-        internal protected abstract AdLogic rewardVideo { get; }
+        protected internal abstract AdLogic interstitial { get; }
+        protected internal abstract AdLogic rewardVideo { get; }
 
         public abstract void ShowBanner(BannerPosition bannerPosition);
         public abstract void HideBanner();
 
         // Internally used
-        internal protected abstract void SetUserId(string userId);
+        protected internal abstract void SetUserId(string userId);
     }
     
     public interface IAdCallback { }
@@ -504,7 +505,6 @@ namespace Amanotes.Core.Internal
 
     public abstract class AdLogic
     {
-        internal protected AdAdapter adapter => Ads._adapter;
         protected AdModuleConfig adConfig => Config.ad;
         protected AdShowContext context => Ads.context;
         

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.50";
+        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/package.json

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