[2.0.44] Fixed promise retries on 404s (#7)

* Fixing promise retries on 404s * Version bump * README updates
cnguy · May 14, 2017 · 3fd4ac7 · 3fd4ac7
1 parent e58830b
commit 3fd4ac7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Check out [SUMMONER-V3](https://github.com/ChauTNguyen/kindred-api/wiki/SUMMONER
 * All standard endpoints covered but tournament endpoints.
 * Supports both **callbacks** and **promises**.
 * **Burst/Spread** rate limiter that is **enforced per region** and **follows retry headers**.
-    * Retries on 429 and >= 500. (Doesn't retry on 404)
+    * **Retries** on 429 and >= 500 **until all calls are successful**. (Doesn't retry on 404)
 * Built-in **parameter checks** so you can hopefully refer to documentation less! :)
 * Built-in **caching** (in-memory and Redis).
     * **Customized expiration timers**. You can set a timer for each endpoint type. Refer to [Caching](https://github.com/ChauTNguyen/kindred-api/wiki/Caching) for more info.
@@ -278,7 +278,7 @@ The difference between my site and other applications people seem to be working
 
 ## ~~Rate Limiter is not as optimized as it should be.~~ (FIXED 2.0.33)
 
-## Promises retry on 404.
+## ~~Promises retry on 404.~~ (FIXED 2.0.43)
 
 This is problematic because certain calls such as getCurrentGame, which will hit 404's often, will always retry up to 3 times.
 

diff --git a/dist/kindred-api.js b/dist/kindred-api.js
@@ -1011,16 +1011,21 @@
                           } else {
                             if (statusCode >= 500) {
                               if (self.debug) console.log('!!! resending promise request !!!');
+                              setTimeout(function () {
+                                (function () {
+                                  return resolve(tryRequest());
+                                });
+                              }, 1000);
                               setTimeout(function () {
                                 return reject('retry');
                               }, 1000);
                             } else if (statusCode === 429) {
                               if (self.debug) console.log('!!! resending promise request !!!');
                               setTimeout(function () {
-                                return reject('retry');
+                                return resolve(tryRequest());
                               }, response.headers['retry-after'] * 1000 + 50);
                             } else if (error || statusCode >= 400) {
-                              return reject('err:', error, statusCode);
+                              return reject(statusMessage + ' : ' + chalk.yellow(reqUrl));
                             } else {
                               if (Number.isInteger(cacheParams.ttl) && cacheParams.ttl > 0) self.cache.set({ key: reqUrl, ttl: cacheParams.ttl }, body);
                               return resolve(JSON.parse(body));
@@ -1062,10 +1067,6 @@
           });
         };
 
-        if (!cb) return tryRequest().catch(tryRequest).catch(tryRequest).catch(tryRequest).then(function (data) {
-          return data;
-        });
-
         return tryRequest();
       }
     }, {

diff --git a/dist/kindred-api.min.js b/dist/kindred-api.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kindred-api",
-  "version": "2.0.43",
+  "version": "2.0.44",
   "description": "Node.js League of Legends v3 API wrapper with built-in rate-limiting (burst/spread, enforced per region), caching (in-memory, Redis), and parameter checking.",
   "main": "index.js",
   "jsnext:main": "src/index.js",

diff --git a/src/kindred-api.js b/src/kindred-api.js
@@ -554,12 +554,17 @@ class Kindred {
                         } else {
                           if (statusCode >= 500) {
                             if (self.debug) console.log('!!! resending promise request !!!')
+                            setTimeout(() => {
+                              () => resolve(tryRequest())
+                            }, 1000)
                             setTimeout(() => { return reject('retry') }, 1000)
                           } else if (statusCode === 429) {
                             if (self.debug) console.log('!!! resending promise request !!!')
-                            setTimeout(() => { return reject('retry') }, (response.headers['retry-after'] * 1000) + 50)
+                            setTimeout(() => {
+                              return resolve(tryRequest())
+                            }, (response.headers['retry-after'] * 1000) + 50)
                           } else if (error || statusCode >= 400) {
-                            return reject('err:', error, statusCode)
+                            return reject(statusMessage + ' : ' + chalk.yellow(reqUrl))
                           } else {
                             if (Number.isInteger(cacheParams.ttl) && cacheParams.ttl > 0)
                               self.cache.set({ key: reqUrl, ttl: cacheParams.ttl }, body)
@@ -605,10 +610,6 @@ class Kindred {
       })
     }
 
-    if (!cb) return tryRequest()
-      .catch(tryRequest).catch(tryRequest).catch(tryRequest)
-      .then(data => data)
-
     return tryRequest()
   }