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

Simpler timeout mechanis in sendSpontPayment..

Browse source
This commit is contained in:
Daniel Lugo 2021-09-04 14:28:26 -04:00
parent d0e4020ce9
commit 6857443c8d
1 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

35
services/gunDB/contact-api/actions.js
View file

@ -389,10 +389,13 @@ const sendSpontaneousPayment = async (
logger.info('ORDER ID') logger.info('ORDER ID')
logger.info(orderID) logger.info(orderID)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const encryptedOrderRes = await Utils.tryAndWait( const encryptedOrderRes = await Common.makePromise((res, rej) => {
gun => setTimeout(() => {
new Promise(res => { rej(new Error('Timeout of 20s passed when awaiting order response.'))
gun }, 20000)
require('../Mediator')
.getGun()
.user(to) .user(to)
.get(Key.ORDER_TO_RESPONSE) .get(Key.ORDER_TO_RESPONSE)
.get(orderID) .get(orderID)
@ -402,9 +405,7 @@ const sendSpontaneousPayment = async (
res(orderResponse) res(orderResponse)
} }
}) })
}), })
v => Schema.isOrderResponse(v)
)
if (!Schema.isOrderResponse(encryptedOrderRes)) { if (!Schema.isOrderResponse(encryptedOrderRes)) {
const e = TypeError( const e = TypeError(
@ -479,10 +480,17 @@ const sendSpontaneousPayment = async (
logger.info('ACK NODE') logger.info('ACK NODE')
logger.info(orderResponse.ackNode) logger.info(orderResponse.ackNode)
/** @type {import('shock-common').Schema.OrderResponse} */ /** @type {import('shock-common').Schema.OrderResponse} */
const encryptedOrderAckRes = await Utils.tryAndWait( const encryptedOrderAckRes = await Common.makePromise((res, rej) => {
gun => setTimeout(() => {
new Promise(res => { rej(
gun new Error(
"Timeout of 20s exceeded when waiting for order response's ack."
)
)
}, 20000)
require('../Mediator')
.getGun()
.user(to) .user(to)
.get(Key.ORDER_TO_RESPONSE) .get(Key.ORDER_TO_RESPONSE)
.get(orderResponse.ackNode) .get(orderResponse.ackNode)
@ -496,10 +504,7 @@ const sendSpontaneousPayment = async (
res(orderResponse) res(orderResponse)
} }
}) })
}), })
//@ts-expect-error
v => !v || !v.type
)
if (!encryptedOrderAckRes || !encryptedOrderAckRes.type) { if (!encryptedOrderAckRes || !encryptedOrderAckRes.type) {
const e = TypeError( const e = TypeError(