Optional storage session for tab stats (#1340)

ghostery · Oct 17, 2023 · 40da99f · 40da99f
1 parent bffd4e0
commit 40da99f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/extension-manifest-v3/src/background/stats.js b/extension-manifest-v3/src/background/stats.js
@@ -18,10 +18,10 @@ import DailyStats, { getMergedStats } from '/store/daily-stats.js';
 import Options, { observe } from '/store/options.js';
 
 import { shouldShowOperaSerpAlert } from '/notifications/opera-serp.js';
+import AutoSyncingMap from '/utils/map.js';
 
 import Request from './utils/request.js';
 import * as trackerDb from './utils/trackerdb.js';
-import AutoSyncingMap from './utils/map.js';
 
 export const tabStats = new AutoSyncingMap({ storageKey: 'tabStats:v1' });
 

diff --git a/extension-manifest-v3/src/store/tab-stats.js b/extension-manifest-v3/src/store/tab-stats.js
@@ -11,6 +11,8 @@
 
 import { store } from 'hybrids';
 
+import AutoSyncingMap from '/utils/map.js';
+
 const Tracker = {
   id: true,
   name: '',
@@ -66,9 +68,7 @@ const Stats = {
       const tab = await chrome.runtime.sendMessage({
         action: 'getCurrentTab',
       });
-
-      const storage = await chrome.storage.session.get(['tabStats:v1']);
-      const stats = tab && storage['tabStats:v1']?.entries[tab.id];
+      const stats = tab && (await AutoSyncingMap.get('tabStats:v1', tab.id));
 
       return stats && tab.url.includes(stats.domain) ? stats : {};
     },

diff --git a/...n-manifest-v3/src/background/utils/map.js → extension-manifest-v3/src/utils/map.js b/...n-manifest-v3/src/background/utils/map.js → extension-manifest-v3/src/utils/map.js
@@ -13,7 +13,15 @@
 // with session storage from time to time. That is done to prevent
 // the loss of all stats when the browser terminates the execution
 // context (background script or service worker).
+
+export const storage = chrome.storage.session || chrome.storage.local;
+
 export default class AutoSyncingMap {
+  static async get(storageKey, key) {
+    const data = await storage.get([storageKey]);
+    return data[storageKey]?.entries[key];
+  }
+
   constructor({
     storageKey,
     softFlushIntervalInMs = 200,
@@ -71,9 +79,11 @@ export default class AutoSyncingMap {
     this._pending = new Promise((resolve, reject) => {
       // Migration to session storage
       // TODO: Remove this code after a few releases
-      chrome.storage.local.remove(this.storageKey);
+      if (chrome.storage.session) {
+        chrome.storage.local.remove(this.storageKey);
+      }
 
-      chrome.storage.session.get([this.storageKey], (result) => {
+      storage.get([this.storageKey], (result) => {
         if (chrome.runtime.lastError) {
           reject(chrome.runtime.lastError);
         } else {
@@ -141,7 +151,7 @@ export default class AutoSyncingMap {
 
     this._scheduleAction(
       new Promise((resolve, reject) => {
-        chrome.storage.session.remove(this.storageKey, () => {
+        storage.remove(this.storageKey, () => {
           if (chrome.runtime.lastError) {
             reject(chrome.runtime.lastError);
           } else {
@@ -221,7 +231,7 @@ export default class AutoSyncingMap {
           entries: Object.fromEntries(this.inMemoryMap),
           ttl: Object.fromEntries(this._ttlMap),
         };
-        chrome.storage.session.set({ [this.storageKey]: serialized }, () => {
+        storage.set({ [this.storageKey]: serialized }, () => {
           if (chrome.runtime.lastError) {
             reject(chrome.runtime.lastError);
           } else {