Stevan/steves-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from StevanFreeborn/stevanfreeborn/fix/address-reconnection-failing

Browse Source 
fix: address reconnection logic not working
This commit is contained in:
Stevan Freeborn
2026-05-05 21:35:49 -05:00
committed by GitHub
parent 29d862dd0d 4241258825
commit 9ebdf3fe2c
9 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+1
View File
@@ -30,6 +30,7 @@ dotnet_diagnostic.IDE0058.severity = none
dotnet_diagnostic.IDE0290.severity = none
dotnet_diagnostic.CA1031.severity = none
dotnet_diagnostic.CA1873.severity = none
dotnet_diagnostic.CS1591.severity = none
# Organize usings
dotnet_separate_import_directive_groups = true
src/Directory.Build.props
+1
View File
@@ -9,6 +9,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
</Project>
src/src/Directory.Packages.props
+9 -9
View File
@@ -5,15 +5,15 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
</ItemGroup>
</Project>
src/src/StevesBot.Worker/Discord/Gateway/DiscordGatewayClient.cs
+8 -2
View File
@@ -70,6 +70,8 @@ internal sealed class DiscordGatewayClient : IDiscordGatewayClient
await SetGatewayUrlAsync(gatewayUrl, cancellationToken);
}
_webSocket?.Dispose();
await SetWebSocketAsync(_webSocketFactory.Create(), cancellationToken);
await ConnectWithGatewayUrlAsync(cancellationToken);
@@ -685,9 +687,10 @@ internal sealed class DiscordGatewayClient : IDiscordGatewayClient
await _webSocket.ConnectAsync(uri, cancellationToken);
connected = true;
}
catch (Exception e) when (e is WebSocketException)
catch (Exception e)
{
var currentDelay = (int)(delay.TotalMilliseconds * Math.Pow(2, attempts));
var calculatedDelay = delay.TotalMilliseconds * Math.Pow(2, attempts);
var currentDelay = (int)Math.Min(calculatedDelay, int.MaxValue);
_logger.LogWarning(
e,
@@ -700,6 +703,9 @@ internal sealed class DiscordGatewayClient : IDiscordGatewayClient
await Task.Delay(currentDelay, cancellationToken);
attempts++;
_webSocket.Dispose();
await SetWebSocketAsync(_webSocketFactory.Create(), cancellationToken);
}
}
}
src/tests/Directory.Packages.props
+4 -4
View File
@@ -5,11 +5,11 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.0" />
<PackageVersion Include="FluentAssertions" Version="[7.2.0]" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageVersion Include="moq" Version="4.20.72" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
src/tests/StevesBot.Worker.Tests/Unit/AsyncLockTests.cs
+2
View File
@@ -43,7 +43,9 @@ public class AsyncLockTests
var taskOne = FirstLockAction();
var taskTwo = SecondLockAction();
#pragma warning disable CA2027 // Cancel Task.Delay after Task.WhenAny completes
await Task.WhenAll(taskOne, Task.WhenAny(taskTwo, Task.Delay(500)));
#pragma warning restore CA2027 // Cancel Task.Delay after Task.WhenAny completes
lockOneAcquired.Task.IsCompleted.Should().BeTrue();
lockTwoAttempted.Task.IsCompleted.Should().BeTrue();
src/tests/StevesBot.Worker.Tests/Unit/IdentifyDataTests.cs
-2
View File
@@ -1,5 +1,3 @@
using StevesBot.Worker.Discord.Gateway.Events.Data;
namespace StevesBot.Worker.Tests.Unit;
public class IdentifyDataTests