fix(background): don't clear overpaying on page refresh

Co-authored-by: Radu-Cristian Popa <[email protected]>
interledger · Jul 30, 2024 · 59bd9e5 · 59bd9e5
1 parent dbc9a2b
commit 59bd9e5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/background/services/background.ts b/src/background/services/background.ts
@@ -108,7 +108,9 @@ export class Background {
 
   bindTabHandlers() {
     this.browser.tabs.onRemoved.addListener(this.tabEvents.clearTabSessions)
-    this.browser.tabs.onUpdated.addListener(this.tabEvents.clearTabSessions)
+    this.browser.tabs.onUpdated.addListener(this.tabEvents.clearTabSessions, {
+      properties: ['url', 'discarded', 'status', 'isArticle']
+    })
     this.browser.tabs.onCreated.addListener(this.tabEvents.onCreatedTab)
     this.browser.tabs.onActivated.addListener(this.tabEvents.onActivatedTab)
   }

diff --git a/src/background/services/monetization.ts b/src/background/services/monetization.ts
@@ -215,7 +215,10 @@ export class MonetizationService {
     emitToggleWM({ enabled: !enabled })
   }
 
-  clearTabSessions(tabId: number) {
+  clearTabSessions(
+    tabId: number,
+    { clearOverpaying }: { clearOverpaying: boolean }
+  ) {
     this.logger.debug(`Attempting to clear sessions for tab ${tabId}.`)
     const sessions = this.tabState.getSessions(tabId)
 
@@ -228,7 +231,10 @@ export class MonetizationService {
       session.stop()
     }
 
-    this.tabState.clearByTabId(tabId)
+    this.tabState.clearSessionsByTabId(tabId)
+    if (clearOverpaying) {
+      this.tabState.clearOverpayingByTabId(tabId)
+    }
 
     this.logger.debug(`Cleared ${sessions.size} sessions for tab ${tabId}.`)
   }

diff --git a/src/background/services/tabEvents.ts b/src/background/services/tabEvents.ts
@@ -75,11 +75,13 @@ export class TabEvents {
     tabId: TabId,
     changeInfo: Tabs.OnUpdatedChangeInfoType | Tabs.OnRemovedRemoveInfoType
   ) => {
+    // console.log('clearTabSessions', changeInfo)
     if (
       ('status' in changeInfo && changeInfo.status === 'loading') ||
       'isWindowClosing' in changeInfo
     ) {
-      this.monetizationService.clearTabSessions(tabId)
+      const clearOverpaying = !('isWindowClosing' in changeInfo) // TODO: verify this condition
+      this.monetizationService.clearTabSessions(tabId, { clearOverpaying })
     }
   }
 

diff --git a/src/background/services/tabState.ts b/src/background/services/tabState.ts
@@ -100,8 +100,11 @@ export class TabState {
     return [...this.sessions.keys()]
   }
 
-  clearByTabId(tabId: TabId) {
+  clearOverpayingByTabId(tabId: TabId) {
     this.state.delete(tabId)
+  }
+
+  clearSessionsByTabId(tabId: TabId) {
     this.sessions.delete(tabId)
   }
 }