Merge pull request #26 from TaloDev/develop

Release 0.6.0

Author: tudddorrr

Assets/Scripts/Events/TrackEvent.cs

@@ -14,7 +14,7 @@ public void OnButtonClick()
         Track();
     }
 
-    private void Track()
+    private async void Track()
     {
         try
         {
@@ -24,7 +24,7 @@ private void Track()
 
             if (flushImmediately)
             {
-                Talo.Events.Flush();
+                await Talo.Events.Flush();
 
                 ResponseMessage.SetText($"{eventName} tracked and events flushed");
             }

Assets/Scripts/Leaderboards/GetLeaderboardEntries.cs

@@ -18,7 +18,8 @@ private async void FetchEntries()
         try
         {
             int score = UnityEngine.Random.Range(0, 10000);
-            LeaderboardEntry[] entries = await Talo.Leaderboards.GetEntries(internalName, page);
+            LeaderboardEntriesResponse res = await Talo.Leaderboards.GetEntries(internalName, page);
+            LeaderboardEntry[] entries = res.entries;
 
             if (entries.Length == 0)
             {

Packages/com.trytalo.talo/Runtime/EventsAPI.cs

@@ -45,19 +45,24 @@ public async Task Flush()
             Talo.IdentityCheck();
 
             var eventsToSend = queue.ToArray();
-            queue.Clear();
+            
+            if (eventsToSend.Length > 0)
+            {
+                queue.Clear();
 
-            var uri = new Uri(baseUrl);
-            var content = JsonUtility.ToJson(new EventsPostRequest(eventsToSend));
+                var uri = new Uri(baseUrl);
+                var content = JsonUtility.ToJson(new EventsPostRequest(eventsToSend));
 
-            try
-            {
-                await Call(uri, "POST", content);
-            }
-            catch (Exception err)
-            {
-                Debug.LogError(err.Message);
-                queue.AddRange(eventsToSend);
+                try
+                {
+                    await Call(uri, "POST", content);
+                    manager.ResetFlushTimer();
+                }
+                catch (Exception err)
+                {
+                    Debug.LogError(err.Message);
+                    queue.AddRange(eventsToSend);
+                }
             }
         }
     }

Packages/com.trytalo.talo/Runtime/LeaderboardsAPI.cs

@@ -8,13 +8,13 @@ public class LeaderboardsAPI : BaseAPI
     {
         public LeaderboardsAPI(TaloManager manager) : base(manager, "leaderboards") { }
 
-        public async Task<LeaderboardEntry[]> GetEntries(string internalName, int page)
+        public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page)
         {
             var uri = new Uri(baseUrl + $"/{internalName}/entries?page={page}");
 
             var json = await Call(uri, "GET");
             var res = JsonUtility.FromJson<LeaderboardEntriesResponse>(json);
-            return res.entries;
+            return res;
         }
 
         public async Task<LeaderboardEntry[]> GetEntriesForCurrentPlayer(string leaderboardInternalName, int page)

Packages/com.trytalo.talo/Runtime/Responses/LeaderboardEntriesResponse.cs

@@ -4,5 +4,7 @@
     public class LeaderboardEntriesResponse
     {
         public LeaderboardEntry[] entries;
+        public int count;
+        public bool isLastPage;
     }
 }

Packages/com.trytalo.talo/Runtime/SavesAPI.cs

@@ -64,18 +64,12 @@ public async Task<GameSave[]> GetSaves(SaveMode mode = SaveMode.BOTH)
 
             if (mode != SaveMode.OFFLINE_ONLY)
             {
-                try
-                {
-                    var uri = new Uri(baseUrl + $"?aliasId={Talo.CurrentAlias.id}");
+                var uri = new Uri(baseUrl + $"?aliasId={Talo.CurrentAlias.id}");
 
-                    var json = await Call(uri, "GET");
-                    var res = JsonUtility.FromJson<SavesIndexResponse>(json);
+                var json = await Call(uri, "GET");
+                var res = JsonUtility.FromJson<SavesIndexResponse>(json);
 
-                    saves.AddRange(res.saves);
-                } catch
-                {
-                    Debug.LogWarning("Failed to load online saves");
-                }
+                saves.AddRange(res.saves);
             }
 
             _allSaves = saves;

Packages/com.trytalo.talo/Runtime/Talo.cs

@@ -63,8 +63,7 @@ static Talo()
                 return;
             }
 
-            var go = new GameObject("Talo Manager");
-            var manager = go.AddComponent<TaloManager>();
+            var manager = new GameObject("Talo Manager").AddComponent<TaloManager>();
             manager.settings = settings;
 
             _events = new EventsAPI(manager);
@@ -74,9 +73,14 @@ static Talo()
             _stats = new StatsAPI(manager);
         }
 
+        public static bool HasIdentity()
+        {
+            return CurrentAlias != null;
+        }
+
         public static void IdentityCheck()
         {
-            if (CurrentAlias == null)
+            if (!HasIdentity())
             {
                 throw new Exception("You need to identify a player using Talo.Identify() before doing this.");
             }

Packages/com.trytalo.talo/Runtime/TaloManager.cs

@@ -6,14 +6,52 @@ public class TaloManager : MonoBehaviour
     {
         public TaloSettings settings;
 
+        private float tmrFlush;
+
         private void Awake()
         {
             DontDestroyOnLoad(gameObject);
         }
 
-        private async void OnApplicationQuit()
+        private void OnApplicationQuit()
+        {
+            DoFlush();
+        }
+
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            if (!hasFocus) DoFlush();
+        }
+
+        private void OnApplicationPause(bool isPaused)
+        {
+            if (isPaused) DoFlush();
+        }
+
+        private async void DoFlush()
+        {
+            if (Talo.HasIdentity())
+            {
+                await Talo.Events.Flush();
+            }
+        }
+
+        private void Update()
+        {
+            if (Application.platform == RuntimePlatform.WebGLPlayer)
+            {
+                tmrFlush += Time.deltaTime;
+                if (tmrFlush >= settings.webGLEventFlushRate)
+                {
+                    DoFlush();
+                    tmrFlush = 0;
+                }
+            }
+        }
+
+        public void ResetFlushTimer()
         {
-            await Talo.Events.Flush();
+            tmrFlush = 0;
         }
     }
 }

Packages/com.trytalo.talo/Runtime/TaloSettings.cs

@@ -7,5 +7,7 @@ public class TaloSettings : ScriptableObject
     {
         public string accessKey;
         public string apiUrl = "https://api.trytalo.com/v1";
+        [Tooltip("How often in seconds events are flushed in a WebGL build, see the docs for more info")]
+        public float webGLEventFlushRate = 30f;
     }
 }

Packages/com.trytalo.talo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.trytalo.talo",
-  "version": "0.6.0-pre.0",
+  "version": "0.6.0",
   "displayName": "Talo Game Services",
   "description": "Talo (https://trytalo.com) is an open-source game backend with services designed to help you build games faster. You can currently:\n\n- Identify players\n- Store persistent data across players\n- Track events (levelling up, finding loot, etc)\n- Display high scores with leaderboards\n- Store and load player saves",
   "unity": "2019.1",