mirror of
https://github.com/Flowseal/tg-ws-proxy.git
synced 2026-11-22 07:26:31 +03:00
Fix stale sockets after WinError
This commit is contained in:
@@ -4,11 +4,42 @@ import signal
|
||||
import socket
|
||||
import sys
|
||||
import threading
|
||||
from contextlib import suppress
|
||||
|
||||
|
||||
log = logging.getLogger('tg-mtproto-proxy')
|
||||
|
||||
|
||||
def _close_proactor_socket(transport, exc):
|
||||
sock = transport._sock
|
||||
if sock is None:
|
||||
return
|
||||
try:
|
||||
transport._protocol.connection_lost(exc)
|
||||
finally:
|
||||
try:
|
||||
if sock.fileno() != -1:
|
||||
with suppress(ConnectionResetError):
|
||||
sock.shutdown(socket.SHUT_RDWR)
|
||||
finally:
|
||||
sock.close()
|
||||
transport._sock = None
|
||||
transport._called_connection_lost = True
|
||||
server, transport._server = transport._server, None
|
||||
if server is not None:
|
||||
if sys.version_info >= (3, 13):
|
||||
server._detach(transport)
|
||||
else:
|
||||
server._detach()
|
||||
|
||||
|
||||
def install_proactor_socket_guard(loop):
|
||||
# https://github.com/Flowseal/tg-ws-proxy/issues/1614
|
||||
if sys.platform == 'win32' and isinstance(loop, asyncio.ProactorEventLoop):
|
||||
from asyncio.proactor_events import _ProactorSocketTransport
|
||||
_ProactorSocketTransport._call_connection_lost = _close_proactor_socket
|
||||
|
||||
|
||||
def _replace_self_pipe(loop):
|
||||
reader, writer = socket.socketpair()
|
||||
try:
|
||||
|
||||
@@ -34,7 +34,7 @@ from .balancer import balancer
|
||||
from .pool import ws_pool, cf_worker_pool
|
||||
from .cf_h2 import CfH2Pool
|
||||
from .network_debug import log_ws_flow
|
||||
from .event_loop import install_self_pipe_guard
|
||||
from .event_loop import install_proactor_socket_guard, install_self_pipe_guard
|
||||
from ._aes import Cipher, algorithms, modes
|
||||
|
||||
|
||||
@@ -385,7 +385,9 @@ _client_tasks: Set[asyncio.Task] = set()
|
||||
|
||||
async def _run(stop_event: Optional[asyncio.Event] = None):
|
||||
global _server_instance, _server_stop_event, cf_h2_pool
|
||||
install_self_pipe_guard(asyncio.get_running_loop())
|
||||
loop = asyncio.get_running_loop()
|
||||
install_proactor_socket_guard(loop)
|
||||
install_self_pipe_guard(loop)
|
||||
_server_stop_event = stop_event
|
||||
|
||||
reset_tcp_backoff()
|
||||
|
||||
Reference in New Issue
Block a user