Adjust the backoff strategy calculations + prevent duplicated payload on recursive calls + fix out of range if forced test data set index would be to high

Author: sierpinskid

Assets/Plugins/StreamChat/Core/LowLevelClient/API/Internal/InternalApiClientBase.cs

@@ -102,7 +102,14 @@ private async Task<TResponse> HttpRequest<TResponse>(HttpMethodType httpMethod,
                     queryParameters = QueryParameters.Default;
                 }
 
-                queryParameters.Append("payload", serializedContent);
+                if (queryParameters.ContainsKey("paload"))
+                {
+                    queryParameters["payload"] = serializedContent;
+                }
+                else
+                {
+                    queryParameters.Append("payload", serializedContent);
+                }
             }
 
             var uri = _requestUriFactory.CreateEndpointUri(endpoint, queryParameters);
@@ -307,14 +314,15 @@ private async Task<TResponse> HandleRateLimit<TResponse>(HttpMethodType httpMeth
             var delaySeconds = GetBackoffDelay(attempt, httpResponse, out var resetHeaderTimestamp);
             var now = (int)new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
             _logs.Warning($"API CLIENT, TESTS MODE, Rate Limit API Error - Wait for {delaySeconds} seconds. " +
-                          $"Timestamp reset header: {resetHeaderTimestamp}, Current timestamp: {now}, Dif: {now - resetHeaderTimestamp}");
+                          $"Timestamp reset header: {resetHeaderTimestamp}, Current timestamp: {now}, Dif: {resetHeaderTimestamp - now}");
             await Task.Delay(delaySeconds * 1000);
             return await HttpRequest<TResponse>(httpMethod, endpoint, requestBody, queryParameters, ++attempt);
         }
 
         private int GetBackoffDelay(int attempt, HttpResponse httpResponse, out int resetHeaderTimestamp)
         {
             resetHeaderTimestamp = -1;
+            // StreamTodo: Backoff based on the header doesn't seem to work. Perhaps concurrency is conflicting with this approach
             if (httpResponse.TryGetHeader("x-ratelimit-reset", out var values))
             {
                 var resetTimestamp = values.FirstOrDefault();
@@ -324,14 +332,14 @@ private int GetBackoffDelay(int attempt, HttpResponse httpResponse, out int rese
                     resetHeaderTimestamp = rateLimitTimestamp;
                     var now = (int)new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
                     var secondsLeft = rateLimitTimestamp - now;
-                    if (secondsLeft > 0)
-                    {
-                        return secondsLeft + 5;
-                    }
+                    // if (secondsLeft > 0)
+                    // {
+                    //     return secondsLeft + 5;
+                    // }
                 }
             }
 
-            return 61 + attempt * 10;
+            return 61 + attempt * 20;
         }
     }
 }

Assets/Plugins/StreamChat/Tests/StatefulClient/BaseStateIntegrationTests.cs

@@ -126,12 +126,12 @@ protected Task<StreamChatClient> GetConnectedOtherClientAsync()
         /// <summary>
         /// Use this if state update depends on receiving WS event that might come after the REST call was completed
         /// </summary>
-        protected static async Task WaitWhileTrueAsync(Func<bool> condition, int maxIterations = 500, int maxSeconds = 500)
+        protected static async Task WaitWhileTrueAsync(Func<bool> condition, int maxSeconds = 1000)
         {
             var sw = new Stopwatch();
             sw.Start();
 
-            for (int i = 0; i < maxIterations; i++)
+            for (int i = 0; i < int.MaxValue; i++)
             {
                 if (!condition())
                 {
@@ -150,12 +150,12 @@ protected static async Task WaitWhileTrueAsync(Func<bool> condition, int maxIter
             throw new TimeoutException("Timeout while waiting for condition");
         }
 
-        protected static async Task WaitWhileFalseAsync(Func<bool> condition, int maxIterations = 500, int maxSeconds = 500)
+        protected static async Task WaitWhileFalseAsync(Func<bool> condition, int maxSeconds = 1000)
         {
             var sw = new Stopwatch();
             sw.Start();
 
-            for (int i = 0; i < maxIterations; i++)
+            for (int i = 0; i < int.MaxValue; i++)
             {
                 if (condition())
                 {

Assets/Plugins/StreamChat/Tests/StreamTestClients.cs

@@ -125,7 +125,7 @@ private StreamTestClients()
             }
 
             AuthCredentials primaryAdminSet;
-            if (optionalTestDataIndex.HasValue)
+            if (optionalTestDataIndex.HasValue && optionalTestDataIndex.Value < testAuthDataSet.TestAdminData.Length)
             {
                 Debug.LogWarning($"Using {nameof(optionalTestDataIndex)} to pick credentials test data set: {optionalTestDataIndex}");
                 primaryAdminSet = testAuthDataSet.TestAdminData[optionalTestDataIndex.Value];