Merge branch 'pr/711'
* pr/711: Asset update Move function-specific constants to the top and rename debouncedFcts Improve debounce functionality of REST requests
This commit is contained in:
Jakob Borg
commit
5144330807
File diff suppressed because one or more lines are too long
129
gui/app.js
129
gui/app.js
@ -9,6 +9,9 @@
|
|||||||
|
|
||||||
var syncthing = angular.module('syncthing', ['pascalprecht.translate']);
|
var syncthing = angular.module('syncthing', ['pascalprecht.translate']);
|
||||||
var urlbase = 'rest';
|
var urlbase = 'rest';
|
||||||
|
var requestTimeout = 300000; // Retry the REST request after 5 minutes without reply
|
||||||
|
var refreshTimeout = 5000; // Do not refresh the generic status faster than 5 seconds
|
||||||
|
var refreshQuickTimeout = 500; // Do not refresh the quick stats faster than 500 milliseconds
|
||||||
|
|
||||||
syncthing.config(function ($httpProvider, $translateProvider) {
|
syncthing.config(function ($httpProvider, $translateProvider) {
|
||||||
$httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
|
$httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token';
|
||||||
@ -249,19 +252,19 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
var debouncedFuncs = {};
|
var nextCall = {};
|
||||||
|
|
||||||
function refreshRepo(repo) {
|
function refreshRepo(repo) {
|
||||||
var key = "refreshRepo" + repo;
|
var key = "refreshRepo" + repo;
|
||||||
if (!debouncedFuncs[key]) {
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
debouncedFuncs[key] = debounce(function () {
|
return;
|
||||||
$http.get(urlbase + '/model?repo=' + encodeURIComponent(repo)).success(function (data) {
|
|
||||||
$scope.model[repo] = data;
|
|
||||||
console.log("refreshRepo", repo, data);
|
|
||||||
});
|
|
||||||
}, 1000, true);
|
|
||||||
}
|
}
|
||||||
debouncedFuncs[key]();
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
|
$http.get(urlbase + '/model?repo=' + encodeURIComponent(repo)).success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshTimeout;
|
||||||
|
$scope.model[repo] = data;
|
||||||
|
console.log("refreshRepo", repo, data);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateLocalConfig(config) {
|
function updateLocalConfig(config) {
|
||||||
@ -292,7 +295,13 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
}
|
}
|
||||||
|
|
||||||
function refreshSystem() {
|
function refreshSystem() {
|
||||||
|
var key = "refreshSystem"
|
||||||
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
$http.get(urlbase + '/system').success(function (data) {
|
$http.get(urlbase + '/system').success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshQuickTimeout;
|
||||||
$scope.myID = data.myID;
|
$scope.myID = data.myID;
|
||||||
$scope.system = data;
|
$scope.system = data;
|
||||||
console.log("refreshSystem", data);
|
console.log("refreshSystem", data);
|
||||||
@ -305,34 +314,40 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
}
|
}
|
||||||
|
|
||||||
var key = "refreshCompletion" + node + repo;
|
var key = "refreshCompletion" + node + repo;
|
||||||
if (!debouncedFuncs[key]) {
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
debouncedFuncs[key] = debounce(function () {
|
return;
|
||||||
$http.get(urlbase + '/completion?node=' + node + '&repo=' + encodeURIComponent(repo)).success(function (data) {
|
|
||||||
if (!$scope.completion[node]) {
|
|
||||||
$scope.completion[node] = {};
|
|
||||||
}
|
|
||||||
$scope.completion[node][repo] = data.completion;
|
|
||||||
|
|
||||||
var tot = 0,
|
|
||||||
cnt = 0;
|
|
||||||
for (var cmp in $scope.completion[node]) {
|
|
||||||
if (cmp === "_total") {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
tot += $scope.completion[node][cmp];
|
|
||||||
cnt += 1;
|
|
||||||
}
|
|
||||||
$scope.completion[node]._total = tot / cnt;
|
|
||||||
|
|
||||||
console.log("refreshCompletion", node, repo, $scope.completion[node]);
|
|
||||||
});
|
|
||||||
}, 1000, true);
|
|
||||||
}
|
}
|
||||||
debouncedFuncs[key]();
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
|
$http.get(urlbase + '/completion?node=' + node + '&repo=' + encodeURIComponent(repo)).success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshTimeout;
|
||||||
|
if (!$scope.completion[node]) {
|
||||||
|
$scope.completion[node] = {};
|
||||||
|
}
|
||||||
|
$scope.completion[node][repo] = data.completion;
|
||||||
|
|
||||||
|
var tot = 0,
|
||||||
|
cnt = 0;
|
||||||
|
for (var cmp in $scope.completion[node]) {
|
||||||
|
if (cmp === "_total") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
tot += $scope.completion[node][cmp];
|
||||||
|
cnt += 1;
|
||||||
|
}
|
||||||
|
$scope.completion[node]._total = tot / cnt;
|
||||||
|
|
||||||
|
console.log("refreshCompletion", node, repo, $scope.completion[node]);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function refreshConnectionStats() {
|
function refreshConnectionStats() {
|
||||||
|
var key = "refreshConnectionStats"
|
||||||
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
$http.get(urlbase + '/connections').success(function (data) {
|
$http.get(urlbase + '/connections').success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshQuickTimeout;
|
||||||
var now = Date.now(),
|
var now = Date.now(),
|
||||||
td = (now - prevDate) / 1000,
|
td = (now - prevDate) / 1000,
|
||||||
id;
|
id;
|
||||||
@ -356,7 +371,13 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
}
|
}
|
||||||
|
|
||||||
function refreshErrors() {
|
function refreshErrors() {
|
||||||
|
var key = "refreshErrors"
|
||||||
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
$http.get(urlbase + '/errors').success(function (data) {
|
$http.get(urlbase + '/errors').success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshQuickTimeout;
|
||||||
$scope.errors = data.errors;
|
$scope.errors = data.errors;
|
||||||
console.log("refreshErrors", data);
|
console.log("refreshErrors", data);
|
||||||
});
|
});
|
||||||
@ -373,8 +394,14 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
var refreshNodeStats = debounce(function () {
|
var refreshNodeStats = function () {
|
||||||
|
var key = "refreshNode";
|
||||||
|
if (nextCall[key] && nextCall[key] > Date.now()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
nextCall[key] = Date.now() + requestTimeout;
|
||||||
$http.get(urlbase + "/stats/node").success(function (data) {
|
$http.get(urlbase + "/stats/node").success(function (data) {
|
||||||
|
nextCall[key] = Date.now() + refreshTimeout;
|
||||||
$scope.stats = data;
|
$scope.stats = data;
|
||||||
for (var node in $scope.stats) {
|
for (var node in $scope.stats) {
|
||||||
$scope.stats[node].LastSeen = new Date($scope.stats[node].LastSeen);
|
$scope.stats[node].LastSeen = new Date($scope.stats[node].LastSeen);
|
||||||
@ -382,7 +409,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
|||||||
}
|
}
|
||||||
console.log("refreshNodeStats", data);
|
console.log("refreshNodeStats", data);
|
||||||
});
|
});
|
||||||
}, 500);
|
}
|
||||||
|
|
||||||
$scope.init = function () {
|
$scope.init = function () {
|
||||||
refreshSystem();
|
refreshSystem();
|
||||||
@ -995,40 +1022,6 @@ function isEmptyObject(obj) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function debounce(func, wait) {
|
|
||||||
var timeout, args, context, timestamp, result, again;
|
|
||||||
|
|
||||||
var later = function () {
|
|
||||||
var last = Date.now() - timestamp;
|
|
||||||
if (last < wait) {
|
|
||||||
timeout = setTimeout(later, wait - last);
|
|
||||||
} else {
|
|
||||||
timeout = null;
|
|
||||||
if (again) {
|
|
||||||
again = false;
|
|
||||||
result = func.apply(context, args);
|
|
||||||
context = args = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return function () {
|
|
||||||
context = this;
|
|
||||||
args = arguments;
|
|
||||||
timestamp = Date.now();
|
|
||||||
var callNow = !timeout;
|
|
||||||
if (!timeout) {
|
|
||||||
timeout = setTimeout(later, wait);
|
|
||||||
result = func.apply(context, args);
|
|
||||||
context = args = null;
|
|
||||||
} else {
|
|
||||||
again = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
syncthing.filter('natural', function () {
|
syncthing.filter('natural', function () {
|
||||||
return function (input, valid) {
|
return function (input, valid) {
|
||||||
return input.toFixed(decimals(input, valid));
|
return input.toFixed(decimals(input, valid));
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user