kosmos/lndhub
8
0
Fork 0
Code Issues Pull Requests Releases Activity

FIX: more logging, more error handling

Browse Source
This commit is contained in:
Overtorment 2019-01-05 22:01:50 +00:00
parent 6a3de700f4
commit b3c0873e4c
2 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/api.js
View File

@ -2,6 +2,7 @@ import { User } from '../class/User';
const config = require('../config');
let express = require('express');
let router = express.Router();
let logger = require('../utils/logger');
console.log('using config', JSON.stringify(config));
var Redis = require('ioredis');
@ -53,6 +54,7 @@ redis.info(function(err, info) {
// ######################## ROUTES ########################
router.post('/create', async function(req, res) {
logger.log('/create', [req.id]);
if (!(req.body.partnerid && req.body.partnerid === 'bluewallet' && req.body.accounttype)) return errorBadArguments(res);
let u = new User(redis);
@ -62,6 +64,7 @@ router.post('/create', async function(req, res) {
});
router.post('/auth', async function(req, res) {
logger.log('/auth', [req.id]);
if (!((req.body.login && req.body.password) || req.body.refresh_token)) return errorBadArguments(res);
let u = new User(redis);
@ -82,6 +85,7 @@ router.post('/auth', async function(req, res) {
});
router.post('/addinvoice', async function(req, res) {
logger.log('/addinvoice', [req.id]);
let u = new User(redis);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -100,6 +104,7 @@ router.post('/addinvoice', async function(req, res) {
});
router.post('/payinvoice', async function(req, res) {
logger.log('/payinvoice', [req.id]);
let u = new User(redis);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -174,6 +179,7 @@ router.post('/payinvoice', async function(req, res) {
});
router.get('/getbtc', async function(req, res) {
logger.log('/getbtc', [req.id]);
let u = new User(redis, bitcoinclient, lightning);
await u.loadByAuthorization(req.headers.authorization);
@ -191,6 +197,7 @@ router.get('/getbtc', async function(req, res) {
});
router.get('/balance', async function(req, res) {
logger.log('/balance', [req.id]);
let u = new User(redis, bitcoinclient, lightning);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -203,6 +210,7 @@ router.get('/balance', async function(req, res) {
});
router.get('/getinfo', async function(req, res) {
logger.log('/getinfo', [req.id]);
let u = new User(redis);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -215,6 +223,7 @@ router.get('/getinfo', async function(req, res) {
});
router.get('/gettxs', async function(req, res) {
logger.log('/gettxs', [req.id]);
let u = new User(redis, bitcoinclient, lightning);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -232,6 +241,7 @@ router.get('/gettxs', async function(req, res) {
});
router.get('/getuserinvoices', async function(req, res) {
logger.log('/getuserinvoices', [req.id]);
let u = new User(redis, bitcoinclient, lightning);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -247,6 +257,7 @@ router.get('/getuserinvoices', async function(req, res) {
});
router.get('/getpending', async function(req, res) {
logger.log('/getpending', [req.id]);
let u = new User(redis, bitcoinclient, lightning);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -259,6 +270,7 @@ router.get('/getpending', async function(req, res) {
});
router.get('/decodeinvoice', async function(req, res) {
logger.log('/decodeinvoice', [req.id]);
let u = new User(redis, bitcoinclient);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);
@ -273,6 +285,7 @@ router.get('/decodeinvoice', async function(req, res) {
});
router.get('/checkrouteinvoice', async function(req, res) {
logger.log('/checkrouteinvoice', [req.id]);
let u = new User(redis, bitcoinclient);
if (!(await u.loadByAuthorization(req.headers.authorization))) {
return errorBadAuth(res);

70
controllers/website.js
View File

@ -3,43 +3,47 @@ let router = express.Router();
let fs = require('fs');
let mustache = require('mustache');
let lightning = require('../lightning');
let logger = require('../utils/logger');
let lightningGetInfo = {};
let lightningListChannels = {};
function updateLightning() {
lightning.getInfo({}, function(err, info) {
if (err) {
console.error('lnd failure');
process.exit(3);
}
lightningGetInfo = info;
});
lightning.listChannels({}, function(err, response) {
if (err) {
console.error('lnd failure');
process.exit(3);
}
lightningListChannels = response;
let channels = [];
for (let channel of lightningListChannels.channels) {
let divider = 524287;
let ascii_length1 = channel.local_balance / divider;
let ascii_length2 = channel.remote_balance / divider;
channel.ascii = '[';
channel.ascii += '-'.repeat(Math.round(ascii_length1));
channel.ascii += '/' + '-'.repeat(Math.round(ascii_length2));
channel.ascii += ']';
channel.capacity_btc = channel.capacity / 100000000;
channel.name = pubkey2name[channel.remote_pubkey];
if (channel.name) {
channels.unshift(channel);
} else {
channels.push(channel);
console.log('updateLightning()');
try {
lightning.getInfo({}, function(err, info) {
if (err) {
console.error('lnd failure');
}
}
lightningListChannels.channels = channels;
});
lightningGetInfo = info;
});
lightning.listChannels({}, function(err, response) {
if (err) {
console.error('lnd failure');
}
lightningListChannels = response;
let channels = [];
for (let channel of lightningListChannels.channels) {
let divider = 524287;
let ascii_length1 = channel.local_balance / divider;
let ascii_length2 = channel.remote_balance / divider;
channel.ascii = '[';
channel.ascii += '-'.repeat(Math.round(ascii_length1));
channel.ascii += '/' + '-'.repeat(Math.round(ascii_length2));
channel.ascii += ']';
channel.capacity_btc = channel.capacity / 100000000;
channel.name = pubkey2name[channel.remote_pubkey];
if (channel.name) {
channels.unshift(channel);
} else {
channels.push(channel);
}
}
lightningListChannels.channels = channels;
});
} catch (Err) {
console.log(Err);
}
}
updateLightning();
setInterval(updateLightning, 60000);
@ -59,6 +63,7 @@ const pubkey2name = {
};
router.get('/', function(req, res) {
logger.log('/', [req.id]);
if (!lightningGetInfo) {
console.error('lnd failure');
process.exit(3);
@ -69,6 +74,7 @@ router.get('/', function(req, res) {
});
router.get('/about', function(req, res) {
logger.log('/about', [req.id]);
let html = fs.readFileSync('./templates/about.html').toString('utf8');
res.setHeader('Content-Type', 'text/html');
return res.status(200).send(mustache.render(html, {}));