com.amanotes.gdk 0.2.63 → 0.2.65-1

package/Runtime/AmaGDK.UserProfile.cs

@@ -72,83 +72,152 @@ namespace Amanotes.Core
                     _userId = value;
                     Logging.Log($"GDK UserID Updated: {_userId}");
                     dispatcher.Dispatch(Event.GDK_USER_ID_UPDATED, _userId);
-                    Save();
+                    _dirty = true;
+                    if (isReady) SendMapUserId();
                 }
             }
 
             public string GAId
             {
                 get => _gaid;
-                set => _gaid = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for GAId. Value: {value}");
+                        return;
+                    }
+                    _gaid = value;
+                    UpdateUserId();
+                }
             }
 
             public string IDFA
             {
                 get => _idfa;
-                set => _idfa = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for IDFA. Value: {value}");
+                        return;
+                    }
+                    _idfa = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string IDFV
             {
                 get => _idfv;
-                set => _idfv = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for IDFV. Value: {value}");
+                        return;
+                    }
+                    _idfv = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string AndroidId
             {
                 get => _androidId;
-                set => _androidId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AndroidId. Value: {value}");
+                        return;
+                    }
+                    _androidId = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string PseudoId
             {
                 get => _pseudoId;
-                set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for PseudoId. Value: {value}");
+                        return;
+                    }
+                    _pseudoId = value;
+                    UpdateUserId();
+                }
             }
             
-            #if UNITY_ANDROID && !UNITY_EDITOR
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
-            }
-            #else
-            public string AmaDeviceId
-            {
-                get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    var pattern = ALPHANUMERIC_HYPHEN_PATTERN;
+#if UNITY_ANDROID && !UNITY_EDITOR
+                    pattern = ALPHANUMERIC_PATTERN;
+#endif
+                    if (!ValidateId(value, pattern))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
+                        return;
+                    }
+                    _amaDeviceId = value;
+                    UpdateUserId();
+                }
             }
-            #endif
+
 
             public string AppsFlyerId
             {
                 get => _appsFlyerId;
-                set => _appsFlyerId = ValidateId(value, NUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!Application.isEditor && !ValidateId(value, NUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AppsFlyerId. Value: {value}");
+                        return;
+                    }
+                    _appsFlyerId = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string InstallationId
             {
                 get => _installationId;
-                set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for InstallationId. Value: {value}");
+                        return;
+                    }
+                    _installationId = value;
+                    UpdateUserId();
+                }
             }
 
-            public int Session
-            {
-                get => _session;
-            }
+            public int Session => _session;
 
             public string Country
             {
                 get => _country;
                 set
                 {
-                    _country = ValidateId(value, COUNTRY_CODE_PATTERN);
-                    SaveIfDirty();
+                    if (!ValidateId(value, COUNTRY_CODE_PATTERN)) return;
+                    _country = value;
+                    _dirty = true;
                 }
             }
 
-            public void UpdateUserId()
+            private void UpdateUserId()
             {
+                _dirty = true;
 #if UNITY_ANDROID
                 if (!string.IsNullOrWhiteSpace(_gaid))
                 {
@@ -241,14 +310,14 @@ namespace Amanotes.Core
             {
                 User.LoadJsonFromFile();
 
-#if UNITY_ANDROID
+#if UNITY_ANDROID && !UNITY_EDITOR
                 AndroidId = SystemInfo.deviceUniqueIdentifier;
 #elif UNITY_IOS
                 IDFV = SystemInfo.deviceUniqueIdentifier;
 #endif
                 GetAmaDeviceId();
                 UpdateUserId();
-                _session = _session + 1;
+                _session += 1;
                 _dirty = true;
             }
             
@@ -257,8 +326,20 @@ namespace Amanotes.Core
                 // Always get the latest advertising id
                 GetAdvertisingId();
                 Logging.Log($"[UserProfile] user_id: {_userId}");
-                onFrameUpdate -= SaveIfDirty;
-                onFrameUpdate += SaveIfDirty;
+                GDKUtils.OnFrameUpdate(SaveIfDirty);
+                
+                var adsId = Application.platform == RuntimePlatform.Android ? GAId : IDFA;
+                var delay = string.IsNullOrEmpty(AppsFlyerId)
+                                 || string.IsNullOrEmpty(adsId)
+                                 || string.IsNullOrEmpty(PseudoId);
+                
+                GDKUtils.DelayCall(delay ? 1 : 0, SendMapUserId);
+            }
+            
+            private void SendMapUserId()
+            {
+                Analytics.LogEvent("map_user_id", AmaGDK.User.CollectAllUserIds())
+                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
             }
 
             private void SetAdvertisingID(string id)
@@ -280,8 +361,7 @@ namespace Amanotes.Core
                 {
                     GDKUtils.DelayCall(0, () =>
                     {
-                        SetAdvertisingID(advertisingId);                
-                        Save();
+                        SetAdvertisingID(advertisingId);
                     });
                 });
             }
@@ -292,7 +372,7 @@ namespace Amanotes.Core
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
-                        string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
+                        var v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
                         if (string.IsNullOrEmpty(v))
                         {
                             v = Guid.NewGuid().ToString();
@@ -302,7 +382,7 @@ namespace Amanotes.Core
                         break;
                 
                     case RuntimePlatform.Android:
-                        string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                        var cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
                         if (string.IsNullOrEmpty(cachedAmaDeviceId))
                         {
                             cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
@@ -318,11 +398,10 @@ namespace Amanotes.Core
                 Save();
             }
 
-            private string ValidateId (string id, string pattern)
+            private bool ValidateId (string id, string pattern)
             {
-                if (string.IsNullOrWhiteSpace(id)) return null;
-                if (!Regex.IsMatch(id, pattern)) return null;
-                return id;
+                if (string.IsNullOrWhiteSpace(id)) return false;
+                return Regex.IsMatch(id, pattern);
             }
         }
     }

package/Runtime/AmaGDK.cs

@@ -17,17 +17,16 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.63";
-
-        internal static AmaGDK _instance;
-        internal static bool _allowInit = false;
+        public const string VERSION = "0.2.66";
+        
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
         internal static readonly GDKGeoLocation GeoLocation = new GDKGeoLocation();
         internal static readonly GDKServerTime ServerTime = new GDKServerTime();
         
-        
+        internal static bool _allowInit = false;
         public bool autoInit = true;
+        
         internal static partial class Event
         {
             public const string GDK_HOOK_START = nameof(GDK_HOOK_START);
@@ -48,26 +47,6 @@ namespace Amanotes.Core
                 return _config;
             }
         }
-
-        private void Awake()
-        {
-            if (_instance != null)
-            {
-                if (_instance != this)
-                {
-                    LogWarning(MULTIPLE_INSTANCE);
-                    Destroy(this);    
-                }
-                LogWarning("Should never be here!");
-                return;
-            }
-            
-            _instance = this;
-            DontDestroyOnLoad(this);
-            
-            _allowInit = _allowInit || autoInit;
-            StartCoroutine(InitRoutine());
-        }
         
         IEnumerator InitHook()
         {
@@ -174,21 +153,24 @@ namespace Amanotes.Core
         
         IEnumerator InitRoutine()
         {
+            _allowInit = _allowInit || autoInit;
+            
             if (Config == null)
             {
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
             
-            float startTime = Time.realtimeSinceStartup;
+            var startTime = Time.realtimeSinceStartup;
             var sb = new StringBuilder();
 
             InitModules();
             
-            float moduleTime = Time.realtimeSinceStartup - startTime;
+            var moduleTime = Time.realtimeSinceStartup - startTime;
             sb.Append($"- InitModules() took (~ {moduleTime:#0.00}s)\n");
             
             yield return InitHook(); //Google CMP takes long at first time (~ 1.7s)
-            float hookTime = Time.realtimeSinceStartup - moduleTime - startTime;
+            
+            var hookTime = Time.realtimeSinceStartup - moduleTime - startTime;
             sb.Append($"- InitHook() took (~ {hookTime:#0.00}s)\n\n");
             
             _status = Status.Initialize;
@@ -206,9 +188,12 @@ namespace Amanotes.Core
             
             _status = Status.Ready;
             dispatcher.Dispatch(Event.GDK_READY);
+
+            var initDuration = Time.realtimeSinceStartup - startTime;
+            LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
-            Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime:#0.00}s\n\n{sb}");
+            Debug.Log($"AmaGDK v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
         }
 
         private void ConfigGeoLocation()
@@ -230,6 +215,29 @@ namespace Amanotes.Core
                 }
             }
         }
+
+        private static void LogEvent_GDKInit(int initDuration)
+        {
+            var _dicKey = new Dictionary<string, object>
+            {
+                ["gdk_version"] = VERSION,
+                ["session"] = User.Session,
+                ["gdk_init_duration"] = initDuration,
+                ["user_id"] = User.UserId
+            };
+
+            void AppendServiceKey(string adapterId, string paramName)
+            {
+                var serviceKey = Adapter2.GetAdapterById(adapterId)?.GetServiceKey();
+                if (string.IsNullOrEmpty(serviceKey)) return;
+                _dicKey[paramName] = serviceKey;    
+            }
+            
+            AppendServiceKey(AdapterID.APPSFLYER, "appsflyer_key");
+            AppendServiceKey(AdapterID.IRONSOURCE, "ironsource_key");
+            AppendServiceKey(AdapterID.REVENUECAT, "revenuecat_key");
+            Analytics.LogEvent("gdk_init", _dicKey);
+        }
     }
 
     public partial class AmaGDK // PUBLIC APIS
@@ -330,35 +338,6 @@ namespace Amanotes.Core
             public const string REVENUECAT = "RevenueCat";
         }
     }
-
-    public partial class AmaGDK
-    {
-        internal static event Action onFrameUpdate;
-        internal static event Action<bool> onApplicationPause;
-        internal static event Action<bool> applicationFocus;
-        internal static event Action applicationQuit;
-        
-        private void OnApplicationPause(bool pauseStatus)
-        {
-            onApplicationPause?.Invoke(pauseStatus);
-        }
-
-        private void OnApplicationFocus(bool hasFocus)
-        {
-            applicationFocus?.Invoke(hasFocus);
-        }
-        
-        private void Update()
-        {
-            if (!isReady) return;
-            onFrameUpdate?.Invoke();
-        }
-        
-        private void OnApplicationQuit()
-        {
-            applicationQuit?.Invoke();
-        }
-    }
     
     public partial class  AmaGDK // Switch dev mode
     {
@@ -472,7 +451,7 @@ namespace Amanotes.Core
             {
                 if (completed)
                 {
-                    LogWarning("Register happen too late: Hook completed!");
+                    LogWarning("Add happen too late: Hook completed!");
                     return;
                 }
                 

package/Runtime/Core/GDKRoutine.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+using UnityEngine;
+namespace Amanotes.Core.Internal
+{
+    [Flags]
+    internal enum RoutineStatus
+    {
+        None,
+        Started = 1,
+        Stopped = 2
+    }
+    
+    public class GDKRoutine
+    {
+        private RoutineStatus status;
+        private readonly IEnumerator action;
+        private Coroutine routine;
+
+        public bool isAlive => (status & RoutineStatus.Stopped) == 0;
+        
+        public GDKRoutine(IEnumerator action)
+        {
+            this.action = action;
+            status = RoutineStatus.None;
+        }
+
+        public void StartRoutine()
+        {
+            if (!isAlive)
+            {
+                // StopRoutine() called before start: do nothing
+                return;
+            }
+            
+            status |= RoutineStatus.Started;
+            routine = AmaGDK._instance.StartCoroutine(action);
+        }
+
+        public void StopRoutine()
+        {
+            status |= RoutineStatus.Stopped;
+            if (routine != null) AmaGDK._instance.StopCoroutine(routine);
+        }
+    }
+
+    public static partial class GDKUtils
+    {
+        public static GDKRoutine StartCoroutine(IEnumerator action)
+        {
+            var routine = new GDKRoutine(action);
+            DoOnMainThread(routine.StartRoutine);
+            return routine;
+        }
+
+        public static void StopCoroutine(GDKRoutine gdkRoutine)
+        {
+            gdkRoutine.StopRoutine();
+        }
+    }
+}

package/Runtime/Core/GDKRoutine.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1a341fd3b1ed4dff93eaccd1b4d442a3
+timeCreated: 1718160748

package/Runtime/Core/GDKUnityCallback.cs

@@ -0,0 +1,141 @@
+using System;
+
+namespace Amanotes.Core.Internal
+{
+    public interface IOnApplicationPause { void OnApplicationPause(bool pauseStatus);     }
+    public interface IOnApplicationQuit { void OnApplicationQuit(); }
+    public interface IOnApplicationFocus { void OnApplicationFocus(bool hasFocus); }
+    public interface IOnFrameUpdate { void OnFrameUpdate(); }
+}
+
+namespace Amanotes.Core.Internal
+{
+    public class GDKUnityCallback
+    {
+        public Action<bool> OnApplicationPause;
+        public Action<bool> OnApplicationFocus;
+        public Action OnApplicationQuit;
+        public Action OnFrameUpdate;
+        public Action DoOnceNextFrame;
+
+        // Lock object to ensure thread-safe operations
+        private readonly object _locker = new object();
+
+        // Add Listener
+        public void AddCallback(ref Action source, Action callback)
+        {
+            if (callback == null) return;
+            lock (_locker)
+            {
+                source -= callback;
+                source += callback;
+            }
+        }
+        public void AddCallback<T>(ref Action<T> source, Action<T> callback)
+        {
+            if (callback == null) return;
+            lock (_locker)
+            {
+                source -= callback;
+                source += callback;
+            }
+        }
+
+
+        // Remove Listener
+        public void RemoveCallback(ref Action source, Action callback)
+        {
+            if (callback == null) return;
+            lock (_locker)
+            {
+                source -= callback;
+            }
+        }
+        public void RemoveCallback<T>(ref Action<T> source, Action<T> callback)
+        {
+            if (callback == null) return;
+            lock (_locker)
+            {
+                source -= callback;
+            }
+        }
+
+
+        // Invoke
+        public void Invoke(ref Action source)
+        {
+            if (source == null) return;
+            Action actionsToInvoke;
+            lock (_locker)
+            {
+                bool remove = source == DoOnceNextFrame;
+                actionsToInvoke = source;
+                if (remove) source = null;
+            }
+
+            GDKUtils.SafeInvoke(actionsToInvoke);
+        }
+        public void Invoke<T>(ref Action<T> source, T data)
+        {
+            if (source == null) return;
+            Action<T> actionsToInvoke;
+            lock (_locker)
+            {
+                actionsToInvoke = source;
+            }
+
+            GDKUtils.SafeInvoke(actionsToInvoke, data);
+        }
+        
+        
+        // Observer
+        public void AddObserver<T>(T observer)
+        {
+            if (observer == null) return;
+
+            if (observer is IOnFrameUpdate u)
+            {
+                AddCallback(ref OnFrameUpdate, u.OnFrameUpdate);
+            }
+
+            if (observer is IOnApplicationPause p)
+            {
+                AddCallback(ref OnApplicationPause, p.OnApplicationPause);
+            }
+
+            if (observer is IOnApplicationFocus f)
+            {
+                AddCallback(ref OnApplicationFocus, f.OnApplicationFocus);
+            }
+
+            if (observer is IOnApplicationQuit q)
+            {
+                AddCallback(ref OnApplicationQuit, q.OnApplicationQuit);
+            }
+        }
+        public void RemoveObserver<T>(T observer)
+        {
+            if (observer == null) return;
+
+            if (observer is IOnFrameUpdate u)
+            {
+                RemoveCallback(ref OnFrameUpdate, u.OnFrameUpdate);
+            }
+
+            if (observer is IOnApplicationPause p)
+            {
+                RemoveCallback(ref OnApplicationPause, p.OnApplicationPause);
+            }
+
+            if (observer is IOnApplicationFocus f)
+            {
+                RemoveCallback(ref OnApplicationFocus, f.OnApplicationFocus);
+            }
+
+            if (observer is IOnApplicationQuit q)
+            {
+                RemoveCallback(ref OnApplicationQuit, q.OnApplicationQuit);
+            }
+        }
+    }
+}

package/Runtime/Core/GDKUnityCallback.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 597f549a7af24670b911da2047054e5e
+timeCreated: 1718085791

package/Runtime/Core.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b84f1cdb15ec4442b3a2f0b038c711c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Internal/AmaGDK.Internal.AmaGUI.cs

@@ -149,10 +149,27 @@ namespace Amanotes.Core.Internal
             return true;
         }
 
-        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null, GUIStyle style = null)
+        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
+        {
+            return Foldout(label, null, ref isOpen, drawFunc, titleFunc);
+        }
+
+        public static bool Foldout(string label, Texture icon, ref bool isOpen, Action drawFunc, Action titleFunc = null)
         {
             GUILayout.BeginHorizontal();
-            bool newValue = EditorGUILayout.Foldout(isOpen, label, EditorStyles.foldoutHeader);
+            float labelWidth = EditorGUIUtility.labelWidth;
+            
+            var content = new GUIContent(label, icon);
+            float w = EditorStyles.foldoutHeader.CalcSize(content).x;
+            EditorGUIUtility.labelWidth = w;
+
+            // var c = GUI.color;
+            // GUI.color = Color.red;
+            Rect rect = GUILayoutUtility.GetRect(w, w, 18f, 18f);
+            bool newValue = EditorGUI.Foldout(rect, isOpen, content, EditorStyles.foldoutHeader);
+            EditorGUIUtility.labelWidth = labelWidth;
+            // GUI.color = c;
+            
             bool changed = newValue != isOpen;
             titleFunc?.Invoke();
             GUILayout.EndHorizontal();