com.amanotes.gdk 0.2.68 → 0.2.70-1

package/Runtime/Ad/AdLogic.cs

@@ -7,6 +7,7 @@ namespace Amanotes.Core.Internal
 {
     public abstract class AdLogic
     {
+        private const int MAX_FRAMES_WAIT_FOR_CALLBACK = 60; 
         protected AdModuleConfig adConfig => Config.ad;
         protected AdShowContext context => Ads.context;
         
@@ -130,9 +131,11 @@ namespace Amanotes.Core.Internal
         private Coroutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
+        private bool isFocus;
         
         public void StartShowAd()
         {
+            isFocus = false;
             unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
             unityCallbacks.OnApplicationFocus += OnApplicationFocus;
             
@@ -157,16 +160,12 @@ namespace Amanotes.Core.Internal
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
         }
 
-        void OnApplicationFocus(bool isFocus)
+        private void OnApplicationFocus(bool focus)
         {
-            if (!isFocus) return;
+            if (!focus) return;
             
             unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            if (context == null) return;
-            
-            Log($"OnApplicationFocus Before: {context.hasClosed}");
-            context.adCallback |= AdCallback.Close;
-            Log($"OnApplicationFocus After: {context.hasClosed}");
+            isFocus = true;
         }
 
         public void StopShowAd()
@@ -209,55 +208,26 @@ namespace Amanotes.Core.Internal
 
                 if (!HasLocalNetworkConnection)
                 {
-                    _showState = ShowAdsState.ShowFail;
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.Wifi3GDisabled);
-                    ShowAdRoutineCompleted(false);
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.Wifi3GDisabled);
                     yield break;
                 }
 
                 int timeout = Config.ad.adShowTimeoutInSecs;
                 if (timeout == 0) // do not wait for Ad
                 {
-                    _showState = ShowAdsState.ShowFail;
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
-                    ShowAdRoutineCompleted(false);
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
                     yield break;
                 }
 
                 _showState = ShowAdsState.WaitForAd;
                 OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
 
-                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
-                var counter = 0;
-                bool? hasInternet = null;
-                if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
-
-                var wait1Sec = new WaitForSecondsRealtime(1f);
-                while (counter < timeout || timeout == -1)
-                {
-                    yield return wait1Sec;
-                    counter++;
-
-                    // finish checking internet & result is false
-                    if (adConfig.checkInternet && hasInternet == false)
-                    {
-                        Log("[Ad] Stop WaitForAd : No internet!");
-                        _showState = ShowAdsState.ShowFail;
-                        OnAdShowReadyStatus(false, AdShowReadyStatus.NoInternet);
-                        ShowAdRoutineCompleted(false);
-                        yield break;
-                    }
-
-                    if (_loadState != LoadAdsState.Ready) continue;
-                    Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
-                    break;
-                }
-
+                yield return WaitForAdReadyWithTimeout(timeout);
+                
                 if (!isAdReady)
                 {
-                    Log("[Ad] WaitForAd failed (timeout) " + counter + " | timeout = " + timeout + " secs");
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
-                    ShowAdRoutineCompleted(false);
+                    Log("[Ad] WaitForAd failed (timeout) " + " | timeout = " + timeout + " secs");
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
                     yield break;
                 }
             }
@@ -266,43 +236,78 @@ namespace Amanotes.Core.Internal
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             TriggerBeforeAdShow();
             ShowAd();
+
+            yield return WaitForMediationCallback();
             
-            while (!context.potentiallyCompleted)
-            {
-                yield return null; // callback as quickly as possible
-            }
+            // wait 1 frame in case hasReward callback after onClose
+            if (!context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
+            ShowAdRoutineCompleted(context.isSuccess);
+        }
 
-            if (adType == AdType.Interstitial)
-            {
-                ShowAdRoutineCompleted(!context.hasFailedOrCancelled);
-                yield break;
-            }
+        private void EndShowAdRoutineWithFailure(AdShowReadyStatus status)
+        {
+            _showState = ShowAdsState.ShowFail;
+            OnAdShowReadyStatus(false, status);
+            ShowAdRoutineCompleted(false);
+        }
 
-            if (context.hasFailedOrCancelled)
+        private IEnumerator WaitForAdReadyWithTimeout(int timeout)
+        {
+            if (_loadState != LoadAdsState.Requesting) StartLoadAd();
+            var counter = 0;
+            bool? hasInternet = null;
+            if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
+
+            var wait1Sec = new WaitForSecondsRealtime(1f);
+            while (counter < timeout || timeout == -1)
             {
-                Log($"[Ad] {adType} Waiting for [close]");
-                yield return null;
-                ShowAdRoutineCompleted(false);
-                yield break;
+                yield return wait1Sec;
+                counter++;
+                Log($"[Ad] Waiting for ad {counter} secs");
+
+                // finish checking internet & result is false
+                if (adConfig.checkInternet && hasInternet == false)
+                {
+                    Log("[Ad] Stop WaitForAd : No internet!");
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.NoInternet);
+                    yield break;
+                }
+
+                if (_loadState != LoadAdsState.Ready) continue;
+                Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
+                break;
             }
+        }
 
-            if (context.hasClosed)
+        private IEnumerator WaitForMediationCallback()
+        {
+            #if !UNITY_EDITOR
+            while (!isFocus) yield return null; 
+            #endif
+            
+            int wait4CallbackCounter = 0;
+            while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
-                // wait 1 frame in case hasReward callback after onClose
-                if (!context.hasReward) yield return null;
-                ShowAdRoutineCompleted(context.hasReward);
-                yield break;
+                wait4CallbackCounter++;
+                yield return null;
             }
+            Log($"[Ad] Waiting for potentially completed callback: {wait4CallbackCounter} frames");
+            
+            if (!context.hasClosed) yield return WaitForAdClosedCallback();
+        }
 
-            var wait4CloseCounter = 0;
-            while (!context.hasClosed)
+        private IEnumerator WaitForAdClosedCallback()
+        {
+            int counter = 0;
+            while (!context.hasClosed && counter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
-                wait4CloseCounter++;
-                Log($"[Ad] {adType} Waiting for [close]:  {wait4CloseCounter}");
+                counter++;
                 yield return null;
             }
-            
-            ShowAdRoutineCompleted(true);
+            Log($"[Ad] Waiting for ad closed callback: {counter} frames");
+            if (context.hasClosed) yield break;
+            LogWarning("[Ad] Force close ad (mediation missing OnAdClose callback)");
+            OnAdClosed();
         }
 
         private void ShowAdRoutineCompleted(bool isSuccess)
@@ -315,9 +320,7 @@ namespace Amanotes.Core.Internal
 
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
 
-            // Extra callback
-            Ads.context.showFinishAt = Time.realtimeSinceStartup;
-            Ads.context.onAdResult?.Invoke(isSuccess);
+            
 
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -336,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()
@@ -399,6 +407,11 @@ namespace Amanotes.Core.Internal
 
             if (Ads.context != null)
             {
+                if ((Ads.context.adCallback & AdCallback.Close) != 0)
+                {
+                    LogWarning("[Ad] OnAdClosed() has been called multiple times for the same ad.");
+                    return;
+                }
                 Ads.context.adCallback |= AdCallback.Close;
                 Ads.context.onClosed?.Invoke();
             } else

package/Runtime/Ad/AdShowContext.cs

@@ -39,5 +39,6 @@ namespace Amanotes.Core.Internal
         public bool hasReward => (adCallback & AdCallback.Reward) != 0;
         public bool hasClosed => (adCallback & AdCallback.Close) != 0;
         public bool hasClicked => (adCallback & AdCallback.Click) != 0;
+        public bool isSuccess => (hasReward || adType == AdType.Interstitial) && !hasFailedOrCancelled;
     }
 }

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -150,8 +150,12 @@ namespace Amanotes.Core
         {
             internal static bool InitModule()
             {
+                if (Adapter2.GetAllAdapter<AdAdapter>().Count > 1)
+                {
+                    Utils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
+                }
                 _adapter = Adapter2.GetAdapter<AdAdapter>();
-                return _adapter == null;
+                return _adapter != null;
             }
             
             internal static void StartModule()
@@ -181,24 +185,34 @@ namespace Amanotes.Core
                 return false;
             }
 
-            public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
+            public static IAdCallback ShowInterstitial(Action<bool> onAdResult = null, string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.Interstitial, placementName, userData);
+                if (onAdResult != null)
+                {   
+                    context.onAdResult += onAdResult;
+                }
+                
                 _adapter.interstitial.StartShowAd();
                 return context;
             }
 
             public static bool IsInterstitialShowing => (context != null) && (context.adType == AdType.Interstitial);
 
-            public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
+            public static IAdCallback ShowRewardedVideo(Action<bool> onAdResult = null, string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.VideoReward, placementName, userData);
+                if (onAdResult != null)
+                {   
+                    context.onAdResult += onAdResult;
+                }
+                
                 _adapter.rewardVideo.StartShowAd();
                 return context;
             }

package/Runtime/AmaGDK.Adapters.cs

@@ -10,7 +10,7 @@ namespace Amanotes.Core.Internal
     
     public abstract partial class Adapter2
     {
-        internal protected enum ConfigStatus
+        protected internal enum ConfigStatus
         {
             Ok,
             Invalid,
@@ -22,12 +22,15 @@ namespace Amanotes.Core.Internal
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
-        [NonSerialized] internal protected Status status = Status.None;
+        [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
-        internal protected abstract string GetServiceKey();
-        internal protected abstract ConfigStatus configStatus { get; }
-        
+        protected internal abstract string GetServiceKey();
+        protected virtual float GetTimeoutInEditor() => 0.1f;
+        protected virtual float GetTimeoutInRuntime() => 0.1f;
+        protected internal abstract ConfigStatus configStatus { get; }
+        protected internal float Timeout => Application.isEditor ? GetTimeoutInEditor() : GetTimeoutInRuntime();
+
         public bool IsReady => status == Status.Ready;
         
         internal void InitSDK() // call by AmaGDK
@@ -63,6 +66,10 @@ namespace Amanotes.Core.Internal
                 LogWarning($"Adapter <{id}> == null in ConfigAsset? (non-serialized?)");
                 return false;
             }
+            if (!adapter.enabled)
+            {
+                return false;
+            }
             
             adapter.adapterId = id;
             adapter.adapterVersion = version;

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))
             {