Fix IDBDatabase

Author: aybeeseedee

rollup.config.js

@@ -5,7 +5,7 @@ export default {
     input: 'src/index.ts',
     output: {
         dir: 'dist',
-        format: 'es',
+        format: 'cjs',
     },
     plugins: [typescript()],
 };

src/IDBDatabaseHelper.ts

@@ -2,6 +2,8 @@ interface IDBDatabaseEventTarget extends EventTarget {
     result?: IDBDatabase | any
 }
 
+let db: IDBDatabase;
+
 const getIDBDatabaseHelper = async () => {
     const openDB = () => (
         new Promise<IDBDatabase>((resolve, _) => {
@@ -20,7 +22,9 @@ const getIDBDatabaseHelper = async () => {
         })
     );
 
-    const db = await openDB();
+    if (!db) {
+        db = await openDB();
+    }
 
     const getTx = () => db.transaction(['data'], 'readwrite');
 
@@ -108,9 +112,7 @@ const getIDBDatabaseHelper = async () => {
     };
 };
 
-const IDBDatabaseHelper = await getIDBDatabaseHelper();
-
-export default IDBDatabaseHelper;
+export default getIDBDatabaseHelper;
 
 // class IDBDatabaseHelper {
 //

src/KeyContainer.ts

@@ -1,7 +1,8 @@
 import { GetAppDataUUID, GetDeviceKey, GetSeguroKey, KeyChain, PGPKeys } from './define';
 import EncryptHelper from './EncryptHelper';
 import { getUUIDv4 } from './utils';
-import IDBDatabaseHelper from './IDBDatabaseHelper';
+// eslint-disable-next-line import/no-cycle
+import KloakBridge from './KloakBridge';
 
 class KeyContainer {
     private encryptHelper: EncryptHelper | null = null
@@ -22,13 +23,17 @@ class KeyContainer {
         new Promise<boolean>(async (resolve, reject) => {
             try {
                 const encryptedMessage = await this.encryptHelper?.encryptMessage(JSON.stringify(this.keyChain));
-                const tx = IDBDatabaseHelper.getTx();
-                if (tx) {
-                    await IDBDatabaseHelper.save(tx, this.keychainUUID, encryptedMessage);
-                } else {
-                    reject();
+                if (KloakBridge.IDBDatabase) {
+                    const tx = KloakBridge.IDBDatabase.getTx();
+                    if (tx) {
+                        await KloakBridge.IDBDatabase.save(tx, this.keychainUUID, encryptedMessage);
+                    } else {
+                        reject();
+                    }
+                    return resolve(true);
                 }
-                return resolve(true);
+                reject();
+
             } catch (err) {
                 return reject(err);
             }