@unvired/cordova-plugin-unvired-electron-db 0.0.46 → 0.0.48

package/hooks/update-c-flags.js

@@ -0,0 +1,75 @@
+const fs = require('fs');
+const path = require('path');
+const xcode = require('xcode');
+
+module.exports = function (context) {
+  const projectRoot = context.opts.projectRoot;
+  const iosPath = path.join(projectRoot, 'platforms', 'ios');
+
+  if (!fs.existsSync(iosPath)) {
+    console.warn('[c-flags] iOS platform folder not found, skipping patch.');
+    return;
+  }
+
+  const files = fs.readdirSync(iosPath);
+  const xcodeProjName = files.find(file => file.endsWith('.xcodeproj'));
+  if (!xcodeProjName) {
+    console.warn('[c-flags] xcodeproj not found, skipping patch.');
+    return;
+  }
+
+  const projectPath = path.join(iosPath, xcodeProjName, 'project.pbxproj');
+  const myProj = xcode.project(projectPath);
+
+  myProj.parseSync();
+
+  const cFlags = [
+    '-DNDEBUG',
+    '-DSQLCIPHER_CRYPTO_CC',
+    '-DSQLITE_HAS_CODEC',
+    '-DSQLITE_TEMP_STORE=2',
+    '-DSQLITE_THREADSAFE=1'
+  ];
+
+  const buildConfigs = myProj.pbxXCBuildConfigurationSection();
+  let updated = false;
+
+  for (const key in buildConfigs) {
+    if (key.endsWith('_comment')) continue;
+    const config = buildConfigs[key];
+    if (config && config.buildSettings) {
+      let currentFlags = config.buildSettings.OTHER_CFLAGS || '';
+
+      // Normalize currentFlags to a string and strip quotes
+      if (typeof currentFlags === 'string') {
+        currentFlags = currentFlags.replace(/"/g, '');
+      } else if (Array.isArray(currentFlags)) {
+        currentFlags = currentFlags.map(f => typeof f === 'string' ? f.replace(/"/g, '') : f).join(' ');
+      }
+
+      // Convert current flags to an array of tokens
+      let flagTokens = currentFlags.split(/\s+/).filter(t => t.length > 0);
+
+      // Make sure $(inherited) is the first flag if not already present
+      if (!flagTokens.includes('$(inherited)')) {
+        flagTokens.unshift('$(inherited)');
+      }
+
+      // Add our flags if they are not already present
+      cFlags.forEach(flag => {
+        if (!flagTokens.includes(flag)) {
+          flagTokens.push(flag);
+        }
+      });
+
+      // Join back as a single string wrapped in quotes
+      config.buildSettings.OTHER_CFLAGS = `"${flagTokens.join(' ')}"`;
+      updated = true;
+    }
+  }
+
+  if (updated) {
+    fs.writeFileSync(projectPath, myProj.writeSync());
+    console.log('✅ programmatically added SQLCipher C Flags to all configurations.');
+  }
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unvired/cordova-plugin-unvired-electron-db",
   "displayName": "Unvired DB",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "Unvired DB Native Support for Cordova",
   "scripts": {},
   "keywords": [
@@ -26,7 +26,6 @@
       "url": "http://unvired.com"
     }
   ],
-  "devDependencies": {},
   "cordova": {
     "platforms": [
       "electron",
@@ -37,5 +36,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "dependencies": {
+    "better-sqlite3-multiple-ciphers": "^12.9.0"
   }
-}
+}

package/plugin.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         id="@unvired/cordova-plugin-unvired-electron-db"
-        version="0.0.46"
+        version="0.0.48"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Unvired DB</name>
     <description>Unvired DB Native Support for Cordova</description>
@@ -21,7 +21,9 @@
         </config-file>
         <source-file src="src/ios/UnviredDB.h" />
         <source-file src="src/ios/UnviredDB.m" />
-        <framework src="libsqlite3.tbd" />
+        <source-file src="src/ios/sqlite3.h" />
+        <source-file src="src/ios/sqlite3.c" />
+        <hook type="after_prepare" src="hooks/update-c-flags.js"/>
     </platform>
     <!-- android -->
     <platform name="android">

package/src/android/DBPlugin.java

@@ -1,6 +1,7 @@
 package com.unvired.dbplugin;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
@@ -12,6 +13,10 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.UUID;
 
 public class DBPlugin extends CordovaPlugin {
     private static final String TAG = "DBPlugin";
@@ -50,6 +55,10 @@ public class DBPlugin extends CordovaPlugin {
                     return true;
                 case "deleteUserData":
                     deleteUserData(args, callbackContext);
+                    return true;
+                case "getEncryptionKey":
+                    getEncryptionKey(callbackContext);
+                    return true;
                 default:
                     callbackContext.error("Invalid action: " + action);
                     return false;
@@ -61,9 +70,46 @@ public class DBPlugin extends CordovaPlugin {
         }
     }
 
+    /**
+     * Checks if the database file at the given path is plaintext (unencrypted).
+     * Attempts to open the database without a key and run a simple query.
+     * @param dbPath Path to the database file.
+     * @return true if the database is plaintext, false if encrypted or unreadable.
+     */
+    private boolean isPlaintextDatabase(String dbPath) {
+        File f = new File(dbPath);
+        if (!f.exists()) return false;
+        SQLiteDatabase testDb = null;
+        try {
+            testDb = SQLiteDatabase.openOrCreateDatabase(dbPath, "", null, null, null);
+            testDb.rawQuery("SELECT count(*) FROM sqlite_master;", null).close();
+            return true;
+        } catch (Exception e) {
+            return false;
+        } finally {
+            if (testDb != null) { try { testDb.close(); } catch (Exception ignored) {} }
+        }
+    }
+
+    /**
+     * Opens (or creates) a database with optional encryption.
+     * @param dbPath       Path to the database file.
+     * @param encryptionKey Encryption key (empty string = no encryption).
+     * @return Opened SQLiteDatabase instance.
+     */
+    private SQLiteDatabase openDatabase(String dbPath, String encryptionKey) throws Exception {
+        if (!encryptionKey.isEmpty() && isPlaintextDatabase(dbPath)) {
+            // Existing DB is not encrypted, ignore the key.
+            encryptionKey = "";
+        }
+        return SQLiteDatabase.openOrCreateDatabase(dbPath, encryptionKey, null, null, null);
+    }
+
     private void create(JSONArray args, CallbackContext callbackContext) throws JSONException {
         JSONObject params = args.getJSONObject(0);
         String userId = params.getString("userId");
+        // optString returns "" when key is missing or JSON null — no encryption if not provided
+        String encryptionKey = params.optString("encryptionKey", "");
 
         if (userId == null || userId.isEmpty()) {
             callbackContext.error("userId is required");
@@ -79,34 +125,22 @@ public class DBPlugin extends CordovaPlugin {
         try {
             System.loadLibrary("sqlcipher");
 
-
-            // Create framework database// Create framework database
+            // Open (and migrate if needed) framework database
             fwDbPath = userPath + "/framework.db";
-            fwDb = SQLiteDatabase.openOrCreateDatabase(fwDbPath, "", null, null, null);
-            
-            // Enable WAL
+            fwDb = openDatabase(fwDbPath, encryptionKey);
             fwDb.enableWriteAheadLogging();
-
-            // PRAGMAs that are safe with execSQL
             fwDb.execSQL("PRAGMA read_uncommitted = 1;");
-            // Only if you actually need FKs in this DB:
             fwDb.execSQL("PRAGMA foreign_keys = ON;");
-            
-            // Create app database
+
+            // Open (and migrate if needed) app database
             appDbPath = userPath + "/app.db";
-            appDb = SQLiteDatabase.openOrCreateDatabase(appDbPath, "", null, null, null);
-            
-            // Enable WAL
+            appDb = openDatabase(appDbPath, encryptionKey);
             appDb.enableWriteAheadLogging();
-
-            // PRAGMAs that are safe with execSQL
             appDb.execSQL("PRAGMA read_uncommitted = 1;");
-            // Only if you actually need FKs in this DB:
             appDb.execSQL("PRAGMA foreign_keys = ON;");
 
-
             callbackContext.success("Databases created successfully");
-        } catch (SQLiteException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Error creating databases", e);
             callbackContext.error("Error creating databases: " + e.getMessage());
         }
@@ -326,4 +360,27 @@ public class DBPlugin extends CordovaPlugin {
         }
         return dir.delete();
     }
+
+    private void getEncryptionKey(CallbackContext callbackContext) {
+        cordova.getThreadPool().execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Context context = cordova.getActivity().getApplicationContext();
+                    SharedPreferences prefs = context.getSharedPreferences("UnviredDBPrefs", Context.MODE_PRIVATE);
+                    String key = prefs.getString("unvired_db_encryption_key", null);
+                    if (key == null) {
+                        key = UUID.randomUUID().toString();
+                        SharedPreferences.Editor editor = prefs.edit();
+                        editor.putString("unvired_db_encryption_key", key);
+                        editor.apply();
+                    }
+                    callbackContext.success(key);
+                } catch (Exception e) {
+                    Log.e(TAG, "Error getting encryption key", e);
+                    callbackContext.error("Error getting encryption key: " + e.getMessage());
+                }
+            }
+        });
+    }
 }

package/src/browser/DbPluginProxy.js

@@ -6,15 +6,15 @@ const DBType = {
 }
 
 module.exports.create = async function (sucessCallback, errorCallback, options) {
-    const userId = options[0].userId
-    const appName = options[0].appName
+    const userId = options[0].userId;
+    const encryptionKey = (options[0].encryptionKey !== undefined && options[0].encryptionKey !== null && options[0].encryptionKey !== "") ? options[0].encryptionKey : "";
 
     if (userId == undefined || userId == null || userId == "") {
         errorCallback("userId is required")
         return;
     }
     try {
-        let dbCreationResponse = await webDb.initialize(userId);
+        let dbCreationResponse = await webDb.initialize(userId, encryptionKey);
         sucessCallback(dbCreationResponse);
     }
     catch (err) {
@@ -79,18 +79,22 @@ module.exports.close = async function (sucessCallback, errorCallback, options) {
 };
 
 module.exports.saveWebDB = async function(successCallback, errorCallback, options) {
-    const userId = options[0].userId
+    const userId = options[0].userId;
     if (userId == undefined || userId == null || userId == "") {
         errorCallback("userId is required")
         return;
         
     }
     if (window.unvired_db_worker) {
-        await window.unvired_db_worker.saveWebDb(userId + "_fw_db", webDb.fwDb.export(), "fwData");
-        await window.unvired_db_worker.saveWebDb(userId + "_app_db", webDb.appDb.export(), "appData");
+        const fwData = webDb.fwDb.export();
+        const appData = webDb.appDb.export();
+        await window.unvired_db_worker.saveWebDb(userId + "_fw_db", fwData, "fwData");
+        await window.unvired_db_worker.saveWebDb(userId + "_app_db", appData, "appData");
+        successCallback();
     }
     else {
       console.error('Could not save the data in indexedDB because the script: unvired_db_worker is not loaded. Please make sure that this script is loaded in your application.')
+      errorCallback('unvired_db_worker is not loaded');
     }
 }
 
@@ -153,6 +157,10 @@ module.exports.deleteUserData  = async function (successCallback, errorCallback,
     }
 };
 
+module.exports.getEncryptionKey = async function (successCallback, errorCallback, options) {
+    successCallback("");
+};
+
 //#endregion
 
 
@@ -161,16 +169,16 @@ module.exports.deleteUserData  = async function (successCallback, errorCallback,
 var webDb = /** @class */ (function () {
     function webDb() { }
 
-    webDb.initialize = async function (userId) {
+    webDb.initialize = async function (userId, encryptionKey) {
         var initSqlJs = window.initSqlJs;
         var config = {
             locateFile: filename => "assets/js/sql-wasm.wasm",
-            // INITIAL_MEMORY: 268435456 // 256MB
         };
         try {
             let SQL = await initSqlJs(config);
             if (webDb.fwDb == null) {
-                let data = await webDb.getDataFromIndexedDB(userId + "_fw_db", "fwData");
+                let rawData = await webDb.getDataFromIndexedDB(userId + "_fw_db", "fwData");
+                let data = rawData;
                 if (data) {
                     console.log("Initializing fwDb with data size: " + (data.byteLength || data.length));
                     webDb.fwDb = new SQL.Database(data);
@@ -182,7 +190,8 @@ var webDb = /** @class */ (function () {
                 webDb.fwDb.run("PRAGMA read_uncommitted = 1;");
             }
             if (webDb.appDb == null) {
-                let data = await webDb.getDataFromIndexedDB(userId + "_app_db", "appData");
+                let rawData = await webDb.getDataFromIndexedDB(userId + "_app_db", "appData");
+                let data = rawData;
                 if (data) {
                     console.log("Initializing appDb with data size: " + (data.byteLength || data.length));
                     webDb.appDb = new SQL.Database(data);
@@ -246,6 +255,8 @@ var webDb = /** @class */ (function () {
         });
     };
 
+
+
  // Parse SQL query and convert to prepared statement with bound values
     webDb.parseQueryToPrepared = function (query) {
         try {

package/src/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-unvired-electron-db",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "Unvired DB Native Support for Cordova",
   "main": "unvired-db-proxy.js",
   "author": "Unvired Inc",
@@ -12,6 +12,6 @@
     "serviceName": "UnviredDB"
   },
   "dependencies": {
-    "sqlite3": "5.1.6"
+    "better-sqlite3-multiple-ciphers": "^12.9.0"
   }
-}
+}