Merge pull request #178 from TaloDev/develop

Release 0.52.0

Author: tudddorrr

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.51.0";
+        private const string ClientVersion = "0.52.0";
 
         protected string baseUrl;
 

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

@@ -9,23 +9,52 @@ public abstract class DebouncedAPI<TOperation> : BaseAPI where TOperation : Enum
     {
         private class DebouncedOperation
         {
-            public float nextUpdateTime;
-            public bool hasPending;
+            public float windowEndTime;
+            public bool windowOpen;
+            public bool hasTrailingCallQueued;
+            public bool isExecuting;
         }
 
         private readonly Dictionary<TOperation, DebouncedOperation> operations = new();
 
         protected DebouncedAPI(string service) : base(service) { }
 
+        private void OpenWindow(DebouncedOperation op)
+        {
+            op.windowOpen = true;
+            op.windowEndTime = Time.realtimeSinceStartup + Talo.Settings.debounceTimerSeconds;
+        }
+
         protected void Debounce(TOperation operation)
         {
             if (!operations.ContainsKey(operation))
             {
                 operations[operation] = new DebouncedOperation();
             }
 
-            operations[operation].nextUpdateTime = Time.realtimeSinceStartup + Talo.Settings.debounceTimerSeconds;
-            operations[operation].hasPending = true;
+            var op = operations[operation];
+
+            if (!op.windowOpen && !op.isExecuting)
+            {
+                // leading call: fire immediately and open the debounce window
+                op.hasTrailingCallQueued = false;
+                op.isExecuting = true;
+                OpenWindow(op);
+
+                ExecuteDebouncedOperation(operation).ContinueWith((t) => {
+                    op.isExecuting = false;
+                    if (t.IsFaulted)
+                    {
+                        Debug.LogError(t.Exception);
+                    }
+                }, TaskScheduler.FromCurrentSynchronizationContext());
+            }
+            else
+            {
+                // window open or request in-flight: queue a trailing call and extend the window
+                op.hasTrailingCallQueued = true;
+                OpenWindow(op);
+            }
         }
 
         public async Task ProcessPendingUpdates()
@@ -34,16 +63,45 @@ public async Task ProcessPendingUpdates()
 
             foreach (var kvp in operations)
             {
-                if (kvp.Value.hasPending && Time.realtimeSinceStartup >= kvp.Value.nextUpdateTime)
+                var op = kvp.Value;
+                var windowClosed = Time.realtimeSinceStartup >= op.windowEndTime;
+                if (windowClosed)
                 {
-                    keysToProcess.Add(kvp.Key);
+                    if (op.hasTrailingCallQueued)
+                    {
+                        if (!op.isExecuting)
+                        {
+                            // window closed with a trailing call pending: execute it
+                            keysToProcess.Add(kvp.Key);
+                        }
+                        else
+                        {
+                            // leading call still in-flight: delay trailing until it completes
+                            OpenWindow(op);
+                        }
+                    }
+                    else if (op.windowOpen)
+                    {
+                        // window closed with no trailing call: reset for the next leading call
+                        op.windowOpen = false;
+                    }
                 }
             }
 
             foreach (var key in keysToProcess)
             {
-                operations[key].hasPending = false;
-                await ExecuteDebouncedOperation(key);
+                var op = operations[key];
+                op.hasTrailingCallQueued = false;
+                op.isExecuting = true;
+                try
+                {
+                    await ExecuteDebouncedOperation(key);
+                }
+                finally
+                {
+                    op.isExecuting = false;
+                    op.windowOpen = false;
+                }
             }
         }
 

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

@@ -10,6 +10,7 @@ public class GetEntriesOptions
     {
         public int page = 0;
         public int aliasId = -1;
+        public string playerId = "";
         public bool includeArchived = false;
         public string propKey = "";
         public string propValue = "";
@@ -20,6 +21,7 @@ public string ToQueryString()
         {
             var query = new Dictionary<string, string> { ["page"] = page.ToString() };
             if (aliasId != -1) query["aliasId"] = aliasId.ToString();
+            if (!string.IsNullOrEmpty(playerId)) query["playerId"] = playerId;
             if (includeArchived) query["withDeleted"] = "1";
             if (!string.IsNullOrEmpty(propKey)) query["propKey"] = propKey;
             if (!string.IsNullOrEmpty(propValue)) query["propValue"] = propValue;
@@ -32,7 +34,7 @@ public string ToQueryString()
 
     public class LeaderboardsAPI : BaseAPI
     {
-        private LeaderboardEntriesManager _entriesManager = new();
+        private readonly LeaderboardEntriesManager _entriesManager = new();
 
         public LeaderboardsAPI() : base("v1/leaderboards") { }
 
@@ -65,6 +67,7 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, Ge
             return res;
         }
 
+        [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) with the aliasId or playerId option instead.")]
         public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, GetEntriesOptions options = null)
         {
             Talo.IdentityCheck();
@@ -86,7 +89,7 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, in
             });
         }
 
-        [Obsolete("Use GetEntriesForCurrentPlayer(string internalName, GetEntriesOptions options) instead.")]
+        [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) with the aliasId or playerId option instead.")]
         public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, int page, bool includeArchived = false)
         {
             Talo.IdentityCheck();

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

@@ -6,7 +6,7 @@ namespace TaloGameServices
 {
     public class PlayerAuthAPI : BaseAPI
     {
-        private SessionManager _sessionManager = new();
+        private readonly SessionManager _sessionManager = new();
 
         public SessionManager SessionManager => _sessionManager;
 
@@ -114,6 +114,19 @@ public async Task ChangeEmail(string currentPassword, string newEmail)
             await Call(uri, "POST", content);
         }
 
+        public async Task ChangeIdentifier(string currentPassword, string newIdentifier)
+        {
+            var uri = new Uri($"{baseUrl}/change_identifier");
+            string content = JsonUtility.ToJson(new PlayerAuthChangeIdentifierRequest {
+                currentPassword = currentPassword,
+                newIdentifier = newIdentifier
+            });
+            var json = await Call(uri, "POST", content);
+
+            var res = JsonUtility.FromJson<PlayerAuthChangeIdentifierResponse>(json);
+            _sessionManager.HandleIdentifierUpdated(res);
+        }
+
         public async Task ForgotPassword(string email)
         {
             var uri = new Uri($"{baseUrl}/forgot_password");

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

@@ -22,7 +22,7 @@ public enum DebouncedOperation
         public event Action OnIdentificationFailed;
         public event Action OnIdentityCleared;
 
-        private readonly string offlineDataPath = Application.persistentDataPath + "/ta.bin";
+        public static readonly string offlineDataPath = Application.persistentDataPath + "/ta.bin";
 
         public PlayersAPI() : base("v1/players")
         {
@@ -83,7 +83,7 @@ public async Task<Player> Identify(string service, string identifier)
 
                 var res = JsonUtility.FromJson<PlayersIdentifyResponse>(json);
                 var alias = res.alias;
-                WriteOfflineAlias(alias);
+                alias.WriteOfflineAlias();
                 return await HandleIdentifySuccess(alias, res.socketToken);
             }
             catch
@@ -133,7 +133,7 @@ public async Task<Player> Update()
 
             var res = JsonUtility.FromJson<PlayersUpdateResponse>(json);
             Talo.CurrentPlayer = res.player;
-            WriteOfflineAlias(Talo.CurrentAlias);
+            Talo.CurrentAlias.WriteOfflineAlias();
 
             return Talo.CurrentPlayer;
         }
@@ -191,13 +191,6 @@ private async Task<Player> IdentifyOffline(string service, string identifier)
             }
         }
 
-        private void WriteOfflineAlias(PlayerAlias alias)
-        {
-            if (!Talo.Settings.cachePlayerOnIdentify) return;
-            var content = JsonUtility.ToJson(alias);
-            Talo.Crypto.WriteFileContent(offlineDataPath, content);
-        }
-
         private PlayerAlias GetOfflineAlias()
         {
             if (!Talo.Settings.cachePlayerOnIdentify || !File.Exists(offlineDataPath)) return null;

Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs

@@ -1,4 +1,6 @@
-namespace TaloGameServices
+using UnityEngine;
+
+namespace TaloGameServices
 {
     [System.Serializable]
     public class PlayerAlias
@@ -12,5 +14,16 @@ public bool MatchesIdentifyRequest(string service, string identifier)
         {
             return this.service == service && this.identifier == identifier;
         }
+
+        public void WriteOfflineAlias()
+        {
+            if (!Talo.Settings.cachePlayerOnIdentify)
+            {
+                return;
+            }
+
+            var content = JsonUtility.ToJson(this);
+            Talo.Crypto.WriteFileContent(PlayersAPI.offlineDataPath, content);
+        }
     }
 }

Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeIdentifierRequest.cs

@@ -0,0 +1,9 @@
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class PlayerAuthChangeIdentifierRequest
+    {
+        public string currentPassword;
+        public string newIdentifier;
+    }
+}

Assets/Talo Game Services/Talo/Runtime/Requests/PlayerAuthChangeIdentifierRequest.cs.meta

@@ -0,0 +1,8 @@
+namespace TaloGameServices
+{
+    [System.Serializable]
+    public class PlayerAuthChangeIdentifierResponse
+    {
+        public PlayerAlias alias;
+    }
+}