com.amanotes.gdk 0.2.64 → 0.2.65-2

package/Runtime/AmaGDK.cs

@@ -17,17 +17,18 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.64";
-
-        internal static AmaGDK _instance;
-        internal static bool _allowInit = false;
+        public const string VERSION = "0.2.65-2";
+        
         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();
+        private static readonly ForceQuitMonitor ForceQuit = new ForceQuitMonitor();
         
+        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 +49,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,6 +155,8 @@ namespace Amanotes.Core
         
         IEnumerator InitRoutine()
         {
+            _allowInit = _allowInit || autoInit;
+            
             if (Config == null)
             {
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
@@ -205,6 +188,8 @@ namespace Amanotes.Core
                 ServerTime.UpdateTime();
             }
             
+            ForceQuit.Init();
+            
             _status = Status.Ready;
             dispatcher.Dispatch(Event.GDK_READY);
 
@@ -357,35 +342,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
     {
@@ -499,7 +455,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.cs

@@ -87,12 +87,13 @@ namespace Amanotes.Core.Internal
         public static void LogError(string message)
         {
             if (Config.common.logLevel >= LogLevel.Error) Debug.LogError($"AmaGDK {message}");
-            if (logNonfatalErrorHook != null)
+            if (logNonfatalErrorHook == null) return;
+            GDKUtils.DoOnMainThread(() =>
             {
                 if (nonFatalDict.Contains(message)) return; // LogOnce
                 nonFatalDict.Add(message);
-                logNonfatalErrorHook(message);
-            }
+                logNonfatalErrorHook(message);    
+            });
         }
         public static void Log(string message)
         {
@@ -106,7 +107,7 @@ namespace Amanotes.Core.Internal
         private static bool presetEnableEventStat;
         private static LogLevel presetLogLevel = LogLevel.Warning;
         
-        public static void PresetConfig()
+        public static void LoadPresetConfig()
         {
             presetLogLevel = Config.common.logLevel;
             Config.common.logLevel = LogLevel.Warning;
@@ -184,11 +185,6 @@ 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(); }
-
     public static class Utils // Hidden Utils
     {
         private static readonly Dictionary<string, float> LastFireInSessions = new Dictionary<string, float>();

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -12,65 +13,8 @@ using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
-    public static class GDKUtils
+    public static partial class GDKUtils
     {
-        public static void StartCoroutine(IEnumerator action)
-        {
-            AmaGDK._instance.StartCoroutine(action);
-        }
-        public static void DelayCall(float seconds, Action action)
-        {
-            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 bool IsFromTemplate(string formattedString, string template)
@@ -157,7 +101,7 @@ namespace Amanotes.Core.Internal
             segments[matches.Count] = template.Substring(lastIndex);
             return segments;
         }
-
+        
         internal static void ThrowIf(bool condition, string message)
         {
             if (condition)
@@ -455,11 +399,7 @@ namespace Amanotes.Core.Internal
     {
         public static string TupleToJson(params (string key, object value)[] parameters)
         {
-            var tupleToDict = new Dictionary<string, object>();
-            foreach (var item in parameters)
-            {
-                tupleToDict.Add(item.key, item.value);
-            }
+            var tupleToDict = parameters.ToDictionary(item => item.key, item => item.value);
             return DictionaryToJson(tupleToDict);
         }
 
@@ -476,13 +416,13 @@ namespace Amanotes.Core.Internal
             Profiler.BeginSample("AmaGDK.JsonUtils.DictionaryToJson()");
             var jsonSb = new StringBuilder();
             jsonSb.Append("{");
-            var isFirstElement = true;
+            bool isFirstElement = true;
 
             foreach (DictionaryEntry entry in inputDict)
             {
                 if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString())) continue;
-                var key = entry.Key.ToString();
-                var value = entry.Value;
+                string key = entry.Key.ToString();
+                object value = entry.Value;
 
                 if (isFirstElement)
                     isFirstElement = false;
@@ -494,7 +434,7 @@ namespace Amanotes.Core.Internal
             }
 
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-            var result = jsonSb.ToString();
+            string result = jsonSb.ToString();
             Profiler.EndSample();
             
             return result;
@@ -503,7 +443,7 @@ namespace Amanotes.Core.Internal
         private static void GetJsonIListValue(ref StringBuilder jsonSb, string key, IList list, bool format)
         {
             jsonSb.Append("[");
-            var isFirstElement = true;
+            bool isFirstElement = true;
 
             foreach (object item in list)
             {
@@ -530,7 +470,7 @@ namespace Amanotes.Core.Internal
 
             if (value is string)
             {
-                var s = value.ToString();
+                string s = value.ToString();
                 if (checkJsonInString)
                 {
                     if (s.StartsWith("{") && s.EndsWith("}"))
@@ -554,34 +494,77 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
-            if (value is bool)
+            if (value is bool b)
             {
-                jsonSb.Append((bool)value ? "true" : "false");
+                jsonSb.Append(b ? "true" : "false");
                 return;
             }
 
-            if (value is IDictionary)
+            if (value is IDictionary dictionary)
             {
-                jsonSb.Append($"{DictionaryToJson((IDictionary)value, format)}");
+                jsonSb.Append($"{DictionaryToJson(dictionary, format)}");
                 return;
             }
 
-            if (value is IList || value is Array)
+            if (value is IList list)
             {
-                GetJsonIListValue(ref jsonSb, key, (IList)value, format);
+                GetJsonIListValue(ref jsonSb, key, list, format);
                 return;
             }
 
             jsonSb.Append($"{JsonUtility.ToJson(value, format)}");
         }
 
-        private static string EscapeJsonString(string input)
+        /// <summary>
+        /// Escapes a string for inclusion in a JSON document according to RFC 8259.
+        /// For more details, see <a href="https://www.rfc-editor.org/rfc/rfc8259.txt">RFC 8259</a>.
+        /// </summary>
+        /// <param name="input">The input string to be escaped.</param>
+        /// <returns>The escaped string.</returns>
+        public static string EscapeJsonString(string input)
         {
-            //Match any occurrence of a backslash(\) and double quotation (")
-            string pattern = "[\\\"]";
-            return Regex.Replace(input, pattern, match => $"\\{match.Value}");
+            var sb = new StringBuilder();
+            foreach (char c in input)
+            {
+                switch (c)
+                {
+                    case '\"': sb.Append("\\\""); break;
+                    case '\\': sb.Append("\\\\"); break;
+                    case '\b': sb.Append("\\b"); break;
+                    case '\f': sb.Append("\\f"); break;
+                    case '\n': sb.Append("\\n"); break;
+                    case '\r': sb.Append("\\r"); break;
+                    case '\t': sb.Append("\\t"); break;
+                    default:
+                        if (c < 0x20)
+                        {
+                            // Encode as \uXXXX for control characters
+                            sb.Append("\\u" + ((int)c).ToString("X4"));
+                        }
+                        else if (char.IsSurrogate(c))
+                        {
+                            // Handle surrogate pairs
+                            if (char.IsHighSurrogate(c))
+                            {
+                                sb.Append("\\u" + ((int)c).ToString("X4"));
+                            }
+                            else if (char.IsLowSurrogate(c))
+                            {
+                                sb.Append("\\u" + ((int)c).ToString("X4"));
+                            }
+                        }
+                        else
+                        {
+                            // Keep characters as is if they are in the UTF-8 range
+                            sb.Append(c);
+                        }
+                        break;
+                }
+            }
+            return sb.ToString();
         }
 
+
         //public static T[] FromJsonToArray<T>(string json)
         //{
         //    if (!json.StartsWith("{\"items\":"))