com.amanotes.gdk 0.2.48 → 0.2.50

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -17,17 +17,22 @@ namespace Amanotes.Core
     {
         public enum RemoteConfigSource
         {
-            EmbedConfig,
+            None,
             Cache,
+            Local,
             Internet
         }
 
+        partial class Event
+        {
+            public const string REMOTE_CONFIG_FETCH_COMPLETE = nameof(REMOTE_CONFIG_FETCH_COMPLETE);
+        }
+
         [Serializable]
         public partial class RemoteConfig //Public
         {
-            public static Action<bool> onFetchCompleted;
-            public static Dictionary<string, string> DictConfig => dictConfig;
-            public static RemoteConfigSource Source { private set; get; }
+            public static RemoteConfigSource Source { private set; get; } = RemoteConfigSource.None;
+            
             static bool? _cacheExisted = null;
             public static bool HasCache
             {
@@ -73,8 +78,8 @@ namespace Amanotes.Core
                             return (T)Convert.ChangeType(c.value, typeof(T));
                 }
 #endif
-                if (dictConfig.ContainsKey(key))
-                    return (T)Convert.ChangeType(dictConfig[key], typeof(T));
+                if (DictConfig.ContainsKey(key))
+                    return (T)Convert.ChangeType(DictConfig[key], typeof(T));
                 return defaultValue;
             }
 
@@ -85,7 +90,7 @@ namespace Amanotes.Core
 
             public static string GetConfigAsJsonString()
             {
-                return JsonUtils.DictionaryToJson(dictConfig);
+                return JsonUtils.DictionaryToJson(DictConfig);
             }
 
             public static void SetActiveEmbedConfig(string id)
@@ -105,7 +110,6 @@ namespace Amanotes.Core
             internal enum FetchState
             {
                 None,
-                CheckInternet,
                 Fetch,
                 SaveCache,
 
@@ -116,7 +120,9 @@ namespace Amanotes.Core
                 Fail
             }
 
-            static Dictionary<string, string> dictConfig = new Dictionary<string, string>();
+            public static Dictionary<string, string> DictConfig { get; private set; } = new Dictionary<string, string>();
+            
+            
             static string fileName = $"{nameof(RemoteConfig)}.kv";            
             static string base64Prefix = "base64:";
             const string VERSION_PREFIX = "version:";
@@ -125,28 +131,25 @@ namespace Amanotes.Core
                     ? Config.remoteConfig.embedRemoteConfig.version
                     : 1;
 
-            static FetchState _state = FetchState.None;
-            internal static FetchState State => _state;
+            static FetchState _fetchState = FetchState.None;
+            internal static FetchState fetchState => _fetchState;
 
             static readonly Dictionary<FetchState, Action[]> fetchSM = new Dictionary<FetchState, Action[]>
             {
-                { FetchState.None,                new Action[]{ CheckInternet}},
-                { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},
+                { FetchState.None,                new Action[]{ Fetch}},
                 { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},
                 { FetchState.SaveCache,           new Action[]{ SetDone }},
                 { FetchState.LoadCache,           new Action[]{ LoadEmbedConfig, SetDone}},
-                { FetchState.LoadEmbedConfig,      new Action[]{ SetFail, SetDone}}
+                { FetchState.LoadEmbedConfig,     new Action[]{ SetFail, SetDone}}
             };
 
             internal static RemoteConfigAdapter adapter;
-
-            internal static Action<bool> onAdapterInitCompleteCallback;
             
             internal static void NextState(bool result = true)
             {
-                if (!fetchSM.TryGetValue(_state, out var actions))
+                if (!fetchSM.TryGetValue(_fetchState, out var actions))
                 {
-                    LogWarning("[RemoteConfig] Invalid / Unsupported state: " + _state);
+                    LogWarning("[RemoteConfig] Invalid / Unsupported state: " + _fetchState);
                     return;
                 }
 
@@ -159,15 +162,37 @@ namespace Amanotes.Core
                 actions[result ? 1 : 0]();
             }
             
-            static void CheckInternet()
+            internal static void InitModule()
             {
-                _state = FetchState.CheckInternet;
-                NextState(Application.internetReachability != NetworkReachability.NotReachable);
+                adapter = Adapter2.GetAdapter<RemoteConfigAdapter>();
+            }
+
+            internal static void StartModule()
+            {
+                if (adapter != null) Fetch();
+            }
+
+            public static void SetFetchCompleteCallback(Action<RemoteConfigSource> callback)
+            {
+                
+                if (_fetchState == FetchState.Success || _fetchState == FetchState.Fail)
+                {
+                    callback?.Invoke(Source);
+                    return;
+                }
+                
+                dispatcher.AddListener(Event.REMOTE_CONFIG_FETCH_COMPLETE, callback, true);
             }
 
             static void Fetch()
             {
-                _state = FetchState.Fetch;
+                if (adapter == null)
+                {
+                    _fetchState = FetchState.None;
+                    return;
+                }
+                
+                _fetchState = FetchState.Fetch;
                 adapter.FetchConfig(HasCache, (isSuccess, result) =>
                 {
                     if (!isSuccess)
@@ -175,8 +200,8 @@ namespace Amanotes.Core
                         NextState(false);
                         return;
                     }
-
-                    dictConfig = result;
+                    
+                    DictConfig = result;
                     Source = RemoteConfigSource.Internet;
                     Log("[RemoteConfig] Load from the internet");
                     NextState(true);
@@ -187,13 +212,13 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
                 
-                _state = FetchState.SaveCache;
+                _fetchState = FetchState.SaveCache;
                 StringBuilder sb = new StringBuilder();
                 
                 //Add embedded remote config version to force load from embedded config after app update
                 sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");
 
-                foreach (var c in dictConfig)
+                foreach (var c in DictConfig)
                 {
                     sb.AppendLine($"{c.Key}\t{Encode(c.Value)}");
                 }
@@ -209,7 +234,7 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.RemoteConfig.LoadCache()");
                 
-                _state = FetchState.LoadCache;
+                _fetchState = FetchState.LoadCache;
 
                 if (!HasCache)
                 {
@@ -220,7 +245,7 @@ namespace Amanotes.Core
 
                 try
                 {
-                    dictConfig.Clear();
+                    DictConfig.Clear();
                     using (StreamReader sr = new StreamReader(GDKFileUtils.GetPath(fileName)))
                     {
                         //Check new app update
@@ -253,10 +278,10 @@ namespace Amanotes.Core
                             }
                             string key = line.Substring(0, idx);
                             string value = line.Substring(idx + 1);
-                            dictConfig.Add(key, Decode(value));
+                            DictConfig.Add(key, Decode(value));
                         }
                     }
-                    Source = RemoteConfigSource.Cache;
+                    Source = RemoteConfigSource.Local;
                     Log("[RemoteConfig] Load from cache");
                 }
                 catch (Exception ex)
@@ -274,7 +299,7 @@ namespace Amanotes.Core
 
             static void LoadEmbedConfig()
             {
-                _state = FetchState.LoadEmbedConfig;
+                _fetchState = FetchState.LoadEmbedConfig;
                 
                 if (_config.remoteConfig == null || _config.remoteConfig.embedRemoteConfig == null)
                 {
@@ -292,25 +317,24 @@ namespace Amanotes.Core
 
                 foreach (var item in config.items)
                 {
-                    dictConfig.Add(item.key, item.value);
+                    DictConfig.Add(item.key, item.value);
                 }
-                Source = RemoteConfigSource.EmbedConfig;
+                Source = RemoteConfigSource.Cache;
                 Log("[RemoteConfig] Load from embed asset");
                 NextState(true);
             }
 
             static void SetDone()
             {
-                _state = FetchState.Success;
-                onAdapterInitCompleteCallback(true);
-                onFetchCompleted?.Invoke(true);
+                _fetchState = FetchState.Success;
+                dispatcher.Dispatch(Event.REMOTE_CONFIG_FETCH_COMPLETE, Source);
             }
 
             static void SetFail()
             {
-                _state = FetchState.Fail;
-                onAdapterInitCompleteCallback(false);
-                onFetchCompleted?.Invoke(false);
+                _fetchState = FetchState.Fail;
+                Source = RemoteConfigSource.None;
+                dispatcher.Dispatch(Event.REMOTE_CONFIG_FETCH_COMPLETE, Source);
             }           
 
             static string Encode(string s)
@@ -338,19 +362,19 @@ namespace Amanotes.Core
         }
     }
 
-    public static class RemoteConfigExtension
-    {
-        public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
-        {
-            if (AmaGDK.RemoteConfig.State != AmaGDK.RemoteConfig.FetchState.None)
-            {
-                LogWarning($"[RemoteConfig] Current state {AmaGDK.RemoteConfig.State.ToString()}\nCannot start to initialize");
-                return;
-            }
-            AmaGDK.RemoteConfig.onAdapterInitCompleteCallback = onCompleteCallback;
-            AmaGDK.RemoteConfig.NextState();
-        }
-    }
+    // public static class RemoteConfigExtension
+    // {
+    //     public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
+    //     {
+    //         if (AmaGDK.RemoteConfig.fetchState != AmaGDK.RemoteConfig.FetchState.None)
+    //         {
+    //             LogWarning($"[RemoteConfig] Current state {AmaGDK.RemoteConfig.fetchState.ToString()}\nCannot start to initialize");
+    //             return;
+    //         }
+    //         
+    //         AmaGDK.RemoteConfig.NextState();
+    //     }
+    // }
 }
 
 namespace Amanotes.Core.Internal

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();
+                    });
                 });
             }