@capacitor-community/sqlite 5.0.5-2 → 5.0.6

package/electron/rollup.config.js

@@ -17,6 +17,8 @@ export default {
     'electron',
     'electron-json-storage',
     'better-sqlite3-multiple-ciphers',
+    'crypto',
+    'crypto-js',
     'path',
     'fs',
     'os',

package/ios/Plugin/CapacitorSQLite.swift

@@ -735,7 +735,7 @@ enum CapacitorSQLiteError: Error {
     // MARK: - ExecuteSet
 
     @objc func executeSet(_ dbName: String, set: [[String: Any]],
-                          transaction: Bool, readonly: Bool)
+                          transaction: Bool, readonly: Bool, returnMode: String)
     throws -> [String: Any] {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
@@ -750,7 +750,8 @@ enum CapacitorSQLiteError: Error {
             }
             if !mDb.isNCDB() && mDb.isDBOpen() {
                 do {
-                    let res = try mDb.execSet(set: set, transaction: transaction)
+                    let res = try mDb.execSet(set: set, transaction: transaction,
+                                              returnMode: returnMode)
                     return res
                 } catch DatabaseError.execSet(let message) {
                     throw CapacitorSQLiteError.failed(message: message)
@@ -771,8 +772,9 @@ enum CapacitorSQLiteError: Error {
 
     // swiftlint:disable function_body_length
     // swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable function_parameter_count
     @objc func run(_ dbName: String, statement: String, values: [Any],
-                   transaction: Bool, readonly: Bool)
+                   transaction: Bool, readonly: Bool, returnMode: String)
     throws -> [String: Any] {
         if isInit {
             let mDbName = CapacitorSQLite.getDatabaseName(dbName: dbName)
@@ -834,7 +836,8 @@ enum CapacitorSQLiteError: Error {
                         }
                     }
                     let res = try mDb.runSQL(sql: statement, values: val,
-                                             transaction: transaction)
+                                             transaction: transaction,
+                                             returnMode: returnMode)
                     return res
                 } catch DatabaseError.runSQL(let message) {
                     throw CapacitorSQLiteError.failed(message: message)
@@ -850,6 +853,7 @@ enum CapacitorSQLiteError: Error {
             throw CapacitorSQLiteError.failed(message: initMessage)
         }
     }
+    // swiftlint:enable function_parameter_count
     // swiftlint:enable cyclomatic_complexity
     // swiftlint:enable function_body_length
 
@@ -1018,112 +1022,140 @@ enum CapacitorSQLiteError: Error {
     throws -> [String: Int] {
         if isInit {
             var mDb: Database
-            if let data = ("["+parsingData+"]").data(using: .utf8) {
+            var importData: ImportData
+            // check if json object is encrypted
+            if parsingData.contains("expData") {
+                guard let data = ("["+parsingData+"]")
+                        .data(using: .utf8) else {
+                    let msg: String = "Stringify Encrypted Json Object " +
+                        "not Valid"
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
+                var encryptJson: [EncryptJson]
+                do {
+                    encryptJson = try JSONDecoder()
+                        .decode([EncryptJson].self, from: data)
+                    let dict: [String: Any] = try
+                        UtilsJson.decryptBase64ToDictionary(
+                            encryptJson[0].expData,
+                            forAccount: account)
+                    importData = ImportData(jsonDict: dict)
+                } catch let error {
+                    var msg: String = "Encrypted Json Object not Valid "
+                    msg.append("\(error)")
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
+
+            } else {
+
+                guard let data = ("["+parsingData+"]")
+                        .data(using: .utf8) else {
+                    let msg: String = "Stringify Json Object not Valid"
+                    throw CapacitorSQLiteError.failed(message: msg)
+                }
                 var jsonSQLite: [JsonSQLite]
                 do {
                     jsonSQLite = try JSONDecoder()
                         .decode([JsonSQLite].self, from: data)
+                    importData = ImportData(jsonSQLite: jsonSQLite[0])
+                    jsonSQLite = []
                 } catch let error {
                     var msg: String = "Stringify Json Object not Valid "
                     msg.append("\(error)")
                     throw CapacitorSQLiteError.failed(message: msg)
                 }
-                let encrypted: Bool = jsonSQLite[0].encrypted
-                var overwrite: Bool = false
-                if let mOverwrite = jsonSQLite[0].overwrite {
-                    overwrite = mOverwrite
-                }
-                let mode: String = jsonSQLite[0].mode
-                let inMode: String = encrypted ? "secret"
-                    : "no-encryption"
-                let version: Int = jsonSQLite[0].version
-                var dbName: String = CapacitorSQLite.getDatabaseName(
-                    dbName: jsonSQLite[0].database
-                )
-                dbName.append("SQLite.db")
-                // open the database
-                do {
-                    mDb = try Database(
-                        databaseLocation: databaseLocation, databaseName: dbName,
-                        encrypted: encrypted, isEncryption: isEncryption,
-                        account: account,
-                        mode: inMode, version: version, readonly: false,
-                        vUpgDict: [:])
-                    if overwrite && mode == "full" {
-                        let isExists = UtilsFile
-                            .isFileExist(databaseLocation: databaseLocation,
-                                         fileName: dbName)
-                        if isExists {
-                            _ = try UtilsFile
-                                .deleteFile(fileName: dbName,
-                                            databaseLocation: databaseLocation)
-                        }
+
+            }
+            let encrypted: Bool = importData.encrypted
+            let overwrite: Bool = importData.overwrite ?
+                importData.overwrite : false
+            let mode: String = importData.mode
+            let inMode: String = encrypted ? "secret"
+                : "no-encryption"
+            let version: Int = importData.version
+            var dbName: String = CapacitorSQLite.getDatabaseName(
+                dbName: importData.database
+            )
+            dbName.append("SQLite.db")
+            // open the database
+            do {
+                mDb = try Database(
+                    databaseLocation: databaseLocation, databaseName: dbName,
+                    encrypted: encrypted, isEncryption: isEncryption,
+                    account: account,
+                    mode: inMode, version: version, readonly: false,
+                    vUpgDict: [:])
+                if overwrite && mode == "full" {
+                    let isExists = UtilsFile
+                        .isFileExist(databaseLocation: databaseLocation,
+                                     fileName: dbName)
+                    if isExists {
+                        _ = try UtilsFile
+                            .deleteFile(fileName: dbName,
+                                        databaseLocation: databaseLocation)
                     }
-                    try mDb.open()
-                } catch UtilsFileError.deleteFileFailed {
-                    let message = "Delete Database failed"
-                    throw CapacitorSQLiteError.failed(message: message)
-                } catch DatabaseError.open(let message) {
-                    throw CapacitorSQLiteError.failed(message: message)
-                } catch let error {
-                    let msg: String = "\(error)"
-                    throw CapacitorSQLiteError.failed(message: msg)
                 }
-                // check if the database as some tables
-                do {
-                    let tableList: [String] = try mDb.getTableNames()
-                    if mode == "full" && tableList.count > 0 {
-                        let curVersion = try mDb.getVersion()
-                        if version < curVersion {
-                            var msg: String = "ImportFromJson: Cannot import a "
-                            msg += "version lower than \(curVersion)"
-                            throw CapacitorSQLiteError.failed(message: msg)
-                        }
-                        if curVersion == version {
-                            var res: [String: Int] = [:]
-                            res["changes"] = 0
-                            return res
-                        }
+                try mDb.open()
+            } catch UtilsFileError.deleteFileFailed {
+                let message = "Delete Database failed"
+                throw CapacitorSQLiteError.failed(message: message)
+            } catch DatabaseError.open(let message) {
+                throw CapacitorSQLiteError.failed(message: message)
+            } catch let error {
+                let msg: String = "\(error)"
+                throw CapacitorSQLiteError.failed(message: msg)
+            }
+            // check if the database as some tables
+            do {
+                let tableList: [String] = try mDb.getTableNames()
+                if mode == "full" && tableList.count > 0 {
+                    let curVersion = try mDb.getVersion()
+                    if version < curVersion {
+                        var msg: String = "ImportFromJson: Cannot import a "
+                        msg += "version lower than \(curVersion)"
+                        throw CapacitorSQLiteError.failed(message: msg)
                     }
+                    if curVersion == version {
+                        var res: [String: Int] = [:]
+                        res["changes"] = 0
+                        return res
+                    }
+                }
 
-                } catch DatabaseError.getTableNames(let message) {
-                    throw CapacitorSQLiteError.failed(message: message)
-                } catch let error {
-                    let msg: String = "\(error)"
+            } catch DatabaseError.getTableNames(let message) {
+                throw CapacitorSQLiteError.failed(message: message)
+            } catch let error {
+                let msg: String = "\(error)"
+                throw CapacitorSQLiteError.failed(message: msg)
+            }
+            // import from Json Object
+            do {
+                let res: [String: Int] = try mDb
+                    .importFromJson(importData: importData)
+                try mDb.close()
+                if let result = res["changes"] {
+                    if result < 0 {
+                        let msg: String = "changes < 0"
+                        throw CapacitorSQLiteError
+                        .failed(message: msg)
+                    } else {
+                        return res
+                    }
+                } else {
+                    let msg: String = "changes not found"
                     throw CapacitorSQLiteError.failed(message: msg)
                 }
-                // import from Json Object
+            } catch DatabaseError.importFromJson(let message) {
+                var msg = message
                 do {
-                    let res: [String: Int] = try mDb
-                        .importFromJson(jsonSQLite: jsonSQLite[0])
                     try mDb.close()
-                    if let result = res["changes"] {
-                        if result < 0 {
-                            let msg: String = "changes < 0"
-                            throw CapacitorSQLiteError
-                            .failed(message: msg)
-                        } else {
-                            return res
-                        }
-                    } else {
-                        let msg: String = "changes not found"
-                        throw CapacitorSQLiteError.failed(message: msg)
-                    }
-                } catch DatabaseError.importFromJson(let message) {
-                    var msg = message
-                    do {
-                        try mDb.close()
-                        throw CapacitorSQLiteError.failed(message: msg)
-                    } catch DatabaseError.close(let message) {
-                        msg.append(" \(message)")
-                        throw CapacitorSQLiteError.failed(message: msg)
-                    }
+                    throw CapacitorSQLiteError.failed(message: msg)
                 } catch DatabaseError.close(let message) {
-                    throw CapacitorSQLiteError.failed(message: message)
+                    msg.append(" \(message)")
+                    throw CapacitorSQLiteError.failed(message: msg)
                 }
-            } else {
-                let msg: String = "Stringify Json Object not Valid"
-                throw CapacitorSQLiteError.failed(message: msg)
+            } catch DatabaseError.close(let message) {
+                throw CapacitorSQLiteError.failed(message: message)
             }
         } else {
             throw CapacitorSQLiteError.failed(message: initMessage)
@@ -1152,7 +1184,8 @@ enum CapacitorSQLiteError: Error {
                         var msg: String = "return Object is empty "
                         msg.append("No data to synchronize")
                         throw CapacitorSQLiteError.failed(message: msg)
-
+                    } else if res.count == 1 && res.contains(where: { $0.key == "expData" }) {
+                        return res
                     } else if res.count == 5 || res.count == 6 ||
                                 res.count == 7 {
                         return res

package/ios/Plugin/CapacitorSQLitePlugin.swift

@@ -767,10 +767,12 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
         let transaction: Bool = call.getBool("transaction") ?? true
         let readOnly: Bool = call.getBool("readonly") ?? false
+        let returnMode: String = call.getString("returnMode") ?? "no"
         do {
             if let res = try implementation?.executeSet(dbName, set: set,
                                                         transaction: transaction,
-                                                        readonly: readOnly) {
+                                                        readonly: readOnly,
+                                                        returnMode: returnMode) {
                 retHandler.rChanges(call: call, ret: res)
                 return
             } else {
@@ -823,13 +825,15 @@ public class CapacitorSQLitePlugin: CAPPlugin {
         }
         let transaction: Bool = call.getBool("transaction") ?? true
         let readOnly: Bool = call.getBool("readonly") ?? false
+        let returnMode: String = call.getString("returnMode") ?? "no"
         do {
             if let res = try
                 implementation?.run(dbName,
                                     statement: statement,
                                     values: values,
                                     transaction: transaction,
-                                    readonly: readOnly) {
+                                    readonly: readOnly,
+                                    returnMode: returnMode) {
                 retHandler.rChanges(call: call, ret: res)
                 return
             } else {
@@ -1414,7 +1418,6 @@ public class CapacitorSQLitePlugin: CAPPlugin {
             return
         }
         DispatchQueue.global(qos: .background).async {
-
             do {
                 try self.implementation?.getFromHTTPRequest(call, url: url)
                 DispatchQueue.main.async {

package/ios/Plugin/Database.swift

@@ -297,13 +297,17 @@ class Database {
 
     // MARK: - ExecSet
 
-    func execSet(set: [[String: Any]], transaction: Bool = true) throws -> [String: Int64] {
+    // swiftlint:disable function_body_length
+    func execSet(set: [[String: Any]], transaction: Bool = true,
+                 returnMode: String = "no") throws -> [String: Any] {
         var msg: String = "Failed in execSet : "
         let initChanges = UtilsSQLCipher.dbChanges(mDB: mDb)
         var changes: Int = -1
         var lastId: Int64 = -1
-        var changesDict: [String: Int64] = ["lastId": lastId,
-                                            "changes": Int64(changes)]
+        var response: [[String: Any]] = []
+        var changesDict: [String: Any] = ["lastId": lastId,
+                                          "changes": changes,
+                                          "values": [[:]]]
 
         // Start a transaction
         if transaction {
@@ -316,12 +320,15 @@ class Database {
         }
         // Execute the query
         do {
-            lastId = try UtilsSQLCipher
-                .executeSet(mDB: self, set: set)
+            let resp = try UtilsSQLCipher
+                .executeSet(mDB: self, set: set, returnMode: returnMode)
+            lastId = resp.0
+            response = resp.1
             changes = UtilsSQLCipher
                 .dbChanges(mDB: mDb) - initChanges
-            changesDict["changes"] = Int64(changes)
+            changesDict["changes"] = changes
             changesDict["lastId"] = lastId
+            changesDict["values"] = response
 
         } catch UtilsSQLCipherError
                     .executeSet(let message) {
@@ -352,12 +359,13 @@ class Database {
 
     // MARK: - RunSQL
 
-    func runSQL(sql: String, values: [Any], transaction: Bool = true) throws -> [String: Int64] {
+    func runSQL(sql: String, values: [Any], transaction: Bool = true,
+                returnMode: String = "no") throws -> [String: Any] {
         var msg: String = "Failed in runSQL : "
         var changes: Int = -1
         var lastId: Int64 = -1
+        var response: [[String: Any]] = []
         let initChanges = UtilsSQLCipher.dbChanges(mDB: mDb)
-
         // Start a transaction
         if transaction {
             do {
@@ -370,9 +378,11 @@ class Database {
         }
         // Execute the query
         do {
-            lastId = try UtilsSQLCipher
+            let resp = try UtilsSQLCipher
                 .prepareSQL(mDB: self, sql: sql, values: values,
-                            fromJson: false)
+                            fromJson: false, returnMode: returnMode)
+            lastId = resp.0
+            response = resp.1
         } catch UtilsSQLCipherError.prepareSQL(let message) {
             if transaction {
                 do {
@@ -400,8 +410,9 @@ class Database {
             }
         }
         changes = UtilsSQLCipher.dbChanges(mDB: mDb) - initChanges
-        let result: [String: Int64] = ["changes": Int64(changes),
-                                       "lastId": lastId]
+        let result: [String: Any] = ["changes": changes,
+                                     "lastId": lastId,
+                                     "values": response]
         return result
     }
 
@@ -511,6 +522,8 @@ class Database {
 
     func setSyncDate(syncDate: String ) throws -> Bool {
         var retBool: Bool = false
+        var lastId: Int64 = -1
+        var resp: [String: Any] = [:]
         do {
             let isExists: Bool = try UtilsJson.isTableExists(
                 mDB: self, tableName: "sync_table")
@@ -524,8 +537,9 @@ class Database {
                 let syncTime: Int = Int(date.timeIntervalSince1970)
                 var stmt: String = "UPDATE sync_table SET sync_date = "
                 stmt.append("\(syncTime) WHERE id = 1;")
-                let retRun = try runSQL(sql: stmt, values: [])
-                if let lastId: Int64 = retRun["lastId"] {
+                resp = try runSQL(sql: stmt, values: [])
+                if let mLastId: Int64 = resp["lastId"] as? Int64 {
+                    lastId = mLastId
                     if lastId != -1 {
                         retBool = true
                     }
@@ -580,6 +594,15 @@ class Database {
                 "expMode": expMode, "version": dbVersion]
             retObj = try ExportToJson
                 .createExportObject(mDB: self, data: data)
+            if isEncryption && encrypted {
+                retObj["overwrite"] = true
+                let base64Str = try UtilsJson.encryptDictionaryToBase64(
+                    retObj,
+                    forAccount: account)
+                retObj = [:]
+                retObj["expData"] = base64Str
+            }
+
         } catch UtilsJsonError.tableNotExists(let message) {
             throw DatabaseError.exportToJson(message: message)
         } catch ExportToJsonError.setLastExportDate(let message) {
@@ -603,7 +626,7 @@ class Database {
 
     // MARK: - ImportFromJson
 
-    func importFromJson(jsonSQLite: JsonSQLite)
+    func importFromJson(importData: ImportData)
     throws -> [String: Int] {
         var changes: Int = 0
 
@@ -613,18 +636,21 @@ class Database {
             try UtilsSQLCipher
                 .setForeignKeyConstraintsEnabled(mDB: self,
                                                  toggle: false)
-            if jsonSQLite.tables.count > 0 {
+            if importData.tables.count > 0 {
                 changes = try ImportFromJson
                     .createDatabaseSchema(mDB: self,
-                                          jsonSQLite: jsonSQLite)
+                                          tables: importData.tables,
+                                          mode: importData.mode,
+                                          version: importData.version)
                 if changes != -1 {
                     // Create the Database Data
                     changes += try ImportFromJson
                         .createDatabaseData(mDB: self,
-                                            jsonSQLite: jsonSQLite)
+                                            tables: importData.tables,
+                                            mode: importData.mode)
                 }
             }
-            if let mViews = jsonSQLite.views {
+            if let mViews = importData.views {
                 if mViews.count > 0 {
                     changes += try ImportFromJson
                         .createViews(mDB: self, views: mViews)

package/ios/Plugin/ImportExportJson/ExportToJson.swift

@@ -88,6 +88,7 @@ class ExportToJson {
     // MARK: - ExportToJson - SetLastExportDate
 
     class func setLastExportDate(mDB: Database, sTime: Int) throws {
+        var lastId: Int64 = -1
         do {
             let isExists: Bool = try UtilsJson.isTableExists(
                 mDB: mDB, tableName: "sync_table")
@@ -103,8 +104,10 @@ class ExportToJson {
             } else {
                 stmt = "INSERT INTO sync_table (sync_date) VALUES (\(sTime));"
             }
-            let lastId: Int64 = try UtilsSQLCipher.prepareSQL(
-                mDB: mDB, sql: stmt, values: [], fromJson: false)
+            let resp = try UtilsSQLCipher.prepareSQL(
+                mDB: mDB, sql: stmt, values: [], fromJson: false,
+                returnMode: "no")
+            lastId = resp.0
             if lastId < 0 {
                 throw ExportToJsonError.setLastExportDate(
                     message: "lastId < 0")
@@ -149,9 +152,11 @@ class ExportToJson {
                 // define the delete statement
                 let delStmt = "DELETE FROM \(table) WHERE sql_deleted = 1 " +
                     "AND last_modified < \(lastExportDate);"
-                lastId = try UtilsSQLCipher.prepareSQL(mDB: mDB, sql: delStmt,
-                                                       values: [],
-                                                       fromJson: true)
+                let resp = try UtilsSQLCipher.prepareSQL(mDB: mDB, sql: delStmt,
+                                                         values: [],
+                                                         fromJson: true,
+                                                         returnMode: "no")
+                lastId = resp.0
                 if lastId < 0 {
                     let msg = "DelExportedRows: lastId < 0"
                     throw ExportToJsonError.delExportedRows(message: msg)