simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support requesting rpc service using http protocol

Browse source
This commit is contained in:
MaysWind 2016-05-16 21:28:23 +08:00
parent 38469b607d
commit 671124e3da
6 changed files with 52 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/index.html
View file

@ -185,6 +185,7 @@
<script src="scripts/filters/volumn.js"></script>
<script src="scripts/langs/en-US.js"></script>
<script src="scripts/langs/zh-CN.js"></script>
<script src="scripts/services/aria2HttpRpcService.js"></script>
<script src="scripts/services/aria2RpcService.js"></script>
<script src="scripts/services/aria2WebSocketRpcService.js"></script>
<script src="scripts/services/ariaNgSettingService.js"></script>

1
app/scripts/core/constants.js
View file

@ -6,6 +6,7 @@
appPrefix: 'AriaNg'
}).constant('ariaNgDefaultOptions', {
localeName: 'en-US',
protocol: 'http',
globalStatRefreshInterval: 1000,
downloadTaskRefreshInterval: 1000
}).constant('aria2RpcConstants', {

33
app/scripts/services/aria2HttpRpcService.js Normal file
View file

@ -0,0 +1,33 @@
(function () {
'use strict';
angular.module('ariaNg').factory('aria2HttpRpcService', ['$http', 'ariaNgSettingService', function ($http, ariaNgSettingService) {
var rpcUrl = ariaNgSettingService.getJsonRpcUrl('http');
return {
request: function (context) {
if (!context) {
return;
}
var requestContext = {
url: rpcUrl,
method: 'POST',
data: context.requestBody
};
return $http(requestContext).success(function (data, header, config, status) {
if (!data || !data.result) {
return;
}
if (context.callback) {
context.callback(data.result);
}
}).error(function (data, header, config, status) {
//Do Nothing
});
}
};
}]);
})();

8
app/scripts/services/aria2RpcService.js
View file

@ -1,7 +1,7 @@
(function () {
'use strict';
angular.module('ariaNg').factory('aria2RpcService', ['aria2RpcConstants', 'aria2WebSocketRpcService', 'utils', function (aria2RpcConstants, aria2WebSocketRpcService, utils) {
angular.module('ariaNg').factory('aria2RpcService', ['aria2RpcConstants', 'ariaNgSettingService', 'aria2HttpRpcService', 'aria2WebSocketRpcService', 'utils', function (aria2RpcConstants, ariaNgSettingService, aria2HttpRpcService, aria2WebSocketRpcService, utils) {
var invoke = function (method, context) {
context.uniqueId = utils.generateUniqueId();
context.requestBody = {
@ -11,7 +11,11 @@
params: context.params
};
return aria2WebSocketRpcService.request(context);
if (ariaNgSettingService.getProtocol() == 'ws') {
return aria2WebSocketRpcService.request(context);
} else {
return aria2HttpRpcService.request(context);
}
};
return {

2
app/scripts/services/aria2WebSocketRpcService.js
View file

@ -2,7 +2,7 @@
'use strict';
angular.module('ariaNg').factory('aria2WebSocketRpcService', ['$websocket', 'ariaNgSettingService', function ($websocket, ariaNgSettingService) {
var rpcUrl = ariaNgSettingService.getJsonRpcUrl();
var rpcUrl = ariaNgSettingService.getJsonRpcUrl('ws');
var socketClient = $websocket(rpcUrl);
var sendIdMapping = {};

20
app/scripts/services/ariaNgSettingService.js
View file

@ -29,12 +29,6 @@
};
return {
get: function (key) {
return getOption(key);
},
set: function (key, value) {
return setOption(key, value);
},
getLocaleName: function () {
return getOption('localeName');
},
@ -42,14 +36,20 @@
setOption('localeName', value);
$translate.use(value);
},
getJsonRpcUrl: function () {
getJsonRpcUrl: function (protocol) {
var rpcHost = getOption('aria2RpcHost');
if (!rpcHost) {
rpcHost = $location.$$host + ':6800';
}
return 'ws://' + rpcHost + '/jsonrpc';
return protocol + '://' + rpcHost + '/jsonrpc';
},
getProtocol: function () {
return getOption('protocol');
},
setProtocol: function (value) {
setOption('protocol', value);
},
getGlobalStatRefreshInterval: function () {
return getOption('globalStatRefreshInterval');
@ -59,11 +59,11 @@
},
getDisplayOrder: function () {
var value = getOption('displayOrder');
if (!value) {
value = 'default';
}
return value;
},
setDisplayOrder: function (value) {