lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix json-rpc issue

Browse source
This commit is contained in:
Josh Harvey 2018-07-16 17:00:09 +03:00
parent 0c893f5b22
commit dcef083d49
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dev/json-rpc.js
View file

@ -1,19 +1,19 @@
const rpc = require('../lib/plugins/common/json-rpc') const rpc = require('../lib/plugins/common/json-rpc')
const method = ''
// const url = null
// const url = 'https://httpstat.us/500'
// const url = 'https://httpstat.us/400'
const url = 'https://httpstat.us/200'
const account = { const account = {
username: 'test', username: 'test',
password: 'test', password: 'test',
port: 8080 port: 8080,
url
} }
const method = {} rpc.fetch(account, method)
const params = {
// url: 'https://httpstat.us/500'
// url: 'https://httpstat.us/400'
// url: 'https://httpstat.us/200'
}
rpc.fetch(account, method, params)
.then(res => console.log('got result', res)) .then(res => console.log('got result', res))
.catch(err => console.error('gor error', err)) .catch(err => console.error('gor error', err))

12
lib/plugins/common/json-rpc.js
View file

@ -6,7 +6,9 @@ const _ = require('lodash/fp')
module.exports = {fetch, parseConf} module.exports = {fetch, parseConf}
function fetch (account = {}, method = {}, params = {}) { function fetch (account = {}, method, params) {
params = _.defaultTo([], params)
return Promise.resolve(true) return Promise.resolve(true)
.then(() => { .then(() => {
const data = { const data = {
@ -16,8 +18,8 @@ function fetch (account = {}, method = {}, params = {}) {
} }
if (_.isNil(account.port)) throw new Error('port attribute required for jsonRpc') if (_.isNil(account.port)) throw new Error('port attribute required for jsonRpc')
const url = _.defaultTo(`http://localhost:${account.port}`, params.url) const url = _.defaultTo(`http://localhost:${account.port}`, account.url)
return axios({ return axios({
method: 'post', method: 'post',
@ -33,8 +35,8 @@ function fetch (account = {}, method = {}, params = {}) {
.catch(err => { .catch(err => {
throw new Error(_.join(' ', [ throw new Error(_.join(' ', [
'json-rpc::axios error:', 'json-rpc::axios error:',
_.get('message', err, ''), JSON.stringify(_.get('message', err, '')),
_.get('response.data.error', err, '') JSON.stringify(_.get('response.data.error', err, ''))
])) ]))
}) })
} }