@capacitor-community/sqlite 4.1.0-8 → 4.1.1

package/electron/dist/plugin.js

@@ -5,9 +5,10 @@ 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('os');
-var require$$3 = require('jszip');
-var require$$4 = require('electron');
+var require$$2 = require('node-fetch');
+var require$$3 = require('os');
+var require$$4 = require('jszip');
+var require$$5 = require('electron');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -17,6 +18,7 @@ var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 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 src = {};
 
@@ -2676,6 +2678,7 @@ class UtilsFile {
         this.pathDB = 'Databases';
         this.Path = null;
         this.NodeFs = null;
+        this.NodeFetch = null;
         this.JSZip = null;
         this.Os = null;
         this.Electron = null;
@@ -2684,9 +2687,10 @@ class UtilsFile {
         this.sep = '/';
         this.Path = require$$0__default$1["default"];
         this.NodeFs = require$$1__default["default"];
-        this.Os = require$$2__default["default"];
-        this.JSZip = require$$3__default["default"];
-        this.Electron = require$$4__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.HomeDir = this.Os.homedir();
         const dir = __dirname;
         const idx = dir.indexOf('\\');
@@ -2722,6 +2726,17 @@ class UtilsFile {
         }
         console.log(`&&& Databases path: ${this.pathDB}`);
     }
+    /**
+     * GetExtName
+     * @param filePath
+     * @returns
+     */
+    getExtName(filePath) {
+        return this.Path.extname(filePath);
+    }
+    getBaseName(filePath) {
+        return this.Path.basename(filePath, this.Path.extname(filePath));
+    }
     /**
      * IsPathExists
      * @param filePath
@@ -2781,6 +2796,19 @@ class UtilsFile {
             retPath = '';
         return retPath;
     }
+    /**
+     * GetCachePath
+     * get the database cache folder path
+     */
+    getCachePath() {
+        let retPath = '';
+        const databasePath = this.getDatabasesPath();
+        retPath = this.Path.join(databasePath, 'cache');
+        const retB = this._createFolderIfNotExists(retPath);
+        if (!retB)
+            retPath = '';
+        return retPath;
+    }
     /**
      * GetAssetsDatabasesPath
      * get the assets databases folder path
@@ -2803,10 +2831,12 @@ class UtilsFile {
     setPathSuffix(db) {
         let toDb = db;
         const ext = '.db';
-        const sep = this.Path.sep;
-        if (db.substring(db.length - 3) === ext) {
-            if (!db.includes('SQLite.db')) {
-                toDb = db.slice(db.lastIndexOf(sep) + 1, -3) + 'SQLite.db';
+        const dirName = this.Path.dirname(db);
+        const baseName = this.getBaseName(db);
+        if (this.getExtName(db) === ext) {
+            if (!baseName.includes('SQLite')) {
+                const dbName = `${baseName}SQLite`;
+                toDb = `${this.Path.join(dirName, dbName)}${ext}`;
             }
         }
         return toDb;
@@ -2820,7 +2850,7 @@ class UtilsFile {
         const filenames = this.NodeFs.readdirSync(path);
         const dbs = [];
         filenames.forEach((file) => {
-            if (this.Path.extname(file) == '.db' || this.Path.extname(file) == '.zip')
+            if (this.getExtName(file) == '.db' || this.getExtName(file) == '.zip')
                 dbs.push(file);
         });
         return Promise.resolve(dbs);
@@ -2842,8 +2872,8 @@ class UtilsFile {
      * @param db
      * @param overwrite
      */
-    async unzipDatabase(db, overwrite) {
-        const pZip = this.Path.join(this.getAssetsDatabasesPath(), db);
+    async unzipDatabase(db, fPath, overwrite) {
+        const pZip = this.Path.join(fPath, db);
         // Read the Zip file
         this.NodeFs.readFile(pZip, (err, data) => {
             if (err) {
@@ -3024,13 +3054,39 @@ class UtilsFile {
                 }
             }
             else {
-                return Promise.reject('RenameFilePath: filePath ' + 'does not exist');
+                return Promise.reject(`RenameFilePath: ${filePath} does not exist`);
             }
         }
         else {
             return Promise.reject('RenameFilePath: filePath not found');
         }
     }
+    async moveDatabaseFromCache() {
+        const cachePath = this.getCachePath();
+        const databasePath = this.getDatabasesPath();
+        const dbCacheList = await this.getFileList(cachePath);
+        for (const name of dbCacheList) {
+            const ext = this.getExtName(name);
+            const fromDBName = this.Path.join(cachePath, name);
+            if (ext === '.db') {
+                const pDb = this.setPathSuffix(this.Path.join(databasePath, name));
+                try {
+                    await this.renameFilePath(fromDBName, pDb);
+                }
+                catch (err) {
+                    return Promise.reject('moveDatabaseFromCache: ' + `${err}`);
+                }
+            }
+            if (ext === '.zip') {
+                try {
+                    await this.deleteFilePath(fromDBName);
+                }
+                catch (err) {
+                    return Promise.reject('moveDatabaseFromCache: ' + `${err}`);
+                }
+            }
+        }
+    }
     /**
      * RestoreFileName
      * @param fileName
@@ -3060,6 +3116,23 @@ class UtilsFile {
             return Promise.reject(`RestoreFileName: ${mFileName} ` + 'does not exist');
         }
     }
+    /**
+     * DownloadFileFromHTTP
+     * @param url
+     * @param path
+     */
+    async downloadFileFromHTTP(url, pathFolder) {
+        const res = await this.NodeFetch(url);
+        const ext = this.getExtName(url);
+        const dbName = this.getBaseName(url);
+        const filePath = `${this.Path.join(pathFolder, dbName)}${ext}`;
+        const fileStream = this.NodeFs.createWriteStream(filePath);
+        await new Promise((resolve, reject) => {
+            res.body.pipe(fileStream);
+            res.body.on('error', reject);
+            fileStream.on('finish', resolve);
+        });
+    }
     /**
      * CreateFolderIfNotExists
      * Create directory
@@ -3116,6 +3189,7 @@ class UtilsUpgrade {
      * @param targetVersion
      */
     async onUpgrade(mDB, vUpgDict, curVersion, targetVersion) {
+        let changes;
         const sortedKeys = Object.keys(vUpgDict)
             .map(item => parseInt(item))
             .sort();
@@ -3133,14 +3207,14 @@ class UtilsUpgrade {
                     await this.sqliteUtil.setVersion(mDB, versionKey);
                     // set Foreign Keys On
                     await this.sqliteUtil.setForeignKeyConstraintsEnabled(mDB, true);
-                    const changes = (await this.sqliteUtil.dbChanges(mDB)) - initChanges;
-                    return Promise.resolve(changes);
+                    changes = (await this.sqliteUtil.dbChanges(mDB)) - initChanges;
                 }
                 catch (err) {
                     return Promise.reject(`onUpgrade: ${err}`);
                 }
             }
         }
+        return Promise.resolve(changes);
     }
     /**
      * ExecuteStatementProcess
@@ -3712,7 +3786,7 @@ class CapacitorSQLite {
             versionUpgradeKeys.includes(dbName)) {
             upgrades = this.versionUpgrades[dbName];
         }
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const databaseConnection = new Database_1.Database(dbName + 'SQLite.db', 
         /*        encrypted,
         inMode,
@@ -3724,7 +3798,7 @@ class CapacitorSQLite {
     async closeConnection(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             // close the database
@@ -3747,7 +3821,7 @@ class CapacitorSQLite {
     async open(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         try {
             await database.open();
@@ -3760,7 +3834,7 @@ class CapacitorSQLite {
     async close(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -3779,7 +3853,7 @@ class CapacitorSQLite {
     async getVersion(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -3800,7 +3874,7 @@ class CapacitorSQLite {
     async getTableList(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -3823,11 +3897,11 @@ class CapacitorSQLite {
         const statements = this.getOptionValue(options, 'statements');
         const transaction = this.getOptionValue(options, 'transaction', true);
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`Execute: ${msg}`);
             }
             try {
@@ -3853,7 +3927,7 @@ class CapacitorSQLite {
         const setOfStatements = this.getOptionValue(options, 'set');
         const transaction = this.getOptionValue(options, 'transaction', true);
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         for (const sStmt of setOfStatements) {
             if (!('statement' in sStmt) || !('values' in sStmt)) {
@@ -3862,7 +3936,7 @@ class CapacitorSQLite {
         }
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`ExecuteSet failed: ${msg}`);
             }
             try {
@@ -3889,11 +3963,11 @@ class CapacitorSQLite {
         const values = this.getOptionValue(options, 'values', []);
         const transaction = this.getOptionValue(options, 'transaction', true);
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`Run failed: ${msg}`);
             }
             try {
@@ -3917,7 +3991,7 @@ class CapacitorSQLite {
             throw new Error('Query: Statement may not be an empty string.');
         }
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -3936,7 +4010,7 @@ class CapacitorSQLite {
     async isDBExists(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         this.getDatabaseConnectionOrThrowError(connName);
         //    if (database.isDBOpen()) {
         const isExists = this.fileUtil.isFileExists(dbName + 'SQLite.db');
@@ -3949,7 +4023,7 @@ class CapacitorSQLite {
     async isDBOpen(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         const isOpen = database.isDBOpen();
         return { result: isOpen };
@@ -3963,7 +4037,7 @@ class CapacitorSQLite {
         const dbName = this.getOptionValue(options, 'database');
         const tableName = this.getOptionValue(options, 'table');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -3982,10 +4056,10 @@ class CapacitorSQLite {
     async deleteDatabase(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (readonly) {
-            const msg = "not allowed in read-only mode ";
+            const msg = 'not allowed in read-only mode ';
             throw new Error(`DeleteDatabase failed: ${msg}`);
         }
         try {
@@ -4059,7 +4133,7 @@ class CapacitorSQLite {
         const dbName = this.getOptionValue(options, 'database');
         const exportMode = this.getOptionValue(options, 'jsonexportmode');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -4084,11 +4158,11 @@ class CapacitorSQLite {
     async createSyncTable(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`CreateSyncTable failed: ${msg}`);
             }
             try {
@@ -4110,11 +4184,11 @@ class CapacitorSQLite {
         const dbName = this.getOptionValue(options, 'database');
         const syncDate = this.getOptionValue(options, 'syncdate');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`SetSyncDate failed: ${msg}`);
             }
             try {
@@ -4133,7 +4207,7 @@ class CapacitorSQLite {
     async getSyncDate(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = readonly ? "RO_" + dbName : "RW_" + dbName;
+        const connName = readonly ? 'RO_' + dbName : 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             try {
@@ -4152,11 +4226,11 @@ class CapacitorSQLite {
     async deleteExportedRows(options) {
         const dbName = this.getOptionValue(options, 'database');
         const readonly = options.readonly ? options.readonly : false;
-        const connName = "RW_" + dbName;
+        const connName = 'RW_' + dbName;
         const database = this.getDatabaseConnectionOrThrowError(connName);
         if (database.isDBOpen()) {
             if (readonly) {
-                const msg = "not allowed in read-only mode ";
+                const msg = 'not allowed in read-only mode ';
                 throw new Error(`DeleteExportedRows: ${msg}`);
             }
             try {
@@ -4184,9 +4258,14 @@ class CapacitorSQLite {
         if (typeof firstUpgrade.toVersion != 'number') {
             throw new Error('upgrade.toVersion must be a number');
         }
-        const upgradeVersionDict = {};
-        upgradeVersionDict[firstUpgrade.toVersion] = firstUpgrade;
-        this.versionUpgrades[dbName] = upgradeVersionDict;
+        if (this.versionUpgrades[dbName]) {
+            this.versionUpgrades[dbName][firstUpgrade.toVersion] = firstUpgrade;
+        }
+        else {
+            const upgradeVersionDict = {};
+            upgradeVersionDict[firstUpgrade.toVersion] = firstUpgrade;
+            this.versionUpgrades[dbName] = upgradeVersionDict;
+        }
         return;
     }
     async copyFromAssets(options) {
@@ -4199,12 +4278,13 @@ class CapacitorSQLite {
             const dbList = await this.fileUtil.getFileList(assetsDbPath);
             // loop through the database files
             dbList.forEach(async (db) => {
-                if (db.substring(db.length - 3) === '.db') {
+                if (this.fileUtil.getExtName(db) === '.db') {
                     // for each copy the file to the Application database folder
                     await this.fileUtil.copyFromAssetToDatabase(db, overwrite);
                 }
-                if (db.substring(db.length - 4) === '.zip') {
-                    await this.fileUtil.unzipDatabase(db, overwrite);
+                if (this.fileUtil.getExtName(db) === '.zip') {
+                    const assetPath = this.fileUtil.getAssetsDatabasesPath();
+                    await this.fileUtil.unzipDatabase(db, assetPath, overwrite);
                 }
             });
             return;
@@ -4213,6 +4293,25 @@ class CapacitorSQLite {
             throw new Error(`CopyFromAssets: assets/databases folder does not exist:[${assetsDbPath}]`);
         }
     }
+    async getFromHTTPRequest(options) {
+        const url = this.getOptionValue(options, 'url', '');
+        const overwrite = this.getOptionValue(options, 'overwrite', false);
+        if (url.length === 0) {
+            throw new Error(`getFromHTTPRequest: You must give a database url`);
+        }
+        const cachePath = this.fileUtil.getCachePath();
+        await this.fileUtil.downloadFileFromHTTP(url, cachePath);
+        if (this.fileUtil.getExtName(url) === '.zip') {
+            const zipName = `${this.fileUtil.getBaseName(url)}.zip`;
+            await this.fileUtil.unzipDatabase(zipName, cachePath, overwrite);
+        }
+        if (overwrite) {
+            await this.fileUtil.moveDatabaseFromCache();
+        }
+        else {
+            throw new Error(`getFromHTTPRequest: cannot move file from cache overwrite: ${overwrite}`);
+        }
+    }
     async getDatabaseList() {
         // get the database folder
         const pathDatabase = this.fileUtil.getDatabasesPath();
@@ -4227,11 +4326,16 @@ class CapacitorSQLite {
     }
     async checkConnectionsConsistency(options) {
         const dbNames = this.getOptionValue(options, 'dbNames');
+        const openModes = this.getOptionValue(options, 'openModes');
         const checkConsistencyResult = {};
         checkConsistencyResult.result = false;
+        const dbConns = [];
+        dbNames.forEach((value, i) => {
+            dbConns.push(`${openModes[i]}_${value}`);
+        });
         try {
             let inConnectionsSet = new Set(Object.keys(this.databases));
-            const outConnectionSet = new Set(dbNames);
+            const outConnectionSet = new Set(dbConns);
             if (outConnectionSet.size === 0) {
                 await this.resetDbDict(Object.keys(this.databases));
                 return Promise.resolve(checkConsistencyResult);
@@ -4245,7 +4349,7 @@ class CapacitorSQLite {
                     if (!Array.from(outConnectionSet.keys()).includes(key)) {
                         const opt = {};
                         let readonly = false;
-                        if (key.substring(0, 3) === "RO_") {
+                        if (key.substring(0, 3) === 'RO_') {
                             readonly = true;
                         }
                         opt.database = key.substring(3);
@@ -4280,7 +4384,7 @@ class CapacitorSQLite {
             for (const key of keys) {
                 const opt = {};
                 let readonly = false;
-                if (key.substring(0, 3) === "RO_") {
+                if (key.substring(0, 3) === 'RO_') {
                     readonly = true;
                 }
                 opt.database = key.substring(3);