invoice and token check worker

This commit is contained in:
callebtc 2022-11-05 20:00:24 +01:00 committed by dni ⚡
parent 2e10e89857
commit 28b8087458

View file

@ -201,7 +201,7 @@
<q-td key="status" :props="props"> <q-td key="status" :props="props">
<div v-if="props.row.status == 'pending'"> <div v-if="props.row.status == 'pending'">
<q-icon <q-icon
@click="showInvoiceDialog(props.row)" @click="showTokenDialog(props.row.token)"
name="settings_ethernet" name="settings_ethernet"
color="grey" color="grey"
> >
@ -913,6 +913,8 @@
} }
], ],
pagination: { pagination: {
sortBy: 'date',
descending: true,
rowsPerPage: 5 rowsPerPage: 5
}, },
filter: null filter: null
@ -1230,6 +1232,8 @@
console.log('##### showInvoiceDialog') console.log('##### showInvoiceDialog')
this.invoiceData = _.clone(data) this.invoiceData = _.clone(data)
this.showInvoiceDetails = true this.showInvoiceDetails = true
// kick off invoice check worker
this.invoiceCheckWorker()
}, },
showPayInvoiceDialog: function () { showPayInvoiceDialog: function () {
@ -1240,7 +1244,18 @@
this.payInvoiceData.camera.show = false this.payInvoiceData.camera.show = false
}, },
showTokenDialog: function (token) {
console.log('##### showTokenDialog')
// TODO: this must be decoded and desiarlized!
this.sendData.tokens = _.clone(token)
this.sendData.tokensBase64 = _.clone(token)
this.showSendTokens = true
// kick off token check worker
this.checkTokenSpendableWorker()
},
showSendTokensDialog: function () { showSendTokensDialog: function () {
console.log('##### showSendTokensDialog')
this.sendData.tokens = '' this.sendData.tokens = ''
this.sendData.tokensBase64 = '' this.sendData.tokensBase64 = ''
this.sendData.amount = 0 this.sendData.amount = 0
@ -1317,9 +1332,7 @@
//////////// API /////////// //////////// API ///////////
requestMintButton: async function () { invoiceCheckWorker: async function () {
await this.requestMint()
console.log("#### request mint", this.invoiceData)
let nInterval = 0 let nInterval = 0
this.invoiceCheckListener = setInterval(async () => { this.invoiceCheckListener = setInterval(async () => {
try { try {
@ -1353,6 +1366,12 @@
}, 3000) }, 3000)
}, },
requestMintButton: async function () {
await this.requestMint()
console.log("#### request mint", this.invoiceData)
await this.invoiceCheckWorker()
},
requestMint: async function () { requestMint: async function () {
// gets an invoice from the mint to get new tokens // gets an invoice from the mint to get new tokens
try { try {
@ -1578,8 +1597,6 @@
this.sendData.amount, this.sendData.amount,
true true
) )
this.sendData.tokens = ''
this.sendData.tokensBase64 = ''
this.sendData.tokens = scndProofs this.sendData.tokens = scndProofs
console.log('### this.sendData.tokens', this.sendData.tokens) console.log('### this.sendData.tokens', this.sendData.tokens)
this.sendData.tokensBase64 = btoa(JSON.stringify(this.sendData.tokens)) this.sendData.tokensBase64 = btoa(JSON.stringify(this.sendData.tokens))
@ -1591,8 +1608,7 @@
token: this.sendData.tokensBase64 token: this.sendData.tokensBase64
}) })
this.storehistoryTokens() this.storehistoryTokens()
this.checkTokenSpendableWorker()
navigator.vibrate(200)
}, },
checkFees: async function (payment_request) { checkFees: async function (payment_request) {
const payload = { const payload = {
@ -1712,7 +1728,38 @@
invoice.status = 'paid' invoice.status = 'paid'
this.storehistoryTokens() this.storehistoryTokens()
}, },
checkTokenSpendable: async function(token) {
checkTokenSpendableWorker: async function () {
let nInterval = 0
this.tokensCheckSpendableListener = setInterval(async () => {
try {
nInterval += 1
// exit loop after 5m
if (nInterval > 100) {
console.log("### stopping token check worker")
clearInterval(this.tokensCheckSpendableListener)
}
console.log('### setInterval', nInterval)
console.log(this.sendData)
// this will throw an error if the invoice is pending
paid = await this.checkTokenSpendable(this.sendData.tokensBase64, false)
if (paid) {
console.log("### stopping token check worker")
clearInterval(this.tokensCheckSpendableListener)
this.sendData.tokens = ''
this.showSendTokens = false
}
} catch (error) {
console.log('not paid yet')
}
}, 3000)
},
checkTokenSpendable: async function(token, verbose=true) {
const tokenJson = atob(token) const tokenJson = atob(token)
const proofs = JSON.parse(tokenJson) const proofs = JSON.parse(tokenJson)
const payload = { const payload = {
@ -1735,25 +1782,32 @@
} }
} }
if (paid){ if (paid){
console.log("### token paid")
navigator.vibrate(200) navigator.vibrate(200)
this.$q.notify({ this.$q.notify({
timeout: 5000, timeout: 5000,
type: 'positive', type: 'positive',
message: 'Token sent' message: 'Token paid'
}) })
} else { } else {
this.$q.notify({ console.log("### token not paid yet")
if (verbose) {
this.$q.notify({
timeout: 5000, timeout: 5000,
color: 'gray', color: 'gray',
message: 'Token still pending' message: 'Token still pending'
}) })
}
this.sendData.tokens = token
} }
return paid
} catch (error) { } catch (error) {
console.error(error) console.error(error)
LNbits.utils.notifyApiError(error) LNbits.utils.notifyApiError(error)
throw error throw error
} }
}, },
fetchMintKeys: async function () { fetchMintKeys: async function () {
const {data} = await LNbits.api.request( const {data} = await LNbits.api.request(
'GET', 'GET',