@unvired/cordova-plugin-unvired-electron-db 0.0.37 → 0.0.39

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unvired/cordova-plugin-unvired-electron-db",
   "displayName": "Unvired DB",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "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.37"
+        version="0.0.39"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Unvired DB</name>
     <description>Unvired DB Native Support for Cordova</description>

package/src/android/DBPlugin.java

@@ -45,6 +45,9 @@ public class DBPlugin extends CordovaPlugin {
                 case "saveWebDB":
                     saveWebDB(args, callbackContext);
                     return true;
+                case "exportWebDB":
+                    exportWebDB(args, callbackContext);
+                    return true;
                 case "deleteUserData":
                     deleteUserData(args, callbackContext);
                 default:
@@ -253,6 +256,10 @@ public class DBPlugin extends CordovaPlugin {
     private void saveWebDB(JSONArray args, CallbackContext callbackContext) throws JSONException {
         callbackContext.success("Web DB save is only for browser.");
     }
+
+    private void exportWebDB(JSONArray args, CallbackContext callbackContext) throws JSONException {
+        callbackContext.success();
+    }
     
     private void deleteUserData(JSONArray args, CallbackContext callbackContext) throws JSONException {
         JSONObject params = args.getJSONObject(0);

package/src/browser/DbPluginProxy.js

@@ -85,6 +85,23 @@ module.exports.saveWebDB = async function(successCallback, errorCallback, option
     }
 }
 
+module.exports.exportWebDB = async function(successCallback, errorCallback, options) {
+    //Download sqlite db
+    var arraybuff = webDb.appDb.export();
+    var blob = new Blob([arraybuff]);
+    var a = document.createElement("a");
+    document.body.appendChild(a);
+    a.href = window.URL.createObjectURL(blob);
+    a.download = "sql.db";
+    a.onclick = function () {
+    setTimeout(function () {
+        window.URL.revokeObjectURL(a.href);
+    }, 1500);
+    };
+    a.click();
+    successCallback();
+}
+
 // Execute raw query without returned result
 module.exports.getDBFilePath = async function (sucessCallback, errorCallback, options) {
     sucessCallback("");

package/src/electron/package.json

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

package/src/electron/unvired-db-proxy.js

@@ -28,7 +28,7 @@ const create = (args) => {
             // Set PRAGMA for framework database
             fwDb.run("PRAGMA journal_mode = WAL;");
             fwDb.run("PRAGMA read_uncommitted = 1;");
-            return("Connected to database at " + fwDbFilePath)
+            return ("Connected to database at " + fwDbFilePath)
         }
     });
 
@@ -42,13 +42,13 @@ const create = (args) => {
             appDb.run("PRAGMA journal_mode = WAL;");
             appDb.run("PRAGMA read_uncommitted = 1;");
             appDb.run("PRAGMA foreign_keys = ON;");
-            return("Connected to database at " + appDbFilePath)
+            return ("Connected to database at " + appDbFilePath)
         }
     });
 }
 
 const execute = (args) => {
-    return new Promise((resolve,reject) => {
+    return new Promise((resolve, reject) => {
         const userId = args[0].userId
         const dbType = args[0].dbType
         const query = args[0].query;
@@ -57,20 +57,20 @@ const execute = (args) => {
             reject("userId is required")
             return;
         }
- 
+
         if (dbType != DBType.AppDb && dbType != DBType.FrameworkDb) {
             reject("Invalid dbType")
             return;
         }
 
-        if (query == undefined || query==null || query=="") {
+        if (query == undefined || query == null || query == "") {
             reject("query is required")
             return;
         }
 
         const db = dbType == DBType.AppDb ? appDb : fwDb;
 
-        if(db == null || db == undefined) {
+        if (db == null || db == undefined) {
             try {
                 create(args);
             } catch (error) {
@@ -79,7 +79,7 @@ const execute = (args) => {
             }
         }
 
-        if(query.toUpperCase().includes("SELECT")) {
+        if (query.toUpperCase().includes("SELECT")) {
             db.all(query, [], (err, rows) => {
                 if (err) {
                     reject(err)
@@ -100,16 +100,40 @@ const execute = (args) => {
     });
 }
 
-const close = ()=>{
-    if (appDb) {
-        appDb.close();
-    }
-    if (fwDb) {
-        fwDb.close();
-    }
-    appDb = null;
-    fwDb = null;
-    return("DB connection closed")
+const close = () => {
+    return new Promise((resolve, reject) => {
+        const closeAppDb = new Promise((res) => {
+            if (appDb) {
+                appDb.close((err) => {
+                    if (err) console.error("Error closing appDb:", err);
+                    appDb = null;
+                    appDbFilePath = null;
+                    res();
+                });
+            } else {
+                res();
+            }
+        });
+
+        const closeFwDb = new Promise((res) => {
+            if (fwDb) {
+                fwDb.close((err) => {
+                    if (err) console.error("Error closing fwDb:", err);
+                    fwDb = null;
+                    fwDbFilePath = null;
+                    res();
+                });
+            } else {
+                res();
+            }
+        });
+
+        Promise.all([closeAppDb, closeFwDb]).then(() => {
+            resolve("DB connection closed");
+        }).catch(err => {
+            reject(err);
+        });
+    });
 }
 
 const getDBFilePath = (args) => {
@@ -140,12 +164,17 @@ const saveWebDB = (args) => {
     return "Web DB save is only for browser."
 }
 
+const exportWebDB = (args) => {
+    // Return void or success message as requested
+    return;
+}
+
 /**
  * Deletes the user directory and all its contents for the given userId.
  * @param {Array} args - Array with an object containing userId.
- * @returns {string} - Success or error message.
+ * @returns {Promise<string>} - Success or error message.
  */
-const deleteUserData = (args) => {
+const deleteUserData = async (args) => {
     const userId = args[0]?.userId;
     if (!userId) {
         throw new Error("userId is required");
@@ -154,30 +183,28 @@ const deleteUserData = (args) => {
     if (!fs.existsSync(userPath)) {
         return `User directory does not exist: ${userPath}`;
     }
-    // Close DBs if they are open and point to this user's directory
-    if (appDb) {
-        try {
-            appDb.close();
-        } catch (e) {
-            // Optionally log error
-        }
-        appDb = null;
-        appDbFilePath = null;
-    }
-    if (fwDb) {
+
+    // Close DBs if they are open. We must wait for them to close to release file locks on Windows.
+    await close();
+
+    // On Windows, file locks might take a few milliseconds to be released by the OS even after closing the connection.
+    // We use a retry mechanism to handle this.
+    const maxRetries = 10;
+    const retryDelay = 100; // ms
+
+    for (let i = 0; i < maxRetries; i++) {
         try {
-            fwDb.close();
-        } catch (e) {
-            // Optionally log error
+            if (fs.existsSync(userPath)) {
+                fs.rmSync(userPath, { recursive: true, force: true });
+            }
+            return `User directory deleted: ${userPath}`;
+        } catch (err) {
+            if (i === maxRetries - 1) {
+                throw new Error(`Failed to delete user directory after ${maxRetries} attempts: ${err.message}`);
+            }
+            // Wait before retrying
+            await new Promise(resolve => setTimeout(resolve, retryDelay));
         }
-        fwDb = null;
-        fwDbFilePath = null;
-    }
-    try {
-        fs.rmSync(userPath, { recursive: true, force: true });
-        return `User directory deleted: ${userPath}`;
-    } catch (err) {
-        throw new Error(`Failed to delete user directory: ${err.message}`);
     }
 }
 
@@ -193,7 +220,7 @@ app.on('before-quit', () => {
         });
     }
     if (fwDb) {
-            fwDb.close((err) => {
+        fwDb.close((err) => {
             if (err) {
                 throw err.message;
             } else {
@@ -211,5 +238,6 @@ module.exports = {
     getDBFilePath,
     getUserDirectoryPath,
     saveWebDB,
+    exportWebDB,
     deleteUserData
 };

package/src/ios/UnviredDB.h

@@ -28,6 +28,8 @@
 
 - (void)saveWebDB:(CDVInvokedUrlCommand*)command;
 
+- (void)exportWebDB:(CDVInvokedUrlCommand*)command;
+
 - (void)deleteUserData:(CDVInvokedUrlCommand*)command;
 
 

package/src/ios/UnviredDB.m

@@ -437,6 +437,18 @@ static const NSString *DBTypeFrameworkDb = @"FrameworkDb";
     }];
 }
 
+- (void)exportWebDB:(CDVInvokedUrlCommand*)command {
+    [self.commandDelegate runInBackground: ^{
+        @try {
+            [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+        } @catch (NSException *exception) {
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[exception description]];
+            [pluginResult setKeepCallbackAsBool:true];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }
+    }];
+}
+
 - (void)deleteUserData:(CDVInvokedUrlCommand*)command {
     [self.commandDelegate runInBackground: ^{
         @try {

package/www/unvired-db.js

@@ -24,6 +24,10 @@ exports.saveWebDB = function (arg0, successCallback, errorCallback) {
   exec(successCallback, errorCallback, "UnviredDB", 'saveWebDB', [arg0]);
 };
 
+exports.exportWebDB = function (arg0, successCallback, errorCallback) {
+  exec(successCallback, errorCallback, "UnviredDB", 'exportWebDB', [arg0]);
+};
+
 exports.deleteUserData = function (arg0, successCallback, errorCallback) {
   exec(successCallback, errorCallback, "UnviredDB", 'deleteUserData', [arg0]);
 }