backend-plus 2.5.13 → 2.6.1

package/lib/backend-plus.js

@@ -1593,6 +1593,7 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
 
 AppBackend.prototype.postConfig = function postConfig(){
     this.fieldDomain={};
+    this.scanSkinFiles();
 };
 
 AppBackend.prototype.getContext = function getContext(req){
@@ -2492,7 +2493,52 @@ AppBackend.prototype.csss = function csss(hideBEPlusInclusions){
     return this.clientIncludesCompleted(null, hideBEPlusInclusions).filter(x => x.type == 'css').map(x => x.href);
 };
 
+AppBackend.prototype.scanSkinFiles = function scanSkinFiles() {
+    var be = this;
+    var skinName = be.config['client-setup'].skin;
+    be.activeSkinFiles = new Set(); 
+
+    var skinConfig = be.config.server.skins && be.config.server.skins[skinName];
+
+    if (skinConfig && skinConfig['local-path']) {
+        try {
+            var skinPath = Path.join(Path.resolve(skinConfig['local-path']), skinName);
+            
+            if (fs.existsSync(skinPath)) {
+                
+                const walk = (currentPath) => {
+                    const entries = fs.readdirSync(currentPath, { withFileTypes: true });
+
+                    for (var i = 0; i < entries.length; i++) {
+                        var entry = entries[i];
+                        var fullPath = Path.join(currentPath, entry.name);
+
+                        if (entry.isDirectory()) {
+                            walk(fullPath);
+                        } else if (entry.isFile()) {
+                            if (entry.name.endsWith('.css') || entry.name.endsWith('.styl')) {
+                                var relativePath = Path.relative(skinPath, fullPath)
+                                    .replace(/\\/g, '/')
+                                    .replace(/^\//, '');
+                                
+                                be.activeSkinFiles.add(relativePath);
+                            }
+                        }
+                    }
+                };
+
+                walk(skinPath);
+            } else {
+                console.warn(`[SKIN SCAN] No existe la carpeta del skin: ${skinPath}`);
+            }
+        } catch (err) {
+            console.error("[SKIN SCAN] Error al inicializar:", err);
+        }
+    }
+};
+
 AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
+    var be = this;
     opts = opts||{};
     if(!opts.icons){
         if(!opts.icon){
@@ -2555,9 +2601,22 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
         ].concat(cssList.map(function(css){
             return html.link({href: css, rel: "stylesheet"});
         })).concat(cssList.map(function(css){
-            var skin=be.config['client-setup'].skin;
-            var skinUrl=(skin?skin+'/':'');
-            return skin?html.link({href: skinUrl+css, rel: "stylesheet"}):null;
+            const EXTENSIONES_SKIN = ['.css', '.styl'];
+            var skin = be.config['client-setup'].skin;
+            if(!skin || !be.activeSkinFiles) return null;
+
+            var lastDotIndex = css.lastIndexOf('.');
+            var cssBase = (lastDotIndex !== -1) ? css.substring(0, lastDotIndex) : css;
+            
+            var existsInSkin = EXTENSIONES_SKIN.some(function(ext) {
+                return be.activeSkinFiles.has(cssBase + ext);
+            });
+
+            if (existsInSkin) {
+                var skinUrl = skin + '/';
+                return html.link({href: skinUrl + css, rel: "stylesheet"});
+            }
+            return null;
         }))),
         html.body({'app-version':packagejson.version},[
             html.div({id: "total-layout"}, [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.5.13",
+  "version": "2.6.1",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@upgraded/locate-path": "^6.0.0-alfa.1",
     "ajax-best-promise": "^0.4.3",
-    "backend-skins": "^0.1.33",
+    "backend-skins": "^0.1.34",
     "best-globals": "^2.0.7",
     "big.js": "^7.0.1",
     "body-parser": "^2.2.2",
@@ -45,7 +45,7 @@
     "express": "^5.2.1",
     "express-session": "^1.19.0",
     "express-useragent": "^2.1.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.4",
     "js-to-html": "^1.3.5",
     "js-yaml": "^4.1.1",
     "json4all": "^1.4.2",
@@ -56,19 +56,19 @@
     "mini-tools": "^1.13.5",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^7.0.13",
+    "nodemailer": "^8.0.4",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.4.5",
     "pg-triggers": "0.4.6",
     "pikaday": "^1.8.2",
-    "pug": "^3.0.3",
+    "pug": "^3.0.4",
     "read-yaml-promise": "^1.0.2",
     "regexplicit": "^0.1.3",
     "require-bro": "^0.3.4",
     "self-explain": "^0.11.0",
     "serve-content": "^1.0.4",
     "session-file-store": "^1.5.0",
-    "simple-git": "^3.30.0",
+    "simple-git": "^3.33.0",
     "sql-tools": "^0.1.7",
     "stack-trace": "^0.0.10",
     "stylus": "0.64.0",
@@ -85,8 +85,8 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/multiparty": "~4.2.1",
-    "@types/node": "^25.2.0",
-    "@types/nodemailer": "^7.0.9",
+    "@types/node": "^25.5.0",
+    "@types/nodemailer": "^7.0.11",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.6",
     "@types/stack-trace": "~0.0.33",
@@ -101,9 +101,9 @@
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
     "mocha": "^11.7.5",
-    "nyc": "^17.1.0",
-    "puppeteer": "^24.36.1",
-    "sinon": "^21.0.1",
+    "nyc": "^18.0.0",
+    "puppeteer": "^24.40.0",
+    "sinon": "^21.0.3",
     "supertest": "^7.2.2",
     "types.d.ts": "~0.6.22",
     "typescript": "^5.9.3",

package/unlogged/my-ajax.js

@@ -68,26 +68,44 @@ myAjax.parseStrCookies = function parseStrCookies(cookieString, prefix){
 
 myAjax.readProcedureDefinitions=function readProcedureDefinitions(){
     var my = this;
-    var promise;
-    var getStored=function(setupOrError){
-        if(setupOrError && !(setupOrError instanceof Error) && !setupOrError.isoffline){
-            localStorage.setItem('setup', JSON.stringify(setupOrError));
+    const NETWORK_TIMEOUT = 1800;
+    var cachedSetupStr = my.getLocalVar('setup');
+
+    var getStored = function(setupOrError) {
+        if (setupOrError && !(setupOrError instanceof Error) && !setupOrError.isoffline) {
+            my.setLocalVar('setup', setupOrError);
             return setupOrError;
         }
-        var setupJson=localStorage.getItem('setup');
-        if(setupJson){
-            return JSON.parse(setupJson);
+        if (cachedSetupStr) {
+            console.warn('setup obtenido de cache')
+            return cachedSetupStr;
         }
-        throw new Error("NOT CLIENT-CONFIGURED")
+        var finalError = setupOrError instanceof Error ? setupOrError : new Error("NOT CLIENT-CONFIGURED");
+        throw finalError;
+    };
+
+    var networkPromise = my.ajaxPromise({
+        action: 'client-setup',
+        method: 'get',
+        encoding: 'JSON',
+        parameters: [],
+        progress: false
+    });
+
+    var promise;
+
+    if (cachedSetupStr) {
+        var timeoutPromise = new Promise(function(_, reject) {
+            setTimeout(function() {
+                reject(new Error("NETWORK_TIMEOUT"));
+            }, NETWORK_TIMEOUT);
+        });
+        promise = Promise.race([networkPromise, timeoutPromise]);
+    } else {
+        promise = networkPromise;
     }
-    promise = my.ajaxPromise({
-        action:'client-setup',
-        method:'get',
-        encoding:'JSON',
-        parameters:[],
-        progress:false
-    }).then(getStored, getStored);
-    return promise.then(function(setup){
+
+    return promise.then(getStored,getStored).then(function(setup){
         my.config = setup;
         if(typeof document !== "undefined"){
             var backgroundUrl