alemi/aiocraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better handle auth exceptions

Browse source
This commit is contained in:
əlemi 2021-11-11 14:12:07 +01:00
parent 4b9b093cfe
commit 7b72287215
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aiocraft/client.py
View file

@ -97,6 +97,8 @@ class Client:
return wrapper return wrapper
async def authenticate(self) -> bool: async def authenticate(self) -> bool:
if self._authenticated:
return True # Don't spam Auth endpoint!
if not self.token: if not self.token:
if self.username and self.password: if self.username and self.password:
self.token = await Token.authenticate(self.username, self.password) self.token = await Token.authenticate(self.username, self.password)
@ -165,9 +167,6 @@ class Client:
await self.dispatcher.write(packet) await self.dispatcher.write(packet)
self.dispatcher.state = ConnectionState.LOGIN self.dispatcher.state = ConnectionState.LOGIN
await self._process_packets() await self._process_packets()
except AuthException as e: # TODO maybe tell what went wrong
self._authenticated = False
self._logger.error("Authentication exception")
except ConnectionRefusedError: except ConnectionRefusedError:
self._logger.error("Server rejected connection") self._logger.error("Server rejected connection")
except Exception: except Exception:
@ -209,6 +208,10 @@ class Client:
self.dispatcher.incoming.task_done() self.dispatcher.incoming.task_done()
except asyncio.TimeoutError: except asyncio.TimeoutError:
pass # need this to recheck self._processing periodically pass # need this to recheck self._processing periodically
except AuthException:
self._authenticated = False
self._logger.error("Authentication exception")
await self.dispatcher.disconnect(block=False)
except Exception: except Exception:
self._logger.exception("Exception while processing packet %s", packet) self._logger.exception("Exception while processing packet %s", packet)