@unvired/cordova-plugin-unvired-electron-db 0.0.40 → 0.0.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unvired/cordova-plugin-unvired-electron-db",
   "displayName": "Unvired DB",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "description": "Unvired DB Native Support for Cordova",
   "scripts": {},
   "keywords": [

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.40"
+        version="0.0.42"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Unvired DB</name>
     <description>Unvired DB Native Support for Cordova</description>

package/src/browser/DbPluginProxy.js

@@ -18,6 +18,7 @@ module.exports.create = async function (sucessCallback, errorCallback, options)
         sucessCallback(dbCreationResponse);
     }
     catch (err) {
+        console.error("Error creating DB:", err);
         errorCallback(err);
     }
 };
@@ -29,7 +30,11 @@ module.exports.execute = async function (sucessCallback, errorCallback, options)
     try {
         const db = dbType == DBType.FrameworkDb ? webDb.fwDb : webDb.appDb;
         
-        if (query.toUpperCase().includes("SELECT")) {
+        // Check if query is a SELECT statement (starts with SELECT or WITH for CTEs)
+        // Using regex to handle leading whitespace and ensure it's the start of the command
+        const isSelect = /^\s*\(?\s*(SELECT|WITH|PRAGMA|VALUES|EXPLAIN)\b/i.test(query);
+
+        if (isSelect) {
             let rows = [];
             var stmt = db.prepare(query);
             while (stmt.step()) {
@@ -53,6 +58,7 @@ module.exports.execute = async function (sucessCallback, errorCallback, options)
         }
     }
     catch (err) {
+        console.error("Error executing query: " + query, err);
         errorCallback(err);
     }
 };
@@ -65,6 +71,7 @@ module.exports.close = async function (sucessCallback, errorCallback, options) {
         sucessCallback(true);
     }
     catch (err) {
+        console.error("Error closing DB:", err);
         errorCallback(err);
     }
 };
@@ -154,56 +161,66 @@ var webDb = /** @class */ (function () {
 
     webDb.initialize = async function (userId) {
         var initSqlJs = window.initSqlJs;
-        config = {
-            locateFile: filename => "assets/js/sql-wasm.wasm"
+        var config = {
+            locateFile: filename => "assets/js/sql-wasm.wasm",
+            // INITIAL_MEMORY: 268435456 // 256MB
         };
         try {
             let SQL = await initSqlJs(config);
             if (webDb.fwDb == null) {
-                webDb.fwDb = new SQL.Database();
+                let data = await webDb.getDataFromIndexedDB(userId + "_fw_db", "fwData");
+                if (data) {
+                    console.log("Initializing fwDb with data size: " + (data.byteLength || data.length));
+                    webDb.fwDb = new SQL.Database(data);
+                } else {
+                    webDb.fwDb = new SQL.Database();
+                }
                 // Set PRAGMA for framework database
                 webDb.fwDb.run("PRAGMA journal_mode = WAL;");
                 webDb.fwDb.run("PRAGMA read_uncommitted = 1;");
-                await webDb.populateWebDb(SQL, true, userId);
             }
             if (webDb.appDb == null) {
-                webDb.appDb = new SQL.Database();
+                let data = await webDb.getDataFromIndexedDB(userId + "_app_db", "appData");
+                if (data) {
+                    console.log("Initializing appDb with data size: " + (data.byteLength || data.length));
+                    webDb.appDb = new SQL.Database(data);
+                } else {
+                    webDb.appDb = new SQL.Database();
+                }
                 // Set PRAGMA for app database
                 webDb.appDb.run("PRAGMA journal_mode = WAL;");
                 webDb.appDb.run("PRAGMA read_uncommitted = 1;");
                 webDb.appDb.run("PRAGMA foreign_keys = ON;");
-                await webDb.populateWebDb(SQL, false, userId);
             }
             return "DB Created Successfully";
         }
         catch (err) {
+            console.error("Error initializing DB:", err);
             throw err;
         }
     };
 
-    webDb.populateWebDb = async function (SQL, isFwDb, userId) {
+    webDb.getDataFromIndexedDB = function (dbName, storeName) {
         return new Promise((resolve, reject) => {
             var db;
-            var request = isFwDb ? window.indexedDB.open(userId + "_fw_db") : window.indexedDB.open(userId + "_app_db");
-            var storeName = isFwDb ? "fwData" : "appData";
+            var request = window.indexedDB.open(dbName);
             request.onupgradeneeded = function (event) {
                 db = event.target.result;
                 db.createObjectStore(storeName, { keyPath: "id" });
-                resolve();
             };
             request.onerror = function (event) {
                 console.log("The database failed to open: " + event);
-                resolve();
+                resolve(null);
             };
             request.onsuccess = function (event) {
                 db = request.result;
                 if (!db.objectStoreNames.contains(storeName)) {
-                    resolve();
+                    resolve(null);
                     return;
                 }
 
                 db.onversionchange = function() {
-                    console.log('Unvired Plugin Proxy: Received version change event, we would also this receive event when an attempt is made to delete the database. Closing the database connection in order to facilitate the process.')
+                    console.log('Unvired Plugin Proxy: Received version change event. Closing the database connection.')
                     db.close()
                 }
 
@@ -213,19 +230,15 @@ var webDb = /** @class */ (function () {
 
                 dataRequest.onerror = function (event) {
                     console.log("Unable to read " + storeName + " index DB table");
-                    resolve();
+                    resolve(null);
                 };
                 dataRequest.onsuccess = function (event) {
-                    if (dataRequest.result) {
-                        if (isFwDb) {
-                            webDb.fwDb = new SQL.Database(dataRequest.result.data);
-                        } else {
-                            webDb.appDb = new SQL.Database(dataRequest.result.data);
-                        }
+                    if (dataRequest.result && dataRequest.result.data) {
+                        resolve(dataRequest.result.data);
                     } else {
-                        console.log("Error while populatig web db - no db found in index DB");
+                        console.log("No data found in " + storeName);
+                        resolve(null);
                     }
-                    resolve();
                 };
             };
         });
@@ -294,23 +307,27 @@ var webDb = /** @class */ (function () {
                 if (ch === "'") {
                     // start of quoted string; find the closing quote handling escaped ''
                     let j = i + 1;
-                    let inner = '';
                     let closed = false;
+
                     while (j < len) {
-                        const cj = query.charAt(j);
-                        if (cj === "'") {
-                            // escaped quote?
-                            if (j + 1 < len && query.charAt(j + 1) === "'") {
-                                inner += "'"; // represent escaped single-quote
-                                j += 2;
-                                continue;
-                            } else {
-                                closed = true;
-                                break; // closing quote at j
+                        if (query.charAt(j) !== "'") {
+                            // Optimize: Skip to the next single quote
+                            const nextQuote = query.indexOf("'", j);
+                            if (nextQuote === -1) {
+                                j = len; // Not found
+                                break;
                             }
+                            j = nextQuote;
+                        }
+
+                        // We found a quote at index j
+                        if (j + 1 < len && query.charAt(j + 1) === "'") {
+                            // It is an escaped quote (''), skip both characters
+                            j += 2;
                         } else {
-                            inner += cj;
-                            j++;
+                            // It is a closing quote
+                            closed = true;
+                            break;
                         }
                     }
 
@@ -319,10 +336,15 @@ var webDb = /** @class */ (function () {
                         return { isPrepared: false, query: query, values: [] };
                     }
 
+                    // Extract content and handle escaped quotes
+                    const rawContent = query.slice(i + 1, j);
+                    const inner = rawContent.replace(/''/g, "'");
+
                     // Append text before this literal
                     preparedQuery += query.slice(lastIndex, i);
 
-                    if (inner.toUpperCase() === 'NULL') {
+                    // Optimize: Check length first to avoid toUpperCase() on large strings
+                    if (inner.length === 4 && inner.toUpperCase() === 'NULL') {
                         // keep quoted NULL as-is
                         preparedQuery += query.slice(i, j + 1);
                     } else {

package/src/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-unvired-electron-db",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "description": "Unvired DB Native Support for Cordova",
   "main": "unvired-db-proxy.js",
   "author": "Unvired Inc",