@capacitor-community/sqlite 3.4.1-3 → 3.4.2-1

package/README.md

@@ -28,10 +28,55 @@
 
 ## CAPACITOR 3 (Master)
 
+🚨 Since release 3.4.1 ->> 🚨
+  Databases location for Electron can be set in `the config.config.ts` as followed:
+
+  - for sharing databases between users:
+
+    ``` 
+    plugins: {
+      CapacitorSQLite: {
+        electronMacLocation: "/YOUR_DATABASES_PATH",
+        electronWindowsLocation: "C:\\ProgramData\\CapacitorDatabases",
+        electronLinuxLocation: "/home/CapacitorDatabases"
+      }
+    }
+    ``` 
+
+  - for only the user in its Home folder
+
+    ``` 
+    Plugins: {
+      CapacitorSQLite: {
+        electronMacLocation: "Databases",
+        electronWindowsLocation: "Databases",
+        electronLinuxLocation: "Databases"
+      }
+    }
+    ``` 
+
+  For existing databases, YOU MUST COPY old databases to the new location
+  You MUST remove the Electron folder and add it again with
+
+  ``` 
+  npx cap add @capacitor-community/electron
+  npm run build 
+  cd electron
+  npm i --save sqlite3
+  npm i --save @types:sqlite3
+  npm run rebuild
+  cd ..
+  npx cap sync @capacitor-community/electron
+  npm run build
+  npx cap copy @capacitor-community/electron
+  npx cap open @capacitor-community/electron
+  ``` 
+🚨 Since release 3.4.1 <<- 🚨
+
 🚨 Since release 3.4.1-1 ->> 🚨
 
   - add iosIsEncryption, androidIsEncryption in capacitor.config.ts
-    When your application use only `non-encrypted dzatabases` set those parameter to false then iOS KeyChain & Android MasterKey are not defined.
+    When your application use only `non-encrypted databases` set those parameter to false then iOS KeyChain & Android MasterKey are not defined.
     
 🚨 Since release 3.4.1-1 <<- 🚨
 

package/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLitePlugin.java

@@ -159,6 +159,7 @@ public class CapacitorSQLitePlugin extends Plugin {
                         public void run() {
                             try {
                                 implementation.changeEncryptionSecret(call, passphrase, oldpassphrase);
+                                rHandler.retResult(call, null, null);
                                 return;
                             } catch (Exception e) {
                                 String msg = "ChangeEncryptionSecret: " + e.getMessage();

package/electron/dist/plugin.js

@@ -7,6 +7,7 @@ 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');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -15,6 +16,7 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 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 src = {};
 
@@ -2159,6 +2161,7 @@ class UtilsFile {
         this.NodeFs = null;
         this.JSZip = null;
         this.Os = null;
+        this.Electron = null;
         this.AppName = '';
         this.HomeDir = '';
         this.sep = '/';
@@ -2166,15 +2169,38 @@ class UtilsFile {
         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.HomeDir = this.Os.homedir();
         const dir = __dirname;
         const idx = dir.indexOf('\\');
         if (idx != -1)
             this.sep = '\\';
-        this.appPath = dir.substring(0, dir.indexOf(`electron${this.sep}`) /* + 8*/);
+        this.appPath = this.Electron.app.getAppPath();
         const rawdata = this.NodeFs.readFileSync(this.Path.resolve(this.appPath, 'package.json'));
         this.AppName = JSON.parse(rawdata).name;
+        const pathToBuild = this.Path.join(this.appPath, 'build');
+        if (this.NodeFs.existsSync(this.Path.join(pathToBuild, 'capacitor.config.js'))) {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            this.capConfig = require(this.Path.join(pathToBuild, 'capacitor.config.js')).default;
+        }
+        else {
+            this.capConfig = JSON.parse(this.NodeFs.readFileSync(this.Path.join(this.appPath, 'capacitor.config.json')).toString());
+        }
         this.osType = this.Os.type();
+        switch (this.osType) {
+            case 'Darwin':
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite.electronMacLocation;
+                break;
+            case 'Linux':
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite.electronLinuxLocation;
+                break;
+            case 'Windows_NT':
+                this.pathDB = this.capConfig.plugins.CapacitorSQLite.electronWindowsLocation;
+                break;
+            default:
+                console.log('other operating system');
+        }
+        console.log(`&&& Databases path: ${this.pathDB}`);
     }
     /**
      * IsPathExists
@@ -2213,37 +2239,26 @@ class UtilsFile {
     getFilePath(fileName) {
         return this.Path.join(this.getDatabasesPath(), fileName);
     }
-    /**
-     * GetCustomerPath
-     * get the customer path
-     */
-    getCustomerPath(custPath) {
-        return this.Path.join(this.HomeDir, custPath);
-    }
-    /**
-     * GetCustomerFilePath
-     * get the customer file path
-     */
-    getCustomerFilePath(custPath, file) {
-        return this.Path.join(custPath, file);
-    }
     /**
      * GetDatabasesPath
      * get the database folder path
      */
     getDatabasesPath() {
         let retPath = '';
+        const sep = this.Path.sep;
         const dbFolder = this.pathDB;
-        retPath = this.Path.join(this.HomeDir, dbFolder, this.AppName);
-        let retB = this._createFolderIfNotExists(this.Path.join(this.HomeDir, dbFolder));
-        if (retB) {
-            retB = this._createFolderIfNotExists(this.Path.join(this.HomeDir, dbFolder, this.AppName));
-            if (!retB)
-                retPath = '';
+        if (dbFolder.includes(sep)) {
+            retPath = dbFolder;
+            if (this.Path.basename(dbFolder) !== this.AppName) {
+                retPath = this.Path.join(dbFolder, this.AppName);
+            }
         }
         else {
-            retPath = '';
+            retPath = this.Path.join(this.HomeDir, dbFolder, this.AppName);
         }
+        const retB = this._createFolderIfNotExists(retPath);
+        if (!retB)
+            retPath = '';
         return retPath;
     }
     /**
@@ -2547,9 +2562,10 @@ class UtilsFile {
      * @param directory
      */
     _mkdirSyncRecursive(directory) {
-        const path = directory.replace(/\/$/, '').split('/');
+        const sep = this.Path.sep;
+        const path = directory.replace(/\/$/, '').split(sep);
         for (let i = 1; i <= path.length; i++) {
-            const segment = path.slice(0, i).join('/');
+            const segment = path.slice(0, i).join(sep);
             segment.length > 0 && !this.NodeFs.existsSync(segment)
                 ? this.NodeFs.mkdirSync(segment)
                 : null;