diff --git a/api/utils/nodeinfo.ts b/api/utils/nodeinfo.ts index ac36b06..5e072eb 100644 --- a/api/utils/nodeinfo.ts +++ b/api/utils/nodeinfo.ts @@ -22,55 +22,59 @@ function nodeinfo(){ const clean = await isClean() - lightning.channelBalance({}, (err, channelBalance) => { - if(err) console.log(err) - // const { balance, pending_open_balance } = channelBalance - lightning.listChannels({}, (err, channelList) => { + try { + lightning.channelBalance({}, (err, channelBalance) => { if(err) console.log(err) - const { channels } = channelList + // const { balance, pending_open_balance } = channelBalance + lightning.listChannels({}, (err, channelList) => { + if(err) console.log(err) + const { channels } = channelList - const localBalances = channels.map(c => c.local_balance) - const remoteBalances = channels.map(c => c.remote_balance) - const largestLocalBalance = Math.max(...localBalances) - const largestRemoteBalance = Math.max(...remoteBalances) - const totalLocalBalance = localBalances.reduce((a, b) => parseInt(a) + parseInt(b), 0) + const localBalances = channels.map(c => c.local_balance) + const remoteBalances = channels.map(c => c.remote_balance) + const largestLocalBalance = Math.max(...localBalances) + const largestRemoteBalance = Math.max(...remoteBalances) + const totalLocalBalance = localBalances.reduce((a, b) => parseInt(a) + parseInt(b), 0) - lightning.pendingChannels({}, (err, pendingChannels) => { - if(err) console.log(err) - lightning.getInfo({}, (err, info) => { + lightning.pendingChannels({}, (err, pendingChannels) => { if(err) console.log(err) - if(!err && info){ - const node = { - node_alias: process.env.NODE_ALIAS, - ip: process.env.NODE_IP, - relay_commit: commitHash, - public_ip: public_ip, - pubkey: owner.publicKey, - number_channels: channels.length, - number_active_channels: info.num_active_channels, - number_pending_channels: info.num_pending_channels, - number_peers: info.num_peers, - largest_local_balance: largestLocalBalance, - largest_remote_balance: largestRemoteBalance, - total_local_balance: totalLocalBalance, - lnd_version: info.version, - relay_version: tag, - payment_channel: '', // ? - hosting_provider: '', // ? - open_channel_data: channels, - pending_channel_data: pendingChannels, - synced_to_chain: info.synced_to_chain, - synced_to_graph: info.synced_to_graph, - best_header_timestamp: info.best_header_timestamp, - testnet: info.testnet, - clean, + lightning.getInfo({}, (err, info) => { + if(err) console.log(err) + if(!err && info){ + const node = { + node_alias: process.env.NODE_ALIAS, + ip: process.env.NODE_IP, + relay_commit: commitHash, + public_ip: public_ip, + pubkey: owner.publicKey, + number_channels: channels.length, + number_active_channels: info.num_active_channels, + number_pending_channels: info.num_pending_channels, + number_peers: info.num_peers, + largest_local_balance: largestLocalBalance, + largest_remote_balance: largestRemoteBalance, + total_local_balance: totalLocalBalance, + lnd_version: info.version, + relay_version: tag, + payment_channel: '', // ? + hosting_provider: '', // ? + open_channel_data: channels, + pending_channel_data: pendingChannels, + synced_to_chain: info.synced_to_chain, + synced_to_graph: info.synced_to_graph, + best_header_timestamp: info.best_header_timestamp, + testnet: info.testnet, + clean, + } + resolve(node) } - resolve(node) - } + }) }) }) - }) - }); + }); + } catch(e){ + console.log('=>',e) + } }) } diff --git a/dist/api/utils/nodeinfo.js b/dist/api/utils/nodeinfo.js index 7e505eb..2362a4e 100644 --- a/dist/api/utils/nodeinfo.js +++ b/dist/api/utils/nodeinfo.js @@ -27,57 +27,62 @@ function nodeinfo() { const lightning = lightning_1.loadLightning(); const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); const clean = yield isClean(); - lightning.channelBalance({}, (err, channelBalance) => { - if (err) - console.log(err); - // const { balance, pending_open_balance } = channelBalance - lightning.listChannels({}, (err, channelList) => { + try { + lightning.channelBalance({}, (err, channelBalance) => { if (err) console.log(err); - const { channels } = channelList; - const localBalances = channels.map(c => c.local_balance); - const remoteBalances = channels.map(c => c.remote_balance); - const largestLocalBalance = Math.max(...localBalances); - const largestRemoteBalance = Math.max(...remoteBalances); - const totalLocalBalance = localBalances.reduce((a, b) => parseInt(a) + parseInt(b), 0); - lightning.pendingChannels({}, (err, pendingChannels) => { + // const { balance, pending_open_balance } = channelBalance + lightning.listChannels({}, (err, channelList) => { if (err) console.log(err); - lightning.getInfo({}, (err, info) => { + const { channels } = channelList; + const localBalances = channels.map(c => c.local_balance); + const remoteBalances = channels.map(c => c.remote_balance); + const largestLocalBalance = Math.max(...localBalances); + const largestRemoteBalance = Math.max(...remoteBalances); + const totalLocalBalance = localBalances.reduce((a, b) => parseInt(a) + parseInt(b), 0); + lightning.pendingChannels({}, (err, pendingChannels) => { if (err) console.log(err); - if (!err && info) { - const node = { - node_alias: process.env.NODE_ALIAS, - ip: process.env.NODE_IP, - relay_commit: commitHash, - public_ip: public_ip, - pubkey: owner.publicKey, - number_channels: channels.length, - number_active_channels: info.num_active_channels, - number_pending_channels: info.num_pending_channels, - number_peers: info.num_peers, - largest_local_balance: largestLocalBalance, - largest_remote_balance: largestRemoteBalance, - total_local_balance: totalLocalBalance, - lnd_version: info.version, - relay_version: tag, - payment_channel: '', - hosting_provider: '', - open_channel_data: channels, - pending_channel_data: pendingChannels, - synced_to_chain: info.synced_to_chain, - synced_to_graph: info.synced_to_graph, - best_header_timestamp: info.best_header_timestamp, - testnet: info.testnet, - clean, - }; - resolve(node); - } + lightning.getInfo({}, (err, info) => { + if (err) + console.log(err); + if (!err && info) { + const node = { + node_alias: process.env.NODE_ALIAS, + ip: process.env.NODE_IP, + relay_commit: commitHash, + public_ip: public_ip, + pubkey: owner.publicKey, + number_channels: channels.length, + number_active_channels: info.num_active_channels, + number_pending_channels: info.num_pending_channels, + number_peers: info.num_peers, + largest_local_balance: largestLocalBalance, + largest_remote_balance: largestRemoteBalance, + total_local_balance: totalLocalBalance, + lnd_version: info.version, + relay_version: tag, + payment_channel: '', + hosting_provider: '', + open_channel_data: channels, + pending_channel_data: pendingChannels, + synced_to_chain: info.synced_to_chain, + synced_to_graph: info.synced_to_graph, + best_header_timestamp: info.best_header_timestamp, + testnet: info.testnet, + clean, + }; + resolve(node); + } + }); }); }); }); - }); + } + catch (e) { + console.log('=>', e); + } })); } exports.nodeinfo = nodeinfo; diff --git a/dist/api/utils/nodeinfo.js.map b/dist/api/utils/nodeinfo.js.map index bd772d5..7041912 100644 --- a/dist/api/utils/nodeinfo.js.map +++ b/dist/api/utils/nodeinfo.js.map @@ -1 +1 @@ -{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file