Clean up messaging

Author: hsubox76

packages/messaging/src/helpers/migrate-old-database.test.ts

@@ -28,7 +28,7 @@ import { FakePushSubscription } from '../testing/fakes/service-worker';
 import { base64ToArray } from './array-base64-translator';
 import { expect } from 'chai';
 import { getFakeTokenDetails } from '../testing/fakes/token-details';
-import { openDB } from '@firebase/util';
+import { openDB } from 'idb';
 
 describe('migrateOldDb', () => {
   it("does nothing if old DB didn't exist", async () => {
@@ -179,7 +179,7 @@ describe('migrateOldDb', () => {
 });
 
 async function put(version: number, value: object): Promise<void> {
-  const db = await openDB('fcm_token_details_db', version, (db, oldVersion) => {
+  const db = await openDB('fcm_token_details_db', version, {upgrade: (db, oldVersion) => {
     if (oldVersion === 0) {
       const objectStore = db.createObjectStore('fcm_token_object_Store', {
         keyPath: 'swScope'
@@ -188,13 +188,13 @@ async function put(version: number, value: object): Promise<void> {
         unique: false
       });
       objectStore.createIndex('fcmToken', 'fcmToken', { unique: true });
-    }
+    }}
   });
 
   try {
     const tx = db.transaction('fcm_token_object_Store', 'readwrite');
     await tx.objectStore('fcm_token_object_Store').put(value);
-    await tx.complete;
+    await tx.done;
   } finally {
     db.close();
   }

packages/messaging/src/helpers/migrate-old-database.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { deleteDB, openDB } from '@firebase/util';
+import { deleteDB, openDB } from 'idb';
 
 import { TokenDetails } from '../interfaces/token-details';
 import { arrayToBase64 } from './array-base64-translator';
@@ -91,75 +91,77 @@ export async function migrateOldDatabase(
   const db = await openDB(
     OLD_DB_NAME,
     OLD_DB_VERSION,
-    async (db, oldVersion, newVersion, upgradeTransaction) => {
-      if (oldVersion < 2) {
-        // Database too old, skip migration.
-        return;
-      }
-
-      if (!db.objectStoreNames.contains(OLD_OBJECT_STORE_NAME)) {
-        // Database did not exist. Nothing to do.
-        return;
-      }
-
-      const objectStore = upgradeTransaction.objectStore(OLD_OBJECT_STORE_NAME);
-      const value = await objectStore.index('fcmSenderId').get(senderId);
-      await objectStore.clear();
+    {
+      upgrade: async (db, oldVersion, newVersion, upgradeTransaction) => {
+        if (oldVersion < 2) {
+          // Database too old, skip migration.
+          return;
+        }
 
-      if (!value) {
-        // No entry in the database, nothing to migrate.
-        return;
-      }
+        if (!db.objectStoreNames.contains(OLD_OBJECT_STORE_NAME)) {
+          // Database did not exist. Nothing to do.
+          return;
+        }
 
-      if (oldVersion === 2) {
-        const oldDetails = value as V2TokenDetails;
+        const objectStore = upgradeTransaction.objectStore(OLD_OBJECT_STORE_NAME);
+        const value = await objectStore.index('fcmSenderId').get(senderId);
+        await objectStore.clear();
 
-        if (!oldDetails.auth || !oldDetails.p256dh || !oldDetails.endpoint) {
+        if (!value) {
+          // No entry in the database, nothing to migrate.
           return;
         }
 
-        tokenDetails = {
-          token: oldDetails.fcmToken,
-          createTime: oldDetails.createTime ?? Date.now(),
-          subscriptionOptions: {
-            auth: oldDetails.auth,
-            p256dh: oldDetails.p256dh,
-            endpoint: oldDetails.endpoint,
-            swScope: oldDetails.swScope,
-            vapidKey:
-              typeof oldDetails.vapidKey === 'string'
-                ? oldDetails.vapidKey
-                : arrayToBase64(oldDetails.vapidKey)
-          }
-        };
-      } else if (oldVersion === 3) {
-        const oldDetails = value as V3TokenDetails;
-
-        tokenDetails = {
-          token: oldDetails.fcmToken,
-          createTime: oldDetails.createTime,
-          subscriptionOptions: {
-            auth: arrayToBase64(oldDetails.auth),
-            p256dh: arrayToBase64(oldDetails.p256dh),
-            endpoint: oldDetails.endpoint,
-            swScope: oldDetails.swScope,
-            vapidKey: arrayToBase64(oldDetails.vapidKey)
-          }
-        };
-      } else if (oldVersion === 4) {
-        const oldDetails = value as V4TokenDetails;
-
-        tokenDetails = {
-          token: oldDetails.fcmToken,
-          createTime: oldDetails.createTime,
-          subscriptionOptions: {
-            auth: arrayToBase64(oldDetails.auth),
-            p256dh: arrayToBase64(oldDetails.p256dh),
-            endpoint: oldDetails.endpoint,
-            swScope: oldDetails.swScope,
-            vapidKey: arrayToBase64(oldDetails.vapidKey)
+        if (oldVersion === 2) {
+          const oldDetails = value as V2TokenDetails;
+
+          if (!oldDetails.auth || !oldDetails.p256dh || !oldDetails.endpoint) {
+            return;
           }
-        };
+
+          tokenDetails = {
+            token: oldDetails.fcmToken,
+            createTime: oldDetails.createTime ?? Date.now(),
+            subscriptionOptions: {
+              auth: oldDetails.auth,
+              p256dh: oldDetails.p256dh,
+              endpoint: oldDetails.endpoint,
+              swScope: oldDetails.swScope,
+              vapidKey:
+                typeof oldDetails.vapidKey === 'string'
+                  ? oldDetails.vapidKey
+                  : arrayToBase64(oldDetails.vapidKey)
+            }
+          };
+        } else if (oldVersion === 3) {
+          const oldDetails = value as V3TokenDetails;
+
+          tokenDetails = {
+            token: oldDetails.fcmToken,
+            createTime: oldDetails.createTime,
+            subscriptionOptions: {
+              auth: arrayToBase64(oldDetails.auth),
+              p256dh: arrayToBase64(oldDetails.p256dh),
+              endpoint: oldDetails.endpoint,
+              swScope: oldDetails.swScope,
+              vapidKey: arrayToBase64(oldDetails.vapidKey)
+            }
+          };
+        } else if (oldVersion === 4) {
+          const oldDetails = value as V4TokenDetails;
+
+          tokenDetails = {
+            token: oldDetails.fcmToken,
+            createTime: oldDetails.createTime,
+            subscriptionOptions: {
+              auth: arrayToBase64(oldDetails.auth),
+              p256dh: arrayToBase64(oldDetails.p256dh),
+              endpoint: oldDetails.endpoint,
+              swScope: oldDetails.swScope,
+              vapidKey: arrayToBase64(oldDetails.vapidKey)
+            }
+          };
+        }
       }
     }
   );

packages/messaging/src/testing/setup.ts

@@ -19,7 +19,7 @@ import chaiAsPromised from 'chai-as-promised';
 import sinonChai from 'sinon-chai';
 
 import { dbDelete } from '../internals/idb-manager';
-import { deleteDB } from '@firebase/util';
+import { deleteDB } from 'idb';
 import { restore } from 'sinon';
 import { use } from 'chai';