mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-13 06:34:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add retry policy for 429 responses

Browse source
This commit is contained in:
Alexey Golub 2018-06-28 00:20:31 +03:00
parent e3eac10fb8
commit 49f39c7097
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
View file

@ -23,6 +23,7 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Onova" Version="2.1.0" />
<PackageReference Include="Polly" Version="6.0.1" />
<PackageReference Include="Scriban" Version="1.2.1" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
<PackageReference Include="Tyrrrz.Settings" Version="1.3.2" />

6
DiscordChatExporter.Core/Exceptions/HttpErrorStatusCodeException.cs
View file

@ -7,9 +7,13 @@ namespace DiscordChatExporter.Core.Exceptions
{
public HttpStatusCode StatusCode { get; }
public HttpErrorStatusCodeException(HttpStatusCode statusCode)
public string ReasonPhrase { get; }
public HttpErrorStatusCodeException(HttpStatusCode statusCode, string reasonPhrase)
: base($"Error HTTP status code: {statusCode} - {reasonPhrase}")
{
StatusCode = statusCode;
ReasonPhrase = reasonPhrase;
}
}
}

11
DiscordChatExporter.Core/Services/DataService.cs
View file

@ -7,6 +7,7 @@ using DiscordChatExporter.Core.Exceptions;
using DiscordChatExporter.Core.Models;
using Newtonsoft.Json.Linq;
using DiscordChatExporter.Core.Internal;
using Polly;
namespace DiscordChatExporter.Core.Services
{
@ -25,13 +26,20 @@ namespace DiscordChatExporter.Core.Services
foreach (var parameter in parameters)
url += $"&{parameter}";
// Create request policy
var policy = Policy
.Handle<HttpErrorStatusCodeException>(e => (int) e.StatusCode == 429)
.WaitAndRetryAsync(10, i => TimeSpan.FromSeconds(0.4));
// Send request
return await policy.ExecuteAsync(async () =>
{
using (var response = await _httpClient.GetAsync(url))
{
// Check status code
// We throw our own exception here because default one doesn't have status code
if (!response.IsSuccessStatusCode)
throw new HttpErrorStatusCodeException(response.StatusCode);
throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
// Get content
var raw = await response.Content.ReadAsStringAsync();
@ -39,6 +47,7 @@ namespace DiscordChatExporter.Core.Services
// Parse
return JToken.Parse(raw);
}
});
}
public async Task<Guild> GetGuildAsync(string token, string guildId)

1
Readme.md
View file

@ -41,6 +41,7 @@ DiscordChatExporter can be used to export message history from a [Discord](https
- [MaterialDesignInXamlToolkit](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit)
- [Newtonsoft.Json](http://www.newtonsoft.com/json)
- [Scriban](https://github.com/lunet-io/scriban)
- [Polly](https://github.com/App-vNext/Polly)
- [Onova](https://github.com/Tyrrrz/Onova)
- [FluentCommandLineParser](https://github.com/fclp/fluent-command-line-parser)
- [Tyrrrz.Extensions](https://github.com/Tyrrrz/Extensions)