@capacitor-community/sqlite 5.0.4-alphabetter.3 → 5.0.4-alphabetter.4

package/electron/dist/plugin.js

@@ -68,7 +68,7 @@ class UtilsSQLite {
      * @param password
      */
     async openOrCreateDatabase(pathDB, password, readonly) {
-        const msg = 'OpenOrCreateDatabase: ';
+        const msg = 'OpenOrCreateDatabase';
         // open sqlite3 database
         let mDB;
         if (!readonly) {
@@ -116,7 +116,7 @@ class UtilsSQLite {
      * @param password
      */
     async setCipherPragma(mDB, passphrase) {
-        const msg = 'setCipherPragma: ';
+        const msg = 'setCipherPragma';
         try {
             mDB.pragma(`cipher='sqlcipher'`);
             mDB.pragma(`legacy=4`);
@@ -134,7 +134,7 @@ class UtilsSQLite {
      * @param toggle
      */
     async setForeignKeyConstraintsEnabled(mDB, toggle) {
-        const msg = 'SetForeignKeyConstraintsEnabled: ';
+        const msg = 'SetForeignKeyConstraintsEnabled';
         let key = 'OFF';
         if (toggle) {
             key = 'ON';
@@ -148,12 +148,27 @@ class UtilsSQLite {
             return Promise.reject(`${msg} ${errmsg}`);
         }
     }
+    /**
+     * CloseDB
+     * @param mDB
+     */
+    async closeDB(mDB) {
+        const msg = 'closeDB';
+        try {
+            mDB.close();
+            return Promise.resolve();
+        }
+        catch (err) {
+            const errmsg = err.message ? err.message : err;
+            return Promise.reject(`${msg} ${errmsg}`);
+        }
+    }
     /**
      * GetVersion
      * @param mDB
      */
     async getVersion(mDB) {
-        const msg = 'GetVersion: ';
+        const msg = 'GetVersion';
         try {
             const version = mDB.pragma('user_version');
             return Promise.resolve(version);
@@ -169,7 +184,7 @@ class UtilsSQLite {
      * @param version
      */
     async setVersion(mDB, version) {
-        const msg = 'SetVersion: ';
+        const msg = 'SetVersion';
         try {
             mDB.pragma(`user_version = '${version}'`);
             return;
@@ -197,8 +212,9 @@ class UtilsSQLite {
             return Promise.reject(`${msg} ${errmsg}`);
         }
         finally {
-            mDB.close();
+            await this.closeDB(mDB);
         }
+        return;
     }
     /**
      * PragmaReKey
@@ -3324,9 +3340,9 @@ class UtilsEncryption {
                 const oDB = await this.sqliteUtil.openOrCreateDatabase(tempPath, '', false);
                 const mDB = await this.sqliteUtil.openOrCreateDatabase(pathDB, password, false);
                 await this.sqlcipherEncrypt(oDB, pathDB, password);
-                oDB.close();
+                await this.sqliteUtil.closeDB(oDB);
                 this.fileUtil.deleteFilePath(tempPath);
-                mDB.close();
+                await this.sqliteUtil.closeDB(mDB);
                 return Promise.resolve();
             }
             catch (err) {
@@ -3515,27 +3531,27 @@ class Database {
         }
         catch (err) {
             if (this._isDbOpen)
-                this.close();
+                await this.sqliteUtil.closeDB(this.database);
             throw new Error(`Open: ${err}`);
         }
     }
     /**
      * Close
-     * close the @journeyapps/sqlcipher sqlite3 database
+     * close better-sqlite3 database
      * @returns Promise<boolean>
      */
-    async close() {
+    async dbClose() {
         this.ensureDatabaseIsOpen();
-        return new Promise((resolve, reject) => {
-            this.database.close((err) => {
-                if (err) {
-                    reject(new Error(`Close failed: ${this.dbName}  ${err}`));
-                    return;
-                }
-                this._isDbOpen = false;
-                resolve();
-            });
-        });
+        try {
+            await this.sqliteUtil.closeDB(this.database);
+        }
+        catch (err) {
+            throw new Error(`Close failed: ${this.dbName}  ${err}`);
+        }
+        finally {
+            this._isDbOpen = false;
+        }
+        return;
     }
     /**
      * ChangeSecret
@@ -3569,7 +3585,7 @@ class Database {
         }
         catch (err) {
             if (this._isDbOpen)
-                this.close();
+                await this.sqliteUtil.closeDB(this.database);
             throw new Error(`getVersion: ${err}`);
         }
     }
@@ -3593,7 +3609,7 @@ class Database {
         }
         // close the database
         try {
-            await this.close();
+            await this.dbClose();
         }
         catch (err) {
             throw new Error('DeleteDB: Close failed');
@@ -3997,10 +4013,12 @@ class CapacitorSQLite {
         const readonly = options.readonly ? options.readonly : false;
         const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
+        console.log(`@@@@@ connName: ${connName}`);
         try {
             if (database.isDBOpen()) {
                 // close the database
-                await database.close();
+                await database.dbClose();
+                console.log(`@@@@@ after database.dbClose()`);
             }
         }
         catch (err) {
@@ -4038,7 +4056,7 @@ class CapacitorSQLite {
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
-                await database.close();
+                await database.dbClose();
                 return;
             }
             catch (err) {
@@ -4322,7 +4340,7 @@ class CapacitorSQLite {
             // Import the JsonSQLite Object
             const changes = await database.importJson(vJsonObj);
             // Close the database
-            await database.close();
+            await database.dbClose();
             return { changes: { changes: changes } };
         }
         catch (err) {
@@ -4619,6 +4637,7 @@ class CapacitorSQLite {
      */
     getDatabaseConnectionOrThrowError(dbName) {
         const databaseNames = Object.keys(this.databases);
+        console.log(`@@@@ this.databases: ${JSON.stringify(this.databases)}`);
         if (!databaseNames.includes(dbName)) {
             throw new Error(`No connection available for database "${dbName}"`);
         }
@@ -4719,7 +4738,7 @@ class CapacitorSQLite {
             try {
                 const mDB = await this.sqliteUtil.openOrCreateDatabase(filePath, "", true);
                 await this.sqliteUtil.getVersion(mDB);
-                mDB.close();
+                await this.sqliteUtil.closeDB(mDB);
                 return Promise.resolve({ result: false });
             }
             catch (error) {