com.amanotes.gdk 0.2.69 → 0.2.70

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.2.70 - 2024-08-02]
+- [Fix] onAdResult call multiple times
+- [Dev] Show SQLite analytics in GDK Inspector
+- [Dev] Reduce GC by reuse StringBuilders
+
 ## [0.2.69 - 2024-07-26]
 - [Fix] disable Max adapter
 - [Dev] Update OnAdResult callback

package/Editor/AmaGDKEditor.cs

@@ -52,7 +52,8 @@ namespace Amanotes.Editor
             APPSFLYER,
             IRONSOURCE,
             MAX,
-            REVENUECAT
+            REVENUECAT,
+            SQLITE_ANALYTICS,
         };
 
         public void OnEnable()

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -185,6 +185,7 @@ namespace Amanotes.Editor
                 case IRONSOURCE: return IronSource();
                 case MAX: return Max();
                 case REVENUECAT: return RevenueCat();
+                case SQLITE_ANALYTICS: return SqliteAnalytics();
                 default:
                     Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
                     break;
@@ -329,6 +330,11 @@ namespace Amanotes.Editor
             return version?.Trim();
         }
 
+        internal static string SqliteAnalytics()
+        {
+            return "1.0.0";
+        }
+
         internal static string RevenueCat()
         {
             string[] files = Directory.GetFiles("Assets", "PurchasesWrapper.java", SearchOption.AllDirectories);

package/Runtime/Ad/AdLogic.cs

@@ -320,9 +320,7 @@ namespace Amanotes.Core.Internal
 
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
 
-            // Extra callback
-            context.showFinishAt = Time.realtimeSinceStartup;
-            context.onAdResult?.Invoke(isSuccess);
+            
 
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -341,8 +339,13 @@ namespace Amanotes.Core.Internal
             TriggerOnAfterAdShow();
 
             Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
+            
+            // Extra callback
+            context.showFinishAt = Time.realtimeSinceStartup;
+            var resultCallback = context.onAdResult;
             Ads.context = null;
             _showState = ShowAdsState.None;
+            resultCallback?.Invoke(isSuccess);
         }
 
         private void TriggerBeforeAdShow()

package/Runtime/AmaGDK.Analytics.cs

@@ -68,8 +68,9 @@ namespace Amanotes.Core
                     doNotIncreaseCounter = false;
                     isLoggedImmediately = false;
                     overrideConfig = false;
-                    ignoreAdapterIds = null;
-                    allowAdapterIds = null;
+                    
+                    GDKPool.ReturnAndNullize(ref ignoreAdapterIds);
+                    GDKPool.ReturnAndNullize(ref allowAdapterIds);
                     _detail = null;
                 }
                 
@@ -307,9 +308,8 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile().BuildCache();
             internal static SessionStat sessionStat;
-            internal static readonly GDKPool<StringBuilder> sbPool = new GDKPool<StringBuilder>(3);
-            internal static readonly GDKPool<EventParams> epPool = new GDKPool<EventParams>(1);
-
+            internal static readonly GDKPool.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
+            
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {
                 { "firebase_", "frb_" },
@@ -515,32 +515,31 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
                 {
-                    var sb = sbPool.Get();
-                    sb.Clear();
-                    NormalizeKeyString(ref eventName, sb, dryRun);
+                    var warningLog = GDKPool.GetStringBuilder(8);
+                    NormalizeKeyString(ref eventName, warningLog, dryRun);
                     if (reservedEvents.Contains(eventName))
-                        sb.AppendLine($" - EventName <{eventName}> is reserved and should not be used");
-                    if (sb.Length > 0 && dryRun) LogWarningOnce($"NormalizeEventName <{eventName}> warnings:\n{sb}\n", $"NormalizeEventName<{eventName}>");
-                    sbPool.Return(sb);
+                    {
+                        warningLog.AppendLine($" - EventName <{eventName}> is reserved and should not be used");
+                    }
+                    if (warningLog.Length > 0 && dryRun) LogWarningOnce($"NormalizeEventName <{eventName}> warnings:\n{warningLog}\n", $"NormalizeEventName<{eventName}>");
+                    GDKPool.Return(warningLog);
                 }
                 Profiler.EndSample();
             }
 
             internal static void NormalizeKeyString(ref string key, StringBuilder warningLog, bool dryRun)
             {
+                if (string.IsNullOrWhiteSpace(key))
+                {
+                    LogWarning($" - Name should not be empty");
+                    return;
+                }
+                
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeKeyString()");
                 {
-                    if (string.IsNullOrWhiteSpace(key))
-                    {
-                        LogWarning($" - Name should not be empty");
-                        Profiler.EndSample();
-                        return;
-                    }
-                    
-                    var tempLog = Config.common.logLevel == LogLevel.None ? null : sbPool.Get();
-                    tempLog?.Clear();
-                    var tempKey = sbPool.Get();
-                    tempKey.Clear();
+                    var willLog = Config.common.logLevel != LogLevel.None;
+                    var tempLog = willLog ? GDKPool.GetStringBuilder() : null;
+                    var tempKey = GDKPool.GetStringBuilder();
                     
                     var hasChanged = false;
                     var trimKey = key.Trim();
@@ -563,16 +562,16 @@ namespace Amanotes.Core
                         }
                     }
 
-                    if (hasChanged)
+                    if (hasChanged && willLog)
                     {
-                        tempLog?.Append(" - Name may only contain alphanumeric characters and underscores");
+                        tempLog.Append(" - Name may only contain alphanumeric characters and underscores");
                     }
                     
                     if (tempKey.Length > 0 && !IsAlphabet(tempKey[0]))
                     {
                         hasChanged = true;
                         tempKey.Insert(0, 'E');
-                        tempLog?.Append($" - Name must start with a letter: <{key}>");
+                        if (willLog) tempLog.Append($" - Name must start with a letter: <{key}>");
                     }
                     
                     foreach (var prefix in reservedPrefixes)
@@ -581,13 +580,13 @@ namespace Amanotes.Core
                         hasChanged = true;
                         tempKey.Remove(0, prefix.Key.Length);
                         tempKey.Insert(0, prefix.Value);
-                        tempLog?.AppendLine($" - <{key}> starts with reserved prefix <{prefix}>");
+                        if (willLog) tempLog.AppendLine($" - <{key}> starts with reserved prefix <{prefix}>");
                     }
 
                     if (trimKey.Length > 40)
                     {
                         hasChanged = true;
-                        tempLog?.AppendLine($" - Name is too long ({key.Length} > 40): <{key}> ");
+                        if (willLog) tempLog.AppendLine($" - Name is too long ({key.Length} > 40): <{key}> ");
                         tempKey.Length = 40;
                     }
                     
@@ -598,8 +597,8 @@ namespace Amanotes.Core
                         if (hasChanged) key = tempKey.ToString();
                     }
                     
-                    if (tempLog != null) sbPool.Return(tempLog);
-                    sbPool.Return(tempKey);
+                    GDKPool.Return(tempLog);
+                    GDKPool.Return(tempKey);
                 }
                 Profiler.EndSample();
             }
@@ -702,9 +701,17 @@ namespace Amanotes.Core
                     adapters = adapterIDs;
                 }
 
-                public string ToTsv()
+                public void AppendAsTSV(StringBuilder sb)
                 {
-                    return $"{eventNameToSend}\t{string.Join(",", adapters)}\t{parameters}";
+                    sb.Append(eventNameToSend);
+                    sb.Append("\t");
+                    for (var i = 0; i < adapters.Count; i++)
+                    {
+                        sb.Append(adapters[i]);
+                        if (i < adapters.Count - 1) sb.Append(",");
+                    }
+                    sb.Append("\t");
+                    sb.Append(parameters);
                 }
             }
 
@@ -856,8 +863,8 @@ namespace Amanotes.Core
             {
                 private const string TSV_HEADER_ROW = "EventName\tAdapters\tParameters";
                 private readonly string fileName = nameof(SessionStat) + DateTime.Now.ToString("_yyMMdd_HHmmss") + ".tsv";
-                private StringBuilder contents = new StringBuilder();
                 private bool isFirstSave = true;
+                private StringBuilder contents = new StringBuilder(8192);
                 private readonly ConcurrentQueue<EventStat> lastFrameEventStats = new ConcurrentQueue<EventStat>();
                 internal readonly ConcurrentQueue<EventStat> savedEventStatsInLastFrame = new ConcurrentQueue<EventStat>();
 
@@ -878,10 +885,10 @@ namespace Amanotes.Core
                     }
                     while (lastFrameEventStats.TryDequeue(out var stat))
                     {
-                        contents.AppendLine(stat.ToTsv());
+                        stat.AppendAsTSV(contents);
                         savedEventStatsInLastFrame.Enqueue(stat);
                     }
-
+                    
                     GDKFileUtils.SaveAppend(fileName, contents.ToString());
                 }
 
@@ -972,7 +979,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            eventData.ignoreAdapterIds ??= new HashSet<string>();
+            eventData.ignoreAdapterIds ??= GDKPool.GetHashSet();
             
             foreach (string mId in analyticIds)
             {
@@ -998,7 +1005,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            eventData.allowAdapterIds ??= new HashSet<string>();
+            eventData.allowAdapterIds ??= GDKPool.GetHashSet();
             
             foreach (string mId in analyticIds)
             {
@@ -1080,12 +1087,12 @@ namespace Amanotes.Core
         {
             string eventName = (ap as EventParams)?.eventName;
             
-            var sb = sbPool.Get();
+            var sb = GDKPool.GetStringBuilder();
             sb.Clear();
             NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
             
             if (sb.Length > 0) LogWarningOnce($"Warning for event <{eventName}>, param <{key}>:\n{sb}", $"NormalizeParamKey <{eventName}>");
-            sbPool.Return(sb);
+            GDKPool.Return(sb);
             
             if (string.IsNullOrWhiteSpace(key))
             {

package/Runtime/AmaGDK.Device.cs

@@ -67,16 +67,16 @@ namespace Amanotes.Core.Internal
             
             if (AmaGDK.Config.common.logLevel == LogLevel.Verbose)
             {
-                var stringBuilder = new StringBuilder();
+                var stringBuilder = GDKPool.GetStringBuilder();
                 stringBuilder.Append("Device info:");
                 stringBuilder.AppendLine("DeviceSpec: " + result);
                 stringBuilder.AppendLine("systemMemorySize: " + SystemInfo.systemMemorySize);
                 stringBuilder.AppendLine("processorCount: " + SystemInfo.processorCount);
                 stringBuilder.AppendLine("processorFrequency: " + SystemInfo.processorFrequency);
-                stringBuilder.AppendLine("graphicsMemorySize: " + SystemInfo.graphicsMemorySize);
-                    
-                Logging.Log(stringBuilder.ToString());   
+                stringBuilder.AppendLine("graphicsMemorySize: " + SystemInfo.graphicsMemorySize);    
+                Logging.Log(GDKPool.ReturnString(stringBuilder));
             }
+            
             return result;
         }
         

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -214,7 +214,7 @@ namespace Amanotes.Core
                 Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
                 
                 _fetchState = FetchState.SaveCache;
-                StringBuilder sb = new StringBuilder();
+                StringBuilder sb = GDKPool.GetStringBuilder(8);
                 
                 //Add embedded remote config version to force load from embedded config after app update
                 sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");
@@ -226,6 +226,8 @@ namespace Amanotes.Core
                 
                 string filePath = GDKFileUtils.GetPath(fileName);
                 GDKFileUtils.Save(filePath, sb.ToString());
+                GDKPool.Return(sb);
+                
                 Log($"[RemoteConfig] Saved remote config to {filePath}");
                 Profiler.EndSample();
                 NextState();

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.69";
+        public const string VERSION = "0.2.70";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -176,7 +176,7 @@ namespace Amanotes.Core
             }
             
             var startTime = Time.realtimeSinceStartup;
-            var sb = new StringBuilder();
+            var sb = GDKPool.GetStringBuilder();
 
             InitModules();
             
@@ -211,6 +211,7 @@ namespace Amanotes.Core
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
             Debug.Log($"AmaGDK v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
+            GDKPool.Return(sb);
         }
 
         private void ConfigGeoLocation()
@@ -354,6 +355,7 @@ namespace Amanotes.Core
             public const string IRONSOURCE = "IronSource";
             public const string MAX = "Max";
             public const string REVENUECAT = "RevenueCat";
+            public const string SQLITE_ANALYTICS = "SqliteAnalytics";
         }
     }
     

package/Runtime/AnalyticQualityAsset.cs

@@ -1,3 +1,4 @@
+using Amanotes.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -82,14 +83,15 @@ namespace Amanotes.Core
 
         internal void ValidateParams(string eventName, Dictionary<string, object> eventParams)
         {
-            StringBuilder logBuilder = new StringBuilder();
+            var logBuilder = GDKPool.GetStringBuilder();
+            
             logBuilder.AppendLine($"Analytics quality violation found for event <{eventName}>");
-            bool isValid = true;
-            HashSet<string> checkedParameters = new HashSet<string>();
+            var isValid = true;
+            HashSet<string> checkedParameters = GDKPool.GetHashSet();
 
             foreach (var kvp in DicParam)
             {
-                if (!eventParams.ContainsKey(kvp.Key))
+                if (!eventParams.TryGetValue(kvp.Key, out object paramValue))
                 {
                     if (!kvp.Value.isOptional)
                     {
@@ -99,8 +101,6 @@ namespace Amanotes.Core
                     continue;
                 }
 
-                object paramValue = eventParams[kvp.Key];
-
                 if (!ValidateParamType(paramValue, kvp.Value.type))
                 {
                     isValid = false;
@@ -117,8 +117,11 @@ namespace Amanotes.Core
                 isValid = false;
                 logBuilder.AppendLine($"[+] {parameter.Key}");
             }
-
+            
             if (!isValid) LogWarningOnce(logBuilder.ToString());
+            
+            GDKPool.Return(logBuilder);
+            GDKPool.Return(checkedParameters);
         }
 
         private bool ValidateParamType(object paramValue, ParamType paramType)
@@ -179,7 +182,7 @@ namespace Amanotes.Core
         [ContextMenu("Validate Unique EventNames")]
         private void ValidateUniqueEventNames()
         {
-            HashSet<string> eventNames = new HashSet<string>();
+            HashSet<string> eventNames = GDKPool.GetHashSet();
             
             lstEvent = lstEvent.OrderBy(evt => evt.eventName).ToList();
             
@@ -189,7 +192,7 @@ namespace Amanotes.Core
 
                 if (!eventNames.Add(eventQuality.eventName)) Debug.LogWarning($"Duplicate event name found: {eventQuality.eventName}. Event names must be unique.");
 
-                HashSet<string> paramNames = new HashSet<string>();
+                HashSet<string> paramNames = GDKPool.GetHashSet();
                 
                 eventQuality.lstParam = eventQuality.lstParam.OrderBy(param => param.paramName).ToList();
                 
@@ -199,7 +202,11 @@ namespace Amanotes.Core
 
                     if (!paramNames.Add(param.paramName)) Debug.LogWarning($"Duplicate parameter name found in event {eventQuality.eventName}: {param.paramName}. Parameter names must be unique within an event.");
                 }
+                
+                GDKPool.Return(paramNames);
             }
+            
+            GDKPool.Return(eventNames);
             EditorUtility.SetDirty(this);
         }
 #endif

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/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/package.json

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