com.amanotes.gdk 0.2.75 → 0.2.77

package/Runtime/AmaGDK.UserProfile.cs

@@ -9,11 +9,6 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK //User profile
     {
-        partial class Event
-        {
-            public const string GDK_USER_ID_UPDATED = nameof(GDK_USER_ID_UPDATED);
-        }
-
         private static readonly Lazy<UserProfile> _user = new Lazy<UserProfile>(() => new UserProfile());
         public static UserProfile User => _user.Value;
         
@@ -22,9 +17,13 @@ namespace Amanotes.Core
         /// The callback triggers when a better UserID (gaid, idfv, pseudoId,...)  was found and replace the current UserId
         /// </summary>
         /// <param name="onUserIdChange"></param>
-        public static void SetCallback_OnUserIdUpdated(Action<string> onUserIdChange)
+        
+        private static Action<string> _onUserIdChange;
+        public static void SetCallback_OnUserIdUpdated(Action<string> callback)
         {
-            dispatcher.AddListener(Event.GDK_USER_ID_UPDATED, onUserIdChange);
+            if (callback == null) return;
+            _onUserIdChange -= callback;
+            _onUserIdChange += callback;
         }
         
         [Serializable]
@@ -47,18 +46,18 @@ namespace Amanotes.Core
 
         public partial class UserProfile //PUBLIC
         {
+            private readonly Dictionary<string, object> allUserIds = new Dictionary<string, object>();
             public Dictionary<string, object> CollectAllUserIds()
             {
-                var dic = new Dictionary<string, object>();
-                if (!string.IsNullOrWhiteSpace(IDFA)) dic["idfa"] = IDFA;
-                if (!string.IsNullOrWhiteSpace(IDFV)) dic["idfv"] = IDFV;
-                if (!string.IsNullOrWhiteSpace(GAId)) dic["gaid"] = GAId;
-                if (!string.IsNullOrWhiteSpace(AndroidId)) dic["android_id"] = AndroidId;
-                if (!string.IsNullOrWhiteSpace(PseudoId)) dic["pseudo_id"] = PseudoId;
-                if (!string.IsNullOrWhiteSpace(AmaDeviceId)) dic["ama_device_id"] = AmaDeviceId;
-                if (!string.IsNullOrWhiteSpace(AppsFlyerId)) dic["appsflyer_id"] = AppsFlyerId;
-                if (!string.IsNullOrWhiteSpace(InstallationId)) dic["installation_id"] = InstallationId;
-                return dic;
+                if (!string.IsNullOrWhiteSpace(IDFA)) allUserIds["idfa"] = IDFA;
+                if (!string.IsNullOrWhiteSpace(IDFV)) allUserIds["idfv"] = IDFV;
+                if (!string.IsNullOrWhiteSpace(GAId)) allUserIds["gaid"] = GAId;
+                if (!string.IsNullOrWhiteSpace(AndroidId)) allUserIds["android_id"] = AndroidId;
+                if (!string.IsNullOrWhiteSpace(PseudoId)) allUserIds["pseudo_id"] = PseudoId;
+                if (!string.IsNullOrWhiteSpace(AmaDeviceId)) allUserIds["ama_device_id"] = AmaDeviceId;
+                if (!string.IsNullOrWhiteSpace(AppsFlyerId)) allUserIds["appsflyer_id"] = AppsFlyerId;
+                if (!string.IsNullOrWhiteSpace(InstallationId)) allUserIds["installation_id"] = InstallationId;
+                return allUserIds;
             }
             
             public string UserId
@@ -72,8 +71,10 @@ namespace Amanotes.Core
                 {
                     if (_userId == value) return;
                     _userId = value;
+                    
                     Log($"GDK UserID Updated: {_userId}");
-                    dispatcher.Dispatch(Event.GDK_USER_ID_UPDATED, _userId);
+                    if (_onUserIdChange != null) _onUserIdChange(_userId);
+                    
                     _dirty = true;
                     if (isReady) SendMapUserId();
                 }
@@ -159,11 +160,7 @@ namespace Amanotes.Core
                 get => _amaDeviceId;
                 set
                 {
-                    var pattern = ALPHANUMERIC_HYPHEN_PATTERN;
-#if UNITY_ANDROID && !UNITY_EDITOR_OSX
-                    pattern = ALPHANUMERIC_PATTERN;
-#endif
-                    if (!ValidateId(value, pattern))
+                    if (!ValidateId(value, ALPHANUMERIC_OPTIONAL_HYPHEN_PATTERN))
                     {
                         LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
                         return;
@@ -301,6 +298,7 @@ namespace Amanotes.Core
             [SerializeField]
             private string _country;
 
+            private const string ALPHANUMERIC_OPTIONAL_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d-]+$";
             private const string ALPHANUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])(?=.*-).+$";
             private const string ALPHANUMERIC_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d]+$";
             private const string NUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*-)[\d-]+$";
@@ -349,9 +347,19 @@ namespace Amanotes.Core
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
+                        if (!ValidateId(id, ALPHANUMERIC_HYPHEN_PATTERN))
+                        {
+                            LogWarning($"[UserProfile] Wrong format for IDFA. Value: {id}");
+                            return;
+                        }
                         IDFA = id;
                         break;
                     case RuntimePlatform.Android:
+                        if (!ValidateId(id, ALPHANUMERIC_HYPHEN_PATTERN))
+                        {
+                            LogWarning($"[UserProfile] Wrong format for GAId. Value: {id}");
+                            return;
+                        }
                         GAId = id;
                         break;
                 }

package/Runtime/AmaGDK.cs

@@ -24,7 +24,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.75";
+        public const string VERSION = "0.2.77";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -44,33 +44,46 @@ namespace Amanotes.Core
         
         internal static partial class Event
         {
-            public const string GDK_HOOK_START = nameof(GDK_HOOK_START);
-            public const string GDK_HOOK_END = nameof(GDK_HOOK_END);
-            
-            public const string GDK_INIT = nameof(GDK_INIT);
-            public const string GDK_READY = nameof(GDK_READY);
-            public const string ADAPTER_READY = nameof(ADAPTER_READY);
+            // public const string GDK_HOOK_START = nameof(GDK_HOOK_START);
+            // public const string GDK_HOOK_END = nameof(GDK_HOOK_END);
+            // public const string GDK_INIT = nameof(GDK_INIT);
+            // public const string GDK_READY = nameof(GDK_READY);
+            // public const string ADAPTER_READY = nameof(ADAPTER_READY);
         }
         
+        /// <summary>
+        /// Gets the ConfigAsset for the AmaGDK.
+        /// If the config hasn't been loaded yet, it loads the AmaGDKConfig from Resources.
+        /// In the Unity Editor's Play mode, it creates an instance of the config to avoid modifying the original asset.
+        /// In all other cases, it uses the loaded config directly.
+        /// </summary>
         public static ConfigAsset Config
         {
             get
             {
                 if (_config != null) return _config;
-                _config = Resources.Load<ConfigAsset>("AmaGDKConfig");
-                GDKDebug.logLevel = _config.common.logLevel;
+                var config = Resources.Load<ConfigAsset>("AmaGDKConfig");
+                #if UNITY_EDITOR
+                if (EditorApplication.isPlayingOrWillChangePlaymode)
+                {
+                    _config = Instantiate(config);
+                    return _config;
+                }
+                #endif
+                _config = config;
                 return _config;
             }
         }
         
         IEnumerator InitHook()
         {
-            dispatcher.Dispatch(Event.GDK_HOOK_START);
+            // dispatcher.Dispatch(Event.GDK_HOOK_START);
+            if (_onHookStart!= null) GDKUtils.SafeInvokeAndClear(ref _onHookStart);
             int nHooks = Hook.hooks.Count;
             if (nHooks == 0)
             {
                 Log($"[Hook] No hook registered!");
-                dispatcher.Dispatch(Event.GDK_HOOK_END);
+                if (_onHookEnd!= null) GDKUtils.SafeInvokeAndClear(ref _onHookEnd);
                 yield break;
             }
             
@@ -85,7 +98,7 @@ namespace Amanotes.Core
             yield return new WaitUntil(() => hookCompleted);
             float elapsed = Time.realtimeSinceStartup - stTime;
             Log($"[Hook] {nHooks} hooks complete after {elapsed} secs");
-            dispatcher.Dispatch(Event.GDK_HOOK_END);
+            if (_onHookEnd!= null) GDKUtils.SafeInvokeAndClear(ref _onHookEnd);
         }
         
         IEnumerator WaitForManualInit()
@@ -169,7 +182,8 @@ namespace Amanotes.Core
                         Log($"{adapter.adapterId} init took: {(endTime-beginTime):#0.00} s");
                     }
                 }
-                dispatcher.Dispatch(Event.ADAPTER_READY, adapter.adapterId);
+                
+                GDKUtils.SafeInvoke(_onAdapterReady, adapter.adapterId);
                 sb.AppendLine($"[{(adapter.IsReady ? " OK " : "FAIL")}] {adapter.adapterId} (~ {Time.realtimeSinceStartup - startTime:#0.00}s)");
                 
                 // Wait for postprocessing of each adapter
@@ -200,8 +214,9 @@ namespace Amanotes.Core
             sb.Append($"- InitHook() took (~ {hookTime:#0.00}s)\n\n");
             
             _status = Status.Initialize;
-            dispatcher.Dispatch(Event.GDK_INIT);
-            yield return WaitForManualInit();
+            GDKUtils.SafeInvokeAndClear(ref _onGDKInit);
+            
+            if (!_allowInit) yield return WaitForManualInit();
             yield return InitAdapters(sb);
             
             StartModules();
@@ -215,14 +230,17 @@ namespace Amanotes.Core
             ForceQuit.Init();
             
             _status = Status.Ready;
-            dispatcher.Dispatch(Event.GDK_READY);
+            GDKUtils.SafeInvokeAndClear(ref _onGDKReady);
 
-            var initDuration = Time.realtimeSinceStartup - startTime;
+            float initDuration = Time.realtimeSinceStartup - startTime;
             LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
             ForceLog($"v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
             GDKPool.Return(sb);
+            
+            // also clear callbacks
+            _onAdapterReady = null;
         }
 
         private void ConfigGeoLocation()
@@ -247,12 +265,21 @@ namespace Amanotes.Core
 
         private static void LogEvent_GDKInit(int initDuration)
         {
+            var BToMB = 1.0 / (1024 * 1024);
+            var reservedMemory = Math.Round(Profiler.GetTotalReservedMemoryLong() * BToMB, 2); // in MB
+            var allocatedMemory = Math.Round(Profiler.GetTotalAllocatedMemoryLong() * BToMB, 2); // in MB
+            var unusedReservedMemory = Math.Round(Profiler.GetTotalUnusedReservedMemoryLong() * BToMB, 2); // in MB
+
             var _dicKey = new Dictionary<string, object>
             {
                 ["gdk_version"] = VERSION,
                 ["session"] = User.Session,
                 ["gdk_init_duration"] = initDuration,
-                ["user_id"] = User.UserId
+                ["user_id"] = User.UserId,
+                ["device_spec"] = Device.GetDeviceSpec().ToString(),
+                ["reserved_memory"] = reservedMemory,
+                ["allocated_memory"] = allocatedMemory,
+                ["unused_memory"] = unusedReservedMemory
             };
 
             void AppendServiceKey(string adapterId, string paramName)
@@ -276,8 +303,8 @@ namespace Amanotes.Core
         
         public static LogLevel logLevel
         {
-            get => _config == null ? Config.common.logLevel : GDKDebug.logLevel;
-            set => GDKDebug.logLevel = value;
+            get => Config.common.logLevel;
+            set => Config.common.logLevel = value;
         }
         
         public static void Init(Action onReady = null)
@@ -285,13 +312,14 @@ namespace Amanotes.Core
             if (isReady)
             {
                 LogWarning(SDK_INIT_CALLED);
-                onReady?.Invoke();
+                if (onReady != null) onReady();
                 return;
             }
 
             if (onReady != null)
             {
-                dispatcher.AddListener(Event.GDK_READY, onReady, true);
+                _onGDKReady -= onReady;
+                _onGDKReady += onReady;
             }
 
             if (_allowInit)
@@ -307,6 +335,12 @@ namespace Amanotes.Core
             _instance = sdk.AddComponent<AmaGDK>();
         }
         
+        private static Action _onGDKInit;
+        private static Action _onGDKReady;
+        internal static Action _onHookStart;
+        internal static Action _onHookEnd;
+        private static Action<string> _onAdapterReady;
+        
         /// <summary>
         /// Will be triggered right after all the cached data being loaded
         /// And before any Adapter has been called to Init
@@ -314,13 +348,15 @@ namespace Amanotes.Core
         /// <param name="onInit"></param>
         public static void SetCallback_OnGDKInit(Action onInit)
         {
+            if (onInit == null) return;
             if (isInitted)
             {
-                onInit.Invoke();
+                onInit();
                 return;
             }
-            
-            dispatcher.AddListener(Event.GDK_INIT, onInit, true);
+
+            _onGDKInit += onInit;
+            _onGDKInit -= onInit;
         }
         
         /// <summary>
@@ -329,30 +365,30 @@ namespace Amanotes.Core
         /// <param name="onReady"></param>
         public static void SetCallback_OnGDKReady(Action onReady)
         {
+            if (onReady == null) return;
+            
             if (isReady)
             {
-                onReady.Invoke();
+                onReady();
                 return;
             }
             
-            dispatcher.AddListener(Event.GDK_READY, onReady, true);
+            _onGDKReady -= onReady;
+            _onGDKReady += onReady;
         }
 
-        public static void SetAdapterReadyCallback(Action<string> onAdapterReady)
+        public static void SetCallback_AdapterReady(Action<string> onReady)
         {
-            if (onAdapterReady == null)
-            {
-                LogWarning("Cannot add a null callback!");
-                return;
-            }
-
-            if (AmaGDK.isReady)
-            {
-                LogWarning("All adapters has been init / ready!");
-                return;
-            }
+            if (onReady == null || isReady) return;
             
-            dispatcher.AddListener(Event.ADAPTER_READY, onAdapterReady);
+            _onAdapterReady -= onReady;
+            _onAdapterReady += onReady;
+        }
+
+        [Obsolete("Use SetCallback_AdapterReady instead")]
+        public static void SetAdapterReadyCallback(Action<string> onReady)
+        {
+            SetCallback_AdapterReady(onReady);
         }
     }
 

package/Runtime/Core/GDKDebug.cs

@@ -36,14 +36,13 @@ namespace Amanotes.Core
     
     public class GDKDebug
     {
-        public static LogLevel logLevel;
         public static Action<string> logNonfatalErrorHook = null;
         private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
         public static readonly HashSet<string> logWarningDict = new HashSet<string>();
         
         public static void LogWarningOnce(string message, string key = null)
         {
-            if (logLevel < LogLevel.Warning) return;
+            if (AmaGDK.logLevel < LogLevel.Warning) return;
             if (string.IsNullOrEmpty(key)) key = message;
             if (!logWarningDict.Add(key)) return;
             
@@ -54,7 +53,7 @@ namespace Amanotes.Core
         }
         public static void LogWarning(string message)
         {
-            if (logLevel < LogLevel.Warning) return;
+            if (AmaGDK.logLevel < LogLevel.Warning) return;
             using (NoStackTrace.Warning)
             {
                 Debug.LogWarning($"AmaGDK {message}"); 
@@ -62,13 +61,21 @@ namespace Amanotes.Core
         }
         public static void LogError(string message)
         {
-            if (logLevel < LogLevel.Error) return;
+            if (AmaGDK.logLevel < LogLevel.Error) return;
             using (NoStackTrace.Error)
             {
                 Debug.LogError($"AmaGDK {message}");    
             }
             
             if (logNonfatalErrorHook == null) return;
+            
+            if (GDKUtils.isOnMainThread) // Most of the time
+            {
+                if (!nonFatalDict.Add(message)) return;
+                logNonfatalErrorHook(message);
+                return;
+            }
+            
             GDKUtils.DoOnMainThread(() =>
             {
                 if (!nonFatalDict.Add(message)) return; // LogOnce
@@ -78,7 +85,7 @@ namespace Amanotes.Core
         
         public static void Log(string message)
         {
-            if (logLevel < LogLevel.Verbose) return;
+            if (AmaGDK.logLevel < LogLevel.Verbose) return;
             using (NoStackTrace.Log)
             {
                 Debug.Log($"AmaGDK {message}");