made rpc error handling more robust

This commit is contained in:
hamza zia 2014-05-31 20:42:09 +08:00
parent 3d6df1d5f5
commit 58d9221aa5
3 changed files with 28 additions and 12 deletions

View File

@ -12,11 +12,20 @@ angular.module('webui.ctrls.alert', [
alerts.addAlerter(function(msg, type) { alerts.addAlerter(function(msg, type) {
type = type || 'warning'; type = type || 'warning';
var obj = { msg: sce.trustAsHtml(msg), type: type }; var obj = { msg: sce.trustAsHtml(msg), type: type };
scope.pendingAlerts = _.filter(scope.pendingAlerts, function(al) {
return !al.expired;
});
scope.pendingAlerts.push(obj); scope.pendingAlerts.push(obj);
setTimeout(function() { setTimeout(function() {
var ind = scope.pendingAlerts.indexOf(obj); var ind = scope.pendingAlerts.indexOf(obj);
if (ind != -1) scope.removeAlert(ind); if (ind != -1) {
scope.pendingAlerts[ind].expired = true;
// only remove if more notifications are pending in the pipeline
if (scope.pendingAlerts.length > 1)
scope.removeAlert(ind);
}
}, type == "error" ? 10000 : 3000); }, type == "error" ? 10000 : 3000);
scope.$digest(); scope.$digest();

View File

@ -28,7 +28,7 @@ function(syscall, time, alerts, utils, rootScope, uri) {
var cookieConf = utils.getCookie('aria2conf'); var cookieConf = utils.getCookie('aria2conf');
// try at the end, so that it is not overwridden in case it doesnt work // try at the end, so that it is not overwridden in case it doesnt work
if (cookieConf) configurations.push(cookieConf); if (cookieConf) configurations.unshift(cookieConf);
// update is implemented such that // update is implemented such that
// only one syscall at max is ongoing // only one syscall at max is ongoing
@ -49,7 +49,7 @@ function(syscall, time, alerts, utils, rootScope, uri) {
} }
if (configurations.length) { if (configurations.length) {
currentConf = configurations.shift(); currentConf = configurations[0];
if (currentConf && currentConf.auth && currentConf.auth.token) { if (currentConf && currentConf.auth && currentConf.auth.token) {
currentToken = currentConf.auth.token; currentToken = currentConf.auth.token;
} }
@ -71,14 +71,17 @@ function(syscall, time, alerts, utils, rootScope, uri) {
}); });
var error = function() { var error = function() {
var ind = configurations.indexOf(currentConf);
if (ind != -1) configurations.splice(ind, 1);
// If some proposed configurations are still in the pipeline then retry // If some proposed configurations are still in the pipeline then retry
if (configurations.length) { if (configurations.length) {
alerts.log("The last connection attempt was unsuccessful. Trying another configuration"); alerts.log("The last connection attempt was unsuccessful. Trying another configuration");
timeout = setTimeout(update, 0); timeout = setTimeout(update, 0);
} }
else { else {
alerts.addAlert('<strong>Oh Snap!</strong> Could not connect to the aria2 RPC server. Will retry in ' + time / 1000 + ' secs. You might want to check the connection settings by going to Settings > Connection Settings', 'error'); alerts.addAlert('<strong>Oh Snap!</strong> Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings', 'error');
timeout = setTimeout(update, time); timeout = setTimeout(update, 10000);
} }
}; };
@ -86,19 +89,20 @@ function(syscall, time, alerts, utils, rootScope, uri) {
name: 'system.multicall', name: 'system.multicall',
params: [params], params: [params],
success: function(data) { success: function(data) {
var failed = _.any(data.result, function(d) { var failed = _.any(data.result, function(d) {
return d.code && d.message === "Unauthorized"; return d.code && d.message === "Unauthorized";
}); });
if (failed) { if (failed) {
error(); alerts.addAlert('<strong>Oh Snap!</strong> Authentication failed while connecting to Aria2 RPC server. Will retry in 10 secs. You might want to confirm your authentication details by going to Settings > Connection Settings', 'error');
timeout = setTimeout(update, 10000);
return; return;
} }
if (configurations.length) { if (configurations.length) {
// configuration worked, save it in cookie for next time and // configuration worked, save it in cookie for next time and
// delete the pipelined configurations!! // delete the pipelined configurations!!
alerts.log('Success alas! Saving the current configuration…'); alerts.addAlert('Successfully connected to Aria2 through its remote RPC…', 'success');
configurations = []; configurations = [];
} }
@ -147,12 +151,17 @@ function(syscall, time, alerts, utils, rootScope, uri) {
// each one will be tried one after the other till success, // each one will be tried one after the other till success,
// for all options for one conf read rpc/syscall.js // for all options for one conf read rpc/syscall.js
configure: function(conf) { configure: function(conf) {
alerts.addAlert('Successfully changed aria2 connection configuration', 'success'); alerts.addAlert('Trying to connect to aria2 using the new connection configuration', 'info');
if (conf instanceof Array) if (conf instanceof Array)
configurations = conf; configurations = conf;
else else
configurations = [conf]; configurations = [conf];
if (timeout) {
clearTimeout(timeout);
timeout = setTimeout(update, 0);
}
}, },
// get current configuration being used // get current configuration being used

View File

@ -28,8 +28,7 @@ function(_, JSON, name, utils, alerts) {
_.each(sockRPC.handles, function(h) { h.error() }); _.each(sockRPC.handles, function(h) { h.error() });
sockRPC.handles = []; sockRPC.handles = [];
sockRPC.initialized = false; sockRPC.initialized = false;
alerts.log('Cannot talk to aria2 over WebSockets! Switching to regular HTTP requests…'); alerts.log('Cannot talk to aria2 over WebSockets. Switching to regular HTTP requests…');
}, },
onclose: function(ev) { onclose: function(ev) {
if (sockRPC.handles && sockRPC.handles.length) if (sockRPC.handles && sockRPC.handles.length)
@ -39,7 +38,6 @@ function(_, JSON, name, utils, alerts) {
// when connection opens // when connection opens
onopen: function() { onopen: function() {
alerts.addAlert('Successfully connected to aria2 over a WebSocket!', 'success');
sockRPC.initialized = true; sockRPC.initialized = true;
}, },