Merge pull request #6 from NikTheNak/main

event error handling fix

CHANGELOG.md

@@ -1,6 +1,12 @@
+## 0.2.4
+
+- Fixed memory leak with event errors
+- Fixed event send error handling
+- Reduced logging on errors
+
 ## 0.2.3
 
-- use new session id format
+- Use new session id format
 
 ## 0.2.2
 

PACKAGE.json

@@ -1,7 +1,7 @@
 {
   "name": "com.aptabase",
   "displayName": "Aptabase",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "unity": "2018.4",
   "description": "Analytics for Apps. Privacy-First. Simple. Real-Time.",
   "keywords": ["analytics"],

Runtime/Aptabase.cs

@@ -165,7 +165,7 @@ private static int GetFlushInterval()
 
             return _env.isDebug ? 2000 : 60000;
         }
-        
+
         private static string NewSessionId()
         {
             var epochInSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();

Runtime/Dispatcher/Dispatcher.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AptabaseSDK.TinyJson;
@@ -60,13 +59,13 @@ public async void Flush()
                     eventsToSend.Add(_events.Dequeue());
 
                 try
-                {
-                    await SendEvents(eventsToSend);
+                { 
+                    var result = await SendEvents(eventsToSend);
+                    if (!result) failedEvents.AddRange(eventsToSend);
                 }
-                catch (Exception e)
+                catch
                 {
                     failedEvents.AddRange(eventsToSend);
-                    Debug.LogError(e);
                 }
 
             } while (_events.Count > 0);
@@ -77,10 +76,11 @@ public async void Flush()
             _flushInProgress = false;
         }
 
-        private static async Task SendEvents(List<Event> events)
+        private static async Task<bool> SendEvents(List<Event> events)
         {
             var webRequest = _webRequestHelper.CreateWebRequest(_apiURL, _appKey, _environment, events.ToJson());
-            await _webRequestHelper.SendWebRequestAsync(webRequest);
+            var result = await _webRequestHelper.SendWebRequestAsync(webRequest);
+            return result;
         }
     }
 }

Runtime/Dispatcher/WebGLDispatcher.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AptabaseSDK.TinyJson;
-using UnityEngine;
 
 namespace AptabaseSDK
 {
@@ -56,12 +54,12 @@ public async void Flush()
                 var eventToSend = _events.Dequeue();
                 try
                 {
-                    await SendEvent(eventToSend);
+                    var result = await SendEvent(eventToSend);
+                    if (!result) failedEvents.Add(eventToSend);
                 }
-                catch (Exception e)
+                catch
                 {
                     failedEvents.Add(eventToSend);
-                    Debug.LogError(e);
                 }
 
             } while (_events.Count > 0);
@@ -72,10 +70,11 @@ public async void Flush()
             _flushInProgress = false;
         }
 
-        private static async Task SendEvent(Event eventData)
+        private static async Task<bool> SendEvent(Event eventData)
         {
             var webRequest = _webRequestHelper.CreateWebRequest(_apiURL, _appKey, _environment, eventData.ToJson());
-            await _webRequestHelper.SendWebRequestAsync(webRequest);
+            var result = await _webRequestHelper.SendWebRequestAsync(webRequest);
+            return result;
         }
     }
 }

Runtime/WebRequestHelper.cs

@@ -22,16 +22,24 @@ public UnityWebRequest CreateWebRequest(string url, string appKey, EnvironmentIn
             return webRequest;
         }
 
-        public async Task SendWebRequestAsync(UnityWebRequest request)
+        public async Task<bool> SendWebRequestAsync(UnityWebRequest request)
         {
             var requestOp = request.SendWebRequest();
             while (!requestOp.isDone)
                 await Task.Yield();
 
-            if (requestOp.webRequest.result != UnityWebRequest.Result.Success)
+            var success = requestOp.webRequest.result == UnityWebRequest.Result.Success;
+            if (success)
             {
-                Debug.LogError($"Failed to perform web request due to {requestOp.webRequest.responseCode} and response body {requestOp.webRequest.error}");
+                request.Dispose();
             }
+            else
+            {
+                Debug.LogWarning($"Failed to perform web request due to {requestOp.webRequest.responseCode} and response body {requestOp.webRequest.error}");
+                request.Dispose();
+            }
+
+            return success;
         }
     }
 }