com.amanotes.gdk 0.2.20 → 0.2.21

package/CHANGELOG.md

@@ -1,152 +1,158 @@
 # Changelog
 
+## [0.2.21 - 2023-10-11]
+- RevenueCat adapter v6.0.0
+- Handle early Firebase call
+- Fix null exception in non-subscription game
+- Add log level
+
 ## [0.2.20 - 2023-10-05]
-### Update RevenueCat 5.3.0
+- Update RevenueCat 5.3.0
 
 ## [0.2.19 - 2023-09-12]
-### Add `ama_device_id` to all events
+- Add `ama_device_id` to all events
 
 ## [0.2.18 - 2023-09-11]
-### Add dev mode switch
-### Auto get SDK version
-### Add in-app purchase module, RevenueCat
-### Support Unity 2019.4
-### Remove AmaPassport
+- Add dev mode switch
+- Auto get SDK version
+- Add in-app purchase module, RevenueCat
+- Support Unity 2019.4
+- Remove AmaPassport
 
 ## [0.2.14 - 2023-08-08]
-### Support multiple embed remote config and load config by id
-### Clear cached remote config on new app update
-### Override remote config value in editor mode
-### New feature: Analytics Quality
+- Support multiple embed remote config and load config by id
+- Clear cached remote config on new app update
+- Override remote config value in editor mode
+- New feature: Analytics Quality
 
 ## [0.2.13 - 2023-07-20]
-### Fix error Remote Config JSON caused by special chars (", ', \)
+- Fix error Remote Config JSON caused by special chars (", ', \)
 
 ## [0.2.12 - 2023-07-07]
-### Restructure GDK - symlink GDK source to unity projects
-### Unity 2019 compatible - no null coalescing
-### Remove redundant AmaPassport config field
-### Auto request AmaId
+- Restructure GDK - symlink GDK source to unity projects
+- Unity 2019 compatible - no null coalescing
+- Remove redundant AmaPassport config field
+- Auto request AmaId
 
 ## [0.2.11 - 2023-06-29]
-### SetLogCondition with EventParam
-### Rename Migrated -> HasMigrated
-### Fix StopShowAd
+- SetLogCondition with EventParam
+- Rename Migrated -> HasMigrated
+- Fix StopShowAd
 
 ## [0.2.10 - 2023-06-23]
-### Extra package: Project Panel
-### Remote config: Allow user to enable / disable automatic default valuye updating (in play mode)
-### Fix ad routine
-### Expose analytics migration flag
+- Extra package: Project Panel
+- Remote config: Allow user to enable / disable automatic default valuye updating (in play mode)
+- Fix ad routine
+- Expose analytics migration flag
 
 ## [0.2.9 - 2023-06-15]
-### Show total init time
-### Show adapter version + status at init time
-### Remove AmaGDK version in debug log
-### Remove "Params" in analytics debug log
-### Check "event_name" early
-### Fix null exception in AmaGDKInstaller
-### Add csc.rsp to enable AMAGDK_DEV
-### Update Ads module
+- Show total init time
+- Show adapter version + status at init time
+- Remove AmaGDK version in debug log
+- Remove "Params" in analytics debug log
+- Check "event_name" early
+- Fix null exception in AmaGDKInstaller
+- Add csc.rsp to enable AMAGDK_DEV
+- Update Ads module
 
 ## [0.2.8 - 2023-06-12]
-### Mute Appsflyer's init log on Editor
-### Clear analytics log in adapters
-### Check null event params before calling AddParam()
-### Export AmaPassport info
+- Mute Appsflyer's init log on Editor
+- Clear analytics log in adapters
+- Check null event params before calling AddParam()
+- Export AmaPassport info
 
 ## [0.2.7 - 2023-06-09]
-### Fix log single adapter
+- Fix log single adapter
 
 ## [0.2.6 - 2023-06-08]
-### Update AmaPassport
-### Fix JSON parse in RemoteConfig
-### Ads adds interstitial callbacks
-### Clean & export AmaGDK Installer
+- Update AmaPassport
+- Fix JSON parse in RemoteConfig
+- Ads adds interstitial callbacks
+- Clean & export AmaGDK Installer
 
 ## [0.2.5 - 2023-06-07]
-### Remove ATT dependency package
+- Remove ATT dependency package
 
 ## [0.2.4 - 2023-06-07]
-### Hotfix Ads module
-### Update Analytics unit tests
+- Hotfix Ads module
+- Update Analytics unit tests
 
 ## [0.2.3 - 2023-06-06]
-### Refactor Ads module, support ironSource
-### Refactor AmaPassport
-### Refactor AmaGDK structure
-### Add callback when RemoteConfig module completes fetching
+- Refactor Ads module, support ironSource
+- Refactor AmaPassport
+- Refactor AmaGDK structure
+- Add callback when RemoteConfig module completes fetching
 
 ## [0.1.20 - 2023-04-20]
-### Refactor Adapter architure to support reading adapter config from Core
-### Add session stat for Analytics module
-### Unit test for Json parser and Analytics module
+- Refactor Adapter architure to support reading adapter config from Core
+- Add session stat for Analytics module
+- Unit test for Json parser and Analytics module
 
 ## [0.1.19 - 2023-04-11]
-### Move AmaGDKTest out of AmaGDKCore
+- Move AmaGDKTest out of AmaGDKCore
 
 ## [0.1.18 - 2023-03-27]
-### Fix AmaGDK's autoInit saving issue
+- Fix AmaGDK's autoInit saving issue
 
 ## [0.1.17 - 2023-03-13]
-### Release AmaGDK v0.1.17
-### Rename Analytics APIs
+- Release AmaGDK v0.1.17
+- Rename Analytics APIs
 
 ## [0.1.16 - 2023-03-10]
-### Release AmaGDK v0.1.16
-### SemVer supports 4 parts
-### Analytics supports EventConfig
+- Release AmaGDK v0.1.16
+- SemVer supports 4 parts
+- Analytics supports EventConfig
 
 ## [0.1.15 - 2023-03-06]
-### Release AmaGDK v0.1.15
-### Fix null exception in VersionExtractor
-### Warn unhandle platform in Appsflyer initialization
-### Allow dev to SetPermittedEvents and SetForbiddenEvents to the adapter config
+- Release AmaGDK v0.1.15
+- Fix null exception in VersionExtractor
+- Warn unhandle platform in Appsflyer initialization
+- Allow dev to SetPermittedEvents and SetForbiddenEvents to the adapter config
 
 ## [0.1.14 - 2023-03-02]
-### Release AmaGDK v0.1.14
+- Release AmaGDK v0.1.14
 
 ## [0.1.13 - 2023-03-01]
-### Release AmaGDK v0.1.13
-### Fix Semver parser
+- Release AmaGDK v0.1.13
+- Fix Semver parser
 
 ## [0.1.12 - 2023-03-01]
-### Release AmaGDK v0.1.12
-### Prioritize analytics instant config over the base config
-### Public common config
+- Release AmaGDK v0.1.12
+- Prioritize analytics instant config over the base config
+- Public common config
 
 ## [0.1.11 - 2023-02-28]
-### Release AmaGDK v0.1.11
-### Auto start and log Appsflyer open session
-### Add analytics adapter base config
-### Analytics: count by session
-### Export example scene
-### Add AmaGDKManager
-### Refactor Adapter to support for init order configuration
+- Release AmaGDK v0.1.11
+- Auto start and log Appsflyer open session
+- Add analytics adapter base config
+- Analytics: count by session
+- Export example scene
+- Add AmaGDKManager
+- Refactor Adapter to support for init order configuration
 
 ## [0.1.10 - 2023-02-17]
-### Release AmaGDK v0.1.10
+- Release AmaGDK v0.1.10
 
 ## [0.1.9 - 2023-02-15]
-### Release AmaGDK v0.1.9
-### Change Documentation URL
-### Support API LogEvent(eventName, parameters)
+- Release AmaGDK v0.1.9
+- Change Documentation URL
+- Support API LogEvent(eventName, parameters)
 
 ## [0.1.8 - 2023-02-15]
-### Release AmaGDK v0.1.8
-### Add AdapterID
+- Release AmaGDK v0.1.8
+- Add AdapterID
 
 ## [0.1.5 - 2023-02-13]
-### Release AmaSDK v0.1.5
-### Validate EventParams
+- Release AmaSDK v0.1.5
+- Validate EventParams
 
 ## [0.1.4 - 2023-02-13]
-### Release AmaSDK v0.1.4
+- Release AmaSDK v0.1.4
 
 ## [0.1.3 - 2023-02-10]
-### Release AmaSDK v0.1.3
+- Release AmaSDK v0.1.3
 
 ## [0.1.2] - 2023-02-08
-### Release AmaGDK 0.1.2
-### FirebaseAnalytics adapter compatible with FirebaseAnalytics SDK v9
-### AppsFlyer adapter compatible with AppsFlyer SDK v6
+- Release AmaGDK 0.1.2
+- FirebaseAnalytics adapter compatible with FirebaseAnalytics SDK v9
+- AppsFlyer adapter compatible with AppsFlyer SDK v6

package/Packages/{RevenueCatAdapter_v5.3.0.unitypackage.meta → RevenueCatAdapter_v6.0.0.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7549d4283e5844b68b594b1dcb4add02
+guid: 8143c4447d1894317ac84680e221eec3
 DefaultImporter:
   externalObjects: {}
   userData: 

package/README.md

@@ -1,12 +1,57 @@
 # Amanotes GDK
 
-### Before you begin
+## AmaGDK Dev Project Setup
 
-AmaGDK is a free library from Amanotes provides classes, interfaces and adapter packages for Unity game development.
+### Clone Project From GitLab
 
-# Amanotes GDK for your game
+1. Clone project from GitLab url:  https://gitlab.amanotes.net/sdk/AmaSDK_v5
+2. Open terminal windows and cd to your project
+3. Run file create-links.sh (Link GDK folder children to GDKDev)
 
-# Getting started with AmaGDK
+![image](https://drive.google.com/uc?id=1mlilsAOxjRRqWbQPI-tSUDJamZiY01rm)
+
+### How To Open Project
+
+* Open project GDKDev
+
+![image](https://drive.google.com/uc?id=1N2kM3N-LU22pgY_3Uhyq-YZdCmDTPxJa)
+
+### Main folder
+
+* AmaGDK: adapters logic, example, installer, configs
+
+* AmaGDKCore:  core logic, packages
+
+* AmaGDKDev: tools for dev as build tool, release tool
+
+* AmaGDKTest: scenes test, unit test
+
+![image](https://drive.google.com/uc?id=1iYskLfKqFG95Ezsf_hUotnlHnTaAMTfW)
+
+### Switch To Dev Mode
+
+1. Add GDK_HOME variable to .zshrc file in Mac OS
+
+* Step 1: Open terminal, input sudo nano `~/.zshrc`
+
+* Step 2: Enter and input password, add new line export `GDK_HOME=/AmaGDKCoreFolderPath`
+
+* Step 3: Press Ctr+X buttons -> Press Y button -> Press `Enter` button to save
+
+![image](https://drive.google.com/uc?id=11hUbHwTpkLuEhe3hjQEkaiTuJ0fNCR7X)
+
+2. Select AmaGDK prefab in scene → select `Change Dev Mode` in context menu
+
+![image](https://drive.google.com/uc?id=1tmbtcK9FmZf21HHpQYyICf5dN9FKUeKN)
+
+### Code Convention
+[Convention](https://amanotesjsc.atlassian.net/wiki/spaces/AP/pages/3409413152)
+
+### Links Reference
+[Reference](https://amanotesjsc.atlassian.net/wiki/spaces/AP/pages/3334930473)
+
+
+## Getting started with AmaGDK
 
 ### Add AmaGDK prefab to your bootstrap scene (the first scene in your game build settings)
 There are two ways to do:
@@ -35,10 +80,10 @@ public class YourGameSceneController
 }
 ```
 
-# Versioning
+### Versioning
 
 We use [SemVer](http://semver.org/) for versioning.
 
-# License
+### License
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details

package/Runtime/AmaGDK.Analytics.cs

@@ -136,30 +136,12 @@ namespace Amanotes.Core
 
             public static void SetUserId(string userId)
             {
-                if (listAdapters.Count == 0)
-                {
-                    LogWarningOnce("ListAnalyticsAdapter is empty! Maybe you need to wait for Analytics to init");
-                    return;
-                }
-
-                foreach (AdapterContext s in listAdapters)
-                {
-                    s.GetAdapterApi<IAnalyticAdapter>().SetUserId(userId);
-                }
+                actionQueue.Enqueue(() => InternalSetUserId(userId));
             }
 
             public static void SetUserProperty(string key, string value)
             {
-                if (listAdapters.Count == 0)
-                {
-                    LogWarningOnce("ListAnalyticsAdapter is empty! Maybe you need to wait for Analytics to init");
-                    return;
-                }
-
-                foreach (AdapterContext s in listAdapters)
-                {
-                    s.GetAdapterApi<IAnalyticAdapter>().SetUserProperty(key, value);
-                }
+                actionQueue.Enqueue(() => InternalSetUserProperty(key, value));
             }
 
             private static IntegrityFlag MergeData(List<string> funnelEvents, Dictionary<string, int> eventCountMap, bool sumEventCount)
@@ -285,6 +267,7 @@ namespace Amanotes.Core
             internal static readonly Dictionary<string, EventConfig> sendAtCount = new Dictionary<string, EventConfig>();
             internal static Predicate<EventParams> logEventHook = null;
             internal static readonly Queue<EventParams> eventQueue = new Queue<EventParams>();
+            internal static readonly Queue<Action> actionQueue = new Queue<Action>();
             internal static readonly List<AdapterContext> listAdapters = new List<AdapterContext>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
             internal static readonly SessionStat sessionStat = new SessionStat();
@@ -296,6 +279,9 @@ namespace Amanotes.Core
 
                 onFrameUpdate -= ProcessEventQueue;
                 onFrameUpdate += ProcessEventQueue;
+                
+                onFrameUpdate -= ProcessActionQueue;
+                onFrameUpdate += ProcessActionQueue;
             }
 
             internal static void ProcessEventQueue()
@@ -389,7 +375,7 @@ namespace Amanotes.Core
                         sb.AppendLine($" - Malformed eventName (should not contains <space> or <dash>: <{eventName}>");
                     }
                 }
-
+                
                 if (!char.IsLetter(eventName[0])) sb.AppendLine($" - EventName must start with a letter: <{eventName}> ");
                 if (eventName.Length > 40) sb.AppendLine($" - EventName is too long ({eventName.Length} > 40): <{eventName}> ");
                 if (sb.Length > 0 && dryRun) LogWarningOnce(sb.ToString(), $"NormalizeEventName<{eventName}>");
@@ -418,6 +404,33 @@ namespace Amanotes.Core
 
                 return true;
             }
+            
+            
+            internal static void ProcessActionQueue()
+            {
+                if (actionQueue.Count <= 0) return;
+                while (actionQueue.Count > 0)
+                {
+                    var action = actionQueue.Dequeue();
+                    action.Invoke();
+                }
+            }
+            
+            internal static void InternalSetUserId(string userId)
+            {
+                foreach (AdapterContext s in listAdapters)
+                {
+                    s.GetAdapterApi<IAnalyticAdapter>().SetUserId(userId);
+                }
+            }
+
+            internal static void InternalSetUserProperty(string key, string value)
+            {
+                foreach (AdapterContext s in listAdapters)
+                {
+                    s.GetAdapterApi<IAnalyticAdapter>().SetUserProperty(key, value);
+                }
+            }
         }
 
         //PERSISTENT DATA

package/Runtime/AmaGDK.Config.cs

@@ -83,10 +83,19 @@ namespace Amanotes.Core.Internal
 #endif
     }
 
+    [Flags]
+    public enum LogLevel
+    {
+        None = 0,
+        Error = 1,
+        Warning = 2,
+        Verbose = 4
+    }
+
     [Serializable]
     public partial class SDKConfig
     {
-        public bool verboseLog;
+        public LogLevel logLevel = LogLevel.Warning | LogLevel.Error;
     }
 
     [Serializable]

package/Runtime/AmaGDK.IAP.cs

@@ -438,7 +438,7 @@ namespace Amanotes.Core.Internal
             }
             onSuccess?.Invoke(dicProducts);
             return;
-#endif
+#else
             
             getProdQueue.Clear();
             var subs = new List<string>();
@@ -468,6 +468,7 @@ namespace Amanotes.Core.Internal
             getProdQueue.Enqueue((cons, ProductType.Consumable));
             getProdQueue.Enqueue((nons, ProductType.NonConsumable));
             GetNextProductsInQueue();
+#endif
         }
 
         void GetNextProductsInQueue()

package/Runtime/AmaGDK.Internal.cs

@@ -68,6 +68,7 @@ namespace Amanotes.Core.Internal
 
         public static void LogWarningOnce(string message, string key = null)
         {
+            if ((Config.common.logLevel & LogLevel.Warning) == 0) return;
             if (string.IsNullOrEmpty(key)) key = message;
             if (logWarningDict.Contains(key)) return;
             logWarningDict.Add(key);
@@ -75,15 +76,15 @@ namespace Amanotes.Core.Internal
         }
         public static void LogWarning(string message)
         {
-            Debug.LogWarning($"AmaGDK {message}");
+            if ((Config.common.logLevel & LogLevel.Warning) != 0) Debug.LogWarning($"AmaGDK {message}");
         }
         public static void LogError(string message)
         {
-            Debug.LogError($"AmaGDK {message}");
+            if ((Config.common.logLevel & LogLevel.Error) != 0) Debug.LogError($"AmaGDK {message}");
         }
         public static void Log(string message)
         {
-            if (AmaGDK.Config.common.verboseLog) Debug.Log($"AmaGDK {message}");
+            if ((Config.common.logLevel & LogLevel.Verbose) != 0) Debug.Log($"AmaGDK {message}");
         }
     }
 
@@ -91,10 +92,10 @@ namespace Amanotes.Core.Internal
     {
         public static void DestroyAndReset()
         {
-            if (AmaGDK._instance != null)
+            if (_instance != null)
             {
-                UnityObject.Destroy(AmaGDK._instance);
-                AmaGDK._instance = null;
+                UnityObject.Destroy(_instance);
+                _instance = null;
             }
 
             AmaGDK[] result = Resources.FindObjectsOfTypeAll<AmaGDK>();
@@ -113,8 +114,8 @@ namespace Amanotes.Core.Internal
                 UnityObject.Destroy(result[i].gameObject);
             }
 
-            AmaGDK._status = Status.None;
-            AmaGDK._allowInit = false;
+            _status = Status.None;
+            _allowInit = false;
 
             // TODO: Destroy adapters? - Don't do this. An adapter registers just 1 time. Clear adapters cause Analytics test fail.
             //Adapter.listAdapters.Clear();

package/Runtime/AmaGDK.UserProfile.cs

@@ -1,11 +1,12 @@
 using System;
+using System.Collections;
 using Amanotes.Core.Internal;
 using UnityEngine;
 namespace Amanotes.Core
 {
     public partial class AmaGDK //User profile
     {
-        public static readonly UserProfile User = new UserProfile().Load();
+        public static readonly UserProfile User = new UserProfile();
 
         [Serializable]
         public partial class UserProfile : IJsonFile
@@ -18,14 +19,6 @@ namespace Amanotes.Core
                 GDKFileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
             }
 
-            internal UserProfile Load()
-            {
-                string json = GDKFileUtils.Load(FILE_NAME);
-                if (string.IsNullOrEmpty(json)) return this;
-                JsonUtility.FromJsonOverwrite(json, this);
-                return this;
-            }
-
             internal void SaveIfDirty()
             {
                 if (!_dirty) return;
@@ -57,10 +50,26 @@ namespace Amanotes.Core
             private string appsFlyerId;
             
             private const string AMA_DEVICE_ID_KEY = "ama_device_id";
+            private const float TIME_OUT = 5f;
+            private const float WAIT_TIME = 0.5f;
+            private WaitForSeconds waitForDuration = new WaitForSeconds(WAIT_TIME);
 
-            internal void InitUserProfile()
+            internal IEnumerator Init()
             {
-                if (!IsAmaDeviceIdExist()) GetAdvertisingId();
+                User.LoadJsonFromFile();
+                if (IsAmaDeviceIdExist()) yield break;
+                
+                GetAdvertisingId();
+
+                float time = 0;
+                while (!User.IsAmaDeviceIdExist())
+                {
+                    yield return waitForDuration;
+                    time += WAIT_TIME;
+                    if (time <= TIME_OUT) continue;
+                    Logging.LogWarning($"User init time out: {TIME_OUT}");
+                    break;
+                }
             }
             
             private bool IsAmaDeviceIdExist()
@@ -118,7 +127,7 @@ namespace Amanotes.Core
                             break;
             
                         default:
-                            Logging.LogWarning($"Not support ama_device_id on: {Application.platform}");
+                            amaDeviceId = SystemInfo.deviceUniqueIdentifier;
                             break;
                     }
                     Logging.Log($"Generate AmaDeviceId completed: {amaDeviceId}");

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.20";
+        public const string VERSION = "0.2.21";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -61,6 +61,8 @@ namespace Amanotes.Core
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
 
+            yield return User.Init();
+
             float time = 0;
             float timeout = 10;
 
@@ -106,7 +108,6 @@ namespace Amanotes.Core
             }
 
             // Init modules (Adapter managers)
-            User.InitUserProfile();
             Analytics.Init();
             Ads.Init();
             IAP.Init();

package/package.json

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