com.amanotes.gdk 0.2.77 → 0.2.79

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.79] - 2024-11-13
+- [Dev] Add callbacks for IAP module
+- [Fix] Return empty collections instead of null in RevenueCatAdapter
+- [GameOps] Remove durationInSecs
+
+## [0.2.78] - 2024-11-11
+- [Dev] Add iOS and Android ad unit configuration for MAX
+- [Dev] Track Adapters and Third-party packages used in games
+
 ## [0.2.77] - 2024-11-07
 - [Release] 0.2.76
 - [Dev] Remove GDKAudio

package/Editor/Extra/SDKVersionTracking.cs

@@ -12,6 +12,8 @@ using UnityEditor.Build.Reporting;
 using UnityEngine;
 using System.Threading.Tasks;
 using UnityEditor.Callbacks;
+using System.Reflection;
+
 
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
@@ -43,6 +45,7 @@ namespace Amanotes.Editor
         
         private const int MAX_VERSION_KEY_LENGTH = 30;
         private static Dictionary<string, object> _dicThirdPartyVersion = new Dictionary<string, object>();
+        private static Dictionary<string, object> _dicImportedGDKAdapter = new Dictionary<string, object>();
         private static Dictionary<string, object> _dicExtraVersion = new Dictionary<string, object>();
         private static Dictionary<string, object> _dicIronSourceAdapterVersion = new Dictionary<string, object>();
 
@@ -192,6 +195,29 @@ namespace Amanotes.Editor
             };
         }
 
+        public static Dictionary<string, object> GetImportedGDKAdapter()
+        {
+            var dicGDKAdapters = new Dictionary<string, object>();
+            var config = Resources.Load<ConfigAsset>("AmaGDKConfig");
+            foreach (var field in config
+                .GetType()
+                .GetFields(BindingFlags.Instance | BindingFlags.NonPublic))
+            {
+                var fieldValue = field.GetValue(config);
+                if (fieldValue is Adapter2 adapter)
+                {
+                    string gdkAdapterName = field.Name + "Adapter";
+                    dicGDKAdapters[gdkAdapterName] = adapter.enabled? "Enabled" : "Disabled";
+                }
+                else
+                {
+                    continue;
+                }
+            }
+
+            return dicGDKAdapters;
+        }
+
         private static void WriteToStreamingAssets()
         {
             try
@@ -201,6 +227,7 @@ namespace Amanotes.Editor
 
                 AppendVersion(sb, "BUILD INFO", GetBuildInfo());
                 AppendVersion(sb, "THIRD PARTY", _dicThirdPartyVersion);
+                AppendVersion(sb, "IMPORTED GDK ADAPTERS", _dicImportedGDKAdapter);
                 AppendVersion(sb, "IS ADAPTER", _dicIronSourceAdapterVersion);
                 AppendVersion(sb, "EXTRA", _dicExtraVersion);
                 
@@ -226,6 +253,7 @@ namespace Amanotes.Editor
         public void OnPreprocessBuild(BuildReport report)
         {
             _dicThirdPartyVersion = AmaGDKExtra.GetThirdPartyVersions();
+            _dicImportedGDKAdapter = GetImportedGDKAdapter();
             _dicIronSourceAdapterVersion = AmaGDKExtra.GetIronSourceAdapterVersions();
             _dicExtraVersion = _getExtraSDKVersion?.Invoke() ?? _dicExtraVersion;
 
@@ -242,6 +270,7 @@ namespace Amanotes.Editor
         public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
         {
             var rawData = _dicThirdPartyVersion
+                .Concat(_dicImportedGDKAdapter)
                 .Concat(_dicExtraVersion)
                 .Concat(_dicIronSourceAdapterVersion.ToDictionary(kvp => kvp.Key, kvp => (object)("IS_" + kvp.Value)))
                 .ToDictionary(x => x.Key, x => x.Value);

package/Runtime/AmaGDK.Adapters.cs

@@ -24,7 +24,7 @@ namespace Amanotes.Core.Internal
         [HideInNormalInspector] [SerializeField] internal int initOrder;
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
-        [NonSerialized] internal string adapterVersion;
+        [NonSerialized] internal string compatibleSDKVersion;
         [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
@@ -75,7 +75,7 @@ namespace Amanotes.Core.Internal
             }
             
             adapter.adapterId = id;
-            adapter.adapterVersion = version;
+            adapter.compatibleSDKVersion = version;
             GDKUtils.AddUnityCallbacks(adapter);
             adapterMap.Add(id, adapter);
             return true;

package/Runtime/AmaGDK.IAP.cs

@@ -23,6 +23,58 @@ namespace Amanotes.Core
             public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
             
+            public static void SetCallback_OnModuleReady(Action onReady)
+            {
+                if (onReady == null) return;
+            
+                if (IsModuleReady)
+                {
+                    onReady();
+                    return;
+                }
+            
+                _onModuleReady -= onReady;
+                _onModuleReady += onReady;
+            }
+            
+            public static void SetCallback_OnGetProductsComplete(Action onComplete)
+            {
+                if (onComplete == null) return;
+            
+                if (isGetProductComplete)
+                {
+                    onComplete();
+                    return;
+                }
+            
+                _onGetProductsComplete -= onComplete;
+                _onGetProductsComplete += onComplete;
+            }
+            
+            public static void SetCallback_OnGetCustomerInfoComplete(Action onComplete)
+            {
+                if (onComplete == null) return;
+            
+                if (isGetCustomerInfoComplete)
+                {
+                    onComplete();
+                    return;
+                }
+            
+                _onGetCustomerInfoComplete -= onComplete;
+                _onGetCustomerInfoComplete += onComplete;
+            }
+
+            public static void SyncCustomerInfo(Action<bool> onComplete = null)
+            {
+                if (_adapter == null)
+                {
+                    onComplete?.Invoke(false);
+                    return;
+                }
+                _adapter.SyncCustomerInfo(onComplete);
+            }
+            
             public static ISetupBuilder GetProducts(bool appendExistingList = false)
             {
                 if (!appendExistingList)
@@ -129,6 +181,13 @@ namespace Amanotes.Core
                 }
             }
 
+            private static bool isGetProductComplete;
+            private static bool isGetCustomerInfoComplete;
+            private static bool IsModuleReady => isGetProductComplete && isGetCustomerInfoComplete;
+            private static Action _onGetProductsComplete;
+            private static Action _onGetCustomerInfoComplete;
+            private static Action _onModuleReady;
+
             internal static bool InitModule()
             {
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
@@ -140,8 +199,31 @@ namespace Amanotes.Core
             internal static void StartModule()
             {
                 if (_adapter == null) return;
+                _adapter.SyncCustomerInfo(
+                    success =>
+                    {
+                        isGetCustomerInfoComplete = true;
+                        GDKUtils.SafeInvokeAndClear(ref _onGetCustomerInfoComplete);
+                        if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
+                    });
                 localData.Sync();
-                if (Config.iap.autoGetProducts) GetProducts();
+                if (Config.iap.autoGetProducts)
+                {
+                    GetProducts()
+                        .OnSuccess(_ => OnGetProductsComplete())
+                        .OnFail(_ => OnGetProductsComplete());
+                }
+                else
+                {
+                    OnGetProductsComplete();
+                }
+            }
+
+            private static void OnGetProductsComplete()
+            {
+                isGetProductComplete = true;
+                GDKUtils.SafeInvokeAndClear(ref _onGetProductsComplete);
+                if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
             }
         }
         
@@ -442,6 +524,7 @@ namespace Amanotes.Core.Internal
             if (ls == null || ls.Count == 0)
             {
                 LogWarning("There is no IAP product");
+                onSuccess?.Invoke(AllProducts);
                 return;
             }
             
@@ -506,8 +589,7 @@ namespace Amanotes.Core.Internal
                 {
                     foreach (var p in pList)
                     {
-                        if (AllProducts.ContainsKey(p.id)) AllProducts[p.id] = p;
-                        else AllProducts.Add(p.id, p);  
+                        AllProducts[p.id] = p;
                     }
                     GDKUtils.DelayCall(0f, GetNextProductsInQueue);
                 }, error => onFail?.Invoke(error));
@@ -573,5 +655,7 @@ namespace Amanotes.Core.Internal
         public abstract DateTime? GetUnsubscribedDate();
         public abstract HashSet<PurchaseRecord> GetPurchaseHistory();
         public abstract DateTime? GetLastPurchaseDate(string productAndPlanId);
+        
+        public abstract void SyncCustomerInfo(Action<bool> onComplete = null);
     }
 }

package/Runtime/AmaGDK.cs

@@ -14,17 +14,20 @@ using Debug = UnityEngine.Debug;
 using Amanotes.Core.Internal;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
+using System.Threading.Tasks;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
 using UnityEditor.PackageManager;
 #endif
 
+
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.77";
+        public const string VERSION = "0.2.79";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -46,6 +49,7 @@ namespace Amanotes.Core
         {
             // public const string GDK_HOOK_START = nameof(GDK_HOOK_START);
             // public const string GDK_HOOK_END = nameof(GDK_HOOK_END);
+            
             // public const string GDK_INIT = nameof(GDK_INIT);
             // public const string GDK_READY = nameof(GDK_READY);
             // public const string ADAPTER_READY = nameof(ADAPTER_READY);
@@ -233,7 +237,9 @@ namespace Amanotes.Core
             GDKUtils.SafeInvokeAndClear(ref _onGDKReady);
 
             float initDuration = Time.realtimeSinceStartup - startTime;
-            LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
+
+            yield return LogEvent_GDKInitAsync(Mathf.RoundToInt(initDuration));
+
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
             ForceLog($"v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
@@ -263,7 +269,60 @@ namespace Amanotes.Core
             }
         }
 
-        private static void LogEvent_GDKInit(int initDuration)
+        public static async Task<Dictionary<string, object>> ParseThirdPartyVersionsAsync()
+        {
+            Dictionary<string, object> thirdPartyVersions = new Dictionary<string, object>();
+            string fileContent = await GDKFileUtils.LoadFromStreamingAssets("SDKVersion.txt");
+            if (string.IsNullOrEmpty(fileContent))
+            {
+                LogWarning($"Failed to load SDKVersion.txt.");
+            }
+            else
+            {
+                ProcessFileContent(fileContent, thirdPartyVersions);
+            }
+            return thirdPartyVersions;
+        }
+
+        private static void ProcessFileContent(string fileContent, Dictionary<string, object> thirdPartyVersions)
+        {
+            bool foundThirdPartySection = false;
+            using (StringReader sr = new StringReader(fileContent))
+            {
+                string line;
+                while ((line = sr.ReadLine()) != null)
+                {
+                    if (line.Contains("// THIRD PARTY"))
+                    {
+                        foundThirdPartySection = true;
+                        continue;
+                    }
+
+                    if (line.Contains("//-"))
+                        continue;
+
+                    if (foundThirdPartySection)
+                    {
+                        if (string.IsNullOrWhiteSpace(line) || line.Contains("//"))
+                            break;
+
+                        string[] parts = line.Split(new[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries);
+                        if (parts.Length == 2)
+                        {
+                            string key = parts[0].Trim();       // Extract the key (name of the third-party library)
+                            string value = parts[1].Trim();     // Extract the version number
+                            thirdPartyVersions[key] = value;
+                        }
+                    }
+                }
+            }
+            if (!foundThirdPartySection)
+            {
+                LogWarning("Failed to fetch third-party packages' version from SDKVersions.txt.");
+            }
+        }
+
+        private static async Task LogEvent_GDKInitAsync(int initDuration)
         {
             var BToMB = 1.0 / (1024 * 1024);
             var reservedMemory = Math.Round(Profiler.GetTotalReservedMemoryLong() * BToMB, 2); // in MB
@@ -292,6 +351,10 @@ namespace Amanotes.Core
             AppendServiceKey(AdapterID.APPSFLYER, "appsflyer_key");
             AppendServiceKey(AdapterID.IRONSOURCE, "ironsource_key");
             AppendServiceKey(AdapterID.REVENUECAT, "revenuecat_key");
+
+            var thirdPartyVersions = await ParseThirdPartyVersionsAsync();
+            _dicKey = _dicKey.Concat(thirdPartyVersions).ToDictionary(x=>x.Key, x=>x.Value);
+
             Analytics.LogEvent("gdk_init", _dicKey);
         }
     }

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -10,6 +10,9 @@ using UnityEngine;
 using UnityEngine.Profiling;
 using static Amanotes.Core.GDKDebug;
 
+using System.Threading.Tasks;
+using UnityEngine.Networking;
+
 namespace Amanotes.Core.Internal
 {
     public static partial class GDKUtils
@@ -251,6 +254,41 @@ namespace Amanotes.Core.Internal
             return content;
         }
 
+        public static async Task<string> LoadFromStreamingAssets(string fileName)
+        {
+            string filePath = Path.Combine(Application.streamingAssetsPath, fileName);
+
+            // Android
+            if (Application.platform == RuntimePlatform.Android)
+            {
+                using (UnityWebRequest request = UnityWebRequest.Get(filePath))
+                {
+                    var operation = request.SendWebRequest();
+                    while (!operation.isDone)
+                    {
+                        await Task.Yield();
+                    }
+                    if (request.result != UnityWebRequest.Result.Success)
+                    {
+                        LogWarning($"Error reading file: {request.error}");
+                        return null;
+                    }
+                    return request.downloadHandler.text;
+                }
+            }
+
+            // Other
+            try
+            {
+                return File.ReadAllText(filePath);
+            }
+            catch (Exception e)
+            {
+                LogWarning($"Error reading file: {e.Message}");
+            }
+            return null;
+        }
+
         internal static void Delete(string fileName)
         {
             string path = GetPath(fileName);

package/package.json

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