com.amanotes.gdk 0.2.59 → 0.2.61

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.2.61 - 2024-04-25]
+- Add immediate event logging logic
+- [Feature] Improve handling of locked parameters in Klavar
+
+## [0.2.60 - 2024-04-23]
+- [Feature] Ensured container's context values remain unchanged
+- [Feature] Check sent funnel event
+- [Feature] IRS test suite option
+- [Dev] Format Notion ChangeLog
+- [Dev] Remove too short method AppendExtraSDKVersion
+- [Dev] Auto get tag and push change log to Notion
+- [Dev] Warning missing adapter when using .OnlyTo()
+
 ## [0.2.59 - 2024-04-12]
 - [Dev] Improve code coverage
 
@@ -12,7 +25,6 @@
 - [Fix] Various warnings fixes due to invalid examples
 - [Fix] Warning on AdContext destroyed caused by invalid editor ad callback
 
-
 ## [0.2.57 - 2024-04-08]
 - [Dev] Fix bug in value conversion within KlavarEvent
 - [Dev] Auto get change log
@@ -22,7 +34,6 @@
 - [Dev] Clean up and add tooltip for options
 - [Fix] Null exception in LocalBuild Version
 
-
 ## [0.2.56 - 2024-04-03]
 - Release AmaGDK v0.2.56
 

package/Editor/AmaGDKExtra.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Amanotes.Core;
 
 namespace Amanotes.Editor
 {
@@ -13,12 +14,9 @@ namespace Amanotes.Editor
                 VersionHelper.UpdateListVersions(module);
                 dicThirdParty.Add(module.id, ExtractVersion.ThirdParty(module.id));
             }
-            
-            foreach (IronSourceSDKAdapter adapter in ExtractVersion.IronSourceAdapter())
-            {
-                dicThirdParty.Add(adapter.name, adapter.version);
-            }
 
+            dicThirdParty["Firebase"] =  AmaGDKExtra.FirebaseVersion();
+            dicThirdParty["AmaGDK"] = AmaGDK.VERSION;
             dicThirdParty["AdQuality"] = ExtractVersion.IronSourceAdQuality();
             dicThirdParty["AdRevenue"] = ExtractVersion.AppsFlyerAdRevenue();
             dicThirdParty["ACM"] = ExtractVersion.Acm();
@@ -27,6 +25,16 @@ namespace Amanotes.Editor
             return dicThirdParty;
         }
 
+        public static Dictionary<string, object> GetIronSourceAdapterVersions()
+        {
+            Dictionary<string, object> dicAdapters = new Dictionary<string, object>();
+            foreach (IronSourceSDKAdapter adapter in ExtractVersion.IronSourceAdapter())
+            {
+                dicAdapters.Add(adapter.name, adapter.version);
+            }
+            return dicAdapters;
+        }
+
         public static string FirebaseVersion()
         {
             string version = ExtractVersion.FirebaseAnalytics();

package/Runtime/AmaGDK.Analytics.cs

@@ -92,6 +92,7 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName)
             {
+                ThrowExceptionIfImmediateEvent(eventName);
                 var result = PrepareEvent(eventName);
                 eventQueue.Enqueue(result);
                 return result;
@@ -99,6 +100,7 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName, Dictionary<string, object> parameters)
             {
+                ThrowExceptionIfImmediateEvent(eventName);
                 var result = PrepareEvent(eventName, parameters);
                 eventQueue.Enqueue(result);
                 return result;
@@ -106,6 +108,7 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName, params (string, object)[] parameters)
             {
+                ThrowExceptionIfImmediateEvent(eventName);
                 var result = PrepareEvent(eventName, parameters);
                 eventQueue.Enqueue(result);
                 return result;
@@ -171,6 +174,12 @@ namespace Amanotes.Core
                     s.SetUserProperty(key, value);
                 }
             }
+            
+            private static void ThrowExceptionIfImmediateEvent(string eventName)
+            {
+                if (Config.analytics.immediatelyLoggedEvents.Contains(eventName))
+                    throw new GDKException($"This event '{eventName}' must be sent immediately by AmaGDK.Analytics.LogEventImmediately(eventName, params)");
+            }
 
             private static IntegrityFlag MergeData(List<string> funnelEvents, Dictionary<string, int> eventCountMap, bool sumEventCount)
             {
@@ -261,6 +270,17 @@ namespace Amanotes.Core
                     adapter.NeverSend = eventNames;
                 }
             }
+
+            public static bool HasSent(string eventName)
+            {
+                if (string.IsNullOrWhiteSpace(eventName)) return false;
+                return localData.eventDetails.Exists(e => e.eventName == eventName);
+            }
+            
+            public static bool HasSentSignature(string signature)
+            {
+                return localData.funnelSignatures.Contains(signature);
+            }
         }
 
         //INTERNAL
@@ -618,6 +638,13 @@ namespace Amanotes.Core
                 {
                     return localData.AddFunnelSignature(eventData.funnelSignature);
                 }
+                
+                //No valid adapter
+                if (eventData.overrideConfig && eventData.allowAdapterIds?.Count == 0)
+                {
+                    LogWarning($"Event <{eventData.eventName}> is skipped because no adapter is valid.");
+                    return false;
+                }
 
                 //Check predefined event count config
                 if (eventData.IsSkippedBySendAtCountConfig())
@@ -848,11 +875,15 @@ namespace Amanotes.Core
                 {
                     //Clear() is supported from .Net Standard 2.1
 #if UNITY_2021_3_OR_NEWER
-                    sessionStat?.savedEventStatsInLastFrame.Clear();
+                    savedEventStatsInLastFrame.Clear();
+                    lastFrameEventStats.Clear();
 #else
                     while (savedEventStatsInLastFrame.TryDequeue(out var stat))
                     {
                     }
+                    while (lastFrameEventStats.TryDequeue(out var stat))
+                    {
+                    }
 #endif
                 }
             }
@@ -936,8 +967,14 @@ namespace Amanotes.Core
             
             foreach (string mId in analyticIds)
             {
+                if (!listAdapters.Exists(a => a.adapterId == mId))
+                {
+                    LogError($"Cannot send event <{eventData.eventName}> to <{mId}>. Analytics adapter for <{mId}> is not available.");
+                    continue;
+                }
                 eventData.allowAdapterIds.Add(mId);
             }
+            
             return ap;
         }
 
@@ -1053,6 +1090,7 @@ namespace Amanotes.Core.Internal
         [HideInInspector] public bool checkMigrationIntegrity = true;
         [HideInInspector] public bool migrateAccumulatedCount = true;
         [HideInInspector] public bool enableEventStat;
+        [HideInInspector] public List<string> immediatelyLoggedEvents = new List<string>(){"ad_impression", "ad_impression_ama"};
         public AnalyticQualityConfig quality;
     }
     

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.59";
+        public const string VERSION = "0.2.61";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -175,6 +175,12 @@ namespace Amanotes.Core.Internal
             analyticsData.cachedEventDetails.Clear();
             analyticsData.migrationLog = new MigrationLog();
             analyticsData.SaveIfDirty();
+            sessionStat.Clear();
+#if UNITY_2021_3_OR_NEWER
+            eventQueue.Clear();
+#else
+            while (eventQueue.TryDequeue(out var stat)){}
+#endif
         }
     }
     

package/Runtime/Klavar/KlavarContainer.cs

@@ -8,6 +8,7 @@ namespace Amanotes.Core
     public class KlavarContainer
     {
         public readonly string ctnUUID = GUID.NewGuid().ToString();
+        public readonly DateTime createTime = new DateTime();
         public string lastEventName;
 
         public static void LogEventError(string message)

package/Runtime/Klavar/KlavarEvent.cs

@@ -33,7 +33,15 @@ namespace Amanotes.Core
                 @params[kvp.Key] = kvp.Value;
             }
             
-            AmaGDK.Analytics.LogEvent(eventName, @params);
+            if (AmaGDK.Config.analytics.immediatelyLoggedEvents.Contains(eventName))
+            {
+                AmaGDK.Analytics.LogEventImmediately(eventName, @params);
+            }
+            else
+            {
+                AmaGDK.Analytics.LogEvent(eventName, @params);    
+            }
+            
         }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.59",
+    "version": "0.2.61",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",
@@ -14,6 +14,7 @@
         "email": "tech.support@amanotes.com",
         "url": "https://amanotes.com"
     },
+    "changelogUrl": "https://amagdk.notion.site/Change-Log-6dfd4b67d64f496bbd9eb04ccb4ef95a",
     "documentationUrl": "https://amagdk.notion.site/amagdk/Ama-GDK-a73596617ab247b6a43c8f12a1581415",
     "license": "MIT"    
 }