astelm
/
tg-ws-proxy
mirror of https://github.com/Flowseal/tg-ws-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: https://github.com/Flowseal/tg-ws-proxy/issues/500

This commit is contained in:
deexsed 2026-03-31 08:29:51 +03:00
parent da4b521aba
commit 9705817612
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
proxy/tg_ws_proxy.py
View File

@ -651,7 +651,9 @@ async def _bridge_ws_reencrypt(reader, writer, ws: RawWebSocket, label,
await ws.send(parts[0]) await ws.send(parts[0])
else: else:
await ws.send(chunk) await ws.send(chunk)
except (asyncio.CancelledError, ConnectionError, OSError): except asyncio.CancelledError:
raise
except (ConnectionError, OSError):
return return
except Exception as e: except Exception as e:
log.debug("[%s] tcp->ws ended: %s", label, e) log.debug("[%s] tcp->ws ended: %s", label, e)
@ -671,7 +673,9 @@ async def _bridge_ws_reencrypt(reader, writer, ws: RawWebSocket, label,
data = clt_encryptor.update(plain) data = clt_encryptor.update(plain)
writer.write(data) writer.write(data)
await writer.drain() await writer.drain()
except (asyncio.CancelledError, ConnectionError, OSError): except asyncio.CancelledError:
raise
except (ConnectionError, OSError):
return return
except Exception as e: except Exception as e:
log.debug("[%s] ws->tcp ended: %s", label, e) log.debug("[%s] ws->tcp ended: %s", label, e)
@ -682,12 +686,9 @@ async def _bridge_ws_reencrypt(reader, writer, ws: RawWebSocket, label,
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED) await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
finally: finally:
for t in tasks: for t in tasks:
if not t.done():
t.cancel() t.cancel()
for t in tasks: await asyncio.gather(*tasks, return_exceptions=True)
try:
await t
except BaseException:
pass
elapsed = asyncio.get_running_loop().time() - start_time elapsed = asyncio.get_running_loop().time() - start_time
log.info("[%s] %s WS session closed: " log.info("[%s] %s WS session closed: "
"^%s (%d pkts) v%s (%d pkts) in %.1fs", "^%s (%d pkts) v%s (%d pkts) in %.1fs",
@ -730,7 +731,7 @@ async def _bridge_tcp_reencrypt(reader, writer, remote_reader, remote_writer,
dst_w.write(data) dst_w.write(data)
await dst_w.drain() await dst_w.drain()
except asyncio.CancelledError: except asyncio.CancelledError:
pass raise
except Exception as e: except Exception as e:
log.debug("[%s] forward ended: %s", label, e) log.debug("[%s] forward ended: %s", label, e)
@ -742,12 +743,9 @@ async def _bridge_tcp_reencrypt(reader, writer, remote_reader, remote_writer,
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED) await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
finally: finally:
for t in tasks: for t in tasks:
if not t.done():
t.cancel() t.cancel()
for t in tasks: await asyncio.gather(*tasks, return_exceptions=True)
try:
await t
except BaseException:
pass
for w in (writer, remote_writer): for w in (writer, remote_writer):
try: try:
w.close() w.close()
@ -990,6 +988,7 @@ async def _handle_client(reader, writer, secret: bytes):
log.debug("[%s] client disconnected", label) log.debug("[%s] client disconnected", label)
except asyncio.CancelledError: except asyncio.CancelledError:
log.debug("[%s] cancelled", label) log.debug("[%s] cancelled", label)
raise
except ConnectionResetError: except ConnectionResetError:
log.debug("[%s] connection reset", label) log.debug("[%s] connection reset", label)
except OSError as exc: except OSError as exc: