feat!: overhaul continuous payments logic

Author: sidvishnoi

src/background/config.ts

@@ -5,6 +5,9 @@ export const DEFAULT_RATE_OF_PAY = '60';
 export const MIN_RATE_OF_PAY = '1';
 export const MAX_RATE_OF_PAY = '100';
 
+/** Minimum wait time between two consecutive continuous payments */
+export const MIN_PAYMENT_WAIT = 2000;
+
 export const EXCHANGE_RATES_URL =
   'https://telemetry-exchange-rates.s3.amazonaws.com/exchange-rates-usd.json';
 

src/background/services/monetization.ts

@@ -121,7 +121,6 @@ export class MonetizationService {
     );
 
     this.events.emit('monetization.state_update', tabId);
-    await paymentManager.adjustAmount();
 
     if (
       enabled &&
@@ -145,30 +144,35 @@ export class MonetizationService {
     payload: StopMonetizationPayload,
     sender: Runtime.MessageSender,
   ) {
-    let needsAdjustAmount = false;
     const { tabId, frameId } = getSender(sender);
     const paymentManager = this.tabState.paymentManagers.get(tabId);
     if (!paymentManager) {
       this.logger.warn(`No payment manager found for tab ${tabId}.`);
       return;
     }
 
+    let removedCount = 0;
+    let pausedCount = 0;
     for (const { requestId, intent } of payload) {
       if (intent === 'remove') {
         paymentManager.removeSession(requestId, frameId);
-        needsAdjustAmount = true;
+        removedCount++;
       } else if (intent === 'disable') {
         paymentManager.disableSession(requestId, frameId);
-        needsAdjustAmount = true;
       } else {
-        paymentManager.stopSession(requestId, frameId);
+        paymentManager.deactivateSession(requestId, frameId);
+        pausedCount++;
       }
     }
 
-    if (needsAdjustAmount) {
-      this.events.emit('monetization.state_update', tabId);
-      await paymentManager.adjustAmount();
+    if (pausedCount > 0 && paymentManager.payableSessions.length === 0) {
+      paymentManager?.pause('all-paused');
     }
+    if (removedCount > 0 && paymentManager.size === 0) {
+      this.tabState.paymentManagers.destroy(tabId);
+    }
+
+    this.events.emit('monetization.state_update', tabId);
   }
 
   async resumePaymentSession(
@@ -179,7 +183,7 @@ export class MonetizationService {
     const paymentManager = this.tabState.paymentManagers.get(tabId);
 
     if (!paymentManager) {
-      this.logger.debug(`No payment manager found for tab ${tabId}.`);
+      this.logger.warn(`No payment manager found for tab ${tabId}.`);
       // If there are no sessions and we got a resume call, treat it as a fresh
       // start call. The sessions could be cleared as:
       // - the background script/worker had terminated, so all sessions (stored
@@ -401,8 +405,8 @@ export class MonetizationService {
   }
 
   private stopAllSessions() {
-    for (const session of this.tabState.getAllSessions()) {
-      session.stop();
+    for (const paymentManager of this.tabState.paymentManagers.values()) {
+      paymentManager.stop();
     }
     this.logger.debug('All payment sessions stopped.');
   }