com.amanotes.gdk 0.2.85 → 0.2.86

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.2.86] - 2025-05-22
+- [Dev] Track max adapters
+- [Fix] Do not override config when Adapter id is not available
+- [Fix] Bypass file utils unit test
+- [Dev] Improve verbose logging
+- [BugFix]: Fix sentry issue : Null exception issue
+- [Fix] Missing User Mapping in MaxAdapter
+
 ## [0.2.85] - 2025-03-18
 - [Fix] Manage ad activity killed routine
 

package/Editor/Extra/SDKVersionTracking.cs

@@ -252,6 +252,11 @@ namespace Amanotes.Editor
 
         public int callbackOrder { get; }
         public void OnPreprocessBuild(BuildReport report)
+        {
+            OnPreprocessBuild();
+        }
+
+        public void OnPreprocessBuild()
         {
             _dicThirdPartyVersion = AmaGDKExtra.GetThirdPartyVersions();
             _dicImportedGDKAdapter = GetImportedGDKAdapter();
@@ -283,10 +288,13 @@ namespace Amanotes.Editor
                 return;
             }
             
+            var maxAdapters = MaxEditorUtils.GetMaxAdapters().ToDictionary(kvp => $"{kvp.Key}-MaxAdapter", kvp => (object)kvp.Value);
+            var ironSourceAdapters = _dicIronSourceAdapterVersion.ToDictionary(kvp => $"{kvp.Key}-ISAdapter", kvp => kvp.Value);
             var rawData = _dicThirdPartyVersion
                 .Concat(_dicExtraVersion)
-                .Concat(_dicIronSourceAdapterVersion.ToDictionary(kvp => kvp.Key, kvp => (object)("IS_" + kvp.Value)))
                 .ToDictionary(x => x.Key, x => x.Value);
+            rawData["MaxAdapters"] = maxAdapters;
+            rawData["IronSourceAdapters"] = ironSourceAdapters;
             rawData["UnityVersion"] = Application.unityVersion;
             string platform = "";
 #if UNITY_ANDROID

package/Editor/Utils/AmaGDKEditor.ExtractVersion.Max.cs

@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Amanotes.Editor
+{
+    public class Versions
+    {
+        public string Unity;
+        public string Android;
+        public string Ios;
+    }
+    
+    public class MaxEditorUtils
+    {
+        public static Dictionary<string, string> GetMaxAdapters()
+        {
+            var result = new Dictionary<string, string>();
+            string mediationPath = "Assets/MaxSdk/Mediation";
+            string[] adapterFolders = Directory.GetDirectories(mediationPath);
+
+            foreach (string adapterFolder in adapterFolders)
+            {
+                string adapterName = new DirectoryInfo(adapterFolder).Name;
+                string dependencyPath = Path.Combine(adapterFolder, "Editor/Dependencies.xml");
+                Versions version = GetCurrentVersions(dependencyPath);
+                result.Add(adapterName, $"android_{version.Android}_ios_{version.Ios}");
+            }
+
+            return result;
+        }
+        
+        public static Versions GetCurrentVersions(string dependencyPath)
+        {
+            XDocument dependency;
+            try
+            {
+                dependency = XDocument.Load(dependencyPath);
+            }
+#pragma warning disable 0168
+            catch (IOException exception)
+#pragma warning restore 0168
+            {
+                // Couldn't find the dependencies file. The plugin is not installed.
+                return new Versions();
+            }
+
+            // <dependencies>
+            //  <androidPackages>
+            //      <androidPackage spec="com.applovin.mediation:network_name-adapter:1.2.3.4" />
+            //  </androidPackages>
+            //  <iosPods>
+            //      <iosPod name="AppLovinMediationNetworkNameAdapter" version="2.3.4.5" />
+            //  </iosPods>
+            // </dependencies>
+            string androidVersion = null;
+            string iosVersion = null;
+            var dependenciesElement = dependency.Element("dependencies");
+            if (dependenciesElement != null)
+            {
+                var androidPackages = dependenciesElement.Element("androidPackages");
+                if (androidPackages != null)
+                {
+                    var adapterPackage = androidPackages.Descendants().FirstOrDefault(element => element.Name.LocalName.Equals("androidPackage")
+                                                                                                 && element.FirstAttribute.Name.LocalName.Equals("spec")
+                                                                                                 && element.FirstAttribute.Value.StartsWith("com.applovin"));
+                    if (adapterPackage != null)
+                    {
+                        androidVersion = adapterPackage.FirstAttribute.Value.Split(':').Last();
+                        // Hack alert: Some Android versions might have square brackets to force a specific version. Remove them if they are detected.
+                        if (androidVersion.StartsWith("["))
+                        {
+                            androidVersion = androidVersion.Trim('[', ']');
+                        }
+                    }
+                }
+
+                var iosPods = dependenciesElement.Element("iosPods");
+                if (iosPods != null)
+                {
+                    var adapterPod = iosPods.Descendants().FirstOrDefault(element => element.Name.LocalName.Equals("iosPod")
+                                                                                     && element.FirstAttribute.Name.LocalName.Equals("name")
+                                                                                     && element.FirstAttribute.Value.StartsWith("AppLovin"));
+                    if (adapterPod != null)
+                    {
+                        iosVersion = adapterPod.Attributes().First(attribute => attribute.Name.LocalName.Equals("version")).Value;
+                    }
+                }
+            }
+
+            var currentVersions = new Versions();
+            if (androidVersion != null && iosVersion != null)
+            {
+                currentVersions.Unity = string.Format("android_{0}_ios_{1}", androidVersion, iosVersion);
+                currentVersions.Android = androidVersion;
+                currentVersions.Ios = iosVersion;
+            }
+            else if (androidVersion != null)
+            {
+                currentVersions.Unity = string.Format("android_{0}", androidVersion);
+                currentVersions.Android = androidVersion;
+            }
+            else if (iosVersion != null)
+            {
+                currentVersions.Unity = string.Format("ios_{0}", iosVersion);
+                currentVersions.Ios = iosVersion;
+            }
+
+            return currentVersions;
+        }
+    }
+}

package/Editor/Utils/AmaGDKEditor.ExtractVersion.Max.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 28bb6d2b2f2049d99dc3b44815444965
+timeCreated: 1746611840

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -361,20 +361,18 @@ namespace Amanotes.Editor
         internal static List<IronSourceSDKAdapter> IronSourceAdapter()
         {
             var listAdapter = new List<IronSourceSDKAdapter>();
-            const string IRONSOURCE_PATH = "Assets/IronSource";
+            const string IRON_SOURCE_PATH = "Assets/IronSource";
+            const string LEVEL_PLAY_PATH = "Assets/LevelPlay";         
             
-            if (!Directory.Exists(IRONSOURCE_PATH))
-            {
-                return listAdapter;
-            }
-            
-            string[] filesIRadapter = Directory.GetFiles(IRONSOURCE_PATH, "IS*AdapterDependencies.xml", SearchOption.AllDirectories);
+            var irsFiles = Directory.Exists(IRON_SOURCE_PATH) ? Directory.GetFiles(IRON_SOURCE_PATH, "IS*AdapterDependencies.xml", SearchOption.AllDirectories).ToList() : new List<string>();
+            var levelPlayFiles = Directory.Exists(LEVEL_PLAY_PATH) ? Directory.GetFiles(LEVEL_PLAY_PATH, "IS*AdapterDependencies.xml", SearchOption.AllDirectories).ToList() : new List<string>();
+
+            var adapterFiles = irsFiles.Concat(levelPlayFiles).ToList();
             
-            if (filesIRadapter.Length <= 0) return listAdapter;
-            for (var i = 0; i < filesIRadapter.Length; i++)
+            if (adapterFiles.Count <= 0) return listAdapter;
+            foreach (string filePath in adapterFiles)
             {
                 var Xdoc = new XmlDocument();
-                string filePath = filesIRadapter[i];
 
                 Xdoc.Load(filePath);
 

package/Runtime/Ad/AdLogic.cs

@@ -347,11 +347,18 @@ namespace Amanotes.Core.Internal
             localData.Save();
             TriggerOnAfterAdShow();
 
-            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
+            // Fix: https://amanotes.sentry.io/issues/6366233489/events/0f3f58d81f0848b9bdbf1fd3e4a8161f/
+            var currentContext = Ads.context;
+            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{(currentContext != null ? JsonUtility.ToJson(currentContext) : "Context is null")}");
             
+            Action<bool> resultCallback = null;
+            if (currentContext != null)
+            {
+                currentContext.showFinishAt = Time.realtimeSinceStartup;
+                resultCallback = currentContext.onAdResult;
+            }
+
             // Extra callback
-            context.showFinishAt = Time.realtimeSinceStartup;
-            var resultCallback = context.onAdResult;
             Ads.context = null;
             _showState = ShowAdsState.None;
             resultCallback?.Invoke(isSuccess);

package/Runtime/AmaGDK.Adapters.cs

@@ -63,6 +63,8 @@ namespace Amanotes.Core.Internal
                 return false;
             }
             
+            Log($"Registering Adapter<{id}>");
+            
             var adapter = AmaGDK.Config.GetFieldValue<Adapter2>(id);
             if (adapter == null)
             {

package/Runtime/AmaGDK.Analytics.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
 using Amanotes.Core.Internal;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Profiling;
 using static Amanotes.Core.AmaGDK.Analytics;
@@ -90,7 +91,7 @@ namespace Amanotes.Core
                         return !allowAdapterIds.Contains(adapterId);
                     }
 
-                    Debug.LogWarning("[AmaGDK] Should never be here: overrideConfig == true but no id in listAdapterIds!");
+                    LogWarning("[AmaGDK] Should never be here: overrideConfig == true but no id in listAdapterIds!");
                     return false;
                 }
 
@@ -106,8 +107,14 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName)
             {
+                if (listAdapters.Count == 0)
+                {
+                    InitModule();
+                }
+                
                 var result = PrepareEvent(eventName);
                 eventQueue.Enqueue(result);
+                Log($"Queued Event <{result.eventName}>");
                 return result;
             }
 
@@ -364,6 +371,7 @@ namespace Amanotes.Core
                 {
                     sessionStat = new SessionStat();
                 }
+                
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter2.GetAllAdapter<AnalyticsAdapter>());
             }
@@ -448,15 +456,10 @@ namespace Amanotes.Core
                 string eventNameToSend = GetEventNameToSend(eventParams.eventName, countInSession, totalCount);
                 AnalyticsConfig config = Config.analytics;
                 if (config.normalizeEventName) NormalizeEventName(ref eventNameToSend);
-
-                if (config.showAnalyticsLog)
-                {
-                    ForceLog($"[Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
-                }
-                
 	            config.quality.CheckEventQuality(eventParams.eventName, eventParams.parameters);
 	            
                 var inUseAdapterIDs = config.enableEventStat ? new List<string>(listAdapters.Count) : null;
+                var effective = false;
                 foreach (AnalyticsAdapter m in listAdapters)
                 {
                     if (eventParams.overrideConfig)
@@ -471,9 +474,23 @@ namespace Amanotes.Core
                     {
                         if (m.IsForbidden(eventParams.eventName)) continue;
                     }
+                    
+                    effective = true;
                     m.LogEvent(eventNameToSend, eventParams.parameters);
                     inUseAdapterIDs?.Add(m.adapterId);
                 }
+
+                if (effective)
+                {
+                    if (config.showAnalyticsLog)
+                    {
+                        ForceLog($"[Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
+                    }
+                }
+                else
+                {
+                    LogError($"Event <{eventParams}> has been skipped (no matching Adapter)\n{JsonUtility.ToJson(eventParams)}");
+                }
                 
 	            GDKUtils.SafeInvoke(OnEventSent, eventNameToSend, eventParams.parameters);
 	            sessionStat?.OnEventSent(eventNameToSend, eventParams.parameters, inUseAdapterIDs);
@@ -777,7 +794,7 @@ namespace Amanotes.Core
                 {
                     if (cachedEventDetails.ContainsKey(ed.eventName))
                     {
-                        Debug.LogWarning($"EventName <{ed.eventName}> existed!");
+                        LogWarning($"EventName <{ed.eventName}> existed!");
                         return false;
                     }
                     
@@ -1039,18 +1056,23 @@ namespace Amanotes.Core
                 LogWarning("OnlyTo() can only be set once!");
                 return ap;
             }
-
-            eventData.overrideConfig = true;
-            eventData.allowAdapterIds ??= GDKPool.GetHashSet();
             
+            var h = GDKPool.GetHashSet();
             foreach (string mId in analyticIds)
             {
-                if (!listAdapters.Exists(a => a.adapterId == mId))
+                if (listAdapters.Count > 0 && !listAdapters.Exists(a => a.adapterId == mId))
                 {
-                    LogError($"Cannot send event <{eventData.eventName}> to <{mId}>. Analytics adapter for <{mId}> is not available.");
+                    LogError($"Cannot send event <{eventData.eventName}> to <{mId}>. Analytics adapter for <{mId}> is not available.\n" +
+                        $"listAdapters ({listAdapters.Count}): [{string.Join(",", listAdapters.Select(item=>item.adapterId).ToArray())}]");
                     continue;
                 }
-                eventData.allowAdapterIds.Add(mId);
+                h.Add(mId);
+            }
+
+            if (h.Count > 0)
+            {
+                eventData.overrideConfig = true;
+                eventData.allowAdapterIds ??= h;    
             }
             
             return ap;

package/Runtime/AmaGDK.Singleton.cs

@@ -12,6 +12,8 @@ namespace Amanotes.Core
         
         private void Awake()
         {
+            Log("Awake()");
+            
             if (_instance != null)
             {
                 LogWarning(MULTIPLE_INSTANCE);

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.85";
+        public const string VERSION = "0.2.86";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;
@@ -200,6 +200,8 @@ namespace Amanotes.Core
         
         IEnumerator InitRoutine()
         {
+            Log("InitRoutine!");
+            
             _allowInit = _allowInit || autoInit;
             
             if (Config == null)

package/Runtime/Core/GDKDispatcher.cs

@@ -44,9 +44,11 @@ namespace Amanotes.Core.Internal
                     return false;
                 }
 
-                if (args.Length != nParams)
+                // Fix: https://amanotes.sentry.io/issues/6366288384/events/d45dd8fb736f43d0a8e2aec0df0f173d/
+                int argsLength = args != null ? args.Length : 0;
+                if (argsLength != nParams)
                 {
-                    GDKUtils.ThrowExceptionInEditor($"Dispatch <{eventName}> with incorrect number of params, expecting {nParams}, got {args.Length}!",
+                    GDKUtils.ThrowExceptionInEditor($"Dispatch <{eventName}> with incorrect number of params, expecting {nParams}, got {argsLength}!",
                         (m) => new TargetParameterCountException(m));
                     return false;
                 }

package/Runtime/Utils/GDKFileUtils.cs

@@ -70,7 +70,7 @@ namespace Amanotes.Core.Internal
         }
 
         internal static int writePendingCount => _pendingWrites.Count;
-        internal static bool HasAnyWritePending => _pendingWrites.Count > 0;
+        internal static bool HasAnyWritePending => _pendingWrites.Count > 0 || _isProcessing != 0;
         internal static bool IsWritePending(string fileName)
         {
             return !string.IsNullOrEmpty(fileName) && _pendingWrites.ContainsKey(fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.amanotes.gdk",
-  "version": "0.2.85",
+  "version": "0.2.86",
   "displayName": "AmaGDK",
   "description": "Amanotes Game Development Kit",
   "unity": "2020.3",