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

fix: catch timed out error in auth requests

Browse source
This commit is contained in:
əlemi 2022-06-18 16:11:06 +02:00
parent 4d4ad4a6d6
commit 778fbe76f3
No known key found for this signature in database
GPG key ID: BBCBFE5D7244634E
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
aiocraft/mc/auth/interface.py
View file

@ -1,6 +1,6 @@
"""Minecraft authentication interface"""
import logging
from multiprocessing.sharedctypes import Value
from asyncio.exceptions import TimeoutError
from typing import Optional, Dict, Any
import aiohttp
@ -66,28 +66,34 @@ class AuthInterface:
@classmethod
async def _post(cls, endpoint:str, **kwargs) -> Dict[str, Any]:
async with aiohttp.ClientSession(timeout=cls.TIMEOUT) as session:
async with session.post(endpoint, **kwargs) as res:
try:
data = await res.json(content_type=None)
except JSONDecodeError:
raise AuthException(endpoint, res.status, {"invalid": await res.text()}, kwargs)
logger.debug("POST /%s [%s] : %s", endpoint, str(kwargs), str(data))
if res.status >= 400:
raise AuthException(endpoint, res.status, data, kwargs)
return data
try:
async with session.post(endpoint, **kwargs) as res:
try:
data = await res.json(content_type=None)
except JSONDecodeError:
raise AuthException(endpoint, res.status, {"error": "Invalid JSON response", "response": await res.text()}, kwargs)
logger.debug("POST /%s [%s] : %s", endpoint, str(kwargs), str(data))
if res.status >= 400:
raise AuthException(endpoint, res.status, data, kwargs)
return data
except TimeoutError:
raise AuthException(endpoint, res.status, {"error": "request timed out"}, kwargs)
@classmethod
async def _get(cls, endpoint:str, **kwargs) -> Dict[str, Any]:
async with aiohttp.ClientSession(timeout=cls.TIMEOUT) as session:
async with session.get(endpoint, **kwargs) as res:
try:
data = await res.json(content_type=None)
except JSONDecodeError:
raise AuthException(endpoint, res.status, {"invalid": await res.text()}, kwargs)
logger.debug("GET /%s [%s] : %s", endpoint, str(kwargs), str(data))
if res.status >= 400:
raise AuthException(endpoint, res.status, data, kwargs)
return data
try:
async with session.get(endpoint, **kwargs) as res:
try:
data = await res.json(content_type=None)
except JSONDecodeError:
raise AuthException(endpoint, res.status, {"error": "Invalid JSON response", "response": await res.text()}, kwargs)
logger.debug("GET /%s [%s] : %s", endpoint, str(kwargs), str(data))
if res.status >= 400:
raise AuthException(endpoint, res.status, data, kwargs)
return data
except TimeoutError:
raise AuthException(endpoint, res.status, {"error": "request timed out"}, kwargs)
class OfflineAuthenticator(AuthInterface):
def __init__(self, name:str, id:str=''):