From 57bcb457e47cab91d623ba3a95627a051cc6b54f Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Sat, 31 Jan 2015 19:20:48 +0000
Subject: [PATCH] handle error==RETRY responses from the server a little better
 - prevents slow refresh after a long idle period when the botguard data has
 expired

---
 code/map_data_request.js | 44 +++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/code/map_data_request.js b/code/map_data_request.js
index 63f643c3..de0f7743 100644
--- a/code/map_data_request.js
+++ b/code/map_data_request.js
@@ -485,6 +485,7 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
 
   var successTiles = [];
   var errorTiles = [];
+  var retryTiles = [];
   var timeoutTiles = [];
 
   if (!success || !data || !data.result) {
@@ -492,13 +493,26 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
 
     //request failed - requeue all the tiles(?)
 
-    for (var i in tiles) {
-      var id = tiles[i];
-      errorTiles.push(id);
-      this.debugTiles.setState (id, 'request-fail');
-    }
+    if (data && data.error && data.error == 'RETRY') {
+      // the server can sometimes ask us to retry a request. this is botguard related, I believe
 
-    window.runHooks('requestFinished', {success: false});
+      for (var i in tiles) {
+        var id = tiles[i];
+        retryTiles.push(id);
+        this.debugTiles.setState (id, 'retrying');
+      }
+
+      window.runHooks('requestFinished', {success: false});
+
+    } else {
+      for (var i in tiles) {
+        var id = tiles[i];
+        errorTiles.push(id);
+        this.debugTiles.setState (id, 'request-fail');
+      }
+
+      window.runHooks('requestFinished', {success: false});
+    }
 
   } else {
 
@@ -548,11 +562,18 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
   }
 
   // set the queue delay based on any errors or timeouts
+  // NOTE: retryTimes are retried at the regular delay - no longer wait as for error/timeout cases
   var nextQueueDelay = errorTiles.length > 0 ? this.BAD_REQUEST_RUN_QUEUE_DELAY :
                        timeoutTiles.length > 0 ? this.TIMEOUT_REQUEST_RUN_QUEUE_DELAY :
                        this.RUN_QUEUE_DELAY;
+  var statusMsg = 'getEntities status: '+tiles.length+' tiles: ';
+  statusMsg += successTiles.length+' successful';
+  if (retryTiles.length) statusMsg += ', '+retryTiles.length+' retried';
+  if (timeoutTiles.length) statusMsg += ', '+timeoutTiles.length+' timed out';
+  if (errorTiles.length) statusMsg += ', '+errorTiles.length+' failed';
+  statusMsg += '. delay '+nextQueueDelay+' seconds';
+  console.log (statusMsg);
 
-  console.log ('getEntities status: '+tiles.length+' tiles: '+successTiles.length+' successful, '+timeoutTiles.length+' timed out, '+errorTiles.length+' failed. delay '+nextQueueDelay+' seconds');
 
   // requeue any 'timeout' tiles immediately
   if (timeoutTiles.length > 0) {
@@ -564,6 +585,15 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
     }
   }
 
+  if (retryTiles.length > 0) {
+    for (var i in retryTiles) {
+      var id = retryTiles[i];
+      delete this.requestedTiles[id];
+
+      this.requeueTile(id, false);  //tiles from a error==RETRY request are requeued without counting it as an error
+    }
+  }
+
   if (errorTiles.length > 0) {
     for (var i in errorTiles) {
       var id = errorTiles[i];