com.amanotes.gdk 0.2.48 → 0.2.49

package/Runtime/AmaGDK.UserProfile.cs

@@ -1,36 +1,40 @@
 using System;
-using System.Collections;
 using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
+using System.Collections.Generic;
 using UnityEngine;
+
 namespace Amanotes.Core
 {
     public partial class AmaGDK //User profile
     {
         public static readonly UserProfile User = new UserProfile();
-        public static event Action<string> OnUserIdChanged;
 
         [Serializable]
         public partial class UserProfile : IJsonFile
         {
-            private const string FILE_NAME = nameof(UserProfile);
-            [NonSerialized] internal bool _dirty;
-
             private void Save()
             {
-                GDKFileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
-            }
-
-            internal void SaveIfDirty()
-            {
-                if (!_dirty) return;
-                _dirty = false;
                 this.SaveJsonToFile();
             }
         }
 
         public partial class UserProfile //PUBLIC
         {
+            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;
+            }
+            
             public string UserId
             {
                 get
@@ -40,9 +44,8 @@ namespace Amanotes.Core
                 }
                 private set
                 {
-                    if (_userId == value) return;    
+                    if (_userId == value) return;
                     _userId = value;
-                    OnUserIdChanged?.Invoke(_userId);
                     Save();
                 }
             }
@@ -102,65 +105,8 @@ namespace Amanotes.Core
                 get => _installationId;
                 set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
-        }
-        
-        public partial class UserProfile //INTERNAL
-        {
-            [SerializeField]
-            private string _userId;
-            [SerializeField]
-            private string _gaid;
-            [SerializeField]
-            private string _idfa;
-            [SerializeField]
-            private string _idfv;
-            [SerializeField]
-            private string _androidId;
-            [SerializeField]
-            private string _pseudoId;
-            [SerializeField]
-            private string _amaDeviceId;
-            [SerializeField] 
-            private string _appsFlyerId;
-            [SerializeField] 
-            private string _installationId;
-
-            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-]+$";
-            
-            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
-            private const float TIME_OUT = 5f;
-            private const float WAIT_TIME = 0.5f;
-            private WaitForSecondsRealtime waitForDuration = new WaitForSecondsRealtime(WAIT_TIME);
-
-            internal void InitModule()
-            {
-                User.LoadJsonFromFile();
-                
-                // Always get the latest advertising id
-                GetAdvertisingId();
-            }
-            
-            internal void StartModule()
-            {
-                UpdateUserId();
-            }
             
-            // internal IEnumerator Init()
-            // {
-            //     float time = 0;
-            //     while (!User.IsAmaDeviceIdExist())
-            //     {
-            //         yield return waitForDuration;
-            //         time += WAIT_TIME;
-            //         if (time <= TIME_OUT) continue;
-            //         Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
-            //         break;
-            //     }
-            // }
-            
-            internal void UpdateUserId()
+            public void UpdateUserId()
             {
 #if UNITY_ANDROID
                 if (!string.IsNullOrWhiteSpace(_gaid))
@@ -168,33 +114,35 @@ namespace Amanotes.Core
                     UserId = $"GAID-{_gaid}";
                     return;
                 }
-                
-                if (!string.IsNullOrWhiteSpace(_androidId))
-                {
-                    UserId = $"ADR-{_androidId}";
-                    return;
-                }
 #endif
-                
 #if UNITY_IOS
                 if (!string.IsNullOrWhiteSpace(_idfa))
                 {
                     UserId = $"IDFA-{_idfa}";
                     return;
                 }
+#endif          
                 
-                if (!string.IsNullOrWhiteSpace(_idfv))
+                if (!string.IsNullOrWhiteSpace(_pseudoId))
                 {
-                    UserId = $"IDFV-{_idfv}";
+                    UserId = $"FRB-{_pseudoId}";
                     return;
                 }
-#endif
                 
-                if (!string.IsNullOrWhiteSpace(_pseudoId))
+#if UNITY_ANDROID
+                if (!string.IsNullOrWhiteSpace(_androidId))
                 {
-                    UserId = $"FRB-{_pseudoId}";
+                    UserId = $"ADR-{_androidId}";
                     return;
                 }
+#endif
+#if UNITY_IOS
+                if (!string.IsNullOrWhiteSpace(_idfv))
+                {
+                    UserId = $"IDFV-{_idfv}";
+                    return;
+                }
+#endif
                 
                 if (!string.IsNullOrWhiteSpace(_amaDeviceId))
                 {
@@ -214,71 +162,105 @@ namespace Amanotes.Core
                     return;
                 }
             }
+        }
+        
+        public partial class UserProfile //INTERNAL
+        {
+            [SerializeField]
+            private string _userId;
+            [SerializeField]
+            private string _gaid;
+            [SerializeField]
+            private string _idfa;
+            [SerializeField]
+            private string _idfv;
+            [SerializeField]
+            private string _androidId;
+            [SerializeField]
+            private string _pseudoId;
+            [SerializeField]
+            private string _amaDeviceId;
+            [SerializeField] 
+            private string _appsFlyerId;
+            [SerializeField] 
+            private string _installationId;
+
+            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-]+$";
             
-            private bool IsAmaDeviceIdExist()
+            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
+
+            internal void InitModule()
             {
-                if (!string.IsNullOrEmpty(_amaDeviceId))
-                {
-                    Logging.Log($"AmaDeviceId is already existed: {_amaDeviceId}");
-                    return true;
-                }
-                return false;
+                User.LoadJsonFromFile();
+
+#if UNITY_ANDROID
+                AndroidId = SystemInfo.deviceUniqueIdentifier;
+#elif UNITY_IOS
+                IDFV = SystemInfo.deviceUniqueIdentifier;
+#endif
+                
+                // Always get the latest advertising id
+                GetAdvertisingId();
             }
             
+            internal void StartModule()
+            {
+                UpdateUserId();
+                Logging.Log($"[UserProfile] user_id: {_userId}");
+            }
+
             private void SetAdvertisingID(string id)
             {
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
                         IDFA = id;
-                        IDFV = SystemInfo.deviceUniqueIdentifier;
                         break;
                     case RuntimePlatform.Android:
                         GAId = id;
-                        AndroidId = SystemInfo.deviceUniqueIdentifier;
-                        break;
-                    default:
-                        // Logging.Log($"[UserProfile] There is no advertising ID on {Application.platform}");
                         break;
                 }
             }
             
             private void GetAdvertisingId()
             {
-                float time = Time.realtimeSinceStartup;
-                
                 AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
                 {
-                    SetAdvertisingID(advertisingId);                
-                    switch (Application.platform)
+                    GDKUtils.DelayCall(0, () =>
                     {
-                        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;
+                        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;
+                            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;
-                    }
+                            default:
+                                AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                                break;
+                        }
                     
-                    Logging.Log($"Generate AmaDeviceId completed: {_amaDeviceId}");
-                    User.Save();
+                        Logging.Log($"[UserProfile] ama_device_id: {_amaDeviceId}");
+                        Save();
+                    });
                 });
             }
 

package/Runtime/AmaGDK.cs

@@ -17,18 +17,27 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.48";
+        public const string VERSION = "0.2.49";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
-        internal static Action _onReadyCallback;
-        internal static Action<string> _onAdapterReadyCallback;
         internal static bool _allowInit = false;
         public bool autoInit = true;
 
         private static ConfigAsset _config = null;
-        // private static readonly Dictionary<string, AdapterInfo> _adapters = new Dictionary<string, AdapterInfo>();
-
+        
+        public 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_START = nameof(GDK_INIT_START);
+            public const string GDK_INIT_END = nameof(GDK_INIT_END);
+            
+            public const string GDK_READY = nameof(GDK_READY);
+            public const string ADAPTER_READY = nameof(ADAPTER_READY);
+        }
+        
         public static ConfigAsset Config
         {
             get
@@ -42,15 +51,17 @@ namespace Amanotes.Core
 
         private void Awake()
         {
-            if (_instance != null && _instance != this)
+            if (_instance != null)
             {
-                LogWarning(MULTIPLE_INSTANCE);
-                Destroy(this);
+                if (_instance != this)
+                {
+                    LogWarning(MULTIPLE_INSTANCE);
+                    Destroy(this);    
+                }
+                LogWarning("Should never be here!");
                 return;
             }
-
-            if (_instance != null) LogWarning("Should never be here!");
-
+            
             _instance = this;
             DontDestroyOnLoad(this);
             
@@ -60,10 +71,12 @@ namespace Amanotes.Core
         
         IEnumerator InitHook()
         {
+            dispatcher.Dispatch(Event.GDK_HOOK_START);
             int nHooks = Hook.hooks.Count;
             if (nHooks == 0)
             {
                 Log($"[Hook] No hook registered!");
+                dispatcher.Dispatch(Event.GDK_HOOK_END);
                 yield break;
             }
             
@@ -71,7 +84,6 @@ namespace Amanotes.Core
             var hookCompleted = false;
             
             float stTime = Time.realtimeSinceStartup;
-            
             Hook.TriggerHooks(() =>
             {
                 hookCompleted = true;
@@ -79,6 +91,7 @@ namespace Amanotes.Core
             yield return new WaitUntil(() => hookCompleted);
             float elapsed = Time.realtimeSinceStartup - stTime;
             Log($"[Hook] {nHooks} hooks complete after " + elapsed);
+            dispatcher.Dispatch(Event.GDK_HOOK_END);
         }
         
         IEnumerator WaitForManualInit()
@@ -106,7 +119,8 @@ namespace Amanotes.Core
                 User.InitModule();
                 Analytics.InitModule();
                 Ads.InitModule();
-                IAP.InitModule();    
+                IAP.InitModule();
+                RemoteConfig.InitModule();
             }
             Profiler.EndSample();
         }
@@ -119,6 +133,7 @@ namespace Amanotes.Core
                 Analytics.StartModule();
                 Ads.StartModule();
                 IAP.StartModule();
+                RemoteConfig.StartModule();
             }
             Profiler.EndSample();
         }
@@ -137,9 +152,9 @@ namespace Amanotes.Core
             {
                 // Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder} | {adapter.status}");
                 float startTime = Time.realtimeSinceStartup;
-                Profiler.BeginSample("AmaGDK.adapter.InitSDK()");
+                Profiler.BeginSample($"AmaGDK.adapter.InitSDK-{adapter.adapterId}");
                 {
-                    adapter.InitSDK();    
+                    adapter.InitSDK();
                 }
                 Profiler.EndSample();
                 
@@ -150,13 +165,12 @@ namespace Amanotes.Core
                     LogWarning($"{adapter.adapterId} init time out: {TIMEOUT}");
                 }
 
-                _onAdapterReadyCallback?.Invoke(adapter.adapterId);
+                dispatcher.Dispatch(Event.ADAPTER_READY, adapter.adapterId);
                 sb.AppendLine($"[{(adapter.IsReady ? " OK " : "FAIL")}] {adapter.adapterId} (~ {Time.realtimeSinceStartup - startTime:#0.00}s)");
                 
                 // Wait for postprocessing of each adapter
                 yield return null;
             }
-            _onAdapterReadyCallback = null;
         }
         
         
@@ -170,6 +184,7 @@ namespace Amanotes.Core
             float startTime = Time.realtimeSinceStartup;
             yield return InitHook();
             
+            dispatcher.Dispatch(Event.GDK_INIT_START);
             var sb = new StringBuilder();
             InitModules();
             
@@ -177,10 +192,10 @@ namespace Amanotes.Core
             yield return InitAdapters(sb);
             
             StartModules();
+            dispatcher.Dispatch(Event.GDK_INIT_END);
             
             _status = Status.Ready;
-            _onReadyCallback?.Invoke();
-            _onReadyCallback = null;
+            dispatcher.Dispatch(Event.GDK_READY);
             Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime:#0.00}s\n\n{sb}");
         }
     }
@@ -200,8 +215,7 @@ namespace Amanotes.Core
 
             if (onReady != null)
             {
-                _onReadyCallback -= onReady;
-                _onReadyCallback += onReady;
+                dispatcher.AddListener(Event.GDK_READY, onReady, true);
             }
 
             if (_allowInit)
@@ -211,28 +225,21 @@ namespace Amanotes.Core
             }
 
             _allowInit = true;
-
             if (_instance != null) return;
+            
             var sdk = new GameObject("AmaGDK");
             _instance = sdk.AddComponent<AmaGDK>();
         }
 
         public static void SetOnReadyCallback(Action onReady)
         {
-            if (onReady == null)
-            {
-                LogWarning("Cannot add a null callback!");
-                return;
-            }
-
             if (isReady)
             {
                 onReady.Invoke();
                 return;
             }
             
-            _onReadyCallback -= onReady;
-            _onReadyCallback += onReady;
+            dispatcher.AddListener(Event.GDK_READY, onReady, true);
         }
 
         public static void SetAdapterReadyCallback(Action<string> onAdapterReady)
@@ -242,11 +249,15 @@ namespace Amanotes.Core
                 LogWarning("Cannot add a null callback!");
                 return;
             }
+
+            if (AmaGDK.isReady)
+            {
+                LogWarning("All adapters has been init / ready!");
+                return;
+            }
             
-            _onAdapterReadyCallback -= onAdapterReady;
-            _onAdapterReadyCallback += onAdapterReady;
+            dispatcher.AddListener(Event.ADAPTER_READY, onAdapterReady, false);
         }
-
     }
 
     public partial class AmaGDK
@@ -316,7 +327,7 @@ namespace Amanotes.Core
                 return;
             }
         
-            int startIndex = zshrcContent.IndexOf($"export {variableName}=");
+            int startIndex = zshrcContent.IndexOf($"export {variableName}=", StringComparison.Ordinal);
             if (startIndex >= 0)
             {
                 startIndex += $"export {variableName}=".Length;
@@ -366,7 +377,7 @@ namespace Amanotes.Core
         #endif
     }
 
-    public partial class AmaGDK // Switch dev mode
+    public partial class AmaGDK
     {
         public static class Hook
         {