github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure rate limits are updated when requests fail

Browse Source
This commit is contained in:
RogueException
2016-11-16 16:26:00 -04:00
parent 853f8f2e6b
commit 228209aec8
1 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/Discord.Net.Core/Net/Queue/RequestQueueBucket.cs
View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json; using Discord.Net.Rest;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
#if DEBUG_LIMITS #if DEBUG_LIMITS
@@ -54,64 +55,79 @@ namespace Discord.Net.Queue
#if DEBUG_LIMITS #if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Sending..."); Debug.WriteLine($"[{id}] Sending...");
#endif #endif
var response = await request.SendAsync().ConfigureAwait(false); TimeSpan lag = default(TimeSpan);
TimeSpan lag = DateTimeOffset.UtcNow - DateTimeOffset.Parse(response.Headers["Date"]); RateLimitInfo info = default(RateLimitInfo);
var info = new RateLimitInfo(response.Headers); try
if (response.StatusCode < (HttpStatusCode)200 || response.StatusCode >= (HttpStatusCode)300)
{ {
switch (response.StatusCode) var response = await request.SendAsync().ConfigureAwait(false);
lag = DateTimeOffset.UtcNow - DateTimeOffset.Parse(response.Headers["Date"]);
info = new RateLimitInfo(response.Headers);
if (response.StatusCode < (HttpStatusCode)200 || response.StatusCode >= (HttpStatusCode)300)
{ {
case (HttpStatusCode)429: switch (response.StatusCode)
if (info.IsGlobal) {
{ case (HttpStatusCode)429:
#if DEBUG_LIMITS if (info.IsGlobal)
Debug.WriteLine($"[{id}] (!) 429 [Global]");
#endif
_queue.PauseGlobal(info, lag);
}
else
{
#if DEBUG_LIMITS
Debug.WriteLine($"[{id}] (!) 429");
#endif
UpdateRateLimit(id, request, info, lag, true);
}
await _queue.RaiseRateLimitTriggered(Id, info).ConfigureAwait(false);
continue; //Retry
case HttpStatusCode.BadGateway: //502
#if DEBUG_LIMITS
Debug.WriteLine($"[{id}] (!) 502");
#endif
continue; //Continue
default:
string reason = null;
if (response.Stream != null)
{
try
{ {
using (var reader = new StreamReader(response.Stream)) #if DEBUG_LIMITS
using (var jsonReader = new JsonTextReader(reader)) Debug.WriteLine($"[{id}] (!) 429 [Global]");
{ #endif
var json = JToken.Load(jsonReader); _queue.PauseGlobal(info, lag);
reason = json.Value<string>("message");
}
} }
catch { } else
} {
throw new HttpException(response.StatusCode, reason); #if DEBUG_LIMITS
Debug.WriteLine($"[{id}] (!) 429");
#endif
UpdateRateLimit(id, request, info, lag, true);
}
await _queue.RaiseRateLimitTriggered(Id, info).ConfigureAwait(false);
continue; //Retry
case HttpStatusCode.BadGateway: //502
#if DEBUG_LIMITS
Debug.WriteLine($"[{id}] (!) 502");
#endif
continue; //Continue
default:
string reason = null;
if (response.Stream != null)
{
try
{
using (var reader = new StreamReader(response.Stream))
using (var jsonReader = new JsonTextReader(reader))
{
var json = JToken.Load(jsonReader);
reason = json.Value<string>("message");
}
}
catch { }
}
throw new HttpException(response.StatusCode, reason);
}
}
else
{
#if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Success");
#endif
return response.Stream;
} }
} }
else
{
#if DEBUG_LIMITS #if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Success"); catch
{
Debug.WriteLine($"[{id}] Error");
throw;
}
#endif #endif
finally
{
UpdateRateLimit(id, request, info, lag, false); UpdateRateLimit(id, request, info, lag, false);
#if DEBUG_LIMITS #if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Stop"); Debug.WriteLine($"[{id}] Stop");
#endif #endif
return response.Stream;
} }
} }
} }