fix: 4006 voice crashes and upgrade to voice v8 (Pycord-Development#2812)

Signed-off-by: Lala Sabathil <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lala Sabathil <[email protected]>
(cherry picked from commit 2ae01b7)

Author: 3 people

CHANGELOG.md

@@ -119,6 +119,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2781](https://github.com/Pycord-Development/pycord/pull/2781))
 - Fixed `VoiceClient` crashing randomly while receiving audio
   ([#2800](https://github.com/Pycord-Development/pycord/pull/2800))
+- Fixed `VoiceClient.connect` failing to do initial connection.
+  ([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
 
 ### Changed
 
@@ -138,6 +140,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
 - Changed the default value of `ApplicationCommand.nsfw` to `False`.
   ([#2797](https://github.com/Pycord-Development/pycord/pull/2797))
+- Upgraded voice websocket version to v8.
+  ([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
 
 ### Deprecated
 

discord/gateway.py

@@ -35,6 +35,7 @@
 import traceback
 import zlib
 from collections import deque, namedtuple
+from typing import TYPE_CHECKING
 
 import aiohttp
 
@@ -200,6 +201,9 @@ def ack(self):
 
 
 class VoiceKeepAliveHandler(KeepAliveHandler):
+    if TYPE_CHECKING:
+        ws: DiscordVoiceWebSocket
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.recent_ack_latencies = deque(maxlen=20)
@@ -208,7 +212,10 @@ def __init__(self, *args, **kwargs):
         self.behind_msg = "High socket latency, shard ID %s heartbeat is %.1fs behind"
 
     def get_payload(self):
-        return {"op": self.ws.HEARTBEAT, "d": int(time.time() * 1000)}
+        return {
+            "op": self.ws.HEARTBEAT,
+            "d": {"t": int(time.time() * 1000), "seq_ack": self.ws.seq_ack},
+        }
 
     def ack(self):
         ack_time = time.perf_counter()
@@ -766,6 +773,7 @@ def __init__(self, socket, loop, *, hook=None):
         self._close_code = None
         self.secret_key = None
         self.ssrc_map = {}
+        self.seq_ack: int = -1
         if hook:
             self._hook = hook
 
@@ -786,6 +794,9 @@ async def resume(self):
                 "token": state.token,
                 "server_id": str(state.server_id),
                 "session_id": state.session_id,
+                # this seq_ack will allow for us to do buffered resume, which is, receive the
+                # lost voice packets while trying to resume the reconnection
+                "seq_ack": self.seq_ack,
             },
         }
         await self.send_as_json(payload)
@@ -806,7 +817,7 @@ async def identify(self):
     @classmethod
     async def from_client(cls, client, *, resume=False, hook=None):
         """Creates a voice websocket for the :class:`VoiceClient`."""
-        gateway = f"wss://{client.endpoint}/?v=4"
+        gateway = f"wss://{client.endpoint}/?v=8"
         http = client._state.http
         socket = await http.ws_connect(gateway, compress=15)
         ws = cls(socket, loop=client.loop, hook=hook)
@@ -842,14 +853,21 @@ async def client_connect(self):
         await self.send_as_json(payload)
 
     async def speak(self, state=SpeakingState.voice):
-        payload = {"op": self.SPEAKING, "d": {"speaking": int(state), "delay": 0}}
+        payload = {
+            "op": self.SPEAKING,
+            "d": {
+                "speaking": int(state),
+                "delay": 0,
+            },
+        }
 
         await self.send_as_json(payload)
 
     async def received_message(self, msg):
         _log.debug("Voice websocket frame received: %s", msg)
         op = msg["op"]
         data = msg.get("d")
+        self.seq_ack = data.get("seq", self.seq_ack)
 
         if op == self.READY:
             await self.initial_connection(data)

discord/voice_client.py

@@ -325,11 +325,7 @@ async def on_voice_server_update(self, data: VoiceServerUpdatePayload) -> None:
             )
             return
 
-        self.endpoint, _, _ = endpoint.rpartition(":")
-        if self.endpoint.startswith("wss://"):
-            # Just in case, strip it off since we're going to add it later
-            self.endpoint = self.endpoint[6:]
-
+        self.endpoint = endpoint.removeprefix("wss://")
         # This gets set later
         self.endpoint_ip = MISSING
 
@@ -467,8 +463,8 @@ async def poll_voice_ws(self, reconnect: bool) -> None:
                     # The following close codes are undocumented, so I will document them here.
                     # 1000 - normal closure (obviously)
                     # 4014 - voice channel has been deleted.
-                    # 4015 - voice server has crashed
-                    if exc.code in (1000, 4015):
+                    # 4015 - voice server has crashed, we should resume
+                    if exc.code == 1000:
                         _log.info(
                             "Disconnecting from voice normally, close code %d.",
                             exc.code,
@@ -484,6 +480,21 @@ async def poll_voice_ws(self, reconnect: bool) -> None:
                         _log.info("Reconnect was unsuccessful, disconnecting from voice normally...")
                         await self.disconnect()
                         break
+                    if exc.code == 4015:
+                        _log.info("Disconnected from voice, trying to resume...")
+
+                        try:
+                            await self.ws.resume()
+                        except asyncio.TimeoutError:
+                            _log.info(
+                                "Could not resume the voice connection... Disconnection..."
+                            )
+                            if self._connected.is_set():
+                                await self.disconnect(force=True)
+                        else:
+                            _log.info("Successfully resumed voice connection")
+                            continue
+
                 if not reconnect:
                     await self.disconnect()
                     raise