@capacitor-community/sqlite 4.2.0 → 4.2.2-1

package/README.md

@@ -27,8 +27,21 @@
 | Quéau Jean Pierre | [jepiqueau](https://github.com/jepiqueau) |        |
 
 To install:
+
+```
+npm install --save @capacitor-community/sqlite
+npx cap sync
+```
+
+```
+yarn install --save @capacitor-community/sqlite
+npx cap sync
+```
+
 ```
-npm install @capacitor-community/sqlite
+pnpm install --save @capacitor-community/sqlite
+pnpm install --save @jeep-sqlite
+pnpm install --save sql.js
 npx cap sync
 ```
 

package/electron/dist/plugin.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var require$$0 = require('sqlite3');
-var require$$0$1 = require('path');
-var require$$1 = require('fs');
-var require$$2 = require('node-fetch');
-var require$$3 = require('os');
-var require$$4 = require('jszip');
-var require$$5 = require('electron');
+var require$$0$1 = require('node:fs/promises');
+var require$$1 = require('path');
+var require$$2 = require('fs');
+var require$$3 = require('node-fetch');
+var require$$4 = require('os');
+var require$$5 = require('jszip');
+var require$$6 = require('electron');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -19,6 +20,7 @@ var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
+var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
 
 var src = {};
 
@@ -216,14 +218,19 @@ class UtilsSQLite {
      * BeginTransaction
      * @param db
      * @param isOpen
+     * @param mode
      */
-    async beginTransaction(db, isOpen) {
+    async beginTransaction(db, isOpen, mode) {
+        // eslint-disable-next-line no-async-promise-executor
         return new Promise((resolve, reject) => {
             const msg = 'BeginTransaction: ';
             if (!isOpen) {
                 return Promise.reject(`${msg}database not opened`);
             }
-            const sql = 'BEGIN TRANSACTION;';
+            let sql = 'BEGIN TRANSACTION;';
+            if (mode.slice(0, 3) === "wal") {
+                sql = "BEGIN CONCURRENT";
+            }
             db.run(sql, (err) => {
                 if (err) {
                     reject(`${msg}${err.message}`);
@@ -821,6 +828,23 @@ class UtilsSQLite {
             return Promise.reject(`isSqlDeleted: ${err}`);
         }
     }
+    async getJournalMode(mDB) {
+        let resQuery = [];
+        let retMode = "delete";
+        const query = `PRAGMA journal_mode;`;
+        try {
+            resQuery = await this.queryAll(mDB, query, []);
+            if (resQuery.length === 1) {
+                for (const query of resQuery) {
+                    retMode = query.journal_mode;
+                }
+            }
+            return retMode;
+        }
+        catch (err) {
+            return Promise.reject('GetJournalMode: ' + `${err}`);
+        }
+    }
     /**
      * GetTableColumnNamesTypes
      * @param mDB
@@ -925,7 +949,8 @@ class UtilsJson {
         let changes = 0;
         try {
             // start a transaction
-            await this.sqliteUtil.beginTransaction(mDB, true);
+            const mode = await this.sqliteUtil.getJournalMode(mDB);
+            await this.sqliteUtil.beginTransaction(mDB, true, mode);
         }
         catch (err) {
             return Promise.reject(`CreateDatabaseSchema: ${err}`);
@@ -2561,7 +2586,8 @@ class ImportFromJson {
         try {
             initChanges = await this.sqliteUtil.dbChanges(mDB);
             // start a transaction
-            await this.sqliteUtil.beginTransaction(mDB, true);
+            const mode = await this.sqliteUtil.getJournalMode(mDB);
+            await this.sqliteUtil.beginTransaction(mDB, true, mode);
         }
         catch (err) {
             return Promise.reject(`createTablesData: ${err}`);
@@ -2621,7 +2647,8 @@ class ImportFromJson {
         try {
             initChanges = await this.sqliteUtil.dbChanges(mDB);
             // start a transaction
-            await this.sqliteUtil.beginTransaction(mDB, true);
+            const mode = await this.sqliteUtil.getJournalMode(mDB);
+            await this.sqliteUtil.beginTransaction(mDB, true, mode);
         }
         catch (err) {
             return Promise.reject(`createViews: ${err}`);
@@ -2673,6 +2700,7 @@ var utilsFile = {};
 
 Object.defineProperty(utilsFile, "__esModule", { value: true });
 utilsFile.UtilsFile = void 0;
+const promises_1 = require$$0__default$1["default"];
 class UtilsFile {
     constructor() {
         this.pathDB = 'Databases';
@@ -2685,12 +2713,12 @@ class UtilsFile {
         this.AppName = '';
         this.HomeDir = '';
         this.sep = '/';
-        this.Path = require$$0__default$1["default"];
-        this.NodeFs = require$$1__default["default"];
-        this.NodeFetch = require$$2__default["default"];
-        this.Os = require$$3__default["default"];
-        this.JSZip = require$$4__default["default"];
-        this.Electron = require$$5__default["default"];
+        this.Path = require$$1__default["default"];
+        this.NodeFs = require$$2__default["default"];
+        this.NodeFetch = require$$3__default["default"];
+        this.Os = require$$4__default["default"];
+        this.JSZip = require$$5__default["default"];
+        this.Electron = require$$6__default["default"];
         this.HomeDir = this.Os.homedir();
         const dir = __dirname;
         const idx = dir.indexOf('\\');
@@ -2996,6 +3024,7 @@ class UtilsFile {
             const isPath = this.isPathExists(filePath);
             if (isPath) {
                 try {
+                    await this.waitForFilePathLock(filePath);
                     this.NodeFs.unlinkSync(filePath);
                     return Promise.resolve();
                 }
@@ -3011,6 +3040,52 @@ class UtilsFile {
             return Promise.reject('DeleteFilePath: delete filePath' + 'failed');
         }
     }
+    async waitForFilePathLock(filePath, timeoutMS = 4000) {
+        let timeIsOver = false;
+        setTimeout(() => {
+            timeIsOver = true;
+        }, timeoutMS);
+        return new Promise((resolve, reject) => {
+            const check = async () => {
+                if (timeIsOver) {
+                    reject(new Error(`WaitForFilePathLock: The resource is still locked / busy after ${timeoutMS} milliseconds.`));
+                    return;
+                }
+                // check if path exists
+                const isPath = this.isPathExists(filePath);
+                // The file path does not exist. A non existant path cannot be locked.
+                if (!isPath) {
+                    resolve();
+                    return;
+                }
+                try {
+                    const stream = await promises_1.open(filePath, 'r+');
+                    // We need to close the stream afterwards, because otherwise, we're locking the file
+                    await stream.close();
+                    resolve();
+                }
+                catch (err) {
+                    if (err.code === 'EBUSY') {
+                        // The resource is busy. Retry in 100ms
+                        setTimeout(() => {
+                            check();
+                        }, 100);
+                        return;
+                    }
+                    else if (err.code === 'ENOENT') {
+                        // The file does not exist (anymore). So it cannot be locked.
+                        resolve();
+                        return;
+                    }
+                    else {
+                        // Something else went wrong.
+                        reject(new Error(`WaitForFilePathLock: Error while checking the file: ${err}`));
+                    }
+                }
+            };
+            check();
+        });
+    }
     /**
      * RenameFileName
      * @param fileName
@@ -3223,7 +3298,8 @@ class UtilsUpgrade {
      */
     async executeStatementsProcess(mDB, statements) {
         try {
-            await this.sqliteUtil.beginTransaction(mDB, true);
+            const mode = await this.sqliteUtil.getJournalMode(mDB);
+            await this.sqliteUtil.beginTransaction(mDB, true, mode);
             for (const statement of statements) {
                 await this.sqliteUtil.execute(mDB, statement, false);
             }
@@ -3350,11 +3426,15 @@ class Database {
      */
     async close() {
         this.ensureDatabaseIsOpen();
-        this.database.close((err) => {
-            if (err) {
-                throw new Error('Close failed: ${this.dbName}  ${err}');
-            }
-            this._isDbOpen = false;
+        return new Promise((resolve, reject) => {
+            this.database.close((err) => {
+                if (err) {
+                    reject(new Error(`Close failed: ${this.dbName}  ${err}`));
+                    return;
+                }
+                this._isDbOpen = false;
+                resolve();
+            });
         });
     }
     /**
@@ -3530,7 +3610,8 @@ class Database {
         this.ensureDatabaseIsOpen();
         try {
             if (transaction) {
-                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen);
+                const mode = await this.sqliteUtil.getJournalMode(this.database);
+                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen, mode);
             }
             const changes = await this.sqliteUtil.execute(this.database, sql, false);
             if (changes < 0) {
@@ -3586,7 +3667,8 @@ class Database {
             initChanges = await this.sqliteUtil.dbChanges(this.database);
             // start a transaction
             if (transaction) {
-                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen);
+                const mode = await this.sqliteUtil.getJournalMode(this.database);
+                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen, mode);
             }
         }
         catch (err) {
@@ -3629,7 +3711,8 @@ class Database {
             initChanges = await this.sqliteUtil.dbChanges(this.database);
             // start a transaction
             if (transaction) {
-                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen);
+                const mode = await this.sqliteUtil.getJournalMode(this.database);
+                await this.sqliteUtil.beginTransaction(this.database, this._isDbOpen, mode);
             }
         }
         catch (err) {