Merge pull request #78 from TaloDev/develop

Release 0.23.0

Author: tudddorrr

.gitignore

@@ -9,6 +9,7 @@
 /[Bb]uilds/
 /[Ll]ogs/
 /[Mm]emoryCaptures/
+/[Uu]serSettings/
 
 # Asset meta data should only be ignored when the corresponding asset is also ignored
 !/[Aa]ssets/**/*.meta

Assets/Samples/AuthenticationDemo/Scripts/GameUIController.cs

@@ -22,7 +22,7 @@ private void OnDisable()
 
         private void OnIdentified(Player player)
         {
-            root.Q<Label>("title").text = root.Q<Label>("title").text.Replace("{username}", Talo.CurrentAlias.identifier);
+            root.Q<Label>("title").text = $"Hi, {Talo.CurrentAlias.identifier}";
         }
 
         private async void OnLogoutClick()

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Talo Platform Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.md

@@ -17,7 +17,6 @@ public class SavesAPI : BaseAPI
         public event Action<GameSave> OnSaveChosen;
         public event Action OnSaveLoadingCompleted;
 
-        private readonly string _offlineSavesPath = Application.persistentDataPath + "/talo-saves.bin";
         private IFileHandler<OfflineSavesContent> _fileHandler;
 
         public GameSave[] All
@@ -148,18 +147,35 @@ public void Register(Loadable loadable)
             _registeredLoadables.Add(new LoadableData(loadable));
         }
 
+        internal string GetOfflineSavesPath()
+        {
+            return Application.persistentDataPath + $"/ts.{Talo.CurrentPlayer.id}.bin";
+        }
+
         internal OfflineSavesContent GetOfflineSavesContent()
         {
-            return _fileHandler.ReadContent(_offlineSavesPath);
+            return _fileHandler.ReadContent(GetOfflineSavesPath());
         }
 
         internal void WriteOfflineSavesContent(OfflineSavesContent newContent)
         {
-            _fileHandler.WriteContent(_offlineSavesPath, newContent);
+            _fileHandler.WriteContent(GetOfflineSavesPath(), newContent);
+        }
+
+        private GameSave CreateOfflineCopy(GameSave originalSave)
+        {
+            return new GameSave
+            {
+                id = originalSave.id,
+                name = originalSave.name,
+                content = originalSave.content,
+                updatedAt = originalSave.updatedAt
+            };
         }
 
-        private void UpdateOfflineSaves(GameSave incomingSave)
+        private GameSave UpdateOfflineSaves(GameSave incomingSave)
         {
+            var offlineIncomingSave = CreateOfflineCopy(incomingSave);
             var offlineContent = GetOfflineSavesContent();
             var updated = false;
 
@@ -168,33 +184,34 @@ private void UpdateOfflineSaves(GameSave incomingSave)
                 // updating
                 offlineContent.saves = offlineContent.saves.Select((existingSave) =>
                 {
-                    if (existingSave.id == incomingSave.id)
+                    if (existingSave.id == offlineIncomingSave.id)
                     {
                         updated = true;
-                        return incomingSave;
+                        return offlineIncomingSave;
                     }
                     return existingSave;
                 }).ToArray();
 
                 // appending
                 if (!updated)
                 {
-                    if (incomingSave.id == 0)
+                    if (offlineIncomingSave.id == 0)
                     {
-                        incomingSave.id = -offlineContent.saves.Length - 1;
+                        offlineIncomingSave.id = -offlineContent.saves.Length - 1;
                     }
 
-                    offlineContent.saves = offlineContent.saves.Concat(new GameSave[] { incomingSave }).ToArray();
+                    offlineContent.saves = offlineContent.saves.Concat(new GameSave[] { offlineIncomingSave }).ToArray();
                 }
             }
             else
             {
                 // first entry into the saves file
-                incomingSave.id = -1;
-                offlineContent = new OfflineSavesContent(new GameSave[] { incomingSave });
+                offlineIncomingSave.id = -1;
+                offlineContent = new OfflineSavesContent(new GameSave[] { offlineIncomingSave });
             }
 
             WriteOfflineSavesContent(offlineContent);
+            return offlineIncomingSave;
         }
 
         public async Task<GameSave> CreateSave(string saveName, string content = null)
@@ -228,10 +245,12 @@ public async Task<GameSave> CreateSave(string saveName, string content = null)
             }
 
             _allSaves.Add(save);
-            UpdateOfflineSaves(save);
 
-            SetChosenSave(save, false);
-            return save;
+            var offlineSave = UpdateOfflineSaves(save);
+            var chosenSave = Talo.IsOffline() ? offlineSave : save;
+
+            SetChosenSave(chosenSave, false);
+            return chosenSave;
         }
 
         public async Task<GameSave> UpdateCurrentSave(string newName = "")

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

@@ -24,7 +24,7 @@ public class ContinuityContent
 
     public class ContinuityManager
     {
-        private readonly string _continuityPath = Application.persistentDataPath + "/talo-continuity.bin";
+        private readonly string _continuityPath = Application.persistentDataPath + "/tc.bin";
 
         private List<Request> _requests;
 
@@ -81,6 +81,7 @@ public async void ProcessRequests()
             if (!HasRequests() || !await Talo.HealthCheck.Ping()) return;
 
             var queue = new List<Request>(_requests.Take(10));
+            var exceptions = new List<Exception>();
 
             for (var i = 0; i < queue.Count; i++)
             {
@@ -98,7 +99,18 @@ public async void ProcessRequests()
                     headers.Add(new HttpHeader("X-Talo-Continuity-Timestamp", request.timestamp.ToString()));
                 }
 
-                await _api.Replay(uri, request.method, request.content, headers);
+                try
+                {
+                    await _api.Replay(uri, request.method, request.content, headers);
+                } catch (Exception e)
+                {
+                    exceptions.Add(e);
+                }
+            }
+
+            if (exceptions.Count > 0)
+            {
+                throw new ContinuityReplayException(exceptions);
             }
         }
     }

Packages/com.trytalo.talo/Runtime/Utils/ContinuityManager.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace TaloGameServices
+{
+    public class ContinuityReplayException : Exception
+    {
+        private List<Exception> _exceptions;
+        public List<Exception> Exceptions => _exceptions;
+
+        public ContinuityReplayException(List<Exception> exceptions)
+            : base($"{exceptions.Count} requests failed after being replayed")
+        {
+            _exceptions = exceptions;
+        }
+
+        public ContinuityReplayException(List<Exception> exceptions, Exception inner)
+            : base($"{exceptions.Count} requests failed after being replayed", inner)
+        {
+            _exceptions = exceptions;
+        }
+    }
+}

Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs

@@ -8,7 +8,7 @@ namespace TaloGameServices
 {
     public class CryptoManager
     {
-        private readonly string _keyPath = Application.persistentDataPath + "/talo-init.bin";
+        private readonly string _keyPath = Application.persistentDataPath + "/ti.bin";
 
         private IFileHandler<string> _fileHandler;
 
@@ -52,7 +52,7 @@ private byte[] GetAESKey()
         {
             using (var sha256 = SHA256.Create())
             {
-                return sha256.ComputeHash(Encoding.UTF8.GetBytes(Talo.Settings.accessKey));
+                return sha256.ComputeHash(Encoding.UTF8.GetBytes(SystemInfo.deviceUniqueIdentifier));
             }
         }
 

Packages/com.trytalo.talo/Runtime/Utils/ContinuityReplayException.cs.meta

@@ -7,11 +7,11 @@ public class SavesFileHandler : IFileHandler<OfflineSavesContent>
     public OfflineSavesContent ReadContent(string path)
     {
         if (!File.Exists(path)) return null;
-        return JsonUtility.FromJson<OfflineSavesContent>(File.ReadAllText(path));
+        return JsonUtility.FromJson<OfflineSavesContent>(Talo.Crypto.ReadFileContent(path));
     }
 
     public void WriteContent(string path, OfflineSavesContent content)
     {
-        File.WriteAllText(path, JsonUtility.ToJson(content));
+        Talo.Crypto.WriteFileContent(path, JsonUtility.ToJson(content));
     }
 }