Add timeouts, deal with overlapping markers, add a table, increase circle radiuses

cmd/strelaypoolsrv/auto/gui.go

@@ -5,12 +5,12 @@ import (
 )
 
 const (
-	AssetsBuildDate = "Sun, 22 Nov 2015 14:10:01 GMT"
+	AssetsBuildDate = "Sun, 22 Nov 2015 22:45:35 GMT"
 )
 
 func Assets() map[string][]byte {
 	var assets = make(map[string][]byte, 1)
 
-	assets["index.html"], _ = base64.StdEncoding.DecodeString("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")
+	assets["index.html"], _ = base64.StdEncoding.DecodeString("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")
 	return assets
 }

cmd/strelaypoolsrv/gui/index.html

@@ -18,6 +18,14 @@
       .ng-cloak {
         display: none;
       }
+      table {
+        font-size: 11px;
+        width: 100%;
+        border: 1px;
+      }
+      tfoot td {
+        font-weight: bold;
+      }
     </style>
   </head>
 
@@ -34,23 +42,67 @@
           <p>
             Currently {{ relays.length }} relays online ({{ totals.goMaxProcs }} cores in total).
           </p>
-          <p>
-            So far {{ totals.bytesProxied | bytes }} proxied.
-            Currently {{ totals.numActiveSessions }} active sessions, with {{ totals.numConnections }} clients online.
-          </p>
-          <p>
-            Average rates in last
-            <span>10s: {{ totals.kbps10s1m5m15m30m60m[0] * 128 | bytes }}/s</span>
-            <span>1m: {{ totals.kbps10s1m5m15m30m60m[1] * 128 | bytes }}/s</span>
-            <span>5m: {{ totals.kbps10s1m5m15m30m60m[2] * 128 | bytes }}/s</span>
-            <span>15m: {{ totals.kbps10s1m5m15m30m60m[3] * 128 | bytes }}/s</span>
-            <span>30m: {{ totals.kbps10s1m5m15m30m60m[4] * 128 | bytes }}/s</span>
-            <span>1h: {{ totals.kbps10s1m5m15m30m60m[5] * 128 | bytes }}/s</span>
-          </p>
         </div>
         <div id="map"></div> <!-- Can't hide the map, otherwise it freaks out -->
         <p ng-show="started" class="ng-hide">The circle size represents how much bytes the relay transfered relative to other relays</p>
       </div>
+      <div ng-show="started" class="ng-hide">
+        <table>
+          <thead>
+            <tr>
+              <th colspan="4"></th>
+              <th colspan="6"">Transfer rate in the last period (per second)</th>
+              <th colspan="2"></th>
+            <tr/>
+            <tr>
+              <th>Address</th>
+              <th>Active Sessions</th>
+              <th>Connections</th>
+              <th>Data proxied</th>
+              <th>10s</th>
+              <th>1m</th>
+              <th>5m</th>
+              <th>15m</th>
+              <th>30m</th>
+              <th>60m</th>
+              <th>Uptime</th>
+              <th>Provided by</th>
+          </thead>
+          <tbody>
+            <tr ng-repeat="relay in relays">
+              <td>{{ relay.url.split('/')[2] }}</td>
+              <td>{{ status[relay.url].numActiveSessions }}</td>
+              <td>{{ status[relay.url].numConnections }}</td>
+              <td>{{ status[relay.url].bytesProxied | bytes }}</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[0] * 128 | bytes }}/s</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[1] * 128 | bytes }}/s</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[2] * 128 | bytes }}/s</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[3] * 128 | bytes }}/s</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[4] * 128 | bytes }}/s</td>
+              <td>{{ status[relay.url].kbps10s1m5m15m30m60m[5] * 128 | bytes }}/s</td>
+              <td ng-if="status[relay.url].uptimeSeconds != undefined">{{ status[relay.url].uptimeSeconds/60/60 | number:0 }} hours</td>
+              <td ng-if="status[relay.url].uptimeSeconds == undefined"></td>
+              <td>{{ status[relay.url].options['provided-by'] || '' }}</td>
+            </tr>
+          </tbody>
+          <tfoot>
+            <tr>
+              <td>Totals</td>
+              <td>{{ totals.numActiveSessions }}</td>
+              <td>{{ totals.numConnections }}</td>
+              <td>{{ totals.bytesProxied | bytes }}</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[0] * 128 | bytes }}/s</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[1] * 128 | bytes }}/s</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[2] * 128 | bytes }}/s</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[3] * 128 | bytes }}/s</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[4] * 128 | bytes }}/s</td>
+              <td>{{ totals.kbps10s1m5m15m30m60m[5] * 128 | bytes }}/s</td>
+              <td>{{ totals.uptimeSeconds/60/60 | number:0 }} hours</td>
+              <td></td>
+            </tr>
+          </tfoor>
+        </table>
+      </div>
     </div>
 
 
@@ -63,6 +115,9 @@
   <script>
   angular.module('syncthing', [
   ])
+  .config(function($httpProvider) {
+    $httpProvider.defaults.timeout = 5000;
+  })
   .filter('bytes', function() {
     return function(bytes, precision) {
       if (isNaN(parseFloat(bytes)) || !isFinite(bytes)) return '-';
@@ -84,7 +139,7 @@
       return value.toFixed(precision) + ' ' + units;
     }
   })
-  .controller('relayDataController', ['$scope', '$rootScope', '$http', '$q', '$compile', function($scope, $rootScope, $http, $q, $compile) {
+  .controller('relayDataController', ['$scope', '$rootScope', '$http', '$q', '$compile', '$timeout', function($scope, $rootScope, $http, $q, $compile, $timeout) {
     $scope.started = false;
     $scope.geoip = {};
     $scope.status = {};
@@ -98,8 +153,11 @@
       numConnections: 0,
       numPendingSessionKeys: 0,
       numProxies: 0,
+      uptimeSeconds: 0,
     };
 
+    var usedLocs = {};
+
     function initProgress(name) {
       $scope.progress.push({name: name, done: false});
     }
@@ -154,7 +212,12 @@
         var resolveStatus = $q.defer();
 
         initProgress("Getting relay status for " + uri.hostname);
-        $http.get("http://" + uri.hostname + (uri.args.statusAddr || ":22070") + "/status").then(function (response) {
+
+        // Normal timeout doesn't deal with relays which accept the TCP connection
+        // but don't respond (some firewalls do that), so deal with it this way.
+        var timeoutRequest = $q.defer();
+
+        $http.get("http://" + uri.hostname + (uri.args.statusAddr || ":22070") + "/status", { timeout: timeoutRequest.promise }).then(function (response) {
           progressDone("Getting relay status for " + uri.hostname);
           $scope.status[relay.url] = response.data;
           angular.forEach($scope.totals, function(value, key) {
@@ -173,6 +236,10 @@
           resolveStatus.resolve(response.data);
         });
 
+        $timeout(function() {
+          timeoutRequest.resolve();
+        }, 5000);
+
         promises.push(resolveStatus.promise);
       });
 
@@ -183,6 +250,17 @@
         angular.forEach($scope.relays, function(relay) {
           var scope = $rootScope.$new(true);
           var geoip = $scope.geoip[relay.url];
+
+          // Deal with overlapping markers
+          while (geoip.loc in usedLocs) {
+            var locParts = geoip.loc.split(',');
+            locParts = [parseFloat(locParts[0]), parseFloat(locParts[1])];
+            locParts[Math.round(Math.random())] += 0.5 * (Math.random() >= 0.5 ? 1 : -1);
+            geoip.loc = locParts.join(',');
+          }
+
+          usedLocs[geoip.loc] = true;
+
           var locParts = geoip.loc.split(',');
           var position = new google.maps.LatLng(locParts[0], locParts[1]);
 
@@ -206,7 +284,7 @@
               fillOpacity: 0.35,
               map: map,
               center: position,
-              radius: ((scope.status.bytesProxied * 100) / $scope.totals.bytesProxied) * 5000
+              radius: ((scope.status.bytesProxied * 100) / $scope.totals.bytesProxied) * 10000
             });
           }
 
@@ -223,12 +301,6 @@
             marker.info.close();
           });
 
-          marker.addListener('click', function() {
-            if (scope.status) {
-              window.open("http://" + scope.uri.hostname + (scope.uri.args.statusAddr || ":22070") + "/status", "_blank");
-            }
-          });
-
           bounds.extend(marker.position);
         });