Merge pull request #161 from TaloDev/develop

Release 0.48.0

Author: tudddorrr

.github/workflows/ci.yml

@@ -25,4 +25,4 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          unityVersion: 6000.0.28f1
+          unityVersion: 6000.0.59f2

Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs

@@ -9,7 +9,7 @@ namespace TaloGameServices
     public class BaseAPI
     {
         // automatically updated with a pre-commit hook
-        private const string ClientVersion = "0.47.0";
+        private const string ClientVersion = "0.48.0";
 
         protected string baseUrl;
 
@@ -101,6 +101,8 @@ protected async Task<string> Call(
                     Debug.Log($"--> {method} {uri} [{www.responseCode}] {www.downloadHandler.text}");
                 }
 
+                await Talo.Continuity.HandlePostResponseHealthCheck(uri.ToString(), www.result);
+
                 if (www.result == UnityWebRequest.Result.Success)
                 {
                     return www.downloadHandler.text;

Assets/Talo Game Services/Talo/Runtime/APIs/HealthCheckAPI.cs

@@ -4,23 +4,60 @@
 
 namespace TaloGameServices
 {
+    public enum HealthCheckStatus
+    {
+        OK,
+        FAILED,
+        UNKNOWN
+    }
+
     public class HealthCheckAPI : BaseAPI
     {
+        private HealthCheckStatus lastHealthCheckStatus = HealthCheckStatus.UNKNOWN;
+
         public HealthCheckAPI() : base("v1/health-check") { }
 
+        public HealthCheckStatus GetLastStatus()
+        {
+            return lastHealthCheckStatus;
+        }
+
         public async Task<bool> Ping()
         {
             var uri = new Uri(baseUrl);
 
+            bool success;
             try
             {
                 await Call(uri, "GET");
-                return true;
-            } catch
+                success = true;
+            }
+            catch
             {
                 Debug.LogWarning("Health check failed");
-                return false;
+                success = false;
             }
+
+            bool failedLastHealthCheck = lastHealthCheckStatus == HealthCheckStatus.FAILED;
+
+            if (success)
+            {
+                lastHealthCheckStatus = HealthCheckStatus.OK;
+                if (failedLastHealthCheck)
+                {
+                    Talo.InvokeConnectionRestored();
+                }
+            }
+            else
+            {
+                lastHealthCheckStatus = HealthCheckStatus.FAILED;
+                if (!failedLastHealthCheck)
+                {
+                    Talo.InvokeConnectionLost();
+                }
+            }
+
+            return success;
         }
     }
 }

Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs

@@ -14,7 +14,24 @@ public class PlayersAPI : BaseAPI
 
         private readonly string offlineDataPath = Application.persistentDataPath + "/ta.bin";
 
-        public PlayersAPI() : base("v1/players") { }
+        public PlayersAPI() : base("v1/players")
+        {
+            Talo.OnConnectionRestored += OnConnectionRestored;
+        }
+
+        private async void OnConnectionRestored()
+        {
+            await Talo.Socket.ResetConnection();
+
+            if (Talo.HasIdentity())
+            {
+                var socketToken = await CreateSocketToken();
+                if (!string.IsNullOrEmpty(socketToken))
+                {
+                    Talo.Socket.SetSocketToken(socketToken);
+                }
+            }
+        }
 
         public void InvokeIdentifiedEvent()
         {
@@ -202,5 +219,24 @@ public async Task<PlayersSearchResponse> Search(string query)
             var res = JsonUtility.FromJson<PlayersSearchResponse>(json);
             return res;
         }
+
+        public async Task<string> CreateSocketToken()
+        {
+            Talo.IdentityCheck();
+
+            var uri = new Uri($"{baseUrl}/socket-token");
+
+            try
+            {
+                var json = await Call(uri, "POST");
+                var res = JsonUtility.FromJson<PlayersSocketTokenResponse>(json);
+                return res.socketToken;
+            }
+            catch (Exception ex)
+            {
+                Debug.LogWarning($"Failed to create socket token: {ex.Message}");
+                return "";
+            }
+        }
     }
 }

Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs

@@ -69,6 +69,41 @@ public async Task<GameSave> ReplaceSaveWithOfflineSave(GameSave offlineSave)
             return res.save;
         }
 
+        private async Task<GameSave[]> SyncOfflineSaves(GameSave[] offlineSaves)
+        {
+            var offlineOnlySaves = offlineSaves.Where((save) => save.id < 0).ToArray();
+            if (offlineOnlySaves.Length == 0) return Array.Empty<GameSave>();
+
+            Talo.IdentityCheck();
+
+            var tasks = offlineOnlySaves.Select(async (offlineSave) =>
+            {
+                try
+                {
+                    var uri = new Uri(baseUrl);
+                    var json = await Call(uri, "POST", JsonUtility.ToJson(new SavesPostRequest
+                    {
+                        name = offlineSave.name,
+                        content = offlineSave.content
+                    }));
+
+                    var res = JsonUtility.FromJson<SavesPostResponse>(json);
+                    return new { res.save, offlineId = offlineSave.id };
+                }
+                catch
+                {
+                    return null;
+                }
+            });
+
+            var results = await Task.WhenAll(tasks);
+            var successfulResults = results.Where((res) => res != null);
+            var offlineIdsToDelete = successfulResults.Select((res) => res.offlineId).ToArray();
+            savesManager.DeleteOfflineSaves(offlineIdsToDelete);
+
+            return successfulResults.Select((res) => res.save).ToArray();
+        }
+
         public async Task<GameSave[]> GetSaves()
         {
             var saves = new List<GameSave>();
@@ -88,27 +123,26 @@ public async Task<GameSave[]> GetSaves()
                 var onlineSaves = res.saves;
 
                 if (offlineSaves != null)
+                {
+                    var tasks = onlineSaves.Select(async (onlineSave) =>
                     {
-                        var tasks = onlineSaves.Select(async (onlineSave) =>
-                        {
-                            var offlineSave = offlineSaves
-                                .FirstOrDefault((offlineSave) => offlineSave.id == onlineSave.id);
+                        var offlineSave = offlineSaves
+                            .FirstOrDefault((offlineSave) => offlineSave.id == onlineSave.id);
 
-                            if (offlineSave != null)
-                            {
-                                return await savesManager.SyncSave(onlineSave, offlineSave);
-                            }
-                            return onlineSave;
-                        })
-                            .ToList();
+                        if (offlineSave != null)
+                        {
+                            return await savesManager.SyncSave(onlineSave, offlineSave);
+                        }
+                        return onlineSave;
+                    });
 
-                        onlineSaves = await Task.WhenAll(tasks);
+                    onlineSaves = await Task.WhenAll(tasks);
 
-                        var syncedSaves = await savesManager.SyncOfflineSaves(offlineSaves);
-                        saves.AddRange(syncedSaves);
-                    }
+                    var syncedSaves = await SyncOfflineSaves(offlineSaves);
+                    saves.AddRange(syncedSaves);
+                }
 
-                    saves.AddRange(onlineSaves);
+                saves.AddRange(onlineSaves);
             }
 
             savesManager.HandleSavesLoaded(saves);

Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs

@@ -44,6 +44,17 @@ public async Task<PlayerStat> FindPlayerStat(string internalName)
             return res.playerStat;
         }
 
+        public async Task<PlayerStat[]> ListPlayerStats()
+        {
+            Talo.IdentityCheck();
+
+            var uri = new Uri($"{baseUrl}/player-stats");
+
+            var json = await Call(uri, "GET");
+            var res = JsonUtility.FromJson<PlayerStatsListResponse>(json);
+            return res.playerStats;
+        }
+
         public async Task<StatsPutResponse> Track(string internalName, float change = 1f)
         {
             Talo.IdentityCheck();

Assets/Talo Game Services/Talo/Runtime/Responses/PlayerStatsListResponse.cs

@@ -0,0 +1,8 @@
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class PlayerStatsListResponse
+    {
+        public PlayerStat[] playerStats;
+    }
+}

Assets/Talo Game Services/Talo/Runtime/Responses/PlayerStatsListResponse.cs.meta

@@ -0,0 +1,8 @@
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class PlayersSocketTokenResponse
+    {
+        public string socketToken;
+    }
+}