com.amanotes.gdk 0.2.63 → 0.2.64

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.64 - 2024-06-06]
+- [Dev] Log gdk_init
+- [Fix] map_user_id must contain FRB, AF, [GAID, IDFA]
+- [Dev] Check duplicated SKAdNetwork
+- [Dev] New editor attribute [HideInNormalInspector]
+- [Dev] Public ClearCacheData method
+- [Feature] Add adapter config validation
+- [Feature] Add DevMode for remote config fetching
+- [Fix] Create button did not create a new AmaGDKConfig asset in Resources
+- Also: Hide config details
+- [Feature] Support AF Purchase Connector and deeplinking
+
 ## [0.2.63 - 2024-06-01]
 - [Fix] Do not include default GDK config asset
 - [Fix] Support compare SemVer with an invalid value

package/Editor/AmaGDKEditor.cs

@@ -100,6 +100,11 @@ namespace Amanotes.Editor
                     if (AmaGUI.BigButton("CREATE", 40f, BLUE))
                     {
                         AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
+
+                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
+                        AssetDatabase.CreateAsset(config, "Assets/AmaGDK/Resources/AmaGDKConfig.asset");
+                        AssetDatabase.SaveAssets();
+                        TryLoadConfigAsset();
                         adapterScanned = false;
                     }
 
@@ -301,17 +306,16 @@ namespace Amanotes.Editor
 
             configSO = new SerializedObject(configAsset);
             configSO.Update();
-
             DrawProperty(configSO, "common");
+            EditorGUILayout.ObjectField("Config", configAsset, typeof(ScriptableObject), false);
             GUILayout.Space(8f);
             for (var i = 0; i < allAdapters.Count; i++)
             {
                 var item = allAdapters[i];
                 DrawAdapterDetail(item.id, item.adapter);
             }
-
             EditorGUILayout.Space();
-            AmaGUI.Foldout("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
+            
             AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
             AmaGUI.Foldout("Extras", ref showExtra, DrawGUI_ExtraList);
             Profiler.EndSample();
@@ -370,6 +374,11 @@ namespace Amanotes.Editor
                 configOpen.Add(adapterId, isOpen = false);
             }
             
+            var configStatus = adapter?.configStatus ?? Adapter2.ConfigStatus.Ok;
+            Texture2D icon =
+                configStatus == Adapter2.ConfigStatus.Invalid ? (Texture2D)EditorGUIUtility.IconContent("console.erroricon.sml").image :
+                configStatus == Adapter2.ConfigStatus.Warning ? (Texture2D)EditorGUIUtility.IconContent("console.warnicon.sml").image : null;
+            
             SDKStatus status = SDKStatus.Get(adapterId);
             bool changed = AmaGUI.Foldout(ObjectNames.NicifyVariableName(adapterId), ref isOpen, () =>
             {
@@ -392,10 +401,17 @@ namespace Amanotes.Editor
 
             }, () =>
             {
+                if (icon != null)
+                {
+                    Rect rect = GUILayoutUtility.GetRect(6f, 6f, 16f, 16f);
+                    rect.xMin -= 10f;
+                    rect.y += 1f;
+                    GUI.DrawTexture(rect, icon);
+                }
                 GUILayout.FlexibleSpace();
-
+                
                 bool installed = status.adapterInstalled;
-                bool adapterActive = installed && adapter.enabled;
+                bool adapterActive = installed && adapter != null && adapter.enabled;
 
                 if (!adapterActive)
                 {
@@ -407,7 +423,7 @@ namespace Amanotes.Editor
                     GUILayout.Label(label, GUILayout.Width(w));
                     GUI.color = c;
                 }
-
+                
                 AmaGUI.DrawVersionTag(status.sdkVersion, adapterActive);
 
                 if (installed)
@@ -421,7 +437,7 @@ namespace Amanotes.Editor
                     }
                 }
             });
-
+            
 
 
             if (changed) configOpen[adapterId] = isOpen;

package/Editor/HideInNormalInspectorDrawer.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+namespace Amanotes.Core.Editor
+{
+    [CustomPropertyDrawer(typeof(HideInNormalInspectorAttribute))]
+    public class HideInNormalInspectorDrawer : PropertyDrawer
+    {
+        public override VisualElement CreatePropertyGUI(SerializedProperty property)
+        {
+            var mode = ActiveEditorTracker.sharedTracker.inspectorMode;
+            return mode == InspectorMode.Normal ? new VisualElement() : base.CreatePropertyGUI(property);
+        }
+        
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label) {
+            return 0f;
+        }
+	
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) {}
+    }
+}

package/Editor/HideInNormalInspectorDrawer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66d88278f0e44820aebc1e5a5e94e15f
+timeCreated: 1717409948

package/Packages/AppsFlyerAdapter.PurchaseConnector.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d0d621a4b24af4e399401664334f0d2c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Adapters.cs

@@ -6,16 +6,27 @@ using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
+    
+    
     public abstract partial class Adapter2
     {
+        internal protected enum ConfigStatus
+        {
+            Ok,
+            Invalid,
+            Warning
+        }
+        
         // internal use
-        [HideInInspector] [SerializeField] internal int initOrder;
-        [HideInInspector] [SerializeField] internal bool enabled = true;
+        [HideInNormalInspector] [SerializeField] internal int initOrder;
+        [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
         [NonSerialized] internal protected Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
+        internal protected abstract string GetServiceKey();
+        internal protected abstract ConfigStatus configStatus { get; }
         
         public bool IsReady => status == Status.Ready;
         

package/Runtime/AmaGDK.Analytics.cs

@@ -160,14 +160,6 @@ namespace Amanotes.Core
                 logEventHook = condition;
             }
 
-            public static void SetUserId(string userId)
-            {
-                foreach (AnalyticsAdapter s in listAdapters)
-                {
-                    s.SetUserId(userId);
-                }
-            }
-
             public static void SetUserProperty(string key, string value)
             {
                 foreach (AnalyticsAdapter s in listAdapters)
@@ -1104,11 +1096,11 @@ namespace Amanotes.Core.Internal
     {
         // [Header("-----     MODULE CONFIG      -----")]
         public bool showAnalyticsLog;
-        [HideInInspector] public bool normalizeEventName = true;
-        [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"};
+        [HideInNormalInspector] public bool normalizeEventName = true;
+        [HideInNormalInspector] public bool checkMigrationIntegrity = true;
+        [HideInNormalInspector] public bool migrateAccumulatedCount = true;
+        [HideInNormalInspector] public bool enableEventStat;
+        [HideInNormalInspector] public List<string> immediatelyLoggedEvents = new List<string>(){"ad_impression", "ad_impression_ama"};
         public AnalyticQualityConfig quality;
     }
     
@@ -1134,8 +1126,8 @@ namespace Amanotes.Core.Internal
     
     public abstract class AnalyticsAdapter : Adapter2
     {
-        [HideInInspector] public List<string> NeverSend = new List<string>();
-        [HideInInspector] public List<string> AlwaysSend = new List<string>();
+        [HideInNormalInspector] public List<string> NeverSend = new List<string>();
+        [HideInNormalInspector] public List<string> AlwaysSend = new List<string>();
         protected abstract bool SendEventByDefault { get; }
         
         public bool IsForbidden(string eventName)
@@ -1147,10 +1139,8 @@ namespace Amanotes.Core.Internal
         
         public abstract void LogEvent(string eventNameToSend, Dictionary<string, object> parameters);
 
-        public abstract void SetUserId(string userId);
+        // public abstract void SetUserId(string userId);
 
         public abstract void SetUserProperty(string key, string value);
-
-        public abstract void GetAppInstanceID(Action<string> appId);
     }
 }

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -5,6 +5,7 @@ using System.Text;
 using UnityEngine;
 using Amanotes.Core.Internal;
 using UnityEngine.Profiling;
+using UnityEngine.Serialization;
 using static Amanotes.Core.Internal.Logging;
 
 #if UNITY_EDITOR
@@ -369,9 +370,11 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class RemoteConfigConfig
     {
+        [FormerlySerializedAs("firstFetchTimeOutInSeconds")]
         [Tooltip("Fetch timeout for first session (in secs)")]
         public float firstFetchTimeOutInSeconds = 10;
         
+        [FormerlySerializedAs("defaultTimeOutInSeconds")]
         [Tooltip("Fetch timeout for 2nd+ session (in secs)")]
         public float defaultTimeOutInSeconds = 3;
         

package/Runtime/AmaGDK.UserProfile.cs

@@ -72,83 +72,152 @@ namespace Amanotes.Core
                     _userId = value;
                     Logging.Log($"GDK UserID Updated: {_userId}");
                     dispatcher.Dispatch(Event.GDK_USER_ID_UPDATED, _userId);
-                    Save();
+                    _dirty = true;
+                    if (isReady) SendMapUserId();
                 }
             }
 
             public string GAId
             {
                 get => _gaid;
-                set => _gaid = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for GAId. Value: {value}");
+                        return;
+                    }
+                    _gaid = value;
+                    UpdateUserId();
+                }
             }
 
             public string IDFA
             {
                 get => _idfa;
-                set => _idfa = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for IDFA. Value: {value}");
+                        return;
+                    }
+                    _idfa = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string IDFV
             {
                 get => _idfv;
-                set => _idfv = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for IDFV. Value: {value}");
+                        return;
+                    }
+                    _idfv = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string AndroidId
             {
                 get => _androidId;
-                set => _androidId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AndroidId. Value: {value}");
+                        return;
+                    }
+                    _androidId = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string PseudoId
             {
                 get => _pseudoId;
-                set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for PseudoId. Value: {value}");
+                        return;
+                    }
+                    _pseudoId = value;
+                    UpdateUserId();
+                }
             }
             
-            #if UNITY_ANDROID && !UNITY_EDITOR
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
-            }
-            #else
-            public string AmaDeviceId
-            {
-                get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    var pattern = ALPHANUMERIC_HYPHEN_PATTERN;
+#if UNITY_ANDROID && !UNITY_EDITOR
+                    pattern = ALPHANUMERIC_PATTERN;
+#endif
+                    if (!ValidateId(value, pattern))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
+                        return;
+                    }
+                    _amaDeviceId = value;
+                    UpdateUserId();
+                }
             }
-            #endif
+
 
             public string AppsFlyerId
             {
                 get => _appsFlyerId;
-                set => _appsFlyerId = ValidateId(value, NUMERIC_HYPHEN_PATTERN);
+                set
+                {
+                    if (!Application.isEditor && !ValidateId(value, NUMERIC_HYPHEN_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for AppsFlyerId. Value: {value}");
+                        return;
+                    }
+                    _appsFlyerId = value;
+                    UpdateUserId();
+                }
             }
-            
+
             public string InstallationId
             {
                 get => _installationId;
-                set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set
+                {
+                    if (!ValidateId(value, ALPHANUMERIC_PATTERN))
+                    {
+                        Logging.LogError($"[UserProfile] Wrong format for InstallationId. Value: {value}");
+                        return;
+                    }
+                    _installationId = value;
+                    UpdateUserId();
+                }
             }
 
-            public int Session
-            {
-                get => _session;
-            }
+            public int Session => _session;
 
             public string Country
             {
                 get => _country;
                 set
                 {
-                    _country = ValidateId(value, COUNTRY_CODE_PATTERN);
-                    SaveIfDirty();
+                    if (!ValidateId(value, COUNTRY_CODE_PATTERN)) return;
+                    _country = value;
+                    _dirty = true;
                 }
             }
 
-            public void UpdateUserId()
+            private void UpdateUserId()
             {
+                _dirty = true;
 #if UNITY_ANDROID
                 if (!string.IsNullOrWhiteSpace(_gaid))
                 {
@@ -241,14 +310,14 @@ namespace Amanotes.Core
             {
                 User.LoadJsonFromFile();
 
-#if UNITY_ANDROID
+#if UNITY_ANDROID && !UNITY_EDITOR
                 AndroidId = SystemInfo.deviceUniqueIdentifier;
 #elif UNITY_IOS
                 IDFV = SystemInfo.deviceUniqueIdentifier;
 #endif
                 GetAmaDeviceId();
                 UpdateUserId();
-                _session = _session + 1;
+                _session += 1;
                 _dirty = true;
             }
             
@@ -259,6 +328,19 @@ namespace Amanotes.Core
                 Logging.Log($"[UserProfile] user_id: {_userId}");
                 onFrameUpdate -= SaveIfDirty;
                 onFrameUpdate += SaveIfDirty;
+                
+                var adsId = Application.platform == RuntimePlatform.Android ? GAId : IDFA;
+                var delay = string.IsNullOrEmpty(AppsFlyerId)
+                                 || string.IsNullOrEmpty(adsId)
+                                 || string.IsNullOrEmpty(PseudoId);
+                
+                GDKUtils.DelayCall(delay ? 1 : 0, SendMapUserId);
+            }
+            
+            private void SendMapUserId()
+            {
+                Analytics.LogEvent("map_user_id", AmaGDK.User.CollectAllUserIds())
+                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
             }
 
             private void SetAdvertisingID(string id)
@@ -280,8 +362,7 @@ namespace Amanotes.Core
                 {
                     GDKUtils.DelayCall(0, () =>
                     {
-                        SetAdvertisingID(advertisingId);                
-                        Save();
+                        SetAdvertisingID(advertisingId);
                     });
                 });
             }
@@ -292,7 +373,7 @@ namespace Amanotes.Core
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
-                        string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
+                        var v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
                         if (string.IsNullOrEmpty(v))
                         {
                             v = Guid.NewGuid().ToString();
@@ -302,7 +383,7 @@ namespace Amanotes.Core
                         break;
                 
                     case RuntimePlatform.Android:
-                        string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                        var cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
                         if (string.IsNullOrEmpty(cachedAmaDeviceId))
                         {
                             cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
@@ -318,11 +399,10 @@ namespace Amanotes.Core
                 Save();
             }
 
-            private string ValidateId (string id, string pattern)
+            private bool ValidateId (string id, string pattern)
             {
-                if (string.IsNullOrWhiteSpace(id)) return null;
-                if (!Regex.IsMatch(id, pattern)) return null;
-                return id;
+                if (string.IsNullOrWhiteSpace(id)) return false;
+                return Regex.IsMatch(id, pattern);
             }
         }
     }

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.63";
+        public const string VERSION = "0.2.64";
 
         internal static AmaGDK _instance;
         internal static bool _allowInit = false;
@@ -179,16 +179,17 @@ namespace Amanotes.Core
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
             
-            float startTime = Time.realtimeSinceStartup;
+            var startTime = Time.realtimeSinceStartup;
             var sb = new StringBuilder();
 
             InitModules();
             
-            float moduleTime = Time.realtimeSinceStartup - startTime;
+            var moduleTime = Time.realtimeSinceStartup - startTime;
             sb.Append($"- InitModules() took (~ {moduleTime:#0.00}s)\n");
             
             yield return InitHook(); //Google CMP takes long at first time (~ 1.7s)
-            float hookTime = Time.realtimeSinceStartup - moduleTime - startTime;
+            
+            var hookTime = Time.realtimeSinceStartup - moduleTime - startTime;
             sb.Append($"- InitHook() took (~ {hookTime:#0.00}s)\n\n");
             
             _status = Status.Initialize;
@@ -206,9 +207,12 @@ namespace Amanotes.Core
             
             _status = Status.Ready;
             dispatcher.Dispatch(Event.GDK_READY);
+
+            var initDuration = Time.realtimeSinceStartup - startTime;
+            LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
-            Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime:#0.00}s\n\n{sb}");
+            Debug.Log($"AmaGDK v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
         }
 
         private void ConfigGeoLocation()
@@ -230,6 +234,29 @@ namespace Amanotes.Core
                 }
             }
         }
+
+        private static void LogEvent_GDKInit(int initDuration)
+        {
+            var _dicKey = new Dictionary<string, object>
+            {
+                ["gdk_version"] = VERSION,
+                ["session"] = User.Session,
+                ["gdk_init_duration"] = initDuration,
+                ["user_id"] = User.UserId
+            };
+
+            void AppendServiceKey(string adapterId, string paramName)
+            {
+                var serviceKey = Adapter2.GetAdapterById(adapterId)?.GetServiceKey();
+                if (string.IsNullOrEmpty(serviceKey)) return;
+                _dicKey[paramName] = serviceKey;    
+            }
+            
+            AppendServiceKey(AdapterID.APPSFLYER, "appsflyer_key");
+            AppendServiceKey(AdapterID.IRONSOURCE, "ironsource_key");
+            AppendServiceKey(AdapterID.REVENUECAT, "revenuecat_key");
+            Analytics.LogEvent("gdk_init", _dicKey);
+        }
     }
 
     public partial class AmaGDK // PUBLIC APIS

package/Runtime/Internal/AmaGDK.Internal.AmaGUI.cs

@@ -149,10 +149,27 @@ namespace Amanotes.Core.Internal
             return true;
         }
 
-        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null, GUIStyle style = null)
+        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
+        {
+            return Foldout(label, null, ref isOpen, drawFunc, titleFunc);
+        }
+
+        public static bool Foldout(string label, Texture icon, ref bool isOpen, Action drawFunc, Action titleFunc = null)
         {
             GUILayout.BeginHorizontal();
-            bool newValue = EditorGUILayout.Foldout(isOpen, label, EditorStyles.foldoutHeader);
+            float labelWidth = EditorGUIUtility.labelWidth;
+            
+            var content = new GUIContent(label, icon);
+            float w = EditorStyles.foldoutHeader.CalcSize(content).x;
+            EditorGUIUtility.labelWidth = w;
+
+            // var c = GUI.color;
+            // GUI.color = Color.red;
+            Rect rect = GUILayoutUtility.GetRect(w, w, 18f, 18f);
+            bool newValue = EditorGUI.Foldout(rect, isOpen, content, EditorStyles.foldoutHeader);
+            EditorGUIUtility.labelWidth = labelWidth;
+            // GUI.color = c;
+            
             bool changed = newValue != isOpen;
             titleFunc?.Invoke();
             GUILayout.EndHorizontal();

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -14,6 +14,10 @@ namespace Amanotes.Core.Internal
 {
     public static class GDKUtils
     {
+        public static void StartCoroutine(IEnumerator action)
+        {
+            AmaGDK._instance.StartCoroutine(action);
+        }
         public static void DelayCall(float seconds, Action action)
         {
             AmaGDK._instance.StartCoroutine(DelayCallRoutine(seconds, action));
@@ -321,7 +325,7 @@ namespace Amanotes.Core.Internal
             }
         }
         
-        internal static void ClearCacheData()
+        public static void ClearCacheData()
         {
             var sb = new StringBuilder();
             sb.AppendLine("[AmaGDK] All cached data & stats cleared");

package/Runtime/Internal/HideInNormalInspectorAttribute.cs

@@ -0,0 +1,9 @@
+using UnityEngine;
+
+namespace Amanotes.Core
+{
+    public class HideInNormalInspectorAttribute : PropertyAttribute 
+    {
+        public HideInNormalInspectorAttribute() { }
+    }
+}

package/Runtime/Internal/HideInNormalInspectorAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 988f818f8951413e9813008614e04a4a
+timeCreated: 1717410575

package/package.json

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