fix(background): handle unpeered wallets; retry without waiting interval

src/_locales/en/messages.json

@@ -40,6 +40,12 @@
   "pay_error_notEnoughFunds": {
     "message": "Not enough funds to facilitate payment."
   },
+  "pay_error_invalidReceivers": {
+    "message": "[TODO] We cannot send money (probable cause: un-peered wallets)"
+  },
+  "pay_error_notMonetized": {
+    "message": "[TODO] This website is not monetized."
+  },
   "outOfFunds_error_title": {
     "message": "Out of funds"
   },
@@ -85,5 +91,8 @@
   },
   "connectWallet_error_invalidClient": {
     "message": "Failed to connect. Please make sure you have added the public key to the correct wallet address."
+  },
+  "home_warn_invalidLinks": {
+    "message": "[TODO] Has invalid links. (UI)"
   }
 }

src/background/services/events.ts

@@ -4,6 +4,7 @@ import type { AmountValue, Storage, TabId } from '@/shared/types'
 interface BackgroundEvents {
   'open_payments.key_revoked': void
   'open_payments.out_of_funds': void
+  'open_payments.invalid_receiver': { tabId: number }
   'storage.rate_of_pay_update': { rate: string }
   'storage.state_update': {
     state: Storage['state']

src/background/services/monetization.ts

@@ -72,6 +72,7 @@ export class MonetizationService {
     payload.forEach((p) => {
       const { requestId, walletAddress: receiver } = p
 
+      // Q: How does this impact client side apps/routing?
       const existingSession = sessions.get(requestId)
       if (existingSession) {
         existingSession.stop()
@@ -97,7 +98,8 @@ export class MonetizationService {
 
     this.events.emit('monetization.state_update', tabId)
 
-    const sessionsArr = this.tabState.getEnabledSessions(tabId)
+    const sessionsArr = this.tabState.getPayableSessions(tabId)
+    if (!sessionsArr.length) return
     const rate = computeRate(rateOfPay, sessionsArr.length)
 
     // Since we probe (through quoting) the debitAmount we have to await this call.
@@ -162,7 +164,7 @@ export class MonetizationService {
     if (!rateOfPay) return
 
     if (needsAdjustAmount) {
-      const sessionsArr = this.tabState.getEnabledSessions(tabId)
+      const sessionsArr = this.tabState.getPayableSessions(tabId)
       this.events.emit('monetization.state_update', tabId)
       if (!sessionsArr.length) return
       const rate = computeRate(rateOfPay, sessionsArr.length)
@@ -232,17 +234,21 @@ export class MonetizationService {
   async pay(amount: string) {
     const tab = await getCurrentActiveTab(this.browser)
     if (!tab || !tab.id) {
-      throw new Error('Could not find active tab.')
+      throw new Error('Unexpected error: could not find active tab.')
     }
-    const sessions = this.tabState.getEnabledSessions(tab.id)
-    if (!sessions.length) {
-      throw new Error('This website is not monetized.')
+
+    const payableSessions = this.tabState.getPayableSessions(tab.id)
+    if (!payableSessions.length) {
+      if (this.tabState.getEnabledSessions(tab.id).length) {
+        throw new Error(this.t('pay_error_invalidReceivers'))
+      }
+      throw new Error(this.t('pay_error_notMonetized'))
     }
 
-    const splitAmount = Number(amount) / sessions.length
+    const splitAmount = Number(amount) / payableSessions.length
     // TODO: handle paying across two grants (when one grant doesn't have enough funds)
     const results = await Promise.allSettled(
-      sessions.map((session) => session.pay(splitAmount))
+      payableSessions.map((session) => session.pay(splitAmount))
     )
 
     const totalSentAmount = results
@@ -280,6 +286,7 @@ export class MonetizationService {
     this.onRateOfPayUpdate()
     this.onKeyRevoked()
     this.onOutOfFunds()
+    this.onInvalidReceiver()
   }
 
   private onRateOfPayUpdate() {
@@ -299,7 +306,7 @@ export class MonetizationService {
       }
 
       for (const tabId of tabIds) {
-        const sessions = this.tabState.getEnabledSessions(tabId)
+        const sessions = this.tabState.getPayableSessions(tabId)
         if (!sessions.length) continue
         const computedRate = computeRate(rate, sessions.length)
         await this.adjustSessionsAmount(sessions, computedRate).catch((e) => {
@@ -327,6 +334,15 @@ export class MonetizationService {
     })
   }
 
+  private onInvalidReceiver() {
+    this.events.on('open_payments.invalid_receiver', async ({ tabId }) => {
+      if (this.tabState.tabHasAllSessionsInvalid(tabId)) {
+        this.logger.debug(`Tab ${tabId} has all sessions invalid`)
+        this.events.emit('monetization.state_update', tabId)
+      }
+    })
+  }
+
   private stopAllSessions() {
     for (const session of this.tabState.getAllSessions()) {
       session.stop()
@@ -365,6 +381,9 @@ export class MonetizationService {
       }
     }
     const isSiteMonetized = this.tabState.isTabMonetized(tab.id!)
+    const hasAllSessionsInvalid = this.tabState.tabHasAllSessionsInvalid(
+      tab.id!
+    )
 
     return {
       ...dataFromStorage,
@@ -374,7 +393,8 @@ export class MonetizationService {
         oneTime: oneTimeGrant?.amount,
         recurring: recurringGrant?.amount
       },
-      isSiteMonetized
+      isSiteMonetized,
+      hasAllSessionsInvalid
     }
   }
 

src/background/services/paymentSession.ts

@@ -22,18 +22,23 @@ import type { Logger } from '@/shared/logger'
 
 const HOUR_MS = 3600 * 1000
 const MIN_SEND_AMOUNT = 1n // 1 unit
+const MAX_INVALID_RECEIVER_ATTEMPTS = 2
 
 type PaymentSessionSource = 'tab-change' | 'request-id-reused' | 'new-link'
 
 export class PaymentSession {
   private rate: string
   private active: boolean = false
+  /** Invalid receiver (providers not peered or other reasons) */
+  private isInvalid: boolean = false
+  private countInvalidReceiver: number = 0
   private isDisabled: boolean = false
   private incomingPaymentUrl: string
   private incomingPaymentExpiresAt: number
   private amount: string
   private intervalInMs: number
   private probingId: number
+  private shouldRetryImmediately: boolean = false
 
   private interval: ReturnType<typeof setInterval> | null = null
   private timeout: ReturnType<typeof setTimeout> | null = null
@@ -125,6 +130,12 @@ export class PaymentSession {
         } else if (isNonPositiveAmountError(e)) {
           amountToSend = BigInt(amountIter.next().value)
           continue
+        } else if (isInvalidReceiverError(e)) {
+          this.markInvalid()
+          this.events.emit('open_payments.invalid_receiver', {
+            tabId: this.tabId
+          })
+          break
         } else {
           throw e
         }
@@ -140,6 +151,10 @@ export class PaymentSession {
     return this.isDisabled
   }
 
+  get invalid() {
+    return this.isInvalid
+  }
+
   disable() {
     this.isDisabled = true
     this.stop()
@@ -154,6 +169,11 @@ export class PaymentSession {
     throw new Error('Method not implemented.')
   }
 
+  private markInvalid() {
+    this.isInvalid = true
+    this.stop()
+  }
+
   stop() {
     this.active = false
     this.clearTimers()
@@ -185,9 +205,9 @@ export class PaymentSession {
 
   async start(source: PaymentSessionSource) {
     this.debug(
-      `Attempting to start; source=${source} active=${this.active} disabled=${this.isDisabled}`
+      `Attempting to start; source=${source} active=${this.active} disabled=${this.isDisabled} isInvalid=${this.isInvalid}`
     )
-    if (this.active || this.isDisabled) return
+    if (this.active || this.isDisabled || this.isInvalid) return
     this.debug(`Session started; source=${source}`)
     this.active = true
 
@@ -215,12 +235,12 @@ export class PaymentSession {
     // Uncomment this after we perform the Rafiki test and remove the leftover
     // code below.
     //
-    // if (this.active && !this.isDisabled) {
+    // if (this.canContinuePayment) {
     //   this.timeout = setTimeout(() => {
     //     void this.payContinuous()
     //
     //     this.interval = setInterval(() => {
-    //       if (!this.active || this.isDisabled) {
+    //       if (!this.canContinuePayment) {
     //           this.clearTimers()
     //           return
     //       }
@@ -231,26 +251,36 @@ export class PaymentSession {
 
     // Leftover
     const continuePayment = () => {
-      if (!this.active || this.isDisabled) return
+      if (!this.canContinuePayment) return
       // alternatively (leftover) after we perform the Rafiki test, we can just
       // skip the `.then()` here and call setTimeout recursively immediately
       void this.payContinuous().then(() => {
-        this.timeout = setTimeout(() => {
-          continuePayment()
-        }, this.intervalInMs)
+        this.timeout = setTimeout(
+          () => {
+            continuePayment()
+          },
+          this.shouldRetryImmediately ? 0 : this.intervalInMs
+        )
       })
     }
 
-    if (this.active && !this.isDisabled) {
-      this.timeout = setTimeout(() => {
-        void this.payContinuous()
-        this.timeout = setTimeout(() => {
-          continuePayment()
-        }, this.intervalInMs)
+    if (this.canContinuePayment) {
+      this.timeout = setTimeout(async () => {
+        await this.payContinuous()
+        this.timeout = setTimeout(
+          () => {
+            continuePayment()
+          },
+          this.shouldRetryImmediately ? 0 : this.intervalInMs
+        )
       }, waitTime)
     }
   }
 
+  private get canContinuePayment() {
+    return this.active && !this.isDisabled && !this.isInvalid
+  }
+
   private async setIncomingPaymentUrl(reset?: boolean) {
     if (this.incomingPaymentUrl && !reset) return
 
@@ -419,21 +449,37 @@ export class PaymentSession {
           intervalInMs: this.intervalInMs
         })
       }
+      this.shouldRetryImmediately = false
     } catch (e) {
       if (isKeyRevokedError(e)) {
         this.events.emit('open_payments.key_revoked')
       } else if (isTokenExpiredError(e)) {
         await this.openPaymentsService.rotateToken()
+        this.shouldRetryImmediately = true
       } else if (isOutOfBalanceError(e)) {
         const switched = await this.openPaymentsService.switchGrant()
         if (switched === null) {
           this.events.emit('open_payments.out_of_funds')
+        } else {
+          this.shouldRetryImmediately = true
         }
       } else if (isInvalidReceiverError(e)) {
         if (Date.now() >= this.incomingPaymentExpiresAt) {
           await this.setIncomingPaymentUrl(true)
+          this.shouldRetryImmediately = true
         } else {
-          throw e
+          ++this.countInvalidReceiver
+          if (
+            this.countInvalidReceiver >= MAX_INVALID_RECEIVER_ATTEMPTS &&
+            !this.isInvalid
+          ) {
+            this.markInvalid()
+            this.events.emit('open_payments.invalid_receiver', {
+              tabId: this.tabId
+            })
+          } else {
+            this.shouldRetryImmediately = true
+          }
         }
       } else {
         throw e

src/background/services/tabEvents.ts

@@ -99,15 +99,21 @@ export class TabEvents {
     tabId: TabId,
     isTabMonetized: boolean = tabId
       ? this.tabState.isTabMonetized(tabId)
+      : false,
+    hasTabAllSessionsInvalid: boolean = tabId
+      ? this.tabState.tabHasAllSessionsInvalid(tabId)
       : false
   ) => {
     const { enabled, state } = await this.storage.get(['enabled', 'state'])
     const { path, title, isMonetized } = this.getIconAndTooltip({
       enabled,
       state,
-      isTabMonetized
+      isTabMonetized,
+      hasTabAllSessionsInvalid
     })
+
     this.sendToPopup.send('SET_IS_MONETIZED', isMonetized)
+    this.sendToPopup.send('SET_ALL_SESSIONS_INVALID', hasTabAllSessionsInvalid)
     await this.setIconAndTooltip(path, title, tabId)
   }
 
@@ -124,15 +130,17 @@ export class TabEvents {
   private getIconAndTooltip({
     enabled,
     state,
-    isTabMonetized
+    isTabMonetized,
+    hasTabAllSessionsInvalid
   }: {
     enabled: Storage['enabled']
     state: Storage['state']
     isTabMonetized: boolean
+    hasTabAllSessionsInvalid: boolean
   }) {
     let title = this.t('appName')
     let iconData = ICONS.default
-    if (!isOkState(state)) {
+    if (!isOkState(state) || hasTabAllSessionsInvalid) {
       iconData = enabled ? ICONS.enabled_warn : ICONS.disabled_warn
       const tabStateText = this.t('icon_state_actionRequired')
       title = `${title} - ${tabStateText}`

src/background/services/tabState.ts

@@ -95,10 +95,19 @@ export class TabState {
     return [...this.getSessions(tabId).values()].filter((s) => !s.disabled)
   }
 
+  getPayableSessions(tabId: TabId) {
+    return this.getEnabledSessions(tabId).filter((s) => !s.invalid)
+  }
+
   isTabMonetized(tabId: TabId) {
     return this.getEnabledSessions(tabId).length > 0
   }
 
+  tabHasAllSessionsInvalid(tabId: TabId) {
+    const sessions = this.getEnabledSessions(tabId)
+    return sessions.length > 0 && sessions.every((s) => s.invalid)
+  }
+
   getAllSessions() {
     return [...this.sessions.values()].flatMap((s) => [...s.values()])
   }

src/background/utils.test.ts

@@ -65,4 +65,17 @@ describe('getNextSendableAmount', () => {
       '80'
     ])
   })
+
+  it('from assetScale 2 to 2', () => {
+    expect(take(getNextSendableAmount(2, 2), 8)).toEqual([
+      '1',
+      '2',
+      '4',
+      '8',
+      '15',
+      '27',
+      '47',
+      '80'
+    ])
+  })
 })