matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix voice handshake race condition

Browse Source 
In the event that two voice_server_updates are received in a short time frame, the second one is now ignored.
This commit is contained in:
Imayhaveborkedit 2019-04-10 00:17:12 -04:00 committed by Rapptz
parent 4df0f79a6b
commit 7eb8417883
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/voice_client.py
View File

@ -100,6 +100,9 @@ class VoiceClient:
self._state = state self._state = state
# this will be used in the AudioPlayer thread # this will be used in the AudioPlayer thread
self._connected = threading.Event() self._connected = threading.Event()
self._handshaking = False
self._handshake_check = asyncio.Lock(loop=self.loop)
self._handshake_complete = asyncio.Event(loop=self.loop) self._handshake_complete = asyncio.Event(loop=self.loop)
self.mode = None self.mode = None
@ -166,6 +169,12 @@ class VoiceClient:
self._state._remove_voice_client(key_id) self._state._remove_voice_client(key_id)
async def _create_socket(self, server_id, data): async def _create_socket(self, server_id, data):
async with self._handshake_check:
if self._handshaking:
log.info("Ignoring voice server update while handshake is in progress")
return
self._handshaking = True
self._connected.clear() self._connected.clear()
self.session_id = self.main_ws.session_id self.session_id = self.main_ws.session_id
self.server_id = server_id self.server_id = server_id
@ -209,6 +218,7 @@ class VoiceClient:
try: try:
self.ws = await DiscordVoiceWebSocket.from_client(self) self.ws = await DiscordVoiceWebSocket.from_client(self)
self._handshaking = False
self._connected.clear() self._connected.clear()
while not hasattr(self, 'secret_key'): while not hasattr(self, 'secret_key'):
await self.ws.poll_event() await self.ws.poll_event()