Merge pull request #1029 from getAlby/fix/refactor-db-handling

fix: refactor DB loading of allowances/payments

Author: bumi

src/extension/background-script/db.ts

@@ -59,23 +59,49 @@ class DB extends Dexie {
   }
 
   async loadFromStorage() {
-    try {
-      const result = await browser.storage.local.get([
-        "allowances",
-        "payments",
-      ]);
-      console.log("Loading DB data from storage");
-      if (result.allowances) {
-        await this.allowances.bulkAdd(result.allowances);
-      }
-      if (result.payments) {
-        await this.payments.bulkAdd(result.payments);
-      }
-      return true;
-    } catch (e) {
-      console.log("Failed to load DB data from storage");
-      console.log(e);
-    }
+    console.log("Loading DB data from storage");
+    return browser.storage.local
+      .get(["allowances", "payments"])
+      .then((result) => {
+        const allowancePromise = this.allowances.count().then((count) => {
+          // if the DB already has entries we do not need to add the data from the browser storage. We then already have the data in the indexeddb
+          if (count > 0) {
+            console.log(`Found ${count} allowances already in the DB`);
+            return;
+          } else if (result.allowances && result.allowances.length > 0) {
+            // adding the data from the browser storage
+            return this.allowances
+              .bulkAdd(result.allowances)
+              .catch(Dexie.BulkError, function (e) {
+                console.log("Failed to add allowances; ignoring");
+                console.error(e);
+              });
+          }
+        });
+
+        const paymentsPromise = this.payments.count().then((count) => {
+          // if the DB already has entries we do not need to add the data from the browser storage. We then already have the data in the indexeddb
+          if (count > 0) {
+            console.log(`Found ${count} payments already in the DB`);
+            return;
+          } else if (result.payments && result.payments.length > 0) {
+            // adding the data from the browser storage
+            return this.payments
+              .bulkAdd(result.payments)
+              .catch(Dexie.BulkError, function (e) {
+                console.log("Failed to add payments; ignoring");
+                console.error(e);
+              });
+          }
+        });
+
+        // wait for all allowances and payments to be loaded
+        return Promise.all([allowancePromise, paymentsPromise]);
+      })
+      .catch((e) => {
+        console.log("Failed to load DB data from storage");
+        console.error(e);
+      });
   }
 }
 

src/extension/background-script/index.js

@@ -107,16 +107,17 @@ async function init() {
   //await browser.storage.sync.set({ settings: { debug: true }, allowances: [] });
   await state.getState().init();
   console.log("State loaded");
+
   await db.open();
+  console.log("DB opened");
 
   events.subscribe();
+  console.log("Events subscribed");
 
-  // initialize a connector for the current account
   browser.runtime.onMessage.addListener(debugLogger);
   // this is the only handler that may and must return a Promise which resolve with the response to the content script
   browser.runtime.onMessage.addListener(routeCalls);
 
-  // TODO: make optional
   browser.tabs.onUpdated.addListener(updateIcon); // update Icon when there is an allowance
 
   // Notify the content script that the tab has been updated.
@@ -131,12 +132,14 @@ async function init() {
       router,
     };
   }
+  console.log("Loading completed");
 }
 
 // The onInstalled event is fired directly after the code is loaded.
 // When we subscribe to that event asynchronously in the init() function it is too late and we miss the event.
 browser.runtime.onInstalled.addListener(handleInstalled);
 
+console.log("Welcome to Alby");
 init().then(() => {
   if (isFirstInstalled) {
     utils.openUrl("welcome.html");