Make voice heartbeater use own incrementing sequence value

Quahu · Aug 3, 2024 · faba794 · faba794
1 parent 9391df6
commit faba794
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/Disqord.Voice.Api/Default/DefaultVoiceGatewayClient.cs b/src/Disqord.Voice.Api/Default/DefaultVoiceGatewayClient.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Disqord.Serialization.Json;
@@ -30,8 +31,6 @@ public class DefaultVoiceGatewayClient : IVoiceGatewayClient
 
     public IJsonSerializer Serializer { get; }
 
-    public int? Sequence { get; private set; }
-
     public CancellationToken StoppingToken { get; private set; }
 
     private readonly object _stateLock = new();
@@ -172,7 +171,6 @@ private async Task InternalRunAsync(CancellationToken stoppingToken)
                 {
                     var payload = await Gateway.ReceiveAsync(stoppingToken).ConfigureAwait(false);
                     Logger.LogTrace("Received voice payload: {0}.", payload.Op);
-                    Sequence = payload.S;
 
                     switch (payload.Op)
                     {

diff --git a/src/Disqord.Voice.Api/Default/DefaultVoiceGatewayHeartbeater.cs b/src/Disqord.Voice.Api/Default/DefaultVoiceGatewayHeartbeater.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Disqord.Utilities.Threading;
@@ -20,6 +21,7 @@ public class DefaultVoiceGatewayHeartbeater : IVoiceGatewayHeartbeater
 
     private DateTime? _lastSend;
     private DateTime? _lastAcknowledge;
+    private uint _sequence;
 
     private Cts? _cts;
     private Task? _task;
@@ -40,6 +42,7 @@ public ValueTask StartAsync(TimeSpan interval)
         Interval = interval;
         _lastSend = null;
         _lastAcknowledge = null;
+        _sequence = 0;
         _cts = new Cts();
         _task = Task.Run(InternalRunAsync, _cts.Token);
         return default;
@@ -78,7 +81,7 @@ protected virtual VoiceGatewayPayloadJsonModel GetPayload()
         return new()
         {
             Op = VoiceGatewayPayloadOperation.Heartbeat,
-            D = Client.Serializer.GetJsonNode(Client.Sequence)
+            D = Client.Serializer.GetJsonNode(_sequence++)
         };
     }
 

diff --git a/src/Disqord.Voice.Api/IVoiceGatewayClient.cs b/src/Disqord.Voice.Api/IVoiceGatewayClient.cs
@@ -25,11 +25,6 @@ public interface IVoiceGatewayClient : ILogging, IAsyncDisposable
 
     IJsonSerializer Serializer { get; }
 
-    /// <summary>
-    ///     Gets the last sequence number (<see cref="VoiceGatewayPayloadJsonModel.S"/>) received from the voice gateway.
-    /// </summary>
-    int? Sequence { get; }
-
     Task<ReadyJsonModel> WaitForReadyAsync(CancellationToken cancellationToken);
 
     Task<SessionDescriptionJsonModel> WaitForSessionDescriptionAsync(CancellationToken cancellationToken);