Managed timing out

Author: kyb3r

crasync/core.py

@@ -25,7 +25,7 @@
 import aiohttp
 import asyncio
 from .models import Profile, Clan, Constants, ClanInfo
-from .errors import RequestError, NotFoundError, ServerError
+from .errors import RequestError, NotFoundError, ServerError, NotResponding
 
 class Client:
 
@@ -53,27 +53,30 @@ def close(self):
         self.session.close()
 
     async def request(self, url):
-        async with self.session.get(url, timeout=self.timeout) as resp:
-            try:
-                data = await resp.json()
-            except (asyncio.TimeoutError, aiohttp.ClientResponseError):
-                raise ServerError(resp, {})
-
-            # Request was successful 
-            if 300 > resp.status >= 200:
-                return data
-
-            # Tag not found
-            if resp.status == 404:
-                raise NotFoundError(resp, data)
-
-            # Something wrong with the api servers :(
-            if resp.status > 500:
-                raise ServerError(resp, data)
-
-            # Everything else
-            else:
-                raise RequestError(resp, data)
+        try:
+            async with self.session.get(url, timeout=self.timeout) as resp:
+                try:
+                    data = await resp.json()
+                except (asyncio.TimeoutError, aiohttp.ClientResponseError):
+                    raise ServerError(resp, {})
+
+                # Request was successful 
+                if 300 > resp.status >= 200:
+                    return data
+
+                # Tag not found
+                if resp.status == 404:
+                    raise NotFoundError(resp, data)
+
+                # Something wrong with the api servers :(
+                if resp.status > 500:
+                    raise ServerError(resp, data)
+
+                # Everything else
+                else:
+                    raise RequestError(resp, data)
+        except asyncio.TimeoutError:
+            raise NotResponding()
 
 
     async def get_profile(self, *tags):

crasync/errors.py

@@ -22,6 +22,12 @@
 SOFTWARE.
 '''
 
+class NotResponding(Exception):
+    def __init__(self):
+        self.code = 504
+        self.error = 'API request timed out, please be patient.'
+        super().__init__(self.error)
+
 class RequestError(Exception):
     '''Base class for request errors'''
     def __init__(self, resp, data):
@@ -35,7 +41,6 @@ def __init__(self, resp, data):
         self.fmt = '{0.reason} ({0.code}): {0.error}'.format(self)
         super().__init__(self.fmt)
 
-
 class NotFoundError(RequestError):
     '''Raised if the player/clan is not found.'''
     pass

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='crasync',
     packages=['crasync'],  # this must be the same as the name above
-    version='v2.1.2',
+    version='v2.1.4',
     description='An async wrapper for cr-api.com',
     author='verixx',
     license='MIT',