Merge pull request #199 from mathsman5133/cache_fix

Cache fix

Author: doluk

coc/errors.py

@@ -53,8 +53,14 @@ class HTTPException(ClashOfClansException):
     __slots__ = ("response", "status", "message", "reason", "_data")
 
     def _from_response(self, response, data):
-        self.response = response
-        self.status = response.status
+        if isinstance(response, int):
+            self.status = response
+            self.response = None
+        elif isinstance(response, ClientResponse):
+            self.response = response
+            self.status = response.status
+        else:
+            self.response = self.status = None
 
         if isinstance(data, dict):
             self.reason = data.get("reason", "Unknown")
@@ -73,7 +79,7 @@ def _from_response(self, response, data):
         super().__init__(fmt.format(self))
 
     def __init__(self, response=None, data=None):
-        if isinstance(response, ClientResponse):
+        if isinstance(response, (ClientResponse, int)):
             self._from_response(response, data)
         else:
             self.response = None

coc/http.py

@@ -264,7 +264,20 @@ async def request(self, route, **kwargs):
         # the cache will be cleaned once it becomes stale / a new object is available from the api.
         if isinstance(cache, FIFO) and not self.client.realtime and not kwargs.get("ignore_cache", False):
             try:
-                return cache[cache_control_key]
+                data = cache[cache_control_key]
+                status_code = data.get("status_code")
+                if data.get("timestamp") and data.get("timestamp") + data.get("_response_retry", 0) < datetime.utcnow().timestamp():
+                    self._cache_remove(cache_control_key)
+                elif not status_code or 200 <= status_code < 300:
+                    return data
+                elif status_code == 400:
+                    raise InvalidArgument(400, data)
+                elif status_code == 403:
+                    raise Forbidden(403, data)
+                elif status_code == 404:
+                    raise NotFound(404, data)
+                elif status_code == 503:
+                    raise Maintenance(503, data)
             except KeyError:
                 pass
 
@@ -281,7 +294,8 @@ async def request(self, route, **kwargs):
 
                         LOG.debug("API HTTP Request: %s", str(log_info))
                         data = await json_or_text(response)
-
+                        data["status_code"] = response.status
+                        data["timestamp"] = datetime.utcnow().timestamp()
                         try:
                             # set a callback to remove the item from cache once it's stale.
                             delta = int(response.headers["Cache-Control"].strip("max-age=").strip("public max-age="))