Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rh:websockets] Workaround race condition causing issues on PyPy (#9514) 

Authored by: coletdjnz
This commit is contained in:
coletdjnz 2024-03-23 11:27:10 +13:00 committed by GitHub
parent bc2b8c0596
commit e5d4f11104
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
yt_dlp/networking/_websockets.py
View File

@ -1,5 +1,6 @@
from __future__ import annotations from __future__ import annotations
import contextlib
import io import io
import logging import logging
import ssl import ssl
@ -38,27 +39,40 @@ if websockets_version < (12, 0):
import websockets.sync.client import websockets.sync.client
from websockets.uri import parse_uri from websockets.uri import parse_uri
# In websockets Connection, recv_exc and recv_events_exc are defined
# after the recv events handler thread is started [1].
# On our CI using PyPy, in some cases a race condition may occur
# where the recv events handler thread tries to use these attributes before they are defined [2].
# 1: https://github.com/python-websockets/websockets/blame/de768cf65e7e2b1a3b67854fb9e08816a5ff7050/src/websockets/sync/connection.py#L93
# 2: "AttributeError: 'ClientConnection' object has no attribute 'recv_events_exc'. Did you mean: 'recv_events'?"
import websockets.sync.connection # isort: split
with contextlib.suppress(Exception):
# > 12.0
websockets.sync.connection.Connection.recv_exc = None
# 12.0
websockets.sync.connection.Connection.recv_events_exc = None
class WebsocketsResponseAdapter(WebSocketResponse): class WebsocketsResponseAdapter(WebSocketResponse):
def __init__(self, wsw: websockets.sync.client.ClientConnection, url): def __init__(self, ws: websockets.sync.client.ClientConnection, url):
super().__init__( super().__init__(
fp=io.BytesIO(wsw.response.body or b''), fp=io.BytesIO(ws.response.body or b''),
url=url, url=url,
headers=wsw.response.headers, headers=ws.response.headers,
status=wsw.response.status_code, status=ws.response.status_code,
reason=wsw.response.reason_phrase, reason=ws.response.reason_phrase,
) )
self.wsw = wsw self._ws = ws
def close(self): def close(self):
self.wsw.close() self._ws.close()
super().close() super().close()
def send(self, message): def send(self, message):
# https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.send # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.send
try: try:
return self.wsw.send(message) return self._ws.send(message)
except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e: except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e:
raise TransportError(cause=e) from e raise TransportError(cause=e) from e
except SocksProxyError as e: except SocksProxyError as e:
@ -69,7 +83,7 @@ class WebsocketsResponseAdapter(WebSocketResponse):
def recv(self): def recv(self):
# https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.recv # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.recv
try: try:
return self.wsw.recv() return self._ws.recv()
except SocksProxyError as e: except SocksProxyError as e:
raise ProxyError(cause=e) from e raise ProxyError(cause=e) from e
except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e: except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e: