flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-06-08 08:26:20 +00:00
Code Issues Releases Wiki Activity

Added check invalid rate limit for request

Browse Source
This commit is contained in:
Jkorf 2022-03-04 10:37:49 +01:00
parent 434d9e3af6
commit 7b370d47ce
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CryptoExchange.Net/Objects/RateLimiter.cs
View File

@ -241,9 +241,13 @@ namespace CryptoExchange.Net.Objects
break; break;
} }
var currentWeight = historyTopic.Entries.Sum(h => h.Weight); var currentWeight = !historyTopic.Entries.Any() ? 0: historyTopic.Entries.Sum(h => h.Weight);
if (currentWeight + requestWeight > historyTopic.Limit) if (currentWeight + requestWeight > historyTopic.Limit)
{ {
if (currentWeight == 0)
throw new Exception("Request limit reached without any prior request. " +
$"This request can never execute with the current rate limiter. Request weight: {requestWeight}, Ratelimit: {historyTopic.Limit}");
// Wait until the next entry should be removed from the history // Wait until the next entry should be removed from the history
var thisWaitTime = (int)Math.Round((historyTopic.Entries.First().Timestamp - (checkTime - historyTopic.Period)).TotalMilliseconds); var thisWaitTime = (int)Math.Round((historyTopic.Entries.First().Timestamp - (checkTime - historyTopic.Period)).TotalMilliseconds);
if (thisWaitTime > 0) if (thisWaitTime > 0)
@ -251,12 +255,12 @@ namespace CryptoExchange.Net.Objects
if (limitBehaviour == RateLimitingBehaviour.Fail) if (limitBehaviour == RateLimitingBehaviour.Fail)
{ {
historyTopic.Semaphore.Release(); historyTopic.Semaphore.Release();
var msg = $"Request to {endpoint} failed because of rate limit `{historyTopic}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}"; var msg = $"Request to {endpoint} failed because of rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}";
log.Write(LogLevel.Warning, msg); log.Write(LogLevel.Warning, msg);
return new CallResult<int>(new RateLimitError(msg)); return new CallResult<int>(new RateLimitError(msg));
} }
log.Write(LogLevel.Information, $"Request to {endpoint} waiting {thisWaitTime}ms for rate limit `{historyTopic}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}"); log.Write(LogLevel.Information, $"Request to {endpoint} waiting {thisWaitTime}ms for rate limit `{historyTopic.Type}`. Current weight: {currentWeight}/{historyTopic.Limit}, request weight: {requestWeight}");
try try
{ {
await Task.Delay(thisWaitTime, ct).ConfigureAwait(false); await Task.Delay(thisWaitTime, ct).ConfigureAwait(false);