cz.xprees.event-logging 1.0.22 → 1.0.24

package/Runtime/Api/EventLoggingApi.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using Cysharp.Threading.Tasks;
-using Newtonsoft.Json;
 using UnityEngine;
 using UnityEngine.Networking;
 using Xprees.EventLogging.Api.Model;
@@ -12,13 +11,18 @@ namespace Xprees.EventLogging.Api
 {
     public class EventLoggingApi : IEventLoggingApi
     {
-        public const string DefaultEndpoint = "https://cf-collector.xprees.com/";
+        public const string DefaultEndpoint = "https://cf-collector.xprees.com";
 
         private readonly string _baseUrl;
         private string LogsUri => $"{_baseUrl}/logs";
         private string LogsBatchUri => $"{_baseUrl}/logs/batch";
         private string ScenariosUri => $"{_baseUrl}/logs/scenarios";
 
+        /// Seconds before a request is aborted. Browsers impose no default timeout, so WebGL relies on these.
+        private const int timeoutSeconds = 15;
+
+        private const int batchTimeoutSeconds = 30;
+
         public EventLoggingApi(string baseUrl = DefaultEndpoint)
         {
             if (!Uri.TryCreate(baseUrl, UriKind.Absolute, out _))
@@ -35,7 +39,8 @@ namespace Xprees.EventLogging.Api
         {
             try
             {
-                var request = UnityWebRequest.Get(_baseUrl);
+                using var request = UnityWebRequest.Get(_baseUrl);
+                request.timeout = timeoutSeconds;
                 await request.SendWebRequestAsync(cancellationToken);
                 return request.result == UnityWebRequest.Result.Success;
             }
@@ -51,7 +56,8 @@ namespace Xprees.EventLogging.Api
         {
             try
             {
-                var request = new UnityWebRequest(LogsUri, UnityWebRequest.kHttpVerbPOST);
+                using var request = new UnityWebRequest(LogsUri, UnityWebRequest.kHttpVerbPOST);
+                request.timeout = timeoutSeconds;
                 request.AddJsonBody(log);
                 await request.SendWebRequestAsync(cancellationToken);
                 return request.result == UnityWebRequest.Result.Success;
@@ -64,11 +70,15 @@ namespace Xprees.EventLogging.Api
             return false;
         }
 
-        public async UniTask<bool> SendEventLogsBatch(List<EventLog> logs, CancellationToken cancellationToken = default)
+        public async UniTask<bool> SendEventLogsBatch(
+            List<EventLog> logs,
+            CancellationToken cancellationToken = default
+        )
         {
             try
             {
-                var batchRequest = new UnityWebRequest(LogsBatchUri, UnityWebRequest.kHttpVerbPOST);
+                using var batchRequest = new UnityWebRequest(LogsBatchUri, UnityWebRequest.kHttpVerbPOST);
+                batchRequest.timeout = batchTimeoutSeconds;
                 batchRequest.AddJsonBody(logs);
                 await batchRequest.SendWebRequestAsync(cancellationToken);
                 return batchRequest.result == UnityWebRequest.Result.Success;
@@ -87,14 +97,16 @@ namespace Xprees.EventLogging.Api
             {
                 var downloadHandlerBuffer = new DownloadHandlerBuffer();
                 var uploadHandlerRaw = new UploadHandlerRaw(Array.Empty<byte>());
-                var request = new UnityWebRequest(ScenariosUri, UnityWebRequest.kHttpVerbGET, downloadHandlerBuffer, uploadHandlerRaw);
-                request.SetRequestHeader("Content-Type", "application/json");
+                using var request = new UnityWebRequest(ScenariosUri, UnityWebRequest.kHttpVerbGET, downloadHandlerBuffer,
+                    uploadHandlerRaw);
+                request.timeout = timeoutSeconds;
+                request.SetRequestHeader("Accept", "application/json");
                 await request.SendWebRequestAsync(cancellationToken);
                 var result = request.result;
                 if (result != UnityWebRequest.Result.Success) return Array.Empty<string>();
                 var rawString = request.downloadHandler.text;
 
-                return JsonConvert.DeserializeObject<string[]>(rawString);
+                return JsonUtilityExtensions.FromJsonArray<string>(rawString);
             }
             catch (Exception e)
             {

package/Runtime/Api/EventLoggingApi.cs.meta

@@ -1,3 +1,2 @@
 fileFormatVersion: 2
-guid: fd34413abc7046d5b998358c126e4ba8
-timeCreated: 1678722796
+guid: fd34413abc7046d5b998358c126e4ba8

package/Runtime/Api/Model/EventLog.cs

@@ -7,7 +7,7 @@ namespace Xprees.EventLogging.Api.Model
     {
         public long? id = null;
         public string scenario;
-        public DateTime timestamp;
+        public string timestamp;
 
         public string @event;
         public string eventData = null;

package/Runtime/Api/Model/User.cs

@@ -6,8 +6,6 @@ namespace Xprees.EventLogging.Api.Model
     [Serializable]
     public class User
     {
-        public long? id = null;
-
         [Tooltip("Can be left blank and be filled individually later by the UserSetupService.")]
         public string formId;
 

package/Runtime/Extensions/EventLoggingApiExtension.cs

@@ -8,7 +8,7 @@ namespace Xprees.EventLogging.Extensions
     {
         public static EventLog GenerateEventLog(this EventSO @event, User user, DateTime timestamp) => new()
         {
-            timestamp = timestamp,
+            timestamp = timestamp.ToString("O"),
             user = user,
             scenario = @event.scenario?.Trim(),
             @event = @event.eventName.Trim(),

package/Runtime/Extensions/JsonUtilityExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections;
+using System.Linq;
+using UnityEngine;
+
+namespace Xprees.EventLogging.Extensions
+{
+    public static class JsonUtilityExtensions
+    {
+        public static T[] FromJsonArray<T>(string rawString) =>
+            // JsonUtility can't deserialize a root-level array, so wrap it in an object first.
+            JsonUtility.FromJson<ArrayWrapper<T>>($"{{\"items\":{rawString}}}").items;
+
+        [Serializable]
+        private class ArrayWrapper<T>
+        {
+            public T[] items;
+        }
+
+        public static string ToJsonArray(IEnumerable array) =>
+            // JsonUtility can't serialize a root-level collection, so build the array manually for those.
+            $"[{string.Join(",", array.Cast<object>().Select(JsonUtility.ToJson))}]";
+    }
+}

package/Runtime/Extensions/JsonUtilityExtensions.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e4b62e074e6246ce81df8564b19c60f2
+timeCreated: 1789308873

package/Runtime/Extensions/UnityWebRequestExtensions.cs

@@ -1,8 +1,8 @@
 using System;
+using System.Collections;
 using System.Text;
 using System.Threading;
 using Cysharp.Threading.Tasks;
-using Newtonsoft.Json;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -38,37 +38,15 @@ namespace Xprees.EventLogging.Extensions
 
         public static void AddJsonBody(this UnityWebRequest request, object body)
         {
-            var json = JsonConvert.SerializeObject(body);
+            // JsonUtility can't serialize a root-level collection, so build the array manually for those.
+            var json = body is IEnumerable items and not string
+                ? JsonUtilityExtensions.ToJsonArray(items)
+                : JsonUtility.ToJson(body);
             var jsonBytes = Encoding.UTF8.GetBytes(json);
 
             request.uploadHandler = new UploadHandlerRaw(jsonBytes);
             request.downloadHandler = new DownloadHandlerBuffer();
             request.SetRequestHeader("Content-Type", "application/json");
         }
-
-        /// Tries to Request neverssl.com to check that internet connection is working 
-        public async static UniTask<UnityWebRequest.Result> TestInternetConnection(CancellationToken cancellationToken = default)
-        {
-            var request = UnityWebRequest.Get("http://neverssl.com");
-            try
-            {
-                await request.SendWebRequestAsync(cancellationToken: cancellationToken);
-            }
-            catch (OperationCanceledException)
-            {
-                // ignore
-            }
-            catch (UnityWebRequestException e)
-            {
-                Debug.LogError($"Webex: {e.Message}");
-                throw;
-            }
-            catch (Exception e)
-            {
-                Debug.LogError(e);
-            }
-
-            return request.result;
-        }
     }
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "cz.xprees.event-logging",
   "displayName": "Event Logging",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "unity": "2021.3",
   "description": "This package provides a simple way to log events in your game.",
   "license": "Apache-2.0",
   "category": "Core",
   "dependencies": {
-    "com.cysharp.unitask": "2.5.10",
-    "cz.xprees.core": "1.0.32"
+    "com.cysharp.unitask": "2.5.11",
+    "cz.xprees.core": "2.0.41"
   },
   "keywords": [
     "Unity",