com.amanotes.gdk 0.2.68 → 0.2.70

package/Runtime/AudioToolkit/AmaGDK.Audio.Latency.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using Amanotes.Core.Internal;
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -75,7 +73,7 @@ namespace Amanotes.Core
                     return DEFAULT_FOR_SPEAKER;
                 }
 
-                string deviceName = DeviceInfo.Name;
+                string deviceName = currentDevice.name;
                 int savedLatency = PlayerPrefs.GetInt(PREF_AUDIO_LATENCY + deviceName, -1);
 
                 if (savedLatency >= 0)

package/Runtime/AudioToolkit/AmaGDK.Audio.cs

@@ -1,7 +1,5 @@
 using UnityEngine;
 using System;
-using System.Collections;
-using System.Text;
 using Amanotes.Core.Internal;
 
 namespace Amanotes.Core.Internal
@@ -9,7 +7,8 @@ namespace Amanotes.Core.Internal
     public partial class ConfigAsset
     {
         [SerializeField]
-        public bool enableAudioModule;
+        [Tooltip("Enable to get accurate audio latency & be informed when audio device changed\n\nApi: AmaGDK.Audio.DeviceInfo")]
+        public bool enableAudioModule = true;
     }
 }
 
@@ -23,21 +22,38 @@ namespace Amanotes.Core
             public const string GDK_AUDIO_INTERRUPT_BEGIN = nameof(GDK_AUDIO_INTERRUPT_BEGIN);
             public const string GDK_AUDIO_INTERRUPT_END = nameof(GDK_AUDIO_INTERRUPT_END);
         }
-        public class AudioDeviceInfo
-        {
-            internal AudioDeviceType Type;
-            internal string RawType;
-            public string Name;
-            public int LatencyMs;
-        }
+
         // Public Usage
-        public partial class Audio
+        public static partial class Audio
         {
-            public static AudioDeviceInfo DeviceInfo;
+            public class AudioDeviceInfo
+            {
+                internal AudioDeviceType type;
+                internal string rawType;
+                public string name;
+                public int latencyMs;
+
+                public override string ToString()
+                {
+                    if (string.IsNullOrEmpty(rawType) || string.IsNullOrEmpty(name)) return base.ToString();
+                    return $"type: {type.ToString().ToLower()} rawType:{rawType} name:{name}";
+                }
+            }
+
+            private static AudioDeviceInfo _currentDevice;
+
+            public static AudioDeviceInfo currentDevice
+            {
+                get => _currentDevice ?? NO_DEVICE;
+                private set => _currentDevice = value;
+            }
 
             private static readonly AudioDeviceInfo NO_DEVICE = new AudioDeviceInfo()
             {
-                LatencyMs = DEFAULT_FOR_SPEAKER
+                type = AudioDeviceType.Unknown,
+                rawType = string.Empty,
+                name = "NO_DEVICE",
+                latencyMs = DEFAULT_FOR_SPEAKER
             };
 
             /// <remarks>
@@ -87,8 +103,8 @@ namespace Amanotes.Core
                 _audioDeviceDetector.RegisterEvents();
                 RegisterCallbacks();
 
-                DeviceInfo = DetectAudioInfo();
-                DeviceInfo.LatencyMs = GetAudioDeviceLatency();
+                currentDevice = DetectAudioInfo();
+                currentDevice.latencyMs = GetAudioDeviceLatency();
             }
 
             private static AudioDeviceInfo DetectAudioInfo()
@@ -102,9 +118,9 @@ namespace Amanotes.Core
                 var info = _audioDeviceDetector.GetInfo();
                 return new AudioDeviceInfo
                 {
-                    Type = info.AudioDeviceType,
-                    RawType = info.RawType,
-                    Name = info.Name
+                    type = info.AudioDeviceType,
+                    rawType = info.RawType,
+                    name = info.Name
                 };
             }
         }
@@ -125,9 +141,9 @@ namespace Amanotes.Core
             {
                 GDKUtils.DelayCall(1f, () =>
                 {
-                    DeviceInfo = DetectAudioInfo();
-                    DeviceInfo.LatencyMs = GetAudioDeviceLatency();
-                    dispatcher.Dispatch(Event.GDK_AUDIO_INFO_CHANGE, DeviceInfo);
+                    currentDevice = DetectAudioInfo();
+                    currentDevice.latencyMs = GetAudioDeviceLatency();
+                    dispatcher.Dispatch(Event.GDK_AUDIO_INFO_CHANGE, currentDevice);
                 });
             }
 
@@ -144,10 +160,10 @@ namespace Amanotes.Core
             {
                 GDKUtils.ThrowIf(!Config.enableAudioModule, "Audio Module is disabled, Please enable it in the AmaGDKConfig");
 
-                return DeviceInfo != null
-                       && (DeviceInfo.RawType == "AVAudioSessionPortBluetoothA2DP"
-                           || DeviceInfo.RawType == "TYPE_BLUETOOTH_A2DP"
-                           || DeviceInfo.RawType == "AVAudioSessionPortBluetoothHFP");
+                return currentDevice != null
+                       && (currentDevice.rawType == "AVAudioSessionPortBluetoothA2DP"
+                           || currentDevice.rawType == "TYPE_BLUETOOTH_A2DP"
+                           || currentDevice.rawType == "AVAudioSessionPortBluetoothHFP");
             }
 
             private static string GetCurrentRouteInputs()

package/Runtime/AudioToolkit/Plugins/AudioDeviceDetector.cs

@@ -86,15 +86,13 @@ namespace Amanotes.Core
 
         private void OnAudioDeviceAdded(string param)
         {
-            if (string.IsNullOrEmpty(param))
-                return;
+            if (string.IsNullOrEmpty(param)) return;
             onChanged?.Invoke(param);
         }
 
         private void OnAudioDeviceRemoved(string param)
         {
-            if (string.IsNullOrEmpty(param))
-                return;
+            if (string.IsNullOrEmpty(param)) return;
             onChanged?.Invoke(param);
         }
 
@@ -170,15 +168,18 @@ namespace Amanotes.Core
             }
 
             StringBuilder sb = null;
-
-            for (int i = 0; i < str.Length; i++)
+            for (var i = 0; i < str.Length; i++)
             {
                 char ch = str[i];
 
                 if (char.IsSurrogate(ch))
                 {
-                    sb ??= new StringBuilder(str, 0, i, str.Length);
-
+                    if (sb == null)
+                    {
+                        sb = GDKPool.GetStringBuilder();
+                        sb.Append(str, 0, i);
+                    }
+                    
                     sb.Append(replacementCharacter);
 
                     // If there is a high+low surrogate, skip the low surrogate
@@ -187,13 +188,13 @@ namespace Amanotes.Core
                         i++;
                     }
                 }
-                else if (sb != null)
+                else
                 {
-                    sb.Append(ch);
+                    sb?.Append(ch);
                 }
             }
-
-            return sb == null ? str : sb.ToString();
+            
+            return sb == null ? str : GDKPool.ReturnString(sb);
         }
     }
 

package/Runtime/Core/GDKPool.cs

@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
 
 namespace Amanotes.Core.Internal
 {
@@ -6,32 +9,95 @@ namespace Amanotes.Core.Internal
     {
         void Reset();
     }
-    
-    public class GDKPool<T> where T : new()
+
+    public static class GDKPool
     {
-        private readonly ConcurrentQueue<T> _pool;
+        internal class Pool<T> where T : new()
+        {
+            private readonly ConcurrentQueue<T> _pool;
+            public Pool(int initialCapacity = 4)
+            {
+                _pool = new ConcurrentQueue<T>();
+                for (var i = 0; i < initialCapacity; i++)
+                {
+                    _pool.Enqueue(new T());
+                }
+            }
+        
+            public Pool(int initialCapacity, Func<T> newT)
+            {
+                _pool = new ConcurrentQueue<T>();
+                for (var i = 0; i < initialCapacity; i++)
+                {
+                    _pool.Enqueue(newT());
+                }
+            }
+        
+            public T Get()
+            {
+                if (!_pool.TryDequeue(out var obj)) return new T();
+                if (obj is IPoolItem poolItem) poolItem.Reset();
+                return obj;
+            }
+
+            public void Return(T obj)
+            {
+                _pool.Enqueue(obj);
+            }
 
-        public GDKPool(int initialCapacity)
+            public int Count => _pool.Count;
+        }
+        private static readonly Pool<StringBuilder> sbPool1KB = new Pool<StringBuilder>(8, () => new StringBuilder(1024));
+        private static readonly Pool<StringBuilder> sbPool8KB = new Pool<StringBuilder>(8, () => new StringBuilder(8*1024));
+        private static readonly Pool<HashSet<string>> hashsetPool = new Pool<HashSet<string>>(4);
+        
+        public static StringBuilder GetStringBuilder(int capacityInKb = 1)
+        {
+            StringBuilder result = capacityInKb <= 1 ? sbPool1KB.Get() : sbPool8KB.Get();
+            result.Clear();
+            return result;
+        }
+        
+        public static HashSet<string> GetHashSet()
+        {
+            HashSet<string> result = hashsetPool.Get();
+            result.Clear();
+            return result;
+        }
+        
+        public static string ReturnString(StringBuilder sb)
         {
-            _pool = new ConcurrentQueue<T>();
-            for (int i = 0; i < initialCapacity; i++)
+            if (sb == null) return null;
+            var result = sb.ToString();
+            Return(sb);
+            return result;
+        }
+        
+        public static void Return(StringBuilder sb)
+        {
+            if (sb == null) return;
+            int capacity = sb.Capacity;
+            
+            if (capacity == 1024)
             {
-                _pool.Enqueue(new T());
+                sbPool1KB.Return(sb);
+                return;
             }
+            
+            sbPool8KB.Return(sb);
         }
-
-        public T Get()
+        
+        public static void Return(HashSet<string> hashset)
         {
-            if (!_pool.TryDequeue(out var obj)) return new T();
-            if (obj is IPoolItem poolItem) poolItem.Reset();
-            return obj;
+            if (hashset == null) return;
+            hashsetPool.Return(hashset);
         }
-
-        public void Return(T obj)
+        
+        public static void ReturnAndNullize(ref HashSet<string> hashset)
         {
-            _pool.Enqueue(obj);
+            if (hashset == null) return;
+            hashsetPool.Return(hashset);
+            hashset = null;
         }
-
-        public int Count => _pool.Count;
     }
 }

package/Runtime/Fps/AmaFPS.cs

@@ -60,7 +60,6 @@ namespace Amanotes.Core
         public Action<string, Dictionary<string, object>> LogEventHook;
 
         private bool _isAppReady = false;
-        private int _playCount = 0;
 
         public void TrackLaunchTime()
         {

package/Runtime/Fps/AmaFPSVisualizer.cs

@@ -87,8 +87,8 @@ namespace Amanotes.Core
             public bool enabled = true;
             public Graphic graphic = null;
 
-            public int minFPS = 15;
-            public int maxFPS = 60;
+            public int lowerFPSBoundary = 15;
+            public int upperFPSBoundary = 60;
             public int goodFPS = 55;
             public int acceptableFPS = 45;
             public int badFPS = 30;
@@ -128,8 +128,8 @@ namespace Amanotes.Core
                 {
                     var idx = (i + stIndex) % RESOLUTION;
                     var fps = fpsHistory[idx];
-                    var h = fps <= minFPS ? 0 :
-                                fps >= maxFPS ? 1 : (fps - minFPS) / (maxFPS - minFPS);
+                    var h = fps <= lowerFPSBoundary ? 0 :
+                                fps >= upperFPSBoundary ? 1 : (fps - lowerFPSBoundary) / (upperFPSBoundary - lowerFPSBoundary);
 
                     var v0 = new Vector3(barX, 0, 0);
                     var v1 = new Vector3(barX, h * barH, 0);
@@ -155,9 +155,9 @@ namespace Amanotes.Core
                     barX += barW;
                 }
 
-                AddHorzLine(vh, rect.width, barH * ((goodFPS-minFPS) / (float)(maxFPS-minFPS)), colors[2], 2f);
-                AddHorzLine(vh, rect.width, barH * ((acceptableFPS-minFPS) / (float)(maxFPS-minFPS)), colors[1], 2f);
-                AddHorzLine(vh, rect.width, barH * ((badFPS-minFPS) / (float)(maxFPS-minFPS)), colors[0], 2f);
+                AddHorzLine(vh, rect.width, barH * ((goodFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[2], 2f);
+                AddHorzLine(vh, rect.width, barH * ((acceptableFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[1], 2f);
+                AddHorzLine(vh, rect.width, barH * ((badFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[0], 2f);
             }
 
             void AddHorzLine(VertexHelper vh, float w, float h, Color color, float thickness = 1f)

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

@@ -100,7 +100,7 @@ namespace Amanotes.Core.Internal
             GUI.DrawTextureWithTexCoords(new Rect(x + l, y + t, centerX, centerY), texture, new Rect(lu, bv, ru - lu, tv - bv));
         }
 
-        public static void SectionLabel(string text)
+        public static void SectionLabel(GUIContent text)
         {
             if (BIG_LABEL == null)
             {

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -68,16 +68,13 @@ namespace Amanotes.Core.Internal
     {
         public static Action<string> logNonfatalErrorHook = null;
         private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
-        
-        public static readonly StringBuilder tmpWarningSB = new StringBuilder();
         public static readonly HashSet<string> logWarningDict = new HashSet<string>();
 
         public static void LogWarningOnce(string message, string key = null)
         {
             if (Config.common.logLevel < LogLevel.Warning) return;
             if (string.IsNullOrEmpty(key)) key = message;
-            if (logWarningDict.Contains(key)) return;
-            logWarningDict.Add(key);
+            if (!logWarningDict.Add(key)) return;
             Debug.LogWarning($"AmaGDK {message}");
         }
         public static void LogWarning(string message)
@@ -133,7 +130,7 @@ namespace Amanotes.Core.Internal
             }
 
             AmaGDK[] result = Resources.FindObjectsOfTypeAll<AmaGDK>();
-            for (int i = 0; i < result.Length; i++)
+            for (var i = 0; i < result.Length; i++)
             {
                 if (result[i] == null) continue;
 

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -15,8 +14,6 @@ namespace Amanotes.Core.Internal
 {
     public static partial class GDKUtils
     {
-        
-        
         public static bool IsFromTemplate(string formattedString, string template)
         {
             // Split the original template into segments based on the positions of placeholders
@@ -271,7 +268,7 @@ namespace Amanotes.Core.Internal
         
         public static void ClearCacheData()
         {
-            var sb = new StringBuilder();
+            var sb = GDKPool.GetStringBuilder();
             sb.AppendLine("[AmaGDK] All cached data & stats cleared");
             
             if (!Directory.Exists(basePath))
@@ -408,16 +405,16 @@ namespace Amanotes.Core.Internal
             return DictionaryToJson(new Dictionary<string, object>
                 { { key, value } });
         }
-
+        
         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();
+            var jsonSb = GDKPool.GetStringBuilder(8);
             jsonSb.Append("{");
             bool isFirstElement = true;
-
+            
             foreach (DictionaryEntry entry in inputDict)
             {
                 if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString())) continue;
@@ -432,9 +429,9 @@ namespace Amanotes.Core.Internal
                 jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
                 AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
             }
-
+            
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-            string result = jsonSb.ToString();
+            var result = GDKPool.ReturnString(jsonSb);
             Profiler.EndSample();
             
             return result;
@@ -470,7 +467,7 @@ namespace Amanotes.Core.Internal
 
             if (value is string)
             {
-                string s = value.ToString();
+                var s = value.ToString();
                 if (checkJsonInString)
                 {
                     if (s.StartsWith("{") && s.EndsWith("}"))
@@ -484,7 +481,9 @@ namespace Amanotes.Core.Internal
                         return;
                     }
                 }
-                jsonSb.Append($"\"{EscapeJsonString(s)}\"");
+                jsonSb.Append($"\"");
+                AppendEscapeJsonString(jsonSb, s);
+                jsonSb.Append($"\"");
                 return;
             }
 
@@ -521,81 +520,33 @@ namespace Amanotes.Core.Internal
         /// </summary>
         /// <param name="input">The input string to be escaped.</param>
         /// <returns>The escaped string.</returns>
-        public static string EscapeJsonString(string input)
+        private static readonly Dictionary<char, string> escapeSequences = new Dictionary<char, string>
+        {
+            { '\"', "\\\"" },
+            { '\\', @"\\" },
+            { '\b', "\\b" },
+            { '\f', "\\f" },
+            { '\n', "\\n" },
+            { '\r', "\\r" },
+            { '\t', "\\t" }
+        };
+        public static void AppendEscapeJsonString(StringBuilder sb, string input)
         {
-            var sb = new StringBuilder();
             foreach (char c in input)
             {
-                switch (c)
+                if (escapeSequences.TryGetValue(c, out var escapedValue))
+                {
+                    sb.Append(escapedValue);
+                }
+                else if (c < 0x20 || char.IsSurrogate(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;
+                    sb.AppendFormat("\\u{0:X4}", (int)c);
+                }
+                else
+                {
+                    sb.Append(c);
                 }
             }
-            return sb.ToString();
-        }
-
-
-        //public static T[] FromJsonToArray<T>(string json)
-        //{
-        //    if (!json.StartsWith("{\"items\":"))
-        //    {
-        //        json = $"{{\"items\":{json}}}";
-        //    }
-        //    Wrapper<T> wrapper = JsonUtility.FromJson<Wrapper<T>>(json);
-        //    return wrapper.items;
-        //}
-
-        //public static T FromJsonToObject<T>(string json)
-        //{
-        //    return JsonUtility.FromJson<T>(json);
-        //}
-
-        //public static string ToJson<T>(T[] array)
-        //{
-        //    Wrapper<T> wrapper = new Wrapper<T>();
-        //    wrapper.items = array;
-        //    return JsonUtility.ToJson(wrapper);
-        //}
-
-        //public static string ToJson<T>(T obj)
-        //{
-        //    return JsonUtility.ToJson(obj);
-        //}
-
-        //[Serializable]
-        //private class Wrapper<T>
-        //{
-        //    public T[] items;
-        //}
+        }
     }
 }

package/Runtime/Internal/GDKGeoLocationcs.cs

@@ -7,7 +7,9 @@ namespace Amanotes.Core.Internal
 {
     public partial class ConfigAsset
     {
-        [SerializeField] public bool enableGeoLocation = true;
+        [SerializeField]
+        [Tooltip("Enable to get countryCode automatically, provided by '"+ CountryIS_GeoLocationProvider.URL + "'\n\ndefault: OFF")]
+        public bool enableGeoLocation = false;
     }
 
     internal class GDKGeoLocation

package/Runtime/Internal/GDKServerTime.cs

@@ -58,7 +58,7 @@ namespace Amanotes.Core
 
     internal class WorldTimeServer_TimeProvider : BaseServerTimeProvider
     {
-        private const string URL = "https://www.worldtimeserver.com/current_time_in_LA.aspx";
+        internal const string URL = "https://www.worldtimeserver.com/current_time_in_LA.aspx";
 
         public override ServerTimeData ParseResponse(string response)
         {
@@ -90,7 +90,7 @@ namespace Amanotes.Core
 
     internal class WorldTimeAPI_TimeProvider : BaseServerTimeProvider
     {
-        private const string URL = "https://worldtimeapi.org/api/ip";
+        internal const string URL = "https://worldtimeapi.org/api/ip";
 
         [Serializable]
         private class TimeData
@@ -123,18 +123,21 @@ namespace Amanotes.Core.Internal
 {
     public partial class ConfigAsset
     {
-        [SerializeField] public bool enableServerTime = true;
+        [SerializeField]
+        [Tooltip("Enable to get serverTime automatically, provided by\n\n'"+ WorldTimeAPI_TimeProvider.URL + "'\n'" + WorldTimeServer_TimeProvider.URL+ "'\n\ndefault: OFF" )]
+        public bool enableServerTime = false;
     }
 
     internal class GDKServerTime
     {
         private const float MAX_WAIT_TIME = 60;
-        private List<IServerTimeProvider> providers = new List<IServerTimeProvider>() { new WorldTimeAPI_TimeProvider(), new WorldTimeServer_TimeProvider() };
-        private int currentIndex = 0;
-        private IServerTimeProvider provider
+        private List<IServerTimeProvider> providers = new List<IServerTimeProvider>()
         {
-            get { return providers[currentIndex]; }
-        }
+            new WorldTimeAPI_TimeProvider(),
+            new WorldTimeServer_TimeProvider()
+        };
+        private int currentIndex = 0;
+        private IServerTimeProvider provider => providers[currentIndex];
 
         private DateTime? serverTime;
         private float timeSinceFetchServerTime;
@@ -144,7 +147,7 @@ namespace Amanotes.Core.Internal
         {
         }
 
-        public void SetTimeProviders(List<IServerTimeProvider> providers)
+        internal void SetTimeProviders(List<IServerTimeProvider> providers)
         {
             GDKUtils.ThrowIf(providers == null || providers.Count == 0, "Server time providers list cannot be null or empty.");
             this.providers = providers;
@@ -173,7 +176,7 @@ namespace Amanotes.Core.Internal
             }
         }
 
-        public void UpdateTime(Action<DateTime?> result = null)
+        internal void UpdateTime(Action<DateTime?> result = null)
         {
             provider.FetchServerTime(data =>
             {

package/package.json

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