@fto-consult/expo-ui 3.3.0 → 3.3.1

package/electron/index.js

@@ -1,21 +1,44 @@
 const {app, BrowserWindow,Tray,Menu,MenuItem,systemPreferences,powerMonitor,dialog, nativeTheme} = require('electron')
 const appConfig  = {}//require("../src/app/config");
-const session = require("./session");
+const session = require("./src/session");
 const path = require("path");
+const paths = require("./paths.json");
+const images = paths.$images, assets = paths.$assets, logo = paths.logo;
 // Gardez une reference globale de l'objet window, si vous ne le faites pas, la fenetre sera
 // fermee automatiquement quand l'objet JavaScript sera garbage collected.
 let win = undefined;
 let fs = require("fs");
-let icon = undefined;
-const imagesPath = path.join(__dirname,"assets/images")
-if(process.platform =="win32" && fs.existsSync(path.join(imagesPath, "icon.ico"))){
-   icon = path.join(imagesPath, "icon.ico");
-} else if(process.platform =="linux" && fs.existsSync(path.join(imagesPath, "icon.png"))){
-   icon = path.join(imagesPath, "icon.png");
-} else if(process.platform =='darwin' && fs.existsSync(path.join(imagesPath, "icon.incs"))){
-  icon = path.join(imagesPath, "icon.incs");
+const isWindow = process.platform =="win32",
+isMac = process.platform =='darwin',
+isLinux = process.platform =="linux";
+const getIcon = (p)=>{
+    if(Array.isArray(p)){
+       for(let i in p){
+         const r = getIcon(p[i]);
+         if(r) return r;
+       }
+    } else if(typeof p =='string' && p && fs.existsSync(p)){
+      const ext = isWindow ? ".ico" : isMac ? ".incs" : ".png";
+      const possibles =  ["icon","logo","favicon"];
+      for(let i in possibles){
+        const icon = path.join(p,possibles[i]+ext);
+        if(fs.existsSync(icon)){
+           return icon;
+        }
+      }
+    }
+    return undefined;
 }
-
+const icon = isLinux && logo && fs.existsSync(logo) && logo || getIcon(
+    logo && fs.existsSync(logo) && path.dirname(logo),
+    images,
+    assets,
+)
+/*console.log(icon," is iccccccc");
+console.log(logo," is logo ",images,assets);
+throw {
+  message : "icon is "+icon+" logo is "+logo+" image is "+images+" assets is "+assets
+}*/
 Menu.setApplicationMenu(null);
 let clipboadContextMenu = (_, props) => {
   if (props.isEditable || props.selectionText) {
@@ -248,7 +271,7 @@ app.whenReady().then(() => {
   });
 })
 
-let {ipcMain} = require("electron");
+const {ipcMain} = require("electron");
 
 ipcMain.on("electron-restart-app",x =>{
   app.relaunch();
@@ -291,7 +314,7 @@ ipcMain.on("update-system-tray",(event,opts)=>{
   tray.setContextMenu(contextMenu) 
 })
 ipcMain.on("electron-get-path",(event,pathName)=>{
-  let p = app.getPath(pathName);
+  const p = app.getPath(pathName);
   event.returnValue = p;
   return p;
 });

package/electron/src/preload.js

@@ -1,7 +1,6 @@
 (function(window) {
     let showingExitApp = undefined;
-    let sudo = require('sudo-prompt');
-    const { exec } = require('child_process');
+    const exec = require("../exec");
     if(typeof window.isElectron != 'function'){
         Object.defineProperties(window,{
             ELECTRON : {
@@ -23,8 +22,7 @@
             },
         })
     } 
-    ELECTRON;
-    let fs = require("fs");
+    const fs = require("fs");
     let _app = require("./app.config");
     require("./pload")(ELECTRON);
     const {ipcRenderer} = require('electron')
@@ -286,65 +284,7 @@
                 value : getPath, override:false,writable:false
             },
             exec : {
-                value : (opts,successCB,errorCB)=>{
-                    if(isNonNullString(opts)){
-                        opts = {cmd:opts};
-                    }
-                    let {cmd} = opts;
-                    opts = defaultObj(opts);
-                    successCB = defaultFunc(successCB,opts.onSuccess)
-                    errorCB = defaultFunc(errorCB,opts.onError);
-                    return new Promise((resolve,reject)=>{
-                        let handle = function(error, stdout, stderr) {
-                            if(error){
-                                errorCB({error,stderr})
-                                return reject({error,stderr})
-                            }
-                            successCB(stdout);
-                            resolve(stdout);
-                        }
-                        if(opts.sudo || opts.runAsAdmin){
-                            sudo.exec(cmd, opts,handle)   
-                        } else {
-                            exec(cmd,handle);
-                        }
-                    })
-                }
-            },
-            installNewAppVersion : {
-                value : (conf,successCB,errorCB)=>{
-                    if(isNonNullString(conf)){
-                        conf = {filePath:conf}
-                    }
-                    conf = defaultObj(conf);
-                    let {notify} = APP.require("$dialog");
-                    
-                    if(isNonNullString(conf.filePath) && fs.existsSync(conf.filePath)){
-                        let cmd = conf.filePath;
-                        if(ELECTRON.DEVICE.isLinux){
-                            cmd = "dpkg -i "+cmd;
-                        }
-                        let rootPath = path.join(__dirname,'..')
-                        let incs = path.join(rootPath, ELECTRON.DEVICE.isWindows?'icon.ico':ELECTRON.DEVICE.isLinux?'icon.png':'incs');
-                        const options = {
-                            title : "Authorisez "+APP.getName()+"",
-                            name: APP.getName(),
-                            incs,
-                            icon : incs,
-                            cmd,
-                            sudo:true,
-                            onSoucces : (stdout)=>{
-                                let message = "Le processus d'installation de la mise à jour de l'application a été exécutée evec succès. Veuillez relancer l'application";
-                                notify.success(message);
-                            },
-                            onError: ({error})=>{
-                                notify.error("Erreur lors de l'exécution du fichier d'installation : "+defaultStr(error.message));
-                            }
-                            //icns: '/Applications/Electron.app/Contents/Resources/Electron.icns'
-                        };
-                        return ELECTRON.exec(options,successCB,errorCB)       
-                    }
-                }, override : false, writable : false
+                value : exec,
             },
             updateSystemTheme : {
                 value : (theme)=>{

package/electron/writeFile.js

@@ -0,0 +1,7 @@
+const fs = require("fs");
+module.exports = function writeFile(path, contents, cb) {
+  if(require("./createDir")(path)){
+    return fs.writeFileSync(path, contents, cb);
+  }
+  throw {message : 'impossible de créer le repertoire associé au fichier'+path};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -42,9 +42,7 @@
     "delete-node-modules": "rimraf ./**/node_modules",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
   },
-  "bin": {
-    "electron": "bin/electron/index.js"
-  },
+  "bin": "./bin/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/borispipo/expo-ui.git"
@@ -72,6 +70,7 @@
     "@react-navigation/native-stack": "^6.9.7",
     "@shopify/flash-list": "1.3.1",
     "conf": "^10.2.0",
+    "electron": "^22.1.0",
     "expo": "^47.0.8",
     "expo-camera": "~13.1.0",
     "expo-clipboard": "~4.0.1",
@@ -83,6 +82,7 @@
     "expo-system-ui": "~2.0.1",
     "expo-web-browser": "~12.0.0",
     "file-saver": "^2.0.5",
+    "fs-extra": "^11.1.0",
     "google-libphonenumber": "^3.2.31",
     "htmlparser2-without-node-native": "^3.9.2",
     "mongo-parse": "^2.1.0",