fix: cleanup paymentEvents, simplify websockets (#3570)

lnbits/static/js/base.js

@@ -2,18 +2,6 @@ window.LNbits = {
   g: window.g,
   utils: window._lnbitsUtils,
   api: window._lnbitsApi,
-  events: {
-    onInvoicePaid(wallet, cb) {
-      ws = new WebSocket(`${websocketUrl}/${wallet.inkey}`)
-      ws.onmessage = ev => {
-        const data = JSON.parse(ev.data)
-        if (data.payment) {
-          cb(data)
-        }
-      }
-      return ws.onclose
-    }
-  },
   map: {
     user(data) {
       const obj = {

lnbits/static/js/globals.js

@@ -18,13 +18,11 @@ window.g = Vue.reactive({
   fiatBalance: 0,
   exchangeRate: 0,
   fiatTracking: false,
-  wallets: [],
   payments: [],
   walletEventListeners: [],
   showNewWalletDialog: false,
   newWalletType: 'lightning',
   updatePayments: false,
-  updatePaymentsHash: '',
   currencies: WINDOW_SETTINGS.LNBITS_CURRENCIES ?? [],
   allowedCurrencies: WINDOW_SETTINGS.LNBITS_ALLOWED_CURRENCIES ?? [],
   locale: localStore('lnbits.lang', navigator.languages[1] ?? 'en'),

lnbits/static/js/pages/wallet.js

@@ -661,10 +661,6 @@ window.PageWallet = {
     },
     'g.updatePayments'() {
       this.parse.show = false
-      if (this.receive.paymentHash === this.g.updatePaymentsHash) {
-        this.receive.show = false
-        this.receive.paymentHash = null
-      }
       if (
         this.g.wallet.currency &&
         this.$q.localStorage.getItem(

lnbits/static/js/windowMixin.js

@@ -12,43 +12,58 @@ window.windowMixin = {
       this.g.newWalletType = walletType
       this.g.showNewWalletDialog = true
     },
+    onWebsocketMessage(ev) {
+      const data = JSON.parse(ev.data)
+      if (!data.payment) {
+        console.error('ws message no payment', data)
+        return
+      }
+
+      // update sidebar wallet balances
+      this.g.user.wallets.forEach(w => {
+        if (w.id === data.payment.wallet_id) {
+          w.sat = data.wallet_balance
+        }
+      })
+
+      // if current wallet, update balance and payments
+      if (this.g.wallet.id === data.payment.wallet_id) {
+        this.g.wallet.sat = data.wallet_balance
+        // lnbits-payment-list is watching
+        this.g.updatePayments = !this.g.updatePayments
+      }
+
+      // NOTE: react only on incoming payments for now
+      if (data.payment.amount > 0) {
+        eventReaction(data.wallet_balance * 1000)
+      }
+    },
     paymentEvents() {
-      this.g.walletEventListeners = this.g.walletEventListeners || []
+      let timeout
       this.g.user.wallets.forEach(wallet => {
         if (!this.g.walletEventListeners.includes(wallet.id)) {
           this.g.walletEventListeners.push(wallet.id)
-          LNbits.events.onInvoicePaid(wallet, data => {
+          const ws = new WebSocket(`${websocketUrl}/${wallet.inkey}`)
-            const walletIndex = this.g.user.wallets.findIndex(
+          ws.onmessage = this.onWebsocketMessage
-              w => w.id === wallet.id
+          ws.onopen = () => console.log('ws connected for wallet', wallet.id)
+          // onclose and onerror can both happen on their own or together,
+          // so we add a clearTimeout to avoid multiple reconnections
+          ws.onclose = () => {
+            console.log('ws closed, reconnecting...', wallet.id)
+            this.g.walletEventListeners = this.g.walletEventListeners.filter(
+              id => id !== wallet.id
             )
-            if (walletIndex !== -1) {
+            clearTimeout(timeout)
-              //needed for balance being deducted
+            timeout = setTimeout(this.paymentEvents, 5000)
-              let satBalance = data.wallet_balance
+          }
-              if (data.payment.amount < 0) {
+          ws.onerror = () => {
-                satBalance = data.wallet_balance += data.payment.amount / 1000
+            console.warn('ws error, reconnecting...', wallet.id)
-              }
+            this.g.walletEventListeners = this.g.walletEventListeners.filter(
-              //update the wallet
+              id => id !== wallet.id
-              Object.assign(this.g.user.wallets[walletIndex], {
+            )
-                sat: satBalance,
+            clearTimeout(timeout)
-                msat: data.wallet_balance * 1000,
+            timeout = setTimeout(this.paymentEvents, 5000)
-                fsat: data.wallet_balance.toLocaleString()
+          }
-              })
-              //update the current wallet
-              if (this.g.wallet.id === data.payment.wallet_id) {
-                Object.assign(this.g.wallet, this.g.user.wallets[walletIndex])
-
-                //if on the wallet page and payment is incoming trigger the eventReaction
-                if (
-                  data.payment.amount > 0 &&
-                  window.location.pathname === '/wallet'
-                ) {
-                  eventReaction(data.wallet_balance * 1000)
-                }
-              }
-            }
-            this.g.updatePaymentsHash = data.payment.payment_hash
-            this.g.updatePayments = !this.g.updatePayments
-          })
         }
       })
     },
@@ -103,6 +118,7 @@ window.windowMixin = {
   async created() {
     if (window.user) {
       this.g.user = Vue.reactive(window.LNbits.map.user(window.user))
+      this.paymentEvents()
     }
     if (window.wallet) {
       this.g.wallet = Vue.reactive(window.LNbits.map.wallet(window.wallet))
@@ -110,10 +126,5 @@ window.windowMixin = {
     if (window.extensions) {
       this.g.extensions = Vue.reactive(window.extensions)
     }
-  },
-  mounted() {
-    if (this.g.user) {
-      this.paymentEvents()
-    }
   }
 }