@fto-consult/expo-ui 7.4.25 → 7.4.27

package/electron/index.js

@@ -314,8 +314,8 @@ app.whenReady().then(() => {
 })
 
 ipcMain.on("electron-restart-app",x =>{app.relaunch();})
-let tray = null;
-let isJSON = function (json_string){
+  let tray = null;
+  let isJSON = function (json_string){
   if(!json_string || typeof json_string != 'string') return false;
   var text = json_string;
   return !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, '')));
@@ -357,6 +357,14 @@ ipcMain.on("electron-get-path",(event,pathName)=>{
   return p;
 });
 
+ipcMain.on("electron-get-package-json",(event)=>{
+  const packageJSON = path.resolve(projectRoot,"package.json");
+  if(fs.existsSync(packageJSON)){
+      return JSON.stringify(require(packageJSON));
+  }
+  return JSON.stringify({});
+});
+
 ipcMain.on("electron-get-media-access-status",(event,mediaType)=>{
   let p = systemPreferences.getMediaAccessStatus(mediaType);
   event.returnValue = p;

package/electron/preload.js

@@ -6,17 +6,12 @@ const path = require("path");
 const fs = require("fs");
 const isObj = x=>x && typeof x =='object' && !Array.isArray(x);
 const isNonNullString = x=>x && typeof x =='string';
-const ePath = path.resolve(__dirname);
-const packagePath = path.resolve(ePath,"package.json");
-if(!fs.existsSync(packagePath)){
-    throw {message : "Chemin du fichier "+packagePath+ " introuvable"};
-}
-const _app = require(`${packagePath}`);
+const packageJSONStr = ipcRenderer.sendSync("electron-get-package-json");
+const _app = packageJSONStr ? JSON.parse(packageJSONStr) : {};
 if(!_app || typeof _app !=='object' || typeof _app.name !=='string'){
     throw {message : "Contenu du fichier "+packagePath+" invalide!! Veuillez spécifier un nom valide d'application, propriété <<name>> dudit fichier"}
 }
 const paths = require("./paths.json");
-const projectRoot = paths.projectRoot || '';
 const APP_NAME = _app.name.trim().toUpperCase();
 let backupPathField = "_e_backupDataPath";
 let cBackupPathField = "company"+backupPathField;
@@ -28,6 +23,7 @@ const getPath = function(pathName){
 const APP_PATH = path.join(getPath("appData"),APP_NAME).toLowerCase();
 let databasePath = path.join(APP_PATH,"databases");
 let ROOT_APP_FOLDER = undefined;
+let appBackupPathRef = undefined;
 const separator = (path.sep)
 if(typeof separator != 'string' || !separator){
     separator = (()=>{
@@ -71,8 +67,8 @@ const setDatabasePath =  (newPath)=>{
 };
 const setBackupPath = (newPath)=>{
     newPath = typeof newPath =='string' && newPath || typeof ROOT_APP_FOLDER =='string' && ROOT_APP_FOLDER || path.join(getPath("documents"),APP_NAME);
-    ELECTRON.APP_BACKUP_PATH = newPath;
-    config.set(cBackupPathField,ELECTRON.APP_BACKUP_PATH)
+    appBackupPathRef = newPath;
+    config.set(cBackupPathField,appBackupPathRef)
 };
 const APPRef = {
     current : null,
@@ -105,14 +101,14 @@ const ELECTRON = {
         return (p)=>{
             const eePath = config.get(cBackupPathField);
             const defPath  = ROOT_APP_FOLDER || path.join(getPath("documents"),APP_NAME);
-            ELECTRON.APP_BACKUP_PATH = typeof eePath =='string' && eePath || typeof defPath =='string' && defPath || '';
-            if(!fs.existsSync(ELECTRON.APP_BACKUP_PATH)){
-                ELECTRON.APP_BACKUP_PATH = defPath;
+            appBackupPathRef = typeof eePath =='string' && eePath || typeof defPath =='string' && defPath || '';
+            if(!fs.existsSync(appBackupPathRef)){
+                appBackupPathRef = defPath;
             }
             if(p && typeof (p) ==='string'){
-                return path.join(ELECTRON.APP_BACKUP_PATH,p);
+                return path.join(appBackupPathRef,p);
             }
-            return ELECTRON.APP_BACKUP_PATH;
+            return appBackupPathRef;
         };
     },
     get databasePath (){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.4.25",
+  "version": "7.4.27",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {