com.amanotes.gdk 0.2.46 → 0.2.47

package/Runtime/AmaGDK.cs

@@ -6,7 +6,9 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
+using System.Linq;
 using UnityEngine;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
 using Debug = UnityEngine.Debug;
@@ -15,18 +17,17 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.46";
+        public const string VERSION = "0.2.47";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
         internal static Action _onReadyCallback;
-        internal static Action<AdapterInfo> _onAdapterReadyCallback;
+        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>();
-        private static readonly List<string> _firebaseServices = new List<string>() { AdapterID.FIREBASE_REMOTE_CONFIG, AdapterID.FIREBASE_ANALYTICS };
+        // private static readonly Dictionary<string, AdapterInfo> _adapters = new Dictionary<string, AdapterInfo>();
 
         public static ConfigAsset Config
         {
@@ -34,7 +35,6 @@ namespace Amanotes.Core
             {
                 if (_config != null) return _config;
                 _config = Resources.Load<ConfigAsset>("AmaGDKConfig");
-
                 // if (_config == null) LogWarningOnce(CONFIG_NOT_FOUND);
                 return _config;
             }
@@ -53,24 +53,36 @@ namespace Amanotes.Core
 
             _instance = this;
             DontDestroyOnLoad(this);
-
-
+            
             _allowInit = _allowInit || autoInit;
             StartCoroutine(InitRoutine());
         }
         
-        IEnumerator InitRoutine()
+        IEnumerator InitHook()
         {
-            if (Config == null)
+            int nHooks = Hook.hooks.Count;
+            if (nHooks == 0)
             {
-                throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
+                Log($"[Hook] No hook registered!");
+                yield break;
             }
-
-            yield return StartCoroutine(User.Init());
-
-            float time = 0;
-            float timeout = 1;
-
+            
+            //TODO: Sort Hook by orderId
+            var hookCompleted = false;
+            
+            float stTime = Time.realtimeSinceStartup;
+            
+            Hook.TriggerHooks(() =>
+            {
+                hookCompleted = true;
+            });
+            yield return new WaitUntil(() => hookCompleted);
+            float elapsed = Time.realtimeSinceStartup - stTime;
+            Log($"[Hook] {nHooks} hooks complete after " + elapsed);
+        }
+        
+        IEnumerator WaitForManualInit()
+        {
             var counter = 0;
             const int INIT_TOLERANCE = 10 * 60;
             const int INIT_WARN_CYCLE = 5 * 60;
@@ -85,96 +97,97 @@ namespace Amanotes.Core
                     LogWarning($"Waiting for manual Init() call (~ {Mathf.RoundToInt(counter / 60f)}s passed!)");
                 }
             }
+        }
 
-            _status = Status.Initialize;
-            float startTime = Time.realtimeSinceStartup;
-            StringBuilder adapterAnnounce = new StringBuilder();
+        void InitModules()
+        {
+            Profiler.BeginSample("AmaGDK.InitModules()");
+            {
+                User.InitModule();
+                Analytics.InitModule();
+                Ads.InitModule();
+                IAP.InitModule();    
+            }
+            Profiler.EndSample();
+        }
 
-            // sort on priority
-            Adapter.listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
-            foreach (AdapterContext adapter in Adapter.listAdapters)
+        void StartModules()
+        {
+            Profiler.BeginSample("AmaGDK.StartModules()");
             {
-                Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder}");
-                adapter.Init();
-                RegisterUnityCallback(adapter);
-                
-                time = 0;
+                User.StartModule();
+                Analytics.StartModule();
+                Ads.StartModule();
+                IAP.StartModule();
+            }
+            Profiler.EndSample();
+        }
 
-                while (adapter.status == Status.None || adapter.status == Status.Initialize)
+        IEnumerator InitAdapters(StringBuilder sb)
+        {
+            _status = Status.Initialize;
+            float TIMEOUT = 1;
+            
+            // sort on priority
+            List<Adapter2> listAdapters = Adapter2.adapterMap
+                .Values.ToList();
+            listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
+            
+            foreach (Adapter2 adapter in listAdapters)
+            {
+                // Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder} | {adapter.status}");
+                float startTime = Time.realtimeSinceStartup;
+                Profiler.BeginSample("AmaGDK.adapter.InitSDK()");
                 {
-                    time += Time.deltaTime;
-                    yield return null;
-                    if (time <= timeout) continue;
-                    LogWarning($"{adapter.adapterId} init time out: {timeout}");
-                    break;
+                    adapter.InitSDK();    
                 }
+                Profiler.EndSample();
                 
-                if (adapter.IsReady && _firebaseServices.Contains(adapter.adapterId))
+                yield return GDKUtils.Timeout(TIMEOUT,() => adapter.status != Status.Initialize);
+                
+                if (adapter.status == Status.Initialize)
                 {
-                    firebaseResolved = true;
+                    LogWarning($"{adapter.adapterId} init time out: {TIMEOUT}");
                 }
 
-                var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady, adapter.refObj);
-                _adapters[adapter.adapterId] = adapterInfo;
-                _onAdapterReadyCallback?.Invoke(adapterInfo);
-                adapterAnnounce.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL",
-                    adapter.adapterId, adapter.adapterVersion));
-
+                _onAdapterReadyCallback?.Invoke(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;
-            User.UpdateUserId();
-
-            // Init modules (Adapter managers)
-            Analytics.Init();
-            Ads.Init();
-            IAP.Init();
-
-            _status = Status.Ready;
-            _onReadyCallback?.Invoke();
-            _onReadyCallback = null;
-            Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterAnnounce.ToString()}");
         }
-
-        void RegisterUnityCallback(AdapterContext adapter)
+        
+        
+        IEnumerator InitRoutine()
         {
-            switch (adapter)
+            if (Config == null)
             {
-                case IOnFrameUpdate a: {
-                    onFrameUpdate -= a.OnFrameUpdate;
-                    onFrameUpdate += a.OnFrameUpdate;
-                    break;
-                }
-
-                case IOnApplicationPause a: {
-                    onApplicationPause -= a.OnApplicationPause;
-                    onApplicationPause += a.OnApplicationPause;
-                    break;
-                }
-
-                case IOnApplicationFocus a:
-                {
-                    applicationFocus -= a.OnApplicationFocus;
-                    applicationFocus += a.OnApplicationFocus;
-                    break;
-                }
-                
-                case IOnApplicationQuit a:
-                {
-                    applicationQuit -= a.OnApplicationQuit;
-                    applicationQuit += a.OnApplicationQuit;
-                    break;  
-                }
+                throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
+            
+            float startTime = Time.realtimeSinceStartup;
+            yield return InitHook();
+            
+            var sb = new StringBuilder();
+            InitModules();
+            
+            yield return WaitForManualInit();
+            yield return InitAdapters(sb);
+            
+            StartModules();
+            
+            _status = Status.Ready;
+            _onReadyCallback?.Invoke();
+            _onReadyCallback = null;
+            Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime:#0.00}s\n\n{sb}");
         }
-        
     }
 
     public partial class AmaGDK // PUBLIC APIS
     {
         public static bool isReady => _status == Status.Ready;
-        public static bool firebaseResolved { get; private set; }
 
         public static void Init(Action onReady = null)
         {
@@ -222,33 +235,18 @@ namespace Amanotes.Core
             _onReadyCallback += onReady;
         }
 
-        public static void SetAdapterReadyCallback(Action<AdapterInfo> onAdapterReady)
+        public static void SetAdapterReadyCallback(Action<string> onAdapterReady)
         {
             if (onAdapterReady == null)
             {
                 LogWarning("Cannot add a null callback!");
                 return;
             }
+            
             _onAdapterReadyCallback -= onAdapterReady;
             _onAdapterReadyCallback += onAdapterReady;
         }
 
-        public static AdapterInfo GetAdapterInfo(string id)
-        {
-            if (string.IsNullOrWhiteSpace(id))
-            {
-                LogWarning("Please provide Adapter ID to get the info.");
-                return default;
-            }
-
-            if (!_adapters.ContainsKey(id))
-            {
-                LogWarning($"Adapter {id} is not found.");
-                return default;
-            }
-
-            return _adapters[id];
-        }
     }
 
     public partial class AmaGDK
@@ -294,6 +292,7 @@ namespace Amanotes.Core
     
     public partial class  AmaGDK // Switch dev mode
     {
+        #if UNITY_EDITOR
         [ContextMenu("Change Dev Mode")]
         public void ChangeDevMode()
         {
@@ -337,6 +336,7 @@ namespace Amanotes.Core
             output = output.Trim();
             UpdateManifest(output); 
             Debug.Log("AmaGDK changes to dev mode successfully");
+            UnityEditor.AssetDatabase.Refresh();
         }
             
         private string RunShellCommand(string command)
@@ -363,21 +363,68 @@ namespace Amanotes.Core
             manifestJson = Regex.Replace(manifestJson, "\"com\\.amanotes\\.gdk\"\\s*:\\s*\"\\d+\\.\\d+\\.\\d+\"", $"\"com.amanotes.gdk\": \"{strDesired}\"");
             File.WriteAllText(manifestPath, manifestJson);
         }
+        #endif
     }
-    
-    public class AdapterInfo
-    {
-        public readonly string id;
-        public readonly string version;
-        public readonly bool isReady;
-        public readonly GameObject refObj;
 
-        public AdapterInfo(string id, string version, bool isReady, GameObject refObj)
+    public partial class AmaGDK // Switch dev mode
+    {
+        public static class Hook
         {
-            this.id = id;
-            this.version = version;
-            this.isReady = isReady;
-            this.refObj = refObj;
+            internal static bool started;
+            internal static bool completed;
+            internal static Action onHookComplete;
+            internal static readonly Queue<Action<Action>> hooks = new Queue<Action<Action>>();
+
+            public static void Register(Action<Action> hook)
+            {
+                if (completed)
+                {
+                    LogWarning("Register happen too late: Hook completed!");
+                    return;
+                }
+                
+                hooks.Enqueue(hook);
+            }
+
+            internal static void TriggerHooks(Action onComplete)
+            {
+                if (started || completed)
+                {
+                    LogWarning("Multiple calls TriggerHooks - should call once!");
+                    return;
+                }
+                
+                started = true;
+                onHookComplete = onComplete;
+                Next();
+            }
+            
+            internal static void Next()
+            {
+                if (hooks.Count == 0)
+                {
+                    completed = true;
+                    onHookComplete?.Invoke();
+                    return;
+                }
+
+                Action<Action> h = hooks.Dequeue();
+                if (h == null)
+                {
+                    LogWarning("Hook is null???");
+                    return;
+                }
+
+                try
+                {
+                    h?.Invoke(Next);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogWarning("Exception while triggering hook: " + e);
+                    Next();
+                }
+            }
         }
     }
 }

package/Runtime/Core.meta

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

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

@@ -149,10 +149,10 @@ namespace Amanotes.Core.Internal
             return true;
         }
 
-        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
+        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null, GUIStyle style = null)
         {
             GUILayout.BeginHorizontal();
-            bool newValue = EditorGUILayout.Foldout(isOpen, label);
+            bool newValue = EditorGUILayout.Foldout(isOpen, label, EditorStyles.foldoutHeader);
             bool changed = newValue != isOpen;
             titleFunc?.Invoke();
             GUILayout.EndHorizontal();
@@ -195,8 +195,13 @@ namespace Amanotes.Core.Internal
         
         public static void DrawVersionTag(SemVer version, bool? isValid = null)
         {
-            isValid ??= version.isValid;
             Rect rect = GUILayoutUtility.GetRect(60f, 60f, 18f, 18f);
+            DrawVersionTag(rect, version, isValid);
+        }
+        
+        public static void DrawVersionTag(Rect rect, SemVer version, bool? isValid = null)
+        {
+            isValid ??= version.isValid;
             DrawTag(rect, version.ToString(), isValid.Value ? LIGHT_BLUE : LIGHT_GRAY, 0.5f);
         }
     }

package/Runtime/Internal/AmaGDK.Internal.SemVer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
@@ -8,6 +9,7 @@ namespace Amanotes.Core.Internal
     public struct SemVer : IComparable<SemVer>, IComparer<SemVer>
     {
         public static readonly SemVer ZERO = new SemVer(0, 0, 0);
+        private static readonly Regex VERSION_PATTERN = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
 
         public int major;
         public int minor;
@@ -30,25 +32,27 @@ namespace Amanotes.Core.Internal
             extra = -1;
 
             if (string.IsNullOrEmpty(version)) return;
-
-            version = version.Trim();
-
-            var regex = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
-            Match match = regex.Match(version);
-            if (!match.Success)
+            
+            Profiler.BeginSample("AmaGDK.SemVer()");
             {
-                LogWarning($"Invalid SemVer string: [{version}]");
-                return;
+                version = version.Trim();
+                Match match = VERSION_PATTERN.Match(version);
+                if (!match.Success)
+                {
+                    LogWarning($"Invalid SemVer string: [{version}]");
+                    Profiler.EndSample();
+                    return;
+                }
+                major = int.Parse(match.Groups[1].Value);
+                minor = int.Parse(match.Groups[2].Value);
+                patch = int.Parse(match.Groups[3].Value);
+                if (match.Groups.Count > 3)
+                {
+                    if (!int.TryParse(match.Groups[4].Value, out extra))
+                        extra = -1;
+                }
             }
-            major = int.Parse(match.Groups[1].Value);
-            minor = int.Parse(match.Groups[2].Value);
-            patch = int.Parse(match.Groups[3].Value);
-            if (match.Groups.Count > 3)
-            {
-                if (!int.TryParse(match.Groups[4].Value, out extra))
-                    extra = -1;
-            }
-
+            Profiler.EndSample();
         }
 
         public bool isValid => this != ZERO;

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -22,7 +22,7 @@ namespace Amanotes.Core.Internal
 
     public static class Messsage
     {
-        public const string READY = "init success";
+        public const string READY = "Init success";
         public const string SDK_INIT_CALLED = "init has been called!";
         public const string MULTIPLE_INSTANCE = "multiple instance found!";
         public const string CONFIG_NOT_FOUND = "AmaGDKConfig not found in Resources!";
@@ -52,11 +52,11 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
-            var newPrefab = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
-            newPrefab.name = "AmaGDK";
-            newPrefab.transform.SetAsLastSibling();
+            GameObject go = UnityObject.Instantiate(prefab);
+            go.name = "AmaGDK";
+            go.transform.SetAsLastSibling();
             Selection.activeObject = null;
-            Selection.activeObject = newPrefab;
+            Selection.activeObject = go;
         }
 #endif
     }
@@ -113,7 +113,18 @@ namespace Amanotes.Core.Internal
                 // Logging.LogWarning("Something wrong: another AmaGDK instance found!");
                 UnityObject.Destroy(result[i].gameObject);
             }
-
+            
+            // Reset all adapter status
+            var allAdapters = Adapter2.GetAllAdapter<Adapter2>();
+            foreach (var adapter in allAdapters)
+            {
+                adapter.status = Status.None;
+            }
+            
+            // Reset all modules
+            Ads.context = null;
+            Ads._adapter = null;
+            
             _status = Status.None;
             _allowInit = false;
 

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
@@ -15,12 +17,75 @@ namespace Amanotes.Core.Internal
         {
             AmaGDK._instance.StartCoroutine(DelayCallRoutine(seconds, action));
         }
+        
+        public static void RegisterUnityCallbacks<T>(T target)
+        {
+            if (target == null)
+            {
+                LogWarning("RegisterUnityCallbacks: Target is null!");
+                return;
+            }
+            
+            if (target is IOnFrameUpdate u)
+            {
+                AmaGDK.onFrameUpdate -= u.OnFrameUpdate;
+                AmaGDK.onFrameUpdate += u.OnFrameUpdate;
+            }
+
+            if (target is IOnApplicationPause p)
+            {
+                AmaGDK.onApplicationPause -= p.OnApplicationPause;
+                AmaGDK.onApplicationPause += p.OnApplicationPause;
+            }
+            
+            if (target is IOnApplicationFocus f)
+            {
+                AmaGDK.applicationFocus -= f.OnApplicationFocus;
+                AmaGDK.applicationFocus += f.OnApplicationFocus;
+            }
+            
+            if (target is IOnApplicationQuit q)
+            {
+                AmaGDK.applicationQuit -= q.OnApplicationQuit;
+                AmaGDK.applicationQuit += q.OnApplicationQuit;
+            }
+        }
 
         private static IEnumerator DelayCallRoutine(float seconds, Action callback)
         {
             yield return new WaitForSecondsRealtime(seconds);
             callback();
         }
+        
+        public static IEnumerator Timeout(float timeoutInSecs, Func<bool> completeCheckFunc)
+        {
+            float time = Time.realtimeSinceStartup;
+            while (completeCheckFunc() == false)
+            {
+                yield return null;
+                if (Time.realtimeSinceStartup - time > timeoutInSecs) yield break;
+            }
+        }
+    }
+    
+    public static class GDKReflection
+    {
+        internal static readonly BindingFlags FLAGS = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+        public static T GetFieldValue<T>(this object source, string fieldName, BindingFlags? flags = null)
+        {
+            if (source == null) return default(T);
+            Type sourceType = source.GetType();
+            FieldInfo field = sourceType.GetField(fieldName, flags ?? FLAGS);
+            
+            if (field == null)
+            {
+                LogWarning($"fieldName <{fieldName}> not found in {sourceType}?");
+                return default(T);
+            }
+            
+            return (T)field.GetValue(source);
+        }
+        
     }
     
     internal static class GDKFileUtils
@@ -165,12 +230,12 @@ namespace Amanotes.Core.Internal
         
         internal static void ClearCacheData()
         {
-            StringBuilder logBuilder = new StringBuilder();
-            logBuilder.AppendLine("[AmaGDK] All cached data & stats cleared");
+            var sb = new StringBuilder();
+            sb.AppendLine("[AmaGDK] All cached data & stats cleared");
             
             if (!Directory.Exists(basePath))
             {
-                logBuilder.AppendLine("Cache path not exists: " + basePath);
+                sb.AppendLine("Cache path not exists: " + basePath);
                 return;
             }
             
@@ -178,9 +243,9 @@ namespace Amanotes.Core.Internal
             foreach (string path in filePaths)
             {
                 Delete(path);
-                logBuilder.AppendLine($"[deleted] - {path}");
+                sb.AppendLine($"[deleted] - {path}");
             }
-            Debug.Log(logBuilder);
+            Debug.Log(sb);
         }
     }
 
@@ -300,7 +365,8 @@ namespace Amanotes.Core.Internal
         public static string DictionaryToJson(IDictionary inputDict, bool format = false, bool checkJsonInString = true)
         {
             if (inputDict == null) return "{}";
-
+            
+            Profiler.BeginSample("AmaGDK.JsonUtils.DictionaryToJson()");
             var jsonSb = new StringBuilder();
             jsonSb.Append("{");
             var isFirstElement = true;
@@ -318,12 +384,13 @@ namespace Amanotes.Core.Internal
 
                 jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
                 AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
-
             }
 
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-
-            return jsonSb.ToString();
+            var result = jsonSb.ToString();
+            Profiler.EndSample();
+            
+            return result;
         }
 
         private static void GetJsonIListValue(ref StringBuilder jsonSb, string key, IList list, bool format)
@@ -403,8 +470,8 @@ namespace Amanotes.Core.Internal
 
         private static string EscapeJsonString(string input)
         {
-            //Match any occurrence of a backslash(\), single quotation('), or double quotation (")
-            string pattern = "[\\\'\"]";
+            //Match any occurrence of a backslash(\) and double quotation (")
+            string pattern = "[\\\"]";
             return Regex.Replace(input, pattern, match => $"\\{match.Value}");
         }
 

package/package.json

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