From 47f37b06d8f600f0a76cc7b5db9e76cf7b1e4fb2 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Tue, 14 Jan 2020 18:33:20 -0400 Subject: [PATCH] stringent sendpaymentsync handling --- services/gunDB/contact-api/actions.js | 36 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/services/gunDB/contact-api/actions.js b/services/gunDB/contact-api/actions.js index a9c29cfb..ad9bf1d3 100644 --- a/services/gunDB/contact-api/actions.js +++ b/services/gunDB/contact-api/actions.js @@ -934,18 +934,32 @@ const sendPayment = async (to, amount, memo, gun, user, SEA) => { { payment_request: decInvoice }, - (_, /** @type {SendResponse} */ res) => { - if (res.payment_error) { - rej(new Error(res.payment_error)) - } else if (res.payment_route) { - resolve() - } else { - rej( - new Error( - 'Unexpected response from sendPaymentSync() -> ' + - JSON.stringify(res) + (/*** @type {any} */ err, /** @type {SendResponse} */ res) => { + console.log(`sendPaymentSync err: ${JSON.stringify(err)}`) + console.log(`sendPaymentSync res: ${JSON.stringify(res)}`) + + if (err || typeof err === 'number') { + rej(new Error(`sendPaymentSync error: ${JSON.stringify(err)}`)) + } else if (res) { + if (res.payment_error) { + rej( + new Error( + `sendPaymentSync error response: ${JSON.stringify(res)}` + ) ) - ) + } else if (!res.payment_route) { + rej( + new Error( + `sendPaymentSync no payment route response: ${JSON.stringify( + res + )}` + ) + ) + } else { + resolve() + } + } else { + rej(new Error('no error or response received from sendPaymentSync')) } } )