@ejfdelgado/ejflab-back 1.26.11 → 1.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.26.11",
+  "version": "1.27.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"
@@ -18,7 +18,7 @@
   "license": "ISC",
   "private": false,
   "dependencies": {
-    "@ejfdelgado/ejflab-common": "1.14.4",
+    "@ejfdelgado/ejflab-common": "1.16.0",
     "@google-cloud/compute": "^4.7.0",
     "@google-cloud/firestore": "^7.9.0",
     "@google-cloud/storage": "^7.11.3",

package/srv/MainHandler.mjs

@@ -10,7 +10,8 @@ import { ModuloDatoSeguroBack } from "@ejfdelgado/ejflab-common/src/ModuloDatoSe
 import { MyConstants } from "@ejfdelgado/ejflab-common/src/MyConstants.js";
 
 export class MainHandler {
-    static LOCAL_FOLDER = path.resolve() + "/dist/bundle";
+    static LOCAL_FOLDER1 = path.resolve() + "/src";// First try
+    static LOCAL_FOLDER = path.resolve() + "/dist/bundle";// Finall try
     static async handle(req, res, next) {
         const originalUrl = req.getUrl();
         const theUrl = url.parse(originalUrl);
@@ -97,37 +98,54 @@ export class MainHandler {
         return null;
     }
 
-    static async resolveLocalFileSingle(filename, encoding, rootFolder = MainHandler.LOCAL_FOLDER) {
+    static async resolveLocalFileSingle(filename, encoding, rootFolder) {
         return new Promise((resolve, reject) => {
-            const somePath = path.join(rootFolder, filename);
 
-            fs.access(somePath, (err) => {
-                if (err) {
-                    resolve(null);
-                } else {
-                    if (!fs.lstatSync(somePath).isFile()) {
-                        resolve(null);
+            // Try
+            const options = [];
+            if (rootFolder) {
+                options.push(path.join(rootFolder, filename));
+            }
+            options.push(path.join(MainHandler.LOCAL_FOLDER1, filename));
+            options.push(path.join(MainHandler.LOCAL_FOLDER, filename));
+
+            // Check which exists first, if not resolve null with log
+            let selected = null;
+            for (let i = 0; i < options.length; i++) {
+                const actual = options[i];
+                if (fs.existsSync(actual)) {
+                    selected = actual;
+                    break;
+                }
+            }
+
+            if (!selected) {
+                console.log(`Files not found ${options}`);
+                resolve(null);
+            }
+
+            const somePath = selected;
+            if (!fs.lstatSync(somePath).isFile()) {
+                resolve(null);
+                return;
+            }
+            if (typeof encoding == "string") {
+                fs.readFile(somePath, encoding, function (err, data) {
+                    if (err) {
+                        reject(err);
                         return;
                     }
-                    if (typeof encoding == "string") {
-                        fs.readFile(somePath, encoding, function (err, data) {
-                            if (err) {
-                                reject(err);
-                                return;
-                            }
-                            resolve(data);
-                        });
-                    } else {
-                        fs.readFile(somePath, function (err, data) {
-                            if (err) {
-                                reject(err);
-                                return;
-                            }
-                            resolve(data);
-                        });
+                    resolve(data);
+                });
+            } else {
+                fs.readFile(somePath, function (err, data) {
+                    if (err) {
+                        reject(err);
+                        return;
                     }
-                }
-            });
+                    resolve(data);
+                });
+            }
         });
     }
 

package/srv/MyPdf.mjs

@@ -5,6 +5,7 @@ import { MyTemplate } from "@ejfdelgado/ejflab-common/src/MyTemplate.js";
 import { CsvFormatterFilters } from "@ejfdelgado/ejflab-common/src/CsvFormatterFilters.js";
 import { MyUtilities } from '@ejfdelgado/ejflab-common/src/MyUtilities.js';
 import MyDatesBack from '@ejfdelgado/ejflab-common/src/MyDatesBack.mjs';
+import { TranslateSrv } from "./TranslateSrv.mjs";
 
 export class MyPdf {
     static async localRender(template, model = {}, format = "pdf", extra = [], configuration, launch) {
@@ -17,6 +18,18 @@ export class MyPdf {
         renderer.registerFunction("epoch2date", (value, ...args) => {
             return MyDatesBack.formatDateCompleto(new Date(value), ...args);
         });
+        renderer.registerFunction("age", (value, ...args) => {
+            const model = MyDatesBack.age(value);
+            let level = typeof (args[1]) == "number" ? args[1] : 0;
+            if ([0, 1, 2].indexOf(level) < 0) {
+                level = 0;
+            }
+            const folderName = args[0];
+            return TranslateSrv.translate(`pipes.age.${level}`, [folderName, model], 'en');
+        });
+        renderer.registerFunction("translate", (value, ...args) => {
+            return TranslateSrv.translate(value, args, 'en');
+        });
         for (let i = 0; i < extra.length; i++) {
             const extraFile = extra[i];
             const path = MyUtilities.removeRepeatedSlash(`./src/assets/templates/pdf/${extraFile.path}`);
@@ -36,6 +49,7 @@ export class MyPdf {
                     }
                 }
             } else {
+                console.log(`Doesn't exits ${path}`);
                 model.extra[extraFile.alias] = "";
             }
         }

package/srv/TranslateSrv.mjs

@@ -0,0 +1,58 @@
+import fs from "fs";
+import { MyTemplate } from "@ejfdelgado/ejflab-common/src/MyTemplate.js";
+import { MyUtilities } from '@ejfdelgado/ejflab-common/src/MyUtilities.js';
+import { SimpleObj } from '@ejfdelgado/ejflab-common/src/SimpleObj.js';
+
+export class TranslateSrv {
+    static keyPromises = {};// this is the cache
+    static renderer = new MyTemplate();
+
+    static loadLanguageDB(args, currentLang) {
+        // Read query param
+        const key = `${args[0]}/${currentLang}`;
+        let promesa = TranslateSrv.keyPromises[key];
+        if (!promesa) {
+            const path = MyUtilities.removeRepeatedSlash(`./src/assets/lang/${key}.json`);
+            const exists = fs.existsSync(path);
+            if (exists) {
+                TranslateSrv.keyPromises[key] = JSON.parse(fs.readFileSync(path));
+            } else {
+                TranslateSrv.keyPromises[key] = {};
+            }
+            promesa = TranslateSrv.keyPromises[key];
+        }
+        const valor = promesa;
+        return valor;
+    }
+    /**
+    * 
+    * @param key 
+    * @param args Can be a string, referencing the folder name in assets/lang/FOLDER/en.json or a JSON object {es: {}, en: {}}
+    * @returns 
+    */
+    static translate(key, args, currentLang = "en") {
+        const def = key;
+        if (args.length > 0) {
+            let valor = {};
+            const args0 = args[0];
+            if (typeof args0 == 'string') {
+                valor = TranslateSrv.loadLanguageDB(args, currentLang);
+            } else if (
+                args0 !== undefined &&
+                args0 !== null &&
+                typeof args0 == 'object'
+            ) {
+                if (currentLang in args0) {
+                    valor = args0[currentLang];
+                }
+            }
+            let raw = SimpleObj.getValue(valor, key, def);
+            if (args.length >= 2) {
+                raw = TranslateSrv.renderer.render(raw, args[1]);
+            }
+            return raw;
+        } else {
+            return def;
+        }
+    }
+}

package/srv/common/Usuario.mjs

@@ -7,7 +7,12 @@ import { MalaPeticionException } from "../MyError.mjs";
 import { Buffer } from 'buffer';
 
 const AUTH_PROVIDER = process.env.AUTH_PROVIDER;
-const groupIdMap = JSON.parse("AUTH_GROUP_ID_MAP" in process.env ? Buffer.from(process.env.AUTH_GROUP_ID_MAP, 'base64').toString("utf8") : "{}");
+let groupIdMap = {}
+try {
+    groupIdMap = JSON.parse("AUTH_GROUP_ID_MAP" in process.env ? Buffer.from(process.env.AUTH_GROUP_ID_MAP, 'base64').toString("utf8") : "{}");
+} catch (err) {
+    console.log(err);
+}
 const USER_TYPE = "user";
 
 export class Usuario {