aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

fix open channel and sendpayment

Browse source
This commit is contained in:
boufni95 2020-07-30 20:50:44 +02:00
parent c02e8f3016
commit f61efa191f
1 changed files with 59 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/routes.js
View file

@ -1193,25 +1193,38 @@ module.exports = async (
sat_per_byte:satPerByte, sat_per_byte:satPerByte,
}; };
logger.info("OpenChannelRequest", openChannelRequest); logger.info("OpenChannelRequest", openChannelRequest);
let finalEvent = null //Object to send to the socket, depends on final event from the stream
const openedChannel = lightning.openChannel(openChannelRequest); const openedChannel = lightning.openChannel(openChannelRequest);
// only emits one event
openedChannel.on("data", response => { openedChannel.on("data", response => {
logger.debug("OpenChannelRequest:", response); logger.debug("OpenChannelRequest:", response);
if (!res.headersSent) { if(res.headersSent){//if res was already sent
if(response.update === 'chan_open'){
finalEvent = {status:'chan_open'}
}
} else {
res.json(response); res.json(response);
} }
}); });
openedChannel.on("error", async err => { openedChannel.on("error", async err => {
logger.info("OpenChannelRequest Error:", err); logger.info("OpenChannelRequest Error:", err);
if(res.headersSent){
finalEvent = {error:err.details}//send error on socket if http has already finished
} else {
const health = await checkHealth(); const health = await checkHealth();
if (health.LNDStatus.success && !res.headersSent) { if (health.LNDStatus.success) {
res.status(500).json({ field: "openChannelRequest", errorMessage: sanitizeLNDError(err.message) }); res.status(500).json({ field: "openChannelRequest", errorMessage: sanitizeLNDError(err.details) });
} else if (!res.headersSent) { } else if (!res.headersSent) {
res.status(500); res.status(500);
res.json({ errorMessage: "LND is down" }); res.json({ errorMessage: "LND is down" });
} }
}
}); });
openedChannel.write(openChannelRequest) openedChannel.on('end',()=> {
if(finalEvent !== null){//send the last event got from the stream
//TO DO send finalEvent on socket
}
})
}); });
// closechannel // closechannel
@ -1261,7 +1274,11 @@ module.exports = async (
// this is the recommended value from lightning labs // this is the recommended value from lightning labs
const { maxParts = 3, payreq } = req.body; const { maxParts = 3, payreq } = req.body;
const paymentRequest = { payment_request: payreq, max_parts: maxParts }; const paymentRequest = {
payment_request: payreq,
max_parts: maxParts,
timeout_seconds:5
};
if (req.body.amt) { if (req.body.amt) {
paymentRequest.amt = req.body.amt; paymentRequest.amt = req.body.amt;
@ -1269,18 +1286,24 @@ module.exports = async (
logger.info("Sending payment", paymentRequest); logger.info("Sending payment", paymentRequest);
const sentPayment = router.sendPaymentV2(paymentRequest); const sentPayment = router.sendPaymentV2(paymentRequest);
let finalEvent = null //Object to send to the socket, depends on final event from the stream
// only emits one event
sentPayment.on("data", response => { sentPayment.on("data", response => {
if (response.payment_error) { if(res.headersSent){//if res was already sent
if(response.failure_reason !== 'FAILURE_REASON_NONE'){//if the operation failed
finalEvent = {error:response.failure_reason}
} else {
finalEvent = {status:response.status}
}
} else {
if (response.failure_reason !== 'FAILURE_REASON_NONE') {
logger.error("SendPayment Info:", response) logger.error("SendPayment Info:", response)
return res.status(500).json({ return res.status(500).json({
errorMessage: response.payment_error errorMessage: response.failure_reason
}); });
} }
logger.info("SendPayment Data:", response); logger.info("SendPayment Data:", response);
return res.json(response); return res.json(response);
}
}); });
sentPayment.on("status", status => { sentPayment.on("status", status => {
@ -1289,18 +1312,25 @@ module.exports = async (
sentPayment.on("error", async err => { sentPayment.on("error", async err => {
logger.error("SendPayment Error:", err); logger.error("SendPayment Error:", err);
if(res.headersSent){
finalEvent = {error:err.details}//send error on socket if http has already finished
} else {
const health = await checkHealth(); const health = await checkHealth();
if (health.LNDStatus.success) { if (health.LNDStatus.success) {
res.status(500).json({ res.status(500).json({
errorMessage: sanitizeLNDError(err.message) errorMessage: sanitizeLNDError(err.details)
}); });
} else { } else {
res.status(500); res.status(500);
res.json({ errorMessage: "LND is down" }); res.json({ errorMessage: "LND is down" });
} }
}
}); });
sentPayment.on('end',()=>{
sentPayment.write(paymentRequest); if(finalEvent !== null){//send the last event got from the stream
//TO DO send finalEvent on socket
}
})
}); });
app.post("/api/lnd/trackpayment", (req, res) => { app.post("/api/lnd/trackpayment", (req, res) => {