Merge pull request #73 from TaloDev/continuity

Add continuity

Assets/Samples/Playground/Scripts/Continuity/ToggleContinuity.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using TaloGameServices;
+using UnityEngine.UI;
+
+public class ToggleContinuity : MonoBehaviour
+{
+    private void Start()
+    {
+        SetText();
+    }
+
+    private bool GetValue()
+    {
+        return Talo.Settings.continuityEnabled;
+    }
+
+    private void SetText()
+    {
+        GetComponentInChildren<Text>().text = GetValue() ? "Toggle off" : "Toggle on";
+    }
+
+    public void OnButtonClick()
+    {
+        Talo.Settings.continuityEnabled = !Talo.Settings.continuityEnabled;
+        SetText();
+
+        ResponseMessage.SetText($"Continuity is now {(Talo.Settings.continuityEnabled ? "enabled" : "disabled")}");
+    }
+}

Assets/Samples/Playground/Scripts/Continuity/ToggleOfflineMode.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using TaloGameServices;
+using UnityEngine.UI;
+
+public class ToggleOfflineMode : MonoBehaviour
+{
+    private void Start()
+    {
+        SetText();
+    }
+
+    private bool GetValue()
+    {
+        return Talo.Settings.offlineMode;
+    }
+
+    private void SetText()
+    {
+        GetComponentInChildren<Text>().text = GetValue() ? "Go online" : "Go offline";
+    }
+
+    public void OnButtonClick()
+    {
+        Talo.Settings.offlineMode = !Talo.Settings.offlineMode;
+        SetText();
+
+        ResponseMessage.SetText($"You are now now {(Talo.Settings.offlineMode ? "offline" : "online")}");
+    }
+}

Assets/Samples/Playground/Scripts/Players/IdentifyPlayer.cs

@@ -8,6 +8,11 @@ public class IdentifyPlayer : MonoBehaviour
 {
     public string service, identifier;
 
+    private void Start()
+    {
+        Talo.Players.OnIdentified += OnIdentified;
+    }
+
     public async void OnButtonClick()
     {
         await Identify();
@@ -18,18 +23,21 @@ private async Task Identify()
         try
         {
             await Talo.Players.Identify(service, identifier);
-
-            var panel = GameObject.Find("Panel");
-            if (panel != null)
-            {
-                ResponseMessage.SetText("Identified!");
-                panel.GetComponent<Image>().color = new Color(135 / 255f, 1f, 135 / 255f);
-            }
         }
         catch (Exception err)
         {
             ResponseMessage.SetText(err.Message);
             throw err;
         }
     }
+
+    private void OnIdentified(Player player)
+    {
+        var panel = GameObject.Find("Panel");
+        if (panel != null)
+        {
+            ResponseMessage.SetText("Identified!");
+            panel.GetComponent<Image>().color = new Color(135 / 255f, 1f, 135 / 255f);
+        }
+    }
 }

Assets/Samples/Playground/Scripts/Stats/TrackStat.cs

@@ -12,11 +12,11 @@ public void OnButtonClick()
         Track();
     }
 
-    private void Track()
+    private async void Track()
     {
         try
         {
-            Talo.Stats.Track(statInternalName, change);
+            await Talo.Stats.Track(statInternalName, change);
 
             ResponseMessage.SetText($"{statInternalName} changed by {change}");
         }

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

@@ -0,0 +1,138 @@
+using System;
+using UnityEngine;
+using System.Threading.Tasks;
+using UnityEngine.Networking;
+using System.Collections.Generic;
+
+namespace TaloGameServices
+{
+    public class BaseAPI
+    {
+        protected string baseUrl;
+
+        public BaseAPI(string service)
+        {
+            baseUrl = $"{Talo.Settings.apiUrl}/{service}";
+        }
+
+        public Uri GetUri()
+        {
+            return new Uri(baseUrl);
+        }
+
+        private List<HttpHeader> BuildHeaders()
+        {
+            var headers = new List<HttpHeader>
+            {
+                new HttpHeader("Authorization", $"Bearer {Talo.Settings.accessKey}"),
+                new HttpHeader("Content-Type", "application/json"),
+                new HttpHeader("Accept", "application/json"),
+                new HttpHeader("X-Talo-Dev-Build", Debug.isDebugBuild ? "1" : "0"),
+                new HttpHeader("X-Talo-Include-Dev-Data", Debug.isDebugBuild ? "1" : "0")
+            };
+
+            if (Talo.CurrentAlias != null)
+            {
+                headers.Add(new HttpHeader("X-Talo-Player", Talo.CurrentPlayer.id));
+                headers.Add(new HttpHeader("X-Talo-Alias", Talo.CurrentAlias.id.ToString()));
+            }
+
+            var sessionToken = Talo.PlayerAuth.SessionManager.GetSessionToken();
+            if (!string.IsNullOrEmpty(sessionToken))
+            {
+                headers.Add(new HttpHeader("X-Talo-Session", sessionToken));
+            }
+
+            return headers;
+        }
+
+        protected async Task<string> Call(
+            Uri uri,
+            string method,
+            string content = "",
+            List<HttpHeader> headers = null,
+            bool continuity = false
+        )
+        {
+            if (Talo.TestMode)
+            {
+                return RequestMock.HandleCall(uri, method);
+            }
+
+            var continuityTimestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+
+            var allHeaders = continuity ? headers : BuildHeaders();
+
+            if (Talo.Settings.offlineMode)
+            {
+                return HandleOfflineRequest(uri, method, content, allHeaders);
+            }
+
+            byte[] json = new System.Text.UTF8Encoding().GetBytes(content);
+
+            using (UnityWebRequest www = new(uri, method))
+            {
+                if (json.Length > 0) www.uploadHandler = new UploadHandlerRaw(json);
+                www.downloadHandler = new DownloadHandlerBuffer();
+
+                foreach (var header in allHeaders)
+                {
+                    www.SetRequestHeader(header.key, header.value);
+                }
+
+                var op = www.SendWebRequest();
+
+                while (!op.isDone)
+                {
+                    await Task.Yield();
+                }
+
+                if (www.result == UnityWebRequest.Result.Success)
+                {
+                    return www.downloadHandler.text;
+                }
+                else
+                {
+                    if (www.responseCode >= 500 || www.result != UnityWebRequest.Result.ProtocolError)
+                    {
+                        Talo.Continuity.PushRequest(uri, method, content, headers, continuityTimestamp);
+                    }
+
+                    string message = "";
+                    string errorCode = "";
+
+                    try
+                    {
+                        var jsonError = JsonUtility.FromJson<ErrorResponse>(www.downloadHandler.text);
+                        message = string.IsNullOrEmpty(jsonError.message) ? www.downloadHandler.text : jsonError.message;
+                        errorCode = jsonError.errorCode;
+                    }
+                    catch (Exception)
+                    {
+                        message = www.error;
+                    }
+
+                    if (string.IsNullOrEmpty(errorCode))
+                    {
+                        throw new RequestException(www.responseCode, new Exception(message));
+                    }
+                    else
+                    {
+                        throw new PlayerAuthException(errorCode, new Exception(message));
+                    }
+                }
+            }
+        }
+
+        private string HandleOfflineRequest(
+            Uri uri,
+            string method,
+            string content = "",
+            List<HttpHeader> headers = null
+        )
+        {
+            Talo.Continuity.PushRequest(uri, method, content, headers, DateTimeOffset.Now.ToUnixTimeMilliseconds());
+            throw new RequestException(0, new Exception("Offline mode enabled"));
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace TaloGameServices
+{
+    public class ContinuityAPI : BaseAPI
+    {
+        public ContinuityAPI() : base("") { }
+
+        public async Task Replay(
+            Uri uri,
+            string method,
+            string content,
+            List<HttpHeader> headers
+        )
+        {
+            await Call(uri, method, content, headers, true);
+        }
+    }
+}

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

@@ -8,10 +8,12 @@ namespace TaloGameServices
 {
     public class EventsAPI : BaseAPI
     {
+        public event Action OnFlushed;
+
         private List<Event> queue = new List<Event>();
         private readonly int minQueueSize = 10;
 
-        public EventsAPI(TaloManager manager) : base(manager, "v1/events") { }
+        public EventsAPI() : base("v1/events") { }
 
         private string GetWindowMode()
         {
@@ -89,12 +91,11 @@ public async Task Flush()
                 try
                 {
                     await Call(uri, "POST", content);
-                    manager.ResetFlushTimer();
+                    OnFlushed.Invoke();
                 }
                 catch (Exception err)
                 {
                     Debug.LogError(err.Message);
-                    queue.AddRange(eventsToSend);
                 }
             }
         }

Packages/com.trytalo.talo/Runtime/FeedbackAPI.cs → Packages/com.trytalo.talo/Runtime/APIs/FeedbackAPI.cs

@@ -6,13 +6,13 @@ namespace TaloGameServices
 {
     public class FeedbackAPI : BaseAPI
     {
-        public FeedbackAPI(TaloManager manager) : base(manager, "v1/game-feedback") { }
+        public FeedbackAPI() : base("v1/game-feedback") { }
 
         public async Task<FeedbackCategory[]> GetCategories()
         {
-            var uri = new Uri(baseUrl + "/categories");
-
+            var uri = new Uri($"{baseUrl}/categories");
             var json = await Call(uri, "GET");
+
             var res = JsonUtility.FromJson<FeedbackCategoriesResponse>(json);
             return res.feedbackCategories;
         }
@@ -21,7 +21,7 @@ public async Task Send(string internalName, string comment)
         {
             Talo.IdentityCheck();
 
-            var uri = new Uri(baseUrl + $"/categories/{internalName}");
+            var uri = new Uri($"{baseUrl}/categories/{internalName}");
             var content = JsonUtility.ToJson(new FeedbackPostRequest { comment = comment });
 
             await Call(uri, "POST", content);