Skip to content

Commit 5aca20f

Browse files
committed
Update deps, move leakyBucket rate limiter to external assembly
1 parent 556e274 commit 5aca20f

File tree

5 files changed

+7
-196
lines changed

5 files changed

+7
-196
lines changed

src/RSMatrix.Tests/LeakyBucketRateLimiterTests.cs

Lines changed: 0 additions & 104 deletions
This file was deleted.

src/RSMatrix/Http/HttpClientHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.Extensions.Logging;
33
using System.Net.Mime;
44
using System.Text.Json;
5-
using System.Web;
5+
using RSFlowControl;
66

77
namespace RSMatrix.Http;
88
public record HttpClientParameters
@@ -11,7 +11,7 @@ public record HttpClientParameters
1111
public string BaseUri { get; set; }
1212
public string? BearerToken { get; set; }
1313
public ILogger Logger { get; init; }
14-
public LeakyBucketRateLimiter? RateLimiter { get; set; }
14+
public LeakyBucket? RateLimiter { get; set; }
1515

1616
public CancellationToken CancellationToken { get; init; }
1717

src/RSMatrix/Http/LeakyBucketRateLimiter.cs

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/RSMatrix/MatrixTextClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Concurrent;
66
using System.Text.Json;
77
using System.Threading.Channels;
8+
using RSFlowControl;
89

910
namespace RSMatrix;
1011

@@ -169,7 +170,7 @@ public static async Task<MatrixTextClient> ConnectAsync(string userId, string pa
169170
httpClientParameters.BearerToken = loginResponse.AccessToken;
170171

171172
var serverCapabilities = await MatrixHelper.FetchCapabilitiesAsync(httpClientParameters).ConfigureAwait(false);
172-
httpClientParameters.RateLimiter = new LeakyBucketRateLimiter(10, serverCapabilities.Capabilities.RateLimit?.MaxRequestsPerHour ?? 600);
173+
httpClientParameters.RateLimiter = new LeakyBucket(10, serverCapabilities.Capabilities.RateLimit?.MaxRequestsPerHour ?? 600);
173174
var client = new MatrixTextClient(httpClientParameters, parsedUserId, parsedVersions, serverCapabilities.Capabilities);
174175
await client.InitAsync();
175176
_ = Task.Run(async () =>
@@ -302,7 +303,7 @@ private async Task WriteSyncResponseToFileAsync(SyncResponse response)
302303
}
303304

304305

305-
private LeakyBucketRateLimiter _receiptRateLimiter = new LeakyBucketRateLimiter(1, 30);
306+
private LeakyBucket _receiptRateLimiter = new LeakyBucket(1, 30);
306307

307308
private async Task HandleSyncResponseAsync(SyncResponse response)
308309
{

src/RSMatrix/RSMatrix.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

8-
<Version>1.0.2</Version>
8+
<Version>1.0.3</Version>
99
<Authors>Robert.Schili</Authors>
1010
<Description>Simple text client implementation for the matrix.org chat protocol.</Description>
1111
<PackageTags>matrix.org chat client</PackageTags>
@@ -22,6 +22,7 @@
2222
<ItemGroup>
2323
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
2424
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.7" />
25+
<PackageReference Include="RSFlowControl" Version="1.0.1" />
2526
</ItemGroup>
2627

2728
</Project>

0 commit comments

Comments
 (0)