@fto-consult/expo-ui 7.4.33 → 7.4.35

package/electron/pload.js

@@ -32,7 +32,7 @@ module.exports = (ELECTRON,paths)=>{
     }
     const ext = {
         toggleDevTools : (value)=>{
-            ipcRenderer.send("electron-toggle-dev-tools",defaultBool(value,true));
+            ipcRenderer.send("toggle-dev-tools",defaultBool(value,true));
         },
         gc : x =>{
             if(typeof global.gc =='function') return global.gc();
@@ -50,27 +50,6 @@ module.exports = (ELECTRON,paths)=>{
             getFreeRAM : (unit)=> getMem(unit,"freemem"),
             getTotalRAM : (unit)=> getMem(unit,'totalmem')
         },
-        setTitle : (title) =>{
-            if(title && typeof title =="string"){
-               ipcRenderer.send("electron-set-main-window-title",title);
-            }
-        },
-        createWindow : (options)=>{
-            options = defaultObj(options);
-            options.showOnLoad = defaultBool(options.showOnLoad,true);
-            return ipcRenderer.invoke("electron-create-browser-windows",options);
-        },
-        createPDFWindow :(options)=>{
-            options = defaultObj(options);
-            options.modal = true;
-            return ELECTRON.createWindow(options);
-        },
-        createProgressBar : (options)=>{
-            if(!options || typeof options != 'object' || Array.isArray(options)){
-                options = {};
-            }
-            return //new ProgressBar(options,app);
-        },
         getAutoUpdaterEvents : ()=> [
             //'checking-for-update',
             'update-available',

package/electron/preload.js

@@ -4,10 +4,14 @@ const { contextBridge, ipcRenderer, shell } = require('electron')
 const appInstance = require("./app/instance");
 const path = require("path");
 const fs = require("fs");
+const isDataURL = require("./utils/isDataURL");
+const isBase64 = require("./utils/isBase64");
 const isNonNullString = x=>x && typeof x =='string';
+const replaceAll = require("./utils/replaceAll");
 const pathsStr = ipcRenderer.sendSync("get-paths.json");
 const paths = typeof pathsStr ==='string' && pathsStr ? JSON.parse(pathsStr) : {};
 const appName = ipcRenderer.sendSync("get-app-name");
+const sanitize = require("sanitize-filename");
 if(!appName || typeof appName !=='string'){
     throw {message : "Nom de l'application invalide!! Veuillez spécifier un nom valide d'application"}
 }
@@ -24,6 +28,12 @@ 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 defaultStr = (...args)=>{
+    for(let i in args){
+        if(args[i] && typeof args[i] ==='string') return args[i];
+    }
+    return "";
+}
 const separator = (path.sep)
 if(typeof separator != 'string' || !separator){
     separator = (()=>{
@@ -87,6 +97,52 @@ const removeListener =  (channel, callback) => {
         ipcRenderer.removeAllListeners(channel)
     }    
 };
+
+const createWindow = (options)=>{
+    options = Object.assign({},options);
+    options.showOnLoad = typeof options.showOnLoad =='boolean'? options.showOnLoad : true;
+    return ipcRenderer.invoke("create-browser-windows",options);
+};
+
+const createPDFFile = (options)=>{
+    return new Promise((resolve,reject)=>{
+        const dir = getPath("temp");
+        options = Object.assign({},options);
+        let {content,filename,fileName,charset,success,fileExtension,extension,type} = options;
+        filename = defaultStr(filename,fileName)
+        if(isDataURL(content)){
+            content = isDataURL.toBase64(content);
+        }
+        if(isBase64(content)){
+            content = Buffer.from(content,'base64');
+        } else {
+           content = null;
+        }
+        if(!content){
+          console.warn('type de contenu invalide!! impression création fichier electron');
+          return null;
+        }
+        filename = defaultStr(filename,uniqid("print-salite-file-name"))
+        fileExtension = defaultStr(fileExtension,extension,'pdf');
+        charset = defaultStr(charset,'utf-8')
+        filename = sanitize(filename);
+        if(!fileName.endsWith(`.${fileExtension}`)){
+            fileName += "."+fileExtension
+        }
+        return fs.writeFile(_path.join(dir,filename), content,{charset},(err)=>{
+            if(!err) {
+                const fileUrl = 'file://'+(dir+'/'+filename).replaceAll("\\","/");
+                const p = _path.join(dir,filename);
+                const filePathUrl = 'file://'+p;
+                resolve({content,fileName:filename,filename,path:p,filePathUrl,filePathUri:filePathUrl,fileUrl,filePath:p,fileUri:fileUrl})
+            } else {
+                reject(err);
+            }
+        })    
+    })
+}
+
+
 const ELECTRON = {
     get getPouchdb(){
         return ({PouchDB,sqlPouch})=> {
@@ -135,18 +191,18 @@ const ELECTRON = {
     get showOpenDialog(){
        return (options)=>{
         options = typeof options =='object' && options && !Array.isArray(options)? options : {};
-        return ipcRenderer.invoke("electron-show-open-dialog",options);
+        return ipcRenderer.invoke("show-open-dialog",options);
        }
     },
     get showSaveDialog(){
         return (options)=>{
             options = typeof options =='object' && options && !Array.isArray(options)? options : {};
-            return ipcRenderer.invoke("electron-show-save-dialog",options);
+            return ipcRenderer.invoke("show-save-dialog",options);
         };
     },
     get restartApp(){
         return ()=>{
-            ipcRenderer.sendSync("electron-restart-app")
+            ipcRenderer.sendSync("restart-app")
         };
     },
     get is() {
@@ -190,7 +246,7 @@ const ELECTRON = {
     },
     get updateSystemTheme(){
         return  (theme)=>{
-            return ipcRenderer.invoke("electron-set-system-theme:toggle",theme);
+            return ipcRenderer.invoke("set-system-theme:toggle",theme);
         };
     },
     get SESSION (){
@@ -290,9 +346,51 @@ const ELECTRON = {
     },
     get toggleDevTools(){
         return async (toggle)=>{
-            return await ipcRenderer.send("electron-toggle-dev-tools",toggle);
+            return await ipcRenderer.send("toggle-dev-tools",toggle);
+        }
+    },
+    get createWindow (){
+        return createWindow;
+    },
+    get createPDFWindow(){
+        return (options)=>{
+            options = Object.assign({},options);
+            options.modal = true;
+            return createWindow(options);
+        }
+    },
+    get createPDFFile(){
+        return createPDFFile;
+    },
+    get createPdfFile(){
+        return createPDFFile;
+    },
+    createProgressBar : (options)=>{
+        if(!options || typeof options != 'object' || Array.isArray(options)){
+            options = {};
         }
-    } 
+        return //new ProgressBar(options,app);
+    },
+    get setTitle(){
+        return (title) =>{
+            if(title && typeof title =="string"){
+                ipcRenderer.send("set-main-window-title",title);
+            }
+        };
+    },
+    get printPDF (){
+        return (options)=>{
+            const urlPath = path.resolve("./pdf-viewer","viewer.html");
+            return createWindow({file:urlPath,modal:true,showOnLoad:true});
+            return createPDFFile(options).then(({path,filePathUrl})=>{
+                if(fs.existsSync(path)){            
+                    opts.loadURL = `file://${urlPath}?file=${decodeURIComponent(filePathUrl)}&locale=fr`;
+                    opts.showOnLoad = true;
+                    return this.createPDFWindow(opts)
+                }
+            })
+        }
+    }
 };
 
 require("./pload")(ELECTRON,paths || {});

package/electron/utils/index.js

@@ -10,6 +10,11 @@ module.exports = {
         console.error(...args);
         process.exit(-1);
     },
+    replaceAll : require("./replaceAll"),
+    isBase64 : require("./isBase64"),
+    isDataURL : require("./isDataURL"),
+    dataURLToBase64 : require("./isDataURL").toBase64,
+    isValidUrl : require("./isValidUrl"),
     createDirSync : require("./createDirSync"),
     ...require("./dependencies"),
     isObj : x=> typeof x =="object" && x && !Array.isArray(x),

package/electron/utils/isBase64.js

@@ -0,0 +1,14 @@
+module.exports = function isBase64(str, options) {
+    if(!str || typeof str !=='string') return false;
+    options = Object.assign({},options);
+    options.urlSafe = typeof options.urlSafe =='boolean'? options.urlSafe: false;
+    const len = str.length;
+    if (options.urlSafe) {
+        return /^[A-Z0-9_\-]*$/i.test(str);
+    }
+    if (len % 4 !== 0 || /[^A-Z0-9+\/=]/i.test(str)) {
+        return false;
+    }
+    const firstPaddingChar = str.indexOf('=');
+    return firstPaddingChar === -1 || firstPaddingChar === len - 1 || (firstPaddingChar === len - 2 && str[len - 1] === '=');
+}

package/electron/utils/isDataURL.js

@@ -0,0 +1,13 @@
+const isDataURLRegex = /^data:([a-z]+\/[a-z0-9-+.]+(;[a-z0-9-.!#$%*+.{}|~`]+=[a-z0-9-.!#$%*+.{}|~`]+)*)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*?)$/i;
+
+function isDataURL(s) {
+    return s && typeof s ==='string' && !s.includes("data:image/x-icon") && !!s.match(isDataURLRegex);
+}
+
+isDataURL.toBase64 = (dataURLStr)=>{
+    if(!isDataURL(dataURLStr)) return undefined;
+    return dataURLStr.replace(/^data:.+;base64,/, '')
+}
+
+module.exports = isDataURL;
+

package/electron/utils/isValidUrl.js

@@ -0,0 +1,4 @@
+module.exports = (str)=>{
+    if(typeof str !=='string' || !str) return false;
+    return /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/.test(str);
+};

package/electron/utils/postMessage.js

@@ -13,7 +13,7 @@ module.exports = function(message,...params){
     const opts = message && typeof message =='object' && !Array.isArray(message) ? message : {};
     message = opts.message;
     if(!message || typeof message !='string') return null;
-    opts.params = Array.isArray(opts.params) && opts.params || Array.isArray(params) &&  params || [];
+    opts.params = Array.isArray(opts.params) && opts.params || params;
     opts.message = "ELECTRON_MESSAGE/"+message.trim();
     return window.postMessage(opts);
 }

package/electron/utils/replaceAll.js

@@ -0,0 +1,12 @@
+function replaceAll (value,find,replace){
+    if(typeof value !=='string' || typeof find !=='string' || typeof replace !=='string') return "";
+    return value.split(find).join(replace)
+}
+
+if(typeof String.prototype.replaceAll !== 'function'){
+    String.prototype.replaceAll = function(find,replace){
+        return replaceAll(this.toString(),find,replace);
+    }
+}
+
+module.exports = replaceAll;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.4.33",
+  "version": "7.4.35",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -99,9 +99,12 @@
     "fs-extra": "^11.2.0",
     "google-libphonenumber": "^3.2.33",
     "htmlparser2-without-node-native": "^3.9.2",
+    "i": "^0.3.7",
     "is-plain-obj": "^4.1.0",
     "js-base64": "^3.7.5",
     "node-machine-id": "^1.1.12",
+    "npm": "^10.2.5",
+    "pdfjs-dist": "^4.0.269",
     "pdfmake": "^0.2.8",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
@@ -123,8 +126,10 @@
     "react-native-web": "^0.19.9",
     "react-native-webview": "13.2.2",
     "react-virtuoso": "^4.6.2",
+    "sanitize-filename": "^1.6.3",
     "sharp-cli": "^2.1.0",
     "tippy.js": "^6.3.7",
+    "uninstall": "^0.0.0",
     "websql": "^2.0.3",
     "xlsx": "^0.18.5"
   },

package/src/pdf/index.js

@@ -6,14 +6,14 @@ import notify from "$cnotify";
 import DialogProvider from "$ecomponents/Form/FormData/DialogProvider";
 import {isNonNullString,defaultObj,defaultStr} from "$cutils";
 import session from "$session";
+import printPdfMake from "./print";
 
 const {createPdf} = pdfMake;
 pdfMake.createPdf = (docDefinition,...rest)=>{
     try {
         //@see : https://pdfmake.github.io/docs/0.1/getting-started/client-side/methods/
         const pdf = createPdf(docDefinition,...rest);
-        pdf.print();
-        //pdf.open({}, window)
+        printPdfMake(pdf);
         return pdf;
     } catch(e){
         console.log(e," generating pdf make create eerrror");

package/src/pdf/print.electron.js

@@ -0,0 +1,4 @@
+export default function print(pdfMakeInstance,...rest){
+    console.log("printint electron pdf make ",rest);
+    return pdfMakeInstance.print(...rest);
+}

package/src/pdf/print.js

@@ -0,0 +1,3 @@
+export default function print(pdfMakeInstance,...rest){
+    return pdfMakeInstance.print(...rest);
+}

package/src/pdf/print.web.js

@@ -0,0 +1,3 @@
+export default function print(pdfMakeInstance,...rest){
+    return pdfMakeInstance.print(...rest);
+}