@capacitor-community/sqlite 5.0.5-2 → 5.0.6

package/electron/dist/plugin.js

@@ -11,6 +11,8 @@ var require$$5 = require('jszip');
 var require$$6 = require('electron');
 var require$$1$1 = require('better-sqlite3-multiple-ciphers');
 var require$$3$1 = require('electron-json-storage');
+var require$$1$2 = require('crypto');
+var require$$2$1 = require('crypto-js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,6 +25,8 @@ var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
 var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$3__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
+var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 
 var src = {};
 
@@ -84,33 +88,32 @@ class UtilsFile {
         else {
             this.capConfig = JSON.parse(this.NodeFs.readFileSync(this.Path.join(this.appPath, 'capacitor.config.json')).toString());
         }
-        this.isEncryption = this.capConfig.plugins.CapacitorSQLite.electronIsEncryption
+        this.isEncryption = this.capConfig.plugins.CapacitorSQLite
+            .electronIsEncryption
             ? this.capConfig.plugins.CapacitorSQLite.electronIsEncryption
             : false;
         this.osType = this.Os.type();
         switch (this.osType) {
             case 'Darwin':
-                this.pathDB =
-                    this.capConfig.plugins.CapacitorSQLite.electronMacLocation
-                        ? this.capConfig.plugins.CapacitorSQLite.electronMacLocation
-                        : 'Databases';
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite.electronMacLocation
+                    ? this.capConfig.plugins.CapacitorSQLite.electronMacLocation
+                    : 'Databases';
                 break;
             case 'Linux':
-                this.pathDB =
-                    this.capConfig.plugins.CapacitorSQLite.electronLinuxLocation
-                        ? this.capConfig.plugins.CapacitorSQLite.electronLinuxLocation
-                        : 'Databases';
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite
+                    .electronLinuxLocation
+                    ? this.capConfig.plugins.CapacitorSQLite.electronLinuxLocation
+                    : 'Databases';
                 break;
             case 'Windows_NT':
-                this.pathDB =
-                    this.capConfig.plugins.CapacitorSQLite.electronWindowsLocation
-                        ? this.capConfig.plugins.CapacitorSQLite.electronWindowsLocation
-                        : 'Databases';
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite
+                    .electronWindowsLocation
+                    ? this.capConfig.plugins.CapacitorSQLite.electronWindowsLocation
+                    : 'Databases';
                 break;
             default:
                 console.log('other operating system');
         }
-        console.log(`&&& Databases path: ${this.pathDB}`);
     }
     /**
      * Get isEncryption from config
@@ -670,13 +673,13 @@ class UtilsSQLite {
         let mDB;
         if (!readonly) {
             mDB = new this.BCSQLite3(pathDB, {
-                verbose: console.log,
+                //        verbose: console.log,
                 fileMustExist: false,
             });
         }
         else {
             mDB = new this.BCSQLite3(pathDB, {
-                verbose: console.log,
+                //        verbose: console.log,
                 readonly: true,
                 fileMustExist: true,
             });
@@ -799,7 +802,7 @@ class UtilsSQLite {
      */
     changePassword(pathDB, password, newpassword) {
         let mDB;
-        const msg = "ChangePassword";
+        const msg = 'ChangePassword';
         try {
             mDB = this.openOrCreateDatabase(pathDB, password, false);
             this.pragmaReKey(mDB, password, newpassword);
@@ -944,16 +947,16 @@ class UtilsSQLite {
      */
     execute(mDB, sql, fromJson) {
         const result = { changes: 0, lastId: -1 };
-        const msg = "Execute";
+        const msg = 'Execute';
         let changes = -1;
         let lastId = -1;
         let initChanges = -1;
         try {
             initChanges = this.dbChanges(mDB);
             let sqlStmt = sql;
-            if (sql.toLowerCase().includes('DELETE FROM'.toLowerCase())
-                || sql.toLowerCase().includes('INSERT INTO'.toLowerCase())
-                || sql.toLowerCase().includes('UPDATE'.toLowerCase())) {
+            if (sql.toLowerCase().includes('DELETE FROM'.toLowerCase()) ||
+                sql.toLowerCase().includes('INSERT INTO'.toLowerCase()) ||
+                sql.toLowerCase().includes('UPDATE'.toLowerCase())) {
                 sqlStmt = this.checkStatements(mDB, sql, fromJson);
             }
             this.execDB(mDB, sqlStmt);
@@ -972,8 +975,8 @@ class UtilsSQLite {
         // split the statements in an array of statement
         let sqlStmt = sql.replace(/\n/g, '');
         // deal with trigger
-        sqlStmt = sqlStmt.replace(/end;/g, "END;");
-        sqlStmt = sqlStmt.replace(/;END;/g, "&END;");
+        sqlStmt = sqlStmt.replace(/end;/g, 'END;');
+        sqlStmt = sqlStmt.replace(/;END;/g, '&END;');
         const sqlStmts = sqlStmt.split(';');
         const resArr = [];
         // loop through the statement
@@ -986,12 +989,11 @@ class UtilsSQLite {
             switch (method) {
                 case 'CREATE':
                     if (rStmt.includes('&END')) {
-                        rStmt = rStmt.replace(/&END/g, ";END");
+                        rStmt = rStmt.replace(/&END/g, ';END');
                     }
                     break;
                 case 'DELETE':
-                    if (!fromJson &&
-                        stmt.toLowerCase().includes('WHERE'.toLowerCase())) {
+                    if (!fromJson && stmt.toLowerCase().includes('WHERE'.toLowerCase())) {
                         const whereStmt = this.cleanStatement(`${stmt.trim()}`);
                         rStmt = this.deleteSQL(mDB, whereStmt, []);
                     }
@@ -1007,8 +1009,7 @@ class UtilsSQLite {
                     }
                     break;
                 case 'SELECT':
-                    if (!fromJson &&
-                        stmt.toLowerCase().includes('WHERE'.toLowerCase())) {
+                    if (!fromJson && stmt.toLowerCase().includes('WHERE'.toLowerCase())) {
                         rStmt = this.cleanStatement(`${stmt.trim()}`);
                     }
                     break;
@@ -1040,10 +1041,10 @@ class UtilsSQLite {
      * @param set
      * @param fromJson
      */
-    executeSet(mDB, set, fromJson) {
-        const ret = { changes: 0, lastId: -1 };
+    executeSet(mDB, set, fromJson, returnMode) {
+        const ret = { changes: 0, lastId: -1, values: [] };
         let result = { changes: 0, lastId: -1 };
-        const msg = "ExecuteSet";
+        const msg = 'ExecuteSet';
         for (let i = 0; i < set.length; i++) {
             const statement = 'statement' in set[i] ? set[i].statement : null;
             const values = 'values' in set[i] && set[i].values.length > 0 ? set[i].values : [];
@@ -1056,22 +1057,28 @@ class UtilsSQLite {
                 if (Array.isArray(values[0])) {
                     for (const val of values) {
                         const mVal = this.replaceUndefinedByNull(val);
-                        result = this.prepareRun(mDB, statement, mVal, fromJson);
+                        result = this.prepareRun(mDB, statement, mVal, fromJson, returnMode);
                         ret.changes += result.changes;
                         ret.lastId = result.lastId;
+                        const keys = Object.keys(result);
+                        if (keys.includes('values') && result.values.length > 0) {
+                            ret.values.push(result.values);
+                        }
                     }
                 }
                 else {
                     if (values.length > 0) {
                         const mVal = this.replaceUndefinedByNull(values);
-                        result = this.prepareRun(mDB, statement, mVal, fromJson);
-                        ret.changes += result.changes;
-                        ret.lastId = result.lastId;
+                        result = this.prepareRun(mDB, statement, mVal, fromJson, returnMode);
                     }
                     else {
-                        result = this.prepareRun(mDB, statement, [], fromJson);
-                        ret.changes += result.changes;
-                        ret.lastId = result.lastId;
+                        result = this.prepareRun(mDB, statement, [], fromJson, returnMode);
+                    }
+                    ret.changes += result.changes;
+                    ret.lastId = result.lastId;
+                    const keys = Object.keys(result);
+                    if (keys.includes('values') && result.values.length > 0) {
+                        ret.values.push(result.values);
                     }
                 }
             }
@@ -1089,9 +1096,9 @@ class UtilsSQLite {
      * @param values
      * @param fromJson
      */
-    prepareRun(mDB, statement, values, fromJson) {
+    prepareRun(mDB, statement, values, fromJson, returnMode) {
         const result = { changes: 0, lastId: -1 };
-        const msg = "PrepareRun";
+        const msg = 'PrepareRun';
         const stmtType = statement
             .replace(/\n/g, '')
             .trim()
@@ -1114,9 +1121,16 @@ class UtilsSQLite {
                     mVal.push(null);
                 }
             }
-            const ret = this.runExec(mDB, sqlStmt, mVal);
-            result.changes = ret.changes;
-            result.lastId = ret.lastInsertRowid;
+            const ret = this.runExec(mDB, sqlStmt, mVal, returnMode);
+            if (ret.values != null) {
+                result.values = ret.values;
+                result.changes = ret.changes;
+                result.lastId = ret.lastInsertRowid;
+            }
+            else {
+                result.changes = ret.changes;
+                result.lastId = ret.lastInsertRowid;
+            }
             return result;
         }
         catch (err) {
@@ -1124,17 +1138,59 @@ class UtilsSQLite {
             throw new Error(`${msg} ${errmsg}`);
         }
     }
-    runExec(mDB, stmt, values = []) {
+    runExec(mDB, stmt, values = [], returnMode) {
+        let result = { changes: 0, lastInsertRowid: -1, values: [] };
         const msg = 'runExec: ';
         try {
             const cStmt = this.cleanStatement(stmt);
-            const statement = mDB.prepare(cStmt);
-            let result;
-            if (values != null && values.length > 0) {
-                result = statement.run(values);
-            }
-            else {
-                result = statement.run();
+            const params = this.getStmtAndNames(cStmt, returnMode);
+            switch (params.mMode) {
+                case 'one': {
+                    const iniChanges = this.dbChanges(mDB);
+                    if (values.length === 0) {
+                        const value = mDB.prepare(params.stmt).get();
+                        result.values.push(value);
+                        result.lastInsertRowid = this.getLastId(mDB);
+                    }
+                    else {
+                        const lowerId = this.getLastId(mDB) + 1;
+                        const statement = mDB.prepare(params.stmt);
+                        const res = statement.run(values);
+                        result.lastInsertRowid = res.lastInsertRowid;
+                        const sql = `SELECT ${params.names} FROM ${params.tableName} WHERE rowid = ${lowerId};`;
+                        const value = this.queryOne(mDB, sql, []);
+                        result.values.push(value);
+                    }
+                    result.changes = this.dbChanges(mDB) - iniChanges;
+                    break;
+                }
+                case 'all': {
+                    const iniChanges = this.dbChanges(mDB);
+                    if (values.length === 0) {
+                        result.values = mDB.prepare(params.stmt).all();
+                        result.lastInsertRowid = this.getLastId(mDB);
+                    }
+                    else {
+                        const lowerId = this.getLastId(mDB) + 1;
+                        const statement = mDB.prepare(params.stmt);
+                        const res = statement.run(values);
+                        const upperId = res.lastInsertRowid;
+                        const sql = `SELECT ${params.names} FROM ${params.tableName} WHERE rowid BETWEEN ${lowerId} AND ${upperId};`;
+                        result.values = this.queryAll(mDB, sql, []);
+                        result.lastInsertRowid = res.lastInsertRowid;
+                    }
+                    result.changes = this.dbChanges(mDB) - iniChanges;
+                    break;
+                }
+                default: {
+                    const statement = mDB.prepare(params.stmt);
+                    if (values != null && values.length > 0) {
+                        result = statement.run(values);
+                    }
+                    else {
+                        result = statement.run();
+                    }
+                }
             }
             return result;
         }
@@ -1169,7 +1225,7 @@ class UtilsSQLite {
      */
     deleteSQL(mDB, statement, values) {
         let sqlStmt = statement;
-        const msg = "DeleteSQL";
+        const msg = 'DeleteSQL';
         try {
             const isLast = this.isLastModified(mDB, true);
             const isDel = this.isSqlDeleted(mDB, true);
@@ -1201,7 +1257,7 @@ class UtilsSQLite {
      * @returns
      */
     findReferencesAndUpdate(mDB, tableName, whereStmt, values) {
-        const msg = "FindReferencesAndUpdate";
+        const msg = 'FindReferencesAndUpdate';
         try {
             const references = this.getReferences(mDB, tableName);
             if (references.length <= 0) {
@@ -1252,7 +1308,7 @@ class UtilsSQLite {
                         }
                     }
                 }
-                const ret = this.runExec(mDB, stmt, selValues);
+                const ret = this.runExec(mDB, stmt, selValues, 'no');
                 const lastId = ret.lastInsertRowid;
                 if (lastId == -1) {
                     const msg = `UPDATE sql_deleted failed for references table: ${refTable}`;
@@ -1349,7 +1405,7 @@ class UtilsSQLite {
         return whereStmt;
     }
     getReferences(mDB, tableName) {
-        const msg = "GetReferences";
+        const msg = 'GetReferences';
         const sqlStmt = 'SELECT sql FROM sqlite_master ' +
             "WHERE sql LIKE('%FOREIGN KEY%') AND sql LIKE('%REFERENCES%') AND " +
             "sql LIKE('%" +
@@ -1391,7 +1447,7 @@ class UtilsSQLite {
      * @param values
      */
     queryAll(mDB, sql, values) {
-        const msg = "QueryAll";
+        const msg = 'QueryAll';
         try {
             const cSql = this.cleanStatement(sql);
             const stmt = mDB.prepare(cSql);
@@ -1419,7 +1475,7 @@ class UtilsSQLite {
      * @param values
      */
     queryOne(mDB, sql, values) {
-        const msg = "QueryOne";
+        const msg = 'QueryOne';
         try {
             const cSql = this.cleanStatement(sql);
             const stmt = mDB.prepare(cSql);
@@ -1442,7 +1498,7 @@ class UtilsSQLite {
      * @param mDb
      */
     getTablesNames(mDb) {
-        const msg = "getTablesNames";
+        const msg = 'getTablesNames';
         let sql = 'SELECT name FROM sqlite_master WHERE ';
         sql += "type='table' AND name NOT LIKE 'sync_table' ";
         sql += "AND name NOT LIKE '_temp_%' ";
@@ -1466,7 +1522,7 @@ class UtilsSQLite {
      * @param mDb
      */
     getViewsNames(mDb) {
-        const msg = "GetViewsNames";
+        const msg = 'GetViewsNames';
         let sql = 'SELECT name FROM sqlite_master WHERE ';
         sql += "type='view' AND name NOT LIKE 'sqlite_%' ";
         sql += 'ORDER BY rootpage DESC;';
@@ -1489,7 +1545,7 @@ class UtilsSQLite {
      * @param isOpen
      */
     isLastModified(mDB, isOpen) {
-        const msg = "IsLastModified";
+        const msg = 'IsLastModified';
         if (!isOpen) {
             throw new Error(`${msg} database not opened`);
         }
@@ -1515,7 +1571,7 @@ class UtilsSQLite {
      * @param isOpen
      */
     isSqlDeleted(mDB, isOpen) {
-        const msg = "IsSqlDeleted";
+        const msg = 'IsSqlDeleted';
         if (!isOpen) {
             throw new Error(`${msg} database not opened`);
         }
@@ -1536,10 +1592,11 @@ class UtilsSQLite {
         }
     }
     getJournalMode(mDB) {
-        const msg = "getJournalMode";
+        const msg = 'getJournalMode';
         try {
-            const retMode = mDB.pragma('journal_mode')[0];
-            return retMode;
+            const retMode = mDB.pragma('journal_mode');
+            console.log(`journal_mode: ${retMode[0].journal_mode}`);
+            return retMode[0].journal_mode;
         }
         catch (err) {
             const errmsg = err.message ? err.message : err;
@@ -1547,7 +1604,7 @@ class UtilsSQLite {
         }
     }
     async isDatabaseEncrypted(dbName) {
-        const msg = "isDatabaseEncrypted";
+        const msg = 'isDatabaseEncrypted';
         try {
             const isExists = this.fileUtil.isFileExists(dbName);
             if (isExists) {
@@ -1565,7 +1622,10 @@ class UtilsSQLite {
     }
     async isDBEncrypted(filePath) {
         try {
-            const retStr = await this.fileUtil.readFileAsPromise(filePath, { start: 0, end: 12 });
+            const retStr = await this.fileUtil.readFileAsPromise(filePath, {
+                start: 0,
+                end: 12,
+            });
             if (retStr === 'SQLite format')
                 return false;
             else
@@ -1581,7 +1641,7 @@ class UtilsSQLite {
      * @param tableName
      */
     getTableColumnNamesTypes(mDB, tableName) {
-        const msg = "getTableColumnNamesTypes";
+        const msg = 'getTableColumnNamesTypes';
         try {
             const infos = mDB.pragma(`table_info('${tableName}')`);
             const retNames = [];
@@ -1598,22 +1658,21 @@ class UtilsSQLite {
         }
     }
     cleanStatement(stmt) {
-        let sql = "";
+        let sql = '';
         if (stmt.toLowerCase().includes('INSERT INTO'.toLowerCase()) ||
             stmt.toLowerCase().includes('SELECT'.toLowerCase()) ||
             stmt.toLowerCase().includes('UPDATE'.toLowerCase()) ||
             stmt.toLowerCase().includes('DELETE FROM'.toLowerCase())) {
             // check for JSON string
             sql = this.dealJsonString(stmt);
-            sql = sql.replaceAll("\"", "'");
-            sql = sql.replaceAll("§", "\"");
+            sql = sql.replaceAll('"', "'");
+            sql = sql.replaceAll('§', '"');
         }
         else {
             sql = stmt;
         }
         return sql;
     }
-    ;
     findIndex(str, char) {
         const a = [];
         for (let i = str.length; i--;)
@@ -1626,11 +1685,54 @@ class UtilsSQLite {
         const oJ = this.findIndex(stmt, '{');
         const eJ = this.findIndex(stmt, '}');
         for (let i = 0; i < oJ.length; i++) {
-            const g = (retStmt.substring(oJ[i] + 1, eJ[i])).replaceAll("\"", "§");
+            const g = retStmt.substring(oJ[i] + 1, eJ[i]).replaceAll('"', '§');
             retStmt = retStmt.substring(0, oJ[i] + 1) + g + retStmt.substring(eJ[i]);
         }
         return retStmt;
     }
+    getStmtAndNames(stmt, returnMode) {
+        const retObj = {};
+        const mStmt = stmt;
+        if (mStmt.toUpperCase().includes('RETURNING') &&
+            (returnMode === 'all' || returnMode === 'one')) {
+            retObj.tableName = this.getTableName(mStmt);
+            retObj.mMode = returnMode;
+            const idx = mStmt.toUpperCase().indexOf('RETURNING') + 9;
+            const names = mStmt.substring(idx).trim();
+            retObj.names = names.slice(-1) === ';' ? names.slice(0, -1) : names;
+            retObj.stmt = mStmt;
+        }
+        else {
+            retObj.mMode = 'no';
+            if (mStmt.toUpperCase().includes('RETURNING')) {
+                const idx = mStmt.toUpperCase().indexOf('RETURNING');
+                retObj.stmt = mStmt.slice(0, idx).trim() + ';';
+            }
+            else {
+                retObj.stmt = mStmt;
+            }
+        }
+        return retObj;
+    }
+    getTableName(sqlStatement) {
+        const patterns = {
+            insert: /INSERT\s+INTO\s+(\w+)/i,
+            delete: /DELETE\s+FROM\s+(\w+)/i,
+            update: /UPDATE\s+(\w+)/i,
+            select: /SELECT.*\s+FROM\s+(\w+)/i,
+        };
+        let tableName = null;
+        Object.keys(patterns).some((key) => {
+            const pattern = patterns[key];
+            const match = pattern.exec(sqlStatement);
+            if (match) {
+                tableName = match[1];
+                return true; // Stop iterating through patterns
+            }
+            return false;
+        });
+        return tableName;
+    }
 }
 utilsSQLite.UtilsSQLite = UtilsSQLite;
 
@@ -1861,7 +1963,7 @@ class UtilsJson {
                     if (stmt.substring(0, 6).toUpperCase() === 'DELETE') {
                         row = [];
                     }
-                    results = this.sqliteUtil.prepareRun(mDB, stmt, row, true);
+                    results = this.sqliteUtil.prepareRun(mDB, stmt, row, true, 'no');
                     lastId = results.lastId;
                     if (lastId < 0) {
                         throw new Error(`${msg} lastId < 0`);
@@ -1893,8 +1995,7 @@ class UtilsJson {
         if (row.length != tColNames.length ||
             row.length === 0 ||
             tColNames.length === 0) {
-            throw new Error(`${msg} Table ${tableName} ` +
-                `values row ${j} not correct length`);
+            throw new Error(`${msg} Table ${tableName} ` + `values row ${j} not correct length`);
         }
         try {
             const retisIdExists = this.isIdExists(mDB, tableName, tColNames[0], row[0]);
@@ -2521,8 +2622,7 @@ class ExportToJson {
                         break;
                     }
                     default: {
-                        errmsg =
-                            `${msg} expMode ${sqlObj.mode} not defined`;
+                        errmsg = `${msg} expMode ${sqlObj.mode} not defined`;
                         break;
                     }
                 }
@@ -2566,7 +2666,7 @@ class ExportToJson {
         }
     }
     getLastExportDate(mDb) {
-        const msg = "GetLastExportDate";
+        const msg = 'GetLastExportDate';
         let retDate = -1;
         try {
             // get the last sync date
@@ -2589,7 +2689,7 @@ class ExportToJson {
      * @returns
      */
     setLastExportDate(mDb, lastExportedDate) {
-        const msg = "SetLastExportDate";
+        const msg = 'SetLastExportDate';
         try {
             const isTable = this.jsonUtil.isTableExists(mDb, true, 'sync_table');
             if (!isTable) {
@@ -2597,7 +2697,7 @@ class ExportToJson {
             }
             const sDate = Math.round(new Date(lastExportedDate).getTime() / 1000);
             let stmt = '';
-            if ((this.getLastExportDate(mDb)) > 0) {
+            if (this.getLastExportDate(mDb) > 0) {
                 stmt = `UPDATE sync_table SET sync_date = ${sDate} WHERE id = 2;`;
             }
             else {
@@ -2619,7 +2719,7 @@ class ExportToJson {
         }
     }
     delExportedRows(mDb) {
-        const msg = "DelExportedRows";
+        const msg = 'DelExportedRows';
         let lastExportDate;
         try {
             // check if synchronization table exists
@@ -2642,7 +2742,7 @@ class ExportToJson {
                 // define the delete statement
                 const delStmt = `DELETE FROM ${table}
               WHERE sql_deleted = 1 AND last_modified < ${lastExportDate};`;
-                const results = this.sqliteUtil.prepareRun(mDb, delStmt, [], true);
+                const results = this.sqliteUtil.prepareRun(mDb, delStmt, [], true, 'no');
                 if (results.lastId < 0) {
                     throw new Error(`${msg} lastId < 0`);
                 }
@@ -2681,7 +2781,7 @@ class ExportToJson {
      * @param mDb
      */
     getSyncDate(mDb) {
-        const msg = "GetSyncDate";
+        const msg = 'GetSyncDate';
         let retDate = -1;
         // get the last sync date
         const stmt = `SELECT sync_date FROM sync_table WHERE id = ?;`;
@@ -3240,7 +3340,7 @@ class UtilsDrop {
                     statements.push(stmt);
                 }
                 for (const stmt of statements) {
-                    const results = this.sqliteUtil.prepareRun(db, stmt, [], false);
+                    const results = this.sqliteUtil.prepareRun(db, stmt, [], false, 'no');
                     if (results.lastId < 0) {
                         throw new Error(`${msg}: lastId < 0`);
                     }
@@ -3268,7 +3368,7 @@ class UtilsDrop {
             // drop views
             this.dropElements(db, 'view');
             // vacuum the database
-            this.sqliteUtil.prepareRun(db, 'VACUUM;', [], false);
+            this.sqliteUtil.prepareRun(db, 'VACUUM;', [], false, 'no');
             return;
         }
         catch (err) {
@@ -3448,55 +3548,20 @@ class ImportFromJson {
 }
 importFromJson.ImportFromJson = ImportFromJson;
 
-var utilsEncryption = {};
-
-Object.defineProperty(utilsEncryption, "__esModule", { value: true });
-utilsEncryption.UtilsEncryption = void 0;
-const utilsFile_1$3 = utilsFile;
-const utilsSQLite_1$4 = utilsSQLite;
-class UtilsEncryption {
-    constructor() {
-        this.fileUtil = new utilsFile_1$3.UtilsFile();
-        this.sqliteUtil = new utilsSQLite_1$4.UtilsSQLite();
-    }
-    /**
-     * EncryptDatabase
-     * @param pathDB
-     * @param password
-     */
-    async encryptDatabase(pathDB, password) {
-        const msg = 'EncryptDatabase: ';
-        const retB = this.fileUtil.isPathExists(pathDB);
-        if (retB) {
-            try {
-                const mDB = await this.sqliteUtil.openOrCreateDatabase(pathDB, '', false);
-                this.sqliteUtil.pragmaReKey(mDB, '', password);
-                this.sqliteUtil.closeDB(mDB);
-                return Promise.resolve();
-            }
-            catch (err) {
-                return Promise.reject(new Error(`${msg} ${err.message} `));
-            }
-        }
-        else {
-            return Promise.reject(new Error(`${msg}file path ${pathDB} ` + 'does not exist'));
-        }
-    }
-}
-utilsEncryption.UtilsEncryption = UtilsEncryption;
+var utilsJsonEncryption = {};
 
 var utilsSecret = {};
 
 Object.defineProperty(utilsSecret, "__esModule", { value: true });
 utilsSecret.UtilsSecret = void 0;
 const GlobalSQLite_1$2 = GlobalSQLite$1;
-const utilsFile_1$2 = utilsFile;
-const utilsSQLite_1$3 = utilsSQLite;
+const utilsFile_1$3 = utilsFile;
+const utilsSQLite_1$4 = utilsSQLite;
 class UtilsSecret {
     constructor() {
         this.globalUtil = new GlobalSQLite_1$2.GlobalSQLite();
-        this.sqliteUtil = new utilsSQLite_1$3.UtilsSQLite();
-        this.fileUtil = new utilsFile_1$2.UtilsFile();
+        this.sqliteUtil = new utilsSQLite_1$4.UtilsSQLite();
+        this.fileUtil = new utilsFile_1$3.UtilsFile();
         this.storage = require$$3__default$1["default"];
     }
     isSecretStored() {
@@ -3512,7 +3577,7 @@ class UtilsSecret {
                 throw new Error(`setEncryptSecret: passphrase already stored`);
             }
             else {
-                oldpassphrase = this.globalUtil != null ? this.globalUtil.secret : "";
+                oldpassphrase = this.globalUtil != null ? this.globalUtil.secret : '';
                 if (oldpassphrase.length <= 0) {
                     throw new Error(`setEncryptSecret: globalUtil is null`);
                 }
@@ -3547,7 +3612,7 @@ class UtilsSecret {
                 oldpassphrase = this.globalUtil.secret;
             }
             // check if some databases were encrypted with the oldpassphrase
-            this.changeDatabaseSecret(oldpassphrase, "").then(() => {
+            this.changeDatabaseSecret(oldpassphrase, '').then(() => {
                 this.removePassphrase();
             });
         }
@@ -3590,12 +3655,12 @@ class UtilsSecret {
         const data = this.storage.getSync('userData');
         const keys = Object.keys(data);
         if (data == null || keys.length <= 0)
-            return "";
+            return '';
         if (Object.keys(data).includes('passphrase')) {
             return data.passphrase;
         }
         else {
-            return "";
+            return '';
         }
     }
     setPassphrase(passphrase) {
@@ -3617,6 +3682,103 @@ class UtilsSecret {
 }
 utilsSecret.UtilsSecret = UtilsSecret;
 
+Object.defineProperty(utilsJsonEncryption, "__esModule", { value: true });
+utilsJsonEncryption.UtilsJsonEncryption = void 0;
+const utilsSecret_1$2 = utilsSecret;
+class UtilsJsonEncryption {
+    constructor() {
+        this.fileSecret = new utilsSecret_1$2.UtilsSecret();
+        this.SALT = 'jeep_capacitor_sqlite';
+        this.Crypto = require$$1__default$2["default"];
+        this.CryptoJS = require$$2__default$1["default"];
+    }
+    /**
+     * deriveKeyFromPassphrase
+     * Function to derive a symmetric key from passphrase and salt using PBKDF2
+     * @param passphrase
+     * @param salt
+     * @returns
+     */
+    deriveKeyFromPassphrase(passphrase, salt) {
+        const iterations = 10000; // Recommended number of iterations for PBKDF2
+        const keyLength = 32;
+        const key = this.Crypto.pbkdf2Sync(passphrase, salt, iterations, keyLength, 'sha256');
+        const keyHex = Buffer.from(key).toString('hex');
+        return keyHex;
+    }
+    /**
+     * encryptJSONObject
+     * Function to encrypt JSON object with AES and return as Base64
+     * @param jsonObj
+     * @returns
+     */
+    encryptJSONObject(jsonObj) {
+        const jsonString = JSON.stringify(jsonObj);
+        // get the passphrase
+        const passphrase = this.fileSecret.getPassphrase();
+        // derived a combined key from passphrase and salt
+        const key = this.deriveKeyFromPassphrase(passphrase, this.SALT);
+        const encrypted = this.CryptoJS.AES.encrypt(jsonString, key).toString();
+        const encryptedBase64 = Buffer.from(encrypted).toString('base64');
+        return encryptedBase64;
+    }
+    /**
+     * decryptJSONObject
+     * Function to decrypt AES encrypted JSON object from Base64
+     * @param encryptedBase64
+     * @returns
+     */
+    decryptJSONObject(encryptedBase64) {
+        const encryptedData = Buffer.from(encryptedBase64, 'base64').toString();
+        // get the passphrase
+        const passphrase = this.fileSecret.getPassphrase();
+        // derived a combined key from passphrase and salt
+        const key = this.deriveKeyFromPassphrase(passphrase, this.SALT);
+        const bytes = this.CryptoJS.AES.decrypt(encryptedData, key);
+        const decryptedString = bytes.toString(this.CryptoJS.enc.Utf8);
+        const decryptedObj = JSON.parse(decryptedString);
+        return decryptedObj;
+    }
+}
+utilsJsonEncryption.UtilsJsonEncryption = UtilsJsonEncryption;
+
+var utilsEncryption = {};
+
+Object.defineProperty(utilsEncryption, "__esModule", { value: true });
+utilsEncryption.UtilsEncryption = void 0;
+const utilsFile_1$2 = utilsFile;
+const utilsSQLite_1$3 = utilsSQLite;
+class UtilsEncryption {
+    constructor() {
+        this.fileUtil = new utilsFile_1$2.UtilsFile();
+        this.sqliteUtil = new utilsSQLite_1$3.UtilsSQLite();
+    }
+    /**
+     * EncryptDatabase
+     * @param pathDB
+     * @param password
+     */
+    async encryptDatabase(pathDB, password) {
+        const msg = 'EncryptDatabase: ';
+        const retB = this.fileUtil.isPathExists(pathDB);
+        if (retB) {
+            try {
+                const mDB = await this.sqliteUtil.openOrCreateDatabase(pathDB, '', false);
+                this.sqliteUtil.pragmaReKey(mDB, '', password);
+                this.sqliteUtil.closeDB(mDB);
+                return Promise.resolve();
+            }
+            catch (err) {
+                return Promise.reject(new Error(`${msg} ${err.message} `));
+            }
+        }
+        else {
+            return Promise.reject(new Error(`${msg}file path ${pathDB} ` + 'does not exist'));
+        }
+    }
+}
+utilsEncryption.UtilsEncryption = UtilsEncryption;
+
 var utilsUpgrade = {};
 
 Object.defineProperty(utilsUpgrade, "__esModule", { value: true });
@@ -3688,13 +3850,15 @@ const GlobalSQLite_1$1 = GlobalSQLite$1;
 const exportToJson_1 = exportToJson;
 const importFromJson_1 = importFromJson;
 const utilsJson_1$1 = utilsJson;
+const utilsJsonEncryption_1$1 = utilsJsonEncryption;
 const utilsEncryption_1 = utilsEncryption;
 const utilsFile_1$1 = utilsFile;
 const utilsSQLite_1$1 = utilsSQLite;
 const utilsSecret_1$1 = utilsSecret;
 const utilsUpgrade_1 = utilsUpgrade;
 class Database {
-    constructor(dbName, encrypted, mode, version, readonly, upgDict, globalUtil) {
+    constructor(dbName, encrypted, mode, version, isEncryption, readonly, upgDict, globalUtil) {
+        this.jsonEncryptUtil = new utilsJsonEncryption_1$1.UtilsJsonEncryption();
         this.fileUtil = new utilsFile_1$1.UtilsFile();
         this.sqliteUtil = new utilsSQLite_1$1.UtilsSQLite();
         this.jsonUtil = new utilsJson_1$1.UtilsJson();
@@ -3708,6 +3872,7 @@ class Database {
         this.dbName = dbName;
         this._encrypted = encrypted;
         this._mode = mode;
+        this._isEncryption = isEncryption;
         this.version = version;
         this.readonly = readonly;
         this.upgradeVersionDict = upgDict;
@@ -3716,6 +3881,7 @@ class Database {
         this.globalUtil = globalUtil ? globalUtil : new GlobalSQLite_1$1.GlobalSQLite();
         if (this.pathDB.length === 0)
             throw new Error('Could not generate a path to ' + dbName);
+        console.log(`&&& Databases path: ${this.pathDB}`);
     }
     /**
      * IsDBOpen
@@ -4039,7 +4205,7 @@ class Database {
      * @param values: string[]
      * @returns Promise<{changes:number, lastId:number}>
      */
-    runSQL(statement, values, transaction) {
+    runSQL(statement, values, transaction, returnMode) {
         this.ensureDatabaseIsOpen();
         try {
             // start a transaction
@@ -4053,7 +4219,7 @@ class Database {
             throw new Error(`RunSQL: ${err}`);
         }
         try {
-            const results = this.sqliteUtil.prepareRun(this.database, statement, values, false);
+            const results = this.sqliteUtil.prepareRun(this.database, statement, values, false, returnMode);
             if (results.lastId < 0) {
                 if (transaction) {
                     this.sqliteUtil.rollbackTransaction(this.database, this._isDbOpen);
@@ -4078,7 +4244,7 @@ class Database {
      * @param set: any[]
      * @returns Promise<{changes:number, lastId:number}>
      */
-    execSet(set, transaction) {
+    execSet(set, transaction, returnMode) {
         this.ensureDatabaseIsOpen();
         let results = { changes: 0, lastId: -1 };
         try {
@@ -4093,7 +4259,7 @@ class Database {
             throw new Error(`ExecSet: ${err}`);
         }
         try {
-            results = this.sqliteUtil.executeSet(this.database, set, false);
+            results = this.sqliteUtil.executeSet(this.database, set, false, returnMode);
             if (transaction) {
                 this.sqliteUtil.commitTransaction(this.database, this._isDbOpen);
             }
@@ -4174,13 +4340,21 @@ class Database {
             if (isTable) {
                 this.exportToJsonUtil.setLastExportDate(this.database, new Date().toISOString());
             }
-            const jsonResult = this.exportToJsonUtil.createExportObject(this.database, inJson);
+            let jsonResult = this.exportToJsonUtil.createExportObject(this.database, inJson);
             const keys = Object.keys(jsonResult);
             if (keys.length === 0) {
                 const msg = `ExportJson: return Object is empty ` + `No data to synchronize`;
                 throw new Error(msg);
             }
-            const isValid = this.jsonUtil.isJsonSQLite(jsonResult);
+            let isValid = this.jsonUtil.isJsonSQLite(jsonResult);
+            if (this._encrypted && this._isEncryption) {
+                jsonResult.overwrite = true;
+                jsonResult.encrypted = true;
+                const base64Str = this.jsonEncryptUtil.encryptJSONObject(jsonResult);
+                jsonResult = {};
+                jsonResult.expData = base64Str;
+                isValid = true;
+            }
             if (isValid) {
                 return jsonResult;
             }
@@ -4208,6 +4382,7 @@ exports.CapacitorSQLite = src.CapacitorSQLite = void 0;
 const GlobalSQLite_1 = GlobalSQLite$1;
 const Database_1 = Database$1;
 const utilsJson_1 = utilsJson;
+const utilsJsonEncryption_1 = utilsJsonEncryption;
 const utilsFile_1 = utilsFile;
 const utilsSQLite_1 = utilsSQLite;
 const utilsSecret_1 = utilsSecret;
@@ -4217,6 +4392,7 @@ class CapacitorSQLite {
         this.databases = {};
         this.fileUtil = new utilsFile_1.UtilsFile();
         this.jsonUtil = new utilsJson_1.UtilsJson();
+        this.jsonEncryptUtil = new utilsJsonEncryption_1.UtilsJsonEncryption();
         this.sqliteUtil = new utilsSQLite_1.UtilsSQLite();
         this.secretUtil = new utilsSecret_1.UtilsSecret();
         this.globalUtil = new GlobalSQLite_1.GlobalSQLite();
@@ -4250,7 +4426,7 @@ class CapacitorSQLite {
             upgrades = this.versionUpgrades[dbName];
         }
         const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
-        const databaseConnection = new Database_1.Database(dbName + 'SQLite.db', encrypted, inMode, version, readonly, upgrades, this.globalUtil);
+        const databaseConnection = new Database_1.Database(dbName + 'SQLite.db', encrypted, inMode, version, this.isEncryption, readonly, upgrades, this.globalUtil);
         this.databases[connName] = databaseConnection;
         return;
     }
@@ -4389,6 +4565,7 @@ class CapacitorSQLite {
         const setOfStatements = this.getOptionValue(options, 'set');
         const transaction = this.getOptionValue(options, 'transaction', true);
         const readonly = options.readonly ? options.readonly : false;
+        const returnMode = options.returnMode ? options.returnMode : 'no';
         const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         for (const sStmt of setOfStatements) {
@@ -4402,7 +4579,7 @@ class CapacitorSQLite {
                 throw new Error(`ExecuteSet failed: ${msg}`);
             }
             try {
-                const execSetResult = database.execSet(setOfStatements, transaction);
+                const execSetResult = database.execSet(setOfStatements, transaction, returnMode);
                 if (execSetResult.lastId < 0) {
                     throw new Error(`ExecuteSet failed changes <0`);
                 }
@@ -4425,6 +4602,7 @@ class CapacitorSQLite {
         const values = this.getOptionValue(options, 'values', []);
         const transaction = this.getOptionValue(options, 'transaction', true);
         const readonly = options.readonly ? options.readonly : false;
+        const returnMode = options.returnMode ? options.returnMode : 'no';
         const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
@@ -4433,7 +4611,7 @@ class CapacitorSQLite {
                 throw new Error(`Run failed: ${msg}`);
             }
             try {
-                const runResult = database.runSQL(statement, values, transaction);
+                const runResult = database.runSQL(statement, values, transaction, returnMode);
                 return { changes: runResult };
             }
             catch (err) {
@@ -4545,7 +4723,14 @@ class CapacitorSQLite {
     }
     async importFromJson(options) {
         const jsonString = this.getOptionValue(options, 'jsonstring');
-        const jsonObj = JSON.parse(jsonString);
+        let jsonObj = JSON.parse(jsonString);
+        let inMode = 'no-encryption';
+        const key = 'expData';
+        if (key in jsonObj) {
+            // Decrypt the data
+            inMode = 'secret';
+            jsonObj = this.jsonEncryptUtil.decryptJSONObject(jsonObj.expData);
+        }
         const isValid = this.jsonUtil.isJsonSQLite(jsonObj);
         if (!isValid) {
             throw new Error('Must provide a valid JsonSQLite Object');
@@ -4555,12 +4740,12 @@ class CapacitorSQLite {
         const targetDbVersion = vJsonObj.version ?? 1;
         const overwrite = vJsonObj.overwrite ?? false;
         const encrypted = vJsonObj.encrypted ?? false;
-        const mode = vJsonObj.mode ?? 'no-encryption';
+        const mode = vJsonObj.mode ?? 'full';
         if (!this.isEncryption && encrypted) {
             throw new Error('Must set electronIsEncryption = true in capacitor.config.ts');
         }
         // Create the database
-        const database = new Database_1.Database(dbName, encrypted, mode, targetDbVersion, false, {}, this.globalUtil);
+        const database = new Database_1.Database(dbName, encrypted, inMode, targetDbVersion, this.isEncryption, false, {}, this.globalUtil);
         try {
             if (overwrite && mode === 'full') {
                 const isExists = this.fileUtil.isFileExists(dbName);
@@ -4583,7 +4768,7 @@ class CapacitorSQLite {
             // Import the JsonSQLite Object
             const changes = await database.importJson(vJsonObj);
             // Close the database
-            await database.dbClose();
+            database.dbClose();
             return { changes: { changes: changes } };
         }
         catch (err) {
@@ -4598,7 +4783,7 @@ class CapacitorSQLite {
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
-                const exportJsonResult = await database.exportJson(exportMode);
+                const exportJsonResult = database.exportJson(exportMode);
                 const resultKeys = Object.keys(exportJsonResult);
                 if (resultKeys.includes('message')) {
                     throw new Error(`exportToJson: ${exportJsonResult.message}`);
@@ -4859,7 +5044,7 @@ class CapacitorSQLite {
         if (!isEncrypt) {
             throw new Error(`setEncryptionSecret: Not available electronIsEncryption = false in capacitor.config.ts`);
         }
-        const passphrase = options.passphrase ? options.passphrase : "";
+        const passphrase = options.passphrase ? options.passphrase : '';
         if (passphrase.length <= 0) {
             throw new Error(`setEncryptionSecret: You must give a passphrase`);
         }
@@ -4883,14 +5068,14 @@ class CapacitorSQLite {
             throw new Error(`changeEncryptionSecret: Not available electronIsEncryption = false in capacitor.config.ts`);
         }
         const oldsecret = this.secretUtil.getPassphrase();
-        const oldpassphrase = options.oldpassphrase ? options.oldpassphrase : "";
+        const oldpassphrase = options.oldpassphrase ? options.oldpassphrase : '';
         if (oldpassphrase.length <= 0) {
             throw new Error(`changeEncryptionSecret: You must give the oldpassphrase`);
         }
         if (oldpassphrase !== oldsecret) {
             throw new Error(`changeEncryptionSecret: the given oldpassphrase is wrong`);
         }
-        const passphrase = options.passphrase ? options.passphrase : "";
+        const passphrase = options.passphrase ? options.passphrase : '';
         if (passphrase.length <= 0) {
             throw new Error(`changetEncryptionSecret: You must give a passphrase`);
         }
@@ -4938,7 +5123,7 @@ class CapacitorSQLite {
         if (!isEncrypt) {
             throw new Error(`checkEncryptionSecret: Not available electronIsEncryption = false in capacitor.config.ts`);
         }
-        const passphrase = options.passphrase ? options.passphrase : "";
+        const passphrase = options.passphrase ? options.passphrase : '';
         if (passphrase.length <= 0) {
             throw new Error(`checkEncryptionSecret: You must give a passphrase`);
         }