cswimr/SeaCogs
cswimr/SeaCogs
1
1
Fork 1
Code Issues 10 Pull requests 4 Projects 1 Packages 1 Wiki Activity Actions

fix(pterodactyl): handle disconnecting from the websocket
All checks were successful
Actions / Lint Code (Ruff & Pylint) (pull_request) Successful in 21s
Details
Actions / Build Documentation (MkDocs) (pull_request) Successful in 25s
Details

Browse source
This commit is contained in:
Seaswimmer 2024-02-28 11:46:00 -05:00
parent e6ca4071f3
commit d391aeeb7b
Signed by: cswimr
GPG key ID: B8953EC01E5C4063
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pterodactyl/pterodactyl.py
View file

@ -47,27 +47,32 @@ class Pterodactyl(commands.Cog):
self.logger.error('Failed to retrieve Pterodactyl websocket: %s', e) self.logger.error('Failed to retrieve Pterodactyl websocket: %s', e)
return return
async with websockets.connect(websocket_credentials['data']['socket'], extra_headers=extra_headers) as websocket: async for websocket in websockets.connect(websocket_credentials['data']['socket'], extra_headers=extra_headers):
self.logger.debug("WebSocket connection established") try:
self.logger.debug("WebSocket connection established")
auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]}) auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]})
await websocket.send(auth_message) await websocket.send(auth_message)
self.logger.debug("Authentication message sent") self.logger.debug("Authentication message sent")
self.client = client self.client = client
self.websocket = websocket self.websocket = websocket
while True: while True:
message = await websocket.recv() message = await websocket.recv()
if json.loads(message)['event'] in ['token expiring', 'token expired']: if json.loads(message)['event'] in ['token expiring', 'token expired']:
self.logger.debug("Received token expiring/expired event. Refreshing token.") self.logger.debug("Received token expiring/expired event. Refreshing token.")
websocket_credentials = client.servers.get_websocket(server_id) websocket_credentials = client.servers.get_websocket(server_id)
auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]}) auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]})
await websocket.send(auth_message) await websocket.send(auth_message)
self.logger.debug("Authentication message sent") self.logger.debug("Authentication message sent")
if json.loads(message)['event'] == 'auth success': if json.loads(message)['event'] == 'auth success':
self.logger.debug("Authentication successful") self.logger.debug("Authentication successful")
self.logger.debug("Received message: %s", message) self.logger.debug("Received message: %s", message)
except websockets.exceptions.ConnectionClosed as e:
self.logger.debug("WebSocket connection closed: %s", e)
websocket_credentials = client.servers.get_websocket(server_id)
continue
def get_task(self): def get_task(self):
return self.bot.loop.create_task(self.establish_websocket_connection(), name="Pterodactyl Websocket Connection") return self.bot.loop.create_task(self.establish_websocket_connection(), name="Pterodactyl Websocket Connection")