@unvired/cordova-plugin-unvired-electron-db 0.0.36 → 0.0.38

package/package.json

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

package/src/electron/package.json

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

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

@@ -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) => {
@@ -143,9 +167,9 @@ const saveWebDB = (args) => {
 /**
  * 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 +178,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}`);
     }
 }