com.amanotes.gdk 0.2.74 → 0.2.75

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.75] - 2024-09-20
+- [Dev] Use GDKUtils.StartCoroutine to capture exceptions
+- [Fix] Initialize modules lazily to fix AmaGDK serialization layout mismatch
+
 ## [0.2.74] - 2024-09-17
 - [Dev] Add GDKAudio Example
 - [Feature] Add AudioSource fallback for unsupported platforms

package/Runtime/Ad/AdLogic.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core.Internal
             }
         }
 
-        internal Coroutine _loadRoutine;
+        internal GDKRoutine _loadRoutine;
 
         public void StartLoadAd()
         {
@@ -38,7 +38,7 @@ namespace Amanotes.Core.Internal
             }
 
             Log("[Ad] StartLoadAd");
-            _loadRoutine = _instance.StartCoroutine(LoadAdRoutine());
+            _loadRoutine = GDKUtils.StartCoroutine(LoadAdRoutine());
         }
 
         public void StopLoadAd()
@@ -48,9 +48,8 @@ namespace Amanotes.Core.Internal
             {
                 _loadState = LoadAdsState.None;
             }
-
-            if (_loadRoutine == null) return;
-            _instance.StopCoroutine(_loadRoutine);
+            
+            _loadRoutine?.StopRoutine();
             _loadRoutine = null;
         }
 
@@ -128,7 +127,7 @@ namespace Amanotes.Core.Internal
 
         // Show Ad logic
         internal ShowAdsState _showState = ShowAdsState.None;
-        private Coroutine _showAdRoutine;
+        private GDKRoutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
         
@@ -160,8 +159,8 @@ namespace Amanotes.Core.Internal
                 _isInterstitial ? AmaGDK.Event.INTER_SHOW_CALLED : AmaGDK.Event.REWARD_VIDEO_SHOW_CALLED
             );
 
-            if (_showAdRoutine != null) _instance.StopCoroutine(_showAdRoutine);
-            _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
+            if (_showAdRoutine != null) _showAdRoutine.StopRoutine();
+            _showAdRoutine = GDKUtils.StartCoroutine(ShowAdRoutine());
         }
 
         private void OnApplicationFocus(bool focus)
@@ -184,7 +183,7 @@ namespace Amanotes.Core.Internal
 
             TriggerOnAfterAdShow();
             if (_showAdRoutine == null) return;
-            _instance.StopCoroutine(_showAdRoutine);
+            _showAdRoutine.StopRoutine();
             _showAdRoutine = null;
 
             if (Ads.context.adType == AdType.Interstitial)
@@ -260,7 +259,7 @@ namespace Amanotes.Core.Internal
             if (_loadState != LoadAdsState.Requesting) StartLoadAd();
             var counter = 0;
             bool? hasInternet = null;
-            if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
+            if (adConfig.checkInternet) GDKUtils.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
 
             var wait1Sec = new WaitForSecondsRealtime(1f);
             while (counter < timeout || timeout == -1)

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -108,7 +108,8 @@ namespace Amanotes.Core
             public static bool allowAdRequest = true;
 
             // internal use
-            internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
+            private static readonly Lazy<AdsData> _localData = new Lazy<AdsData>(() => new AdsData().LoadJsonFromFile());
+            internal static AdsData localData => _localData.Value;
 
             internal protected static AdShowContext context;
             internal protected static AdAdapter _adapter;

package/Runtime/AmaGDK.Analytics.cs

@@ -308,9 +308,12 @@ namespace Amanotes.Core
             internal static Predicate<EventParams> logEventHook;
             internal static readonly ConcurrentQueue<EventParams> eventQueue = new ConcurrentQueue<EventParams>();
             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.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
+
+            private static readonly Lazy<AnalyticsData> _localData = new Lazy<AnalyticsData>(
+                () => new AnalyticsData().LoadJsonFromFile().BuildCache());
+            internal static AnalyticsData localData => _localData.Value;
             
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {

package/Runtime/AmaGDK.Consent.cs

@@ -123,7 +123,8 @@ namespace Amanotes.Core
 
         public static partial class Consent //Internal
         {
-            private static readonly ConsentData data = new ConsentData().LoadJsonFromFile();
+            private static readonly Lazy<ConsentData> _data = new Lazy<ConsentData>(() => new ConsentData().LoadJsonFromFile());
+            private static ConsentData data => _data.Value;
             private static Action _onConsentComplete;
             
             internal static bool checkedATT => data.att >= Status.Allowed;

package/Runtime/AmaGDK.Mono.cs

@@ -76,7 +76,7 @@ namespace Amanotes.Core.Internal
         
         public static void DelayCall(float seconds, Action action)
         {
-            DoOnMainThread(() => AmaGDK._instance.StartCoroutine(DelayCallRoutine(seconds, action)));
+            DoOnMainThread(() => StartCoroutine(DelayCallRoutine(seconds, action)));
         }
         
         public static IEnumerator Timeout(float timeoutInSecs, Func<bool> completeCheckFunc)

package/Runtime/AmaGDK.Singleton.cs

@@ -1,4 +1,5 @@
 
+using Amanotes.Core.Internal;
 using System.Threading;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
@@ -21,7 +22,8 @@ namespace Amanotes.Core
             _instance = this;
             mainThreadId = Thread.CurrentThread.ManagedThreadId;
             DontDestroyOnLoad(this);
-            StartCoroutine(InitRoutine());
+
+            GDKUtils.StartCoroutine(InitRoutine());
         }
     }
 }

package/Runtime/AmaGDK.UserProfile.cs

@@ -13,8 +13,9 @@ namespace Amanotes.Core
         {
             public const string GDK_USER_ID_UPDATED = nameof(GDK_USER_ID_UPDATED);
         }
-        
-        public static readonly UserProfile User = new UserProfile();
+
+        private static readonly Lazy<UserProfile> _user = new Lazy<UserProfile>(() => new UserProfile());
+        public static UserProfile User => _user.Value;
         
         /// <summary>
         /// We use multiple IDs to do the user mapping between AppsFlyer, IronSource & Firebase

package/Runtime/AmaGDK.cs

@@ -24,15 +24,19 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.74";
+        public const string VERSION = "0.2.75";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
         
+        private static readonly Lazy<GDKGeoLocation> _geoLocation = new Lazy<GDKGeoLocation>(() => new GDKGeoLocation());
+        private static readonly Lazy<GDKServerTime> _serverTime = new Lazy<GDKServerTime>(() => new GDKServerTime());
+        private static readonly Lazy<ForceQuitMonitor> _forceQuit = new Lazy<ForceQuitMonitor>(() => new ForceQuitMonitor());
+        
         internal static readonly GDKDispatcher dispatcher = new GDKDispatcher();
-        internal static readonly GDKGeoLocation GeoLocation = new GDKGeoLocation();
-        internal static readonly GDKServerTime ServerTime = new GDKServerTime();
-        private static readonly ForceQuitMonitor ForceQuit = new ForceQuitMonitor();
+        internal static GDKGeoLocation GeoLocation => _geoLocation.Value;
+        internal static GDKServerTime ServerTime => _serverTime.Value;
+        private static ForceQuitMonitor ForceQuit => _forceQuit.Value;
         
         internal static bool _allowInit = false;
         

package/Runtime/Internal/AmaGDK.WebUtils.cs

@@ -96,12 +96,12 @@ namespace Amanotes.Core.Internal
 
     internal class WebUtils
     {
-        public static Coroutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null,
+        public static GDKRoutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null,
             Dictionary<string, string> headers = null)
         {
-            return AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
+            return GDKUtils.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
         }
-
+        
         private static IEnumerator PostJsonCoroutine(string url, string jsonData,
             Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
         {
@@ -131,7 +131,7 @@ namespace Amanotes.Core.Internal
 
         public static void CheckInternetConnection(Action<bool> hasInternet)
         {
-            AmaGDK._instance.StartCoroutine(CheckInternet(hasInternet));
+            GDKUtils.StartCoroutine(CheckInternet(hasInternet));
         }
 
         public static IEnumerator CheckInternet(Action<bool> hasInternet)

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -38,8 +38,8 @@ namespace Amanotes.Core.Internal
                 isDirty = false;
             }
         }
-                
-	    private readonly ForceQuitData localData = new ForceQuitData();
+        private readonly Lazy<ForceQuitData> _localData = new Lazy<ForceQuitData>(() => new ForceQuitData());
+        private ForceQuitData localData => _localData.Value;
         
 	    public ForceQuitMonitor()
 	    {

package/Runtime/Internal/GDKGeoLocationcs.cs

@@ -1,3 +1,4 @@
+using Amanotes.Core.Internal;
 using System;
 using System.Collections;
 using UnityEngine;
@@ -86,7 +87,7 @@ namespace Amanotes.Core
         
         void IGeoLocationProvider.FetchGeoLocation(Action<GeoLocationData> result)
         {
-            AmaGDK._instance.StartCoroutine(FetchGeoLocationRoutine(result));
+            GDKUtils.StartCoroutine(FetchGeoLocationRoutine(result));
         }
         
         private IEnumerator FetchGeoLocationRoutine(Action<GeoLocationData> result)

package/Runtime/Internal/GDKServerTime.cs

@@ -1,3 +1,4 @@
+using Amanotes.Core.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -37,7 +38,7 @@ namespace Amanotes.Core
 
         public void FetchServerTime(Action<ServerTimeData> result)
         {
-            AmaGDK._instance.StartCoroutine(FetchTimeRoutine(result));
+            GDKUtils.StartCoroutine(FetchTimeRoutine(result));
         }
         
         private IEnumerator FetchTimeRoutine(Action<ServerTimeData> result)

package/package.json

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