monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clients: retry connection with ssl (#1341)

This commit is contained in:
Fabian Dill 2023-01-02 20:24:54 +01:00 committed by GitHub
parent 96cc7f79dc
commit d4e2b75520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CommonClient.py
View File

@ -494,7 +494,7 @@ class CommonContext:
self._messagebox.open() self._messagebox.open()
return self._messagebox return self._messagebox
def _handle_connection_loss(self, msg: str) -> None: def handle_connection_loss(self, msg: str) -> None:
"""Helper for logging and displaying a loss of connection. Must be called from an except block.""" """Helper for logging and displaying a loss of connection. Must be called from an except block."""
exc_info = sys.exc_info() exc_info = sys.exc_info()
logger.exception(msg, exc_info=exc_info, extra={'compact_gui': True}) logger.exception(msg, exc_info=exc_info, extra={'compact_gui': True})
@ -580,14 +580,22 @@ async def server_loop(ctx: CommonContext, address: typing.Optional[str] = None)
for msg in decode(data): for msg in decode(data):
await process_server_cmd(ctx, msg) await process_server_cmd(ctx, msg)
logger.warning(f"Disconnected from multiworld server{reconnect_hint()}") logger.warning(f"Disconnected from multiworld server{reconnect_hint()}")
except websockets.InvalidMessage:
# probably encrypted
if address.startswith("ws://"):
await server_loop(ctx, "ws" + address[1:])
else:
ctx.handle_connection_loss(f"Lost connection to the multiworld server due to InvalidMessage"
f"{reconnect_hint()}")
except ConnectionRefusedError: except ConnectionRefusedError:
ctx._handle_connection_loss("Connection refused by the server. May not be running Archipelago on that address or port.") ctx.handle_connection_loss("Connection refused by the server. "
"May not be running Archipelago on that address or port.")
except websockets.InvalidURI: except websockets.InvalidURI:
ctx._handle_connection_loss("Failed to connect to the multiworld server (invalid URI)") ctx.handle_connection_loss("Failed to connect to the multiworld server (invalid URI)")
except OSError: except OSError:
ctx._handle_connection_loss("Failed to connect to the multiworld server") ctx.handle_connection_loss("Failed to connect to the multiworld server")
except Exception: except Exception:
ctx._handle_connection_loss(f"Lost connection to the multiworld server{reconnect_hint()}") ctx.handle_connection_loss(f"Lost connection to the multiworld server{reconnect_hint()}")
finally: finally:
await ctx.connection_closed() await ctx.connection_closed()
if ctx.server_address and ctx.username and not ctx.disconnected_intentionally: if ctx.server_address and ctx.username and not ctx.disconnected_intentionally: