Centralize polling algorithm

static/js/index.js

@@ -58,38 +58,53 @@ function restoreUiAfterNaClLoad() {
 }
 
 function beginBackgroundPollingOfHost(host) {
-    $("#hostgrid-" + host.serverUid).addClass('host-cell-inactive');
-    // for each host, first assume it's inactive.
-
-    host.initialPing(function () { // initial attempt was a success
+    if (host.online) {
         $("#hostgrid-" + host.serverUid).removeClass('host-cell-inactive');
+
+        // The host was already online. Just start polling in the background now.
         activePolls[host.serverUid] = window.setInterval(function() {
             if (api && activePolls[api.serverUid] != null) {
                 stopBackgroundPollingOfHost(api);
                 return;
             }
             // every 5 seconds, poll at the address we know it was live at
-            host.refreshServerInfoAtAddress(host.address).then(function (onSuccess){
+            host.pollServer(function () {
+                if (host.online) {
                     $("#hostgrid-" + host.serverUid).removeClass('host-cell-inactive');
-            }, function (onFailure) {
+                } else {
                     $("#hostgrid-" + host.serverUid).addClass('host-cell-inactive');
+                }
             });
         }, 5000);
-    }, function () { // initial attempt was a failure
+    } else {
         $("#hostgrid-" + host.serverUid).addClass('host-cell-inactive');
+
+        // The host was offline, so poll immediately.
+        host.pollServer(function () {
+            if (host.online) {
+                $("#hostgrid-" + host.serverUid).removeClass('host-cell-inactive');
+            } else {
+                $("#hostgrid-" + host.serverUid).addClass('host-cell-inactive');
+            }
+
+            // Now start background polling
             activePolls[host.serverUid] = window.setInterval(function() {
                 if (api && activePolls[api.serverUid] != null) {
                     stopBackgroundPollingOfHost(api);
                     return;
                 }
-            if(host.refreshServerInfoAtAddress(host.address)) {
+                // every 5 seconds, poll at the address we know it was live at
+                host.pollServer(function () {
+                    if (host.online) {
                         $("#hostgrid-" + host.serverUid).removeClass('host-cell-inactive');
                     } else {
                         $("#hostgrid-" + host.serverUid).addClass('host-cell-inactive');
                     }
+                });
             }, 5000);
         });
     }
+}
 
 function stopBackgroundPollingOfHost(host) {
     console.log('stopping background polling of server: ' + host.toString());
@@ -221,12 +236,12 @@ function hostChosen(sourceEvent) {
     }
 
     api = hosts[serverUid];
+    if (!api.online) {
+        return;
+    }
+
     stopBackgroundPollingOfHost(api);
 
-    // Use the cached state of this host from the last poll
-    if(!api.paired) {
-        // It doesn't think we're paired. Refresh our serverinfo to make sure.
-        api.refreshServerInfo().then(function (ret) {
     if (!api.paired) {
         // Still not paired; go to the pairing flow
         pairTo(api, function(){ showApps(api); saveHosts();}, function(){});
@@ -234,15 +249,6 @@ function hostChosen(sourceEvent) {
         // When we queried again, it was paired, so show apps.
         showApps(api);
     }
-        }, function (failedRefreshInfo) {
-            snackbarLog('Failed to connect to ' + api.address + '! Are you sure the host is on?');
-            console.log('Returned error was: ' + failedRefreshInfo);
-            console.log('failed API object: ');
-            console.log(api.toString());
-        });
-    } else {
-        showApps(api);
-    }
 }
 
 // the `+` was selected on the host grid.
@@ -743,7 +749,7 @@ function onWindowLoad(){
                     var mDnsDiscoveredHost = new NvHTTP(ip, myUniqueid);
                     if(hosts[mDnsDiscoveredHost.serverUid] != null) {
                         // if we're seeing a host we've already seen before, update it for the current local IP.
-                        hosts[mDnsDiscoveredHost.serverUid].localIp = mDnsDiscoveredHost.localIp;
+                        hosts[mDnsDiscoveredHost.serverUid].address = mDnsDiscoveredHost.address;
                     } else {
                         addHostToGrid(mDnsDiscoveredHost);
                     }

static/js/utils.js

@@ -38,9 +38,10 @@ function NvHTTP(address, clientUid, userEnteredAddress = '') {
     this.currentGame = 0;
     this.serverMajorVersion = 0;
     this.clientUid = clientUid;
-    this._baseUrlHttps = 'https://' + address + ':47984';
-    this._baseUrlHttp = 'http://' + address + ':47989';
     this._memCachedBoxArtArray = {};
+    this._pollCount = 0;
+    this._consecutivePollFailures = 0;
+    this.online = false;
 
     this.userEnteredAddress = userEnteredAddress;  // if the user entered an address, we keep it on hand to try when polling
     this.serverUid = '';
@@ -100,25 +101,55 @@ NvHTTP.prototype = {
         }.bind(this));
     },
 
+    // called every few seconds to poll the server for updated info
+    pollServer: function(onComplete) {
+        this.selectServerAddress(function(successfulAddress) {
+            // Successfully determined server address. Update base URL.
+            this.address = successfulAddress;
+            this._baseUrlHttps = 'https://' + successfulAddress + ':47984';
+            this._baseUrlHttp = 'http://' + successfulAddress + ':47989';
+
+            // Poll for the app list every 10 successful serverinfo polls.
+            // Not including the first one to avoid PCs taking a while to show
+            // as online initially
+            if (++this._pollCount % 10 == 0) {
+                this.getAppListWithCacheFlush();
+            }
+
+            this._consecutivePollFailures = 0;
+            this.online = true;
+
+            onComplete();
+        }.bind(this), function() {
+            if (++this._consecutivePollFailures >= 3) {
+                this.online = false;
+            }
+
+            onComplete();
+        }.bind(this));
+    },
+
     // initially pings the server to try and figure out if it's routable by any means.
-    initialPing: function(onSuccess, onFailure) {
+    selectServerAddress: function(onSuccess, onFailure) {
+        // TODO: Deduplicate the addresses
+        this.refreshServerInfoAtAddress(this.address).then(function(successPrevAddr) {
+            onSuccess(this.address);
+        }.bind(this), function(successPrevAddr) {
             this.refreshServerInfoAtAddress(this.hostname + '.local').then(function(successLocal) {
-            this.address = this.hostname + '.local';
-            onSuccess();
+                onSuccess(this.hostname + '.local');
             }.bind(this), function(failureLocal) {
                 this.refreshServerInfoAtAddress(this.externalIP).then(function(successExternal) {
-                this.address = this.externalIP;
-                onSuccess();
+                    onSuccess(this.externalIP);
                 }.bind(this), function(failureExternal) {
                     this.refreshServerInfoAtAddress(this.userEnteredAddress).then(function(successUserEntered) {
-                    this.address = this.userEnteredAddress;
-                    onSuccess();
+                        onSuccess(this.userEnteredAddress);
                     }.bind(this), function(failureUserEntered) {
                         console.log('WARN! Failed to contact host: ' + this.hostname + '\r\n' + this.toString());
                         onFailure();
                     }.bind(this));
                 }.bind(this));
             }.bind(this));
+        }.bind(this));
     },
 
     toString: function() {