com.amanotes.gdk 0.2.65-5 → 0.2.66

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.2.66 - 2024-06-25]
+- [Dev] Verify all fields are reset in Init EventParams
+- [Dev] Add try catch to prevent coroutines to stop silently
+- [Fix] Reset 'isLoggedImmediately' for every new EventParams
+- [Dev] Update Audio native plugin name
+
+## [0.2.65-6 - 2024-06-20]
+- [Dev] Improve SDK Version Tracking
+- [Klavar] improve enum converter
+- [Fix] Turn off Google CMP on Editor 
+
 ## [0.2.65-5 - 2024-06-17]
 - [Dev] Update for GDKTest Unity 2022.3 project
 - [Dev] Update for GDKTest Unity 2021.3 project
@@ -12,6 +23,22 @@
 - [Dev] Degrade GDKDev project to Unity 2020
 - [Dev] Audio module supports Unity 2020
 
+## [0.2.65-4 - 2024-06-14]
+- [Dev] Audio module supports Unity 2020
+- [Dev] Degrade GDKDev project to Unity 2020
+
+## [0.2.65-3 - 2024-06-14]
+- [Dev] Simplify LocalBuild + Minor editor fixes for GDK Analytics
+- [Dev] fix PostBuild unity 2020
+- [Dev] Audio Device Detector and Bluetooth Audio Latency
+- [Dev] Update SDK configs
+
+## [0.2.65-2 - 2024-06-13]
+- [Feature] Implement analytics event correction for force kill app
+- [Feature] Upload version tracking to Airtable
+- [Fix] Unity 2020 compatible
+- [Fix] Wrong condition check for first time remote config
+
 ## [0.2.65 - 2024-06-13]
 - [Dev] Add GDKRoutine
 - [Dev] Add option to preload banners

package/Editor/Extra/SDKVersionTracking.cs

@@ -2,12 +2,16 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Xml;
+using Amanotes.Core.Internal;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
+using System.Threading.Tasks;
+using UnityEditor.Callbacks;
 
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
@@ -227,6 +231,70 @@ namespace Amanotes.Editor
 
             WriteToStreamingAssets();
         }
+    }
+    
+    public partial class SDKVersionTracking
+    {
+        private const string AUTH_TOKEN = "pat1CmLr9XozLt6ZE";
+        private const string URL = "https://gdk.amanotes.io/gdkVersionTracking";
+
+        [PostProcessBuild(999)]
+        public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
+        {
+            var rawData = _dicThirdPartyVersion
+                .Concat(_dicExtraVersion)
+                .Concat(_dicIronSourceAdapterVersion.ToDictionary(kvp => kvp.Key, kvp => (object)("IS_" + kvp.Value)))
+                .ToDictionary(x => x.Key, x => x.Value);
+            rawData["UnityVersion"] = Application.unityVersion;
+            string platform = "";
+#if UNITY_ANDROID
+            platform = "Android";
+            rawData["Permissions"] = GetAllAndroidPermissions();
+            rawData["APILevel"] = (int)PlayerSettings.Android.targetSdkVersion;
+#elif UNITY_IOS
+            rawData["SKAdNetwork"] = GetSkAdNetworkCount($"{pathToBuiltProject}/Info.plist");
+            platform = "iOS";
+#endif
+            
+            var buildInfo = new Dictionary<string, object>
+            {
+                {"GameName", Application.productName},
+                {"BuildVersion", PlayerSettings.bundleVersion},
+                {"BuildNumber", GetBuildNumber()},
+                {"BuildTime", GetBuildTime()},
+                {"AppId", PlayerSettings.applicationIdentifier },
+                {"Platform", platform},
+                {"RawData", rawData }
+            };
+            string json = JsonUtils.DictionaryToJson(buildInfo, false, false);
+            Task.Run(()=>SendDataToAirTable(json));
+        }
         
+        private static async Task SendDataToAirTable(string payload)
+        {
+            try
+            {
+                var client = new HttpClient();
+                var request = new HttpRequestMessage(HttpMethod.Post, URL);
+                request.Headers.Add("Authorization", AUTH_TOKEN);
+                request.Content = new StringContent(payload, Encoding.UTF8, "application/json");
+
+                var response = await client.SendAsync(request);
+                if (response.IsSuccessStatusCode)
+                {
+                    string responseData = await response.Content.ReadAsStringAsync();
+                    Debug.Log("AmaGDK | [SDKVersionTracking]: done " + responseData);
+                }
+                else
+                {
+                    string errorData = await response.Content.ReadAsStringAsync();
+                    Debug.LogError($"AmaGDK | [SDKVersionTracking] Status code {response.StatusCode} Error Response: {errorData}");
+                }
+            }
+            catch (HttpRequestException e)
+            {
+                Debug.LogError("AmaGDK | [SDKVersionTracking] Request Exception: " + e.Message);
+            }
+        }
     }
 }

package/Runtime/AmaGDK.Ads.cs

@@ -402,7 +402,7 @@ namespace Amanotes.Core
             /// <param name="interstitialCappingTime"></param>
             /// <param name="rewardedVideoCappingTime"></param>
             /// <returns></returns>
-            internal static bool IsCapped(float interstitialCappingTime = 0, float rewardedVideoCappingTime = 0)
+            public static bool IsCapped(float interstitialCappingTime = 0, float rewardedVideoCappingTime = 0)
             {
                 bool interCapped = (interstitialCappingTime > 0) && TimeSinceLastInterstitialSucceed < interstitialCappingTime;
                 bool rewardCapped = (rewardedVideoCappingTime > 0) && TimeSinceLastVideoRewardSucceed < rewardedVideoCappingTime;

package/Runtime/AmaGDK.Analytics.cs

@@ -25,14 +25,15 @@ namespace Amanotes.Core
 
             public interface IEventParamsBuilder { }            
 
-            public class EventParams : IEventParamsBuilder
+            public class EventParams : IEventParamsBuilder, IPoolItem
             {
                 public string eventName { get; private set; }
                 public readonly Dictionary<string, object> parameters = new Dictionary<string, object>();
-                public string funnelSignature;
+                public string funnelSignature = "";
                 public bool accumulated;
                 public bool withinSession;
                 public bool doNotIncreaseCounter;
+                internal bool isLoggedImmediately;
 
                 public bool overrideConfig;
                 public HashSet<string> ignoreAdapterIds = null;
@@ -41,7 +42,7 @@ namespace Amanotes.Core
                 public int totalCount => detail.totalCount;
                 public int totalCountWithinSession => detail.countInSession;
 
-                private EventDetail _detail;
+                internal EventDetail _detail;
                 internal EventDetail detail
                 {
                     get
@@ -50,23 +51,28 @@ namespace Amanotes.Core
                         return _detail = localData.GetEventDetail(eventName, true);
                     }
                 }
-                internal bool isLoggedImmediately = false;
 
-                internal EventParams Init(string eventName)
+                internal EventParams SetEventName(string eventName)
                 {
                     this.eventName = eventName;
+                    return this;
+                }
+                
+                public void Reset()
+                {
+                    eventName = null;
                     parameters.Clear();
                     funnelSignature = "";
                     accumulated = false;
                     withinSession = false;
                     doNotIncreaseCounter = false;
+                    isLoggedImmediately = false;
                     overrideConfig = false;
                     ignoreAdapterIds = null;
                     allowAdapterIds = null;
                     _detail = null;
-                    return this;
                 }
-
+                
                 public bool IsFunnelEvent => !string.IsNullOrEmpty(funnelSignature);
 
                 public bool IsAdapterForbidden(string adapterId)
@@ -92,6 +98,7 @@ namespace Amanotes.Core
                     int accumulatedCount = GetAccumulatedCount(eventName, sendAtCountConfig.withinSession);
                     return sendAtCountConfig.listCount != null && !sendAtCountConfig.listCount.Contains(accumulatedCount);
                 }
+                
             }
 
             public static IEventParamsBuilder LogEvent(string eventName)
@@ -287,8 +294,8 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile().BuildCache();
             internal static readonly SessionStat sessionStat = _config.analytics.enableEventStat ? new SessionStat() : null;
-            internal static readonly Pool<StringBuilder> sbPool = new Pool<StringBuilder>(3);
-            internal static readonly Pool<EventParams> epPool = new Pool<EventParams>(1);
+            internal static readonly GDKPool<StringBuilder> sbPool = new GDKPool<StringBuilder>(3);
+            internal static readonly GDKPool<EventParams> epPool = new GDKPool<EventParams>(1);
 
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {
@@ -349,7 +356,7 @@ namespace Amanotes.Core
             internal static EventParams PrepareEvent(string eventName)
             {
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().Init(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 PostPrepareEventProcess(result);
                 return result;
             }
@@ -358,7 +365,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().Init(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 result.AddParam(parameters);
                 PostPrepareEventProcess(result);
                 return result;
@@ -368,7 +375,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().Init(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 for (var i = 0; i < parameters.Length; i++)
                 {
                     result.AddParam(parameters[i].Item1, parameters[i].Item2);
@@ -491,7 +498,7 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
                 {
-                    StringBuilder sb = sbPool.Get();
+                    var sb = sbPool.Get();
                     sb.Clear();
                     NormalizeKeyString(ref eventName, sb, dryRun);
                     if (reservedEvents.Contains(eventName))
@@ -512,10 +519,9 @@ namespace Amanotes.Core
                         Profiler.EndSample();
                         return;
                     }
-
+                    
                     var tempLog = Config.common.logLevel == LogLevel.None ? null : sbPool.Get();
                     tempLog?.Clear();
-                    
                     var tempKey = sbPool.Get();
                     tempKey.Clear();
                     
@@ -1056,7 +1062,7 @@ namespace Amanotes.Core
         {
             string eventName = (ap as EventParams)?.eventName;
             
-            StringBuilder sb = sbPool.Get();
+            var sb = sbPool.Get();
             sb.Clear();
             NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
             

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.65-5";
+        public const string VERSION = "0.2.66";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/Runtime/AudioToolkit/Plugins/Android/{AudioDeviceDetector.java → GDKAudioDeviceDetector.java}

@@ -12,7 +12,7 @@ import java.util.Map;
 
 import com.unity3d.player.UnityPlayer;
 
-public class AudioDeviceDetector
+public class GDKAudioDeviceDetector
 {
     private static boolean isRegistered = false;
     private static boolean isFirstCallback = true;

package/Runtime/AudioToolkit/Plugins/AudioDeviceDetector.cs

@@ -21,7 +21,7 @@ namespace Amanotes.Core
 #endif
 
 #if !UNITY_EDITOR && UNITY_ANDROID
-        private readonly AndroidJavaClass _detectorClass = new AndroidJavaClass("com.amanotes.audio.AudioDeviceDetector");
+        private readonly AndroidJavaClass _detectorClass = new AndroidJavaClass("com.amanotes.audio.GDKAudioDeviceDetector");
 #endif
 
         private static readonly Dictionary<string, AudioDeviceType> deviceTypeMapping = new Dictionary<string, AudioDeviceType>(StringComparer.OrdinalIgnoreCase)

package/Runtime/Core/GDKPool.cs

@@ -0,0 +1,37 @@
+using System.Collections.Concurrent;
+
+namespace Amanotes.Core.Internal
+{
+    public interface IPoolItem
+    {
+        void Reset();
+    }
+    
+    public class GDKPool<T> where T : new()
+    {
+        private readonly ConcurrentQueue<T> _pool;
+
+        public GDKPool(int initialCapacity)
+        {
+            _pool = new ConcurrentQueue<T>();
+            for (int i = 0; i < initialCapacity; i++)
+            {
+                _pool.Enqueue(new T());
+            }
+        }
+
+        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 int Count => _pool.Count;
+    }
+}

package/Runtime/Core/GDKPool.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4f15ddda3a314d2e978c5207c2bc540d
+timeCreated: 1719217850

package/Runtime/Core/GDKRoutine.cs

@@ -1,47 +1,71 @@
 using System;
 using System.Collections;
 using UnityEngine;
-
 namespace Amanotes.Core.Internal
 {
     public class GDKRoutine
     {
-        [Flags]
-        internal enum RoutineStatus
+        [Flags] private enum RoutineStatus
         {
             None,
             Started = 1,
             Stopped = 2
         }
         
+        private readonly IEnumerator userRoutine;
+        private Action<Exception> exceptionHandler;
+        private Coroutine safeRoutine;
         private RoutineStatus status;
-        private readonly IEnumerator action;
-        private Coroutine routine;
 
-        public bool isAlive => (status & RoutineStatus.Stopped) == 0;
-        
-        public GDKRoutine(IEnumerator action)
+        public GDKRoutine(IEnumerator routine)
         {
-            this.action = action;
+            userRoutine = routine;
             status = RoutineStatus.None;
         }
 
+        public bool isAlive => (status & RoutineStatus.Stopped) == 0;
+
+        public GDKRoutine SetOnExceptionHandler(Action<Exception> handler)
+        {
+            exceptionHandler = handler;
+            return this;
+        }
+
         public void StartRoutine()
         {
-            if (!isAlive)
-            {
-                // StopRoutine() called before start: do nothing
-                return;
-            }
+            // StopRoutine() called before start: do nothing
+            if (!isAlive) return;
             
             status |= RoutineStatus.Started;
-            routine = AmaGDK._instance.StartCoroutine(action);
+            // Start the coroutine using the safe wrapper
+            safeRoutine = AmaGDK._instance.StartCoroutine(SafeCoroutineWrapper(userRoutine));
         }
 
         public void StopRoutine()
         {
             status |= RoutineStatus.Stopped;
-            if (routine != null) AmaGDK._instance.StopCoroutine(routine);
+            if (safeRoutine != null) AmaGDK._instance.StopCoroutine(safeRoutine);
+        }
+        
+        private IEnumerator SafeCoroutineWrapper(IEnumerator coroutine)
+        {
+            while (true)
+            {
+                object current;
+                try
+                {
+                    if (!coroutine.MoveNext()) yield break; // Coroutine has finished execution
+                    current = coroutine.Current; // Get the current yield instruction
+                } catch (Exception ex)
+                {
+                    status |= RoutineStatus.Stopped;
+                    if (exceptionHandler == null) Logging.LogError($"Exception caught in coroutine: {ex}");
+                    exceptionHandler?.Invoke(ex);
+                    yield break; // Stop executing the coroutine
+                }
+
+                yield return current;
+            }
         }
     }
 
@@ -56,7 +80,7 @@ namespace Amanotes.Core.Internal
 
         public static void StopCoroutine(GDKRoutine gdkRoutine)
         {
-            if (gdkRoutine != null) gdkRoutine.StopRoutine();
+            DoOnMainThread(() => { gdkRoutine?.StopRoutine(); });
         }
     }
 }

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -598,30 +598,4 @@ namespace Amanotes.Core.Internal
         //    public T[] items;
         //}
     }
-    
-    internal class Pool<T> where T : new()
-    {
-        private readonly ConcurrentQueue<T> _pool;
-
-        public Pool(int initialCapacity)
-        {
-            _pool = new ConcurrentQueue<T>();
-            for (int i = 0; i < initialCapacity; i++)
-            {
-                _pool.Enqueue(new T());
-            }
-        }
-
-        public T Get()
-        {
-            return _pool.TryDequeue(out var obj) ? obj : new T();
-        }
-
-        public void Return(T obj)
-        {
-            _pool.Enqueue(obj);
-        }
-
-        public int Count => _pool.Count;
-    }
 }

package/package.json

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

package/Editor/Extra/SDKVersionTracking.AirTable.cs

@@ -1,73 +0,0 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using Amanotes.Core.Internal;
-using UnityEditor;
-using UnityEditor.Callbacks;
-using UnityEngine;
-
-namespace Amanotes.Editor
-{
-    public partial class SDKVersionTracking
-    {
-        private const string AUTH_TOKEN = "pat1CmLr9XozLt6ZE";
-        private const string URL = "https://gdk.amanotes.io/gdkVersionTracking";
-
-        [PostProcessBuild(999)]
-        public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
-        {
-            var rawData = AllVersions;
-            rawData["UnityVersion"] = Application.unityVersion;
-#if UNITY_ANDROID
-            rawData["Platform"] = "Android";
-            rawData["Permissions"] = GetAllAndroidPermissions();
-            rawData["APILevel"] = (int)PlayerSettings.Android.targetSdkVersion;
-#elif UNITY_IOS
-            rawData["SKAdNetwork"] = GetSkAdNetworkCount($"{pathToBuiltProject}/Info.plist");
-            rawData["Platform"] = "iOS";
-#endif
-            
-            var buildInfo = new Dictionary<string, object>
-            {
-                {"GameName", Application.productName},
-                {"BuildVersion", PlayerSettings.bundleVersion},
-                {"BuildNumber", GetBuildNumber()},
-                {"BuildTime", GetBuildTime()},
-                {"AppId", PlayerSettings.applicationIdentifier },
-                {"RawData", rawData }
-            };
-            string json = JsonUtils.DictionaryToJson(buildInfo, false, false);
-            Task.Run(()=>SendDataToAirTable(json));
-        }
-        
-        private static async Task SendDataToAirTable(string payload)
-        {
-            Debug.Log("AmaGDK | [SDKVersionTracking]: SendDataToAirTable ");
-            try
-            {
-                var client = new HttpClient();
-                var request = new HttpRequestMessage(HttpMethod.Post, URL);
-                request.Headers.Add("Authorization", AUTH_TOKEN);
-                request.Content = new StringContent(payload, Encoding.UTF8, "application/json");
-
-                var response = await client.SendAsync(request);
-                if (response.IsSuccessStatusCode)
-                {
-                    string responseData = await response.Content.ReadAsStringAsync();
-                    Debug.Log("AmaGDK | [SDKVersionTracking]: done " + responseData);
-                }
-                else
-                {
-                    Debug.LogError("AmaGDK | [SDKVersionTracking] Error: " + response.StatusCode);
-                    string errorData = await response.Content.ReadAsStringAsync();
-                    Debug.LogError("AmaGDK | [SDKVersionTracking] Error Response: " + errorData);
-                }
-            }
-            catch (HttpRequestException e)
-            {
-                Debug.LogError("AmaGDK | [SDKVersionTracking] Request Exception: " + e.Message);
-            }
-        }
-    }
-}

package/Editor/Extra/SDKVersionTracking.AirTable.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 53147bd64d3f47109e84b17644c5b1c2
-timeCreated: 1718186649