backend-plus 2.7.0-beta.11 → 2.7.0-beta.13

package/for-client/my-tables.js

@@ -687,7 +687,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         depot.manager.displayAsDeleted(depot, force ? 'change-ff' : 'unknown');
                         if (myOwn.config.config['grid-row-retain-moved-or-deleted']) {
                             if(!depot['$refreshed']){
-                                grid.retrieveRowAndRefresh(depot,{retrieveIgnoringWhere:true})
+                                grid.retrieveRowAndRefresh(depot,{retrieveWithBroadWhere:true})
                                 depot['$refreshed'] = true
                             }
                         }
@@ -1740,23 +1740,23 @@ myOwn.dialogDownload = function dialogDownload(grid){
         var excelExport = function(){
             var sheet1name=grid.def.name.length>27?grid.def.name.slice(0,27)+'...':grid.def.name;
             var sheet2name=grid.def.name!=="metadata"?"metadata":"meta-data";
-            var rows=[{
-                '#worksheet':sheet1name+'b',
+            var dataSheet = {
+                name: sheet1name,
                 freezeRows: 1,
                 freezeColumns: grid.def.primaryKey?.length ?? 0,
                 autoWidthMax: 40,
-            }];
-            rows=rows.concat(tableRowsXLS(grid.depotsToDisplay, fieldsDef2Export));
-            rows.push({'#worksheet':sheet2name, autoWidthMax: 40});
-            // La primera fila de metadata queda en blanco, como cuando las
-            // celdas se escribían por dirección arrancando en la fila 2.
-            rows.push([]);
-            rows.push([{v:'table',s:'header'}, grid.def.name]);
-            rows.push([{v:'date' ,s:'header'}, new Date().toISOString()]);
-            rows.push([{v:'user' ,s:'header'}, my.config.username]);
-            // grid.def.allow.forEach(function(action,iAction){
-            //     exportFileInformationWs[XLSX.utils.encode_cell({c:iAction,r:2})]={t:'s',v:action};
-            // })
+                rows: tableRowsXLS(grid.depotsToDisplay, fieldsDef2Export)
+            };
+            var metadataSheet = {
+                name:sheet2name,
+                autoWidthMax: 40,
+                rows: [
+                    [],
+                    [{v:'table',s:'header'}, grid.def.name],
+                    [{v:'date' ,s:'header'}, new Date().toISOString()],
+                    [{v:'user' ,s:'header'}, my.config.username],
+                ]
+            };
             if(grid.def.exportMetadata){
                 if(grid.def.exportMetadata.fieldProperties){
                     var fieldPropertiesDefs=grid.def.exportMetadata.fieldProperties.map(function(propName, i){
@@ -1768,11 +1768,11 @@ myOwn.dialogDownload = function dialogDownload(grid){
                         return {row:fieldDef};
                     });
                     extraColumns={};
-                    rows=rows.concat(tableRowsXLS(fieldPropertiesDepot,fieldPropertiesDefs,1));
+                    metadataSheet.rows.push(...(tableRowsXLS(fieldPropertiesDepot,fieldPropertiesDefs,1)));
                 }
             }
             xlsxNowBrowser.createXlsxBlob({
-                rows,
+                sheets: [dataSheet, metadataSheet],
                 styles:XLSX_STYLES
             }).then(function(blob){
                 mainDiv.setAttribute("current-state", "ready");
@@ -2435,7 +2435,7 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 return {fieldName:fieldName, value:depot.primaryKeyValues[i]};
             }),
             pick:grid.def.pick,
-            retrieveIgnoringWhere: opts?opts.retrieveIgnoringWhere:false
+            retrieveWithBroadWhere : opts?.retrieveWithBroadWhere ?? false
         }).then(function(result){
             grid.depotRefresh(depot,{updatedRow:result[0], sendedForUpdate:{}}, opts);
         })

package/lib/backend-plus.d.ts

@@ -284,10 +284,12 @@ export type TableDefinition = EditableDbDefinition & {
     primaryKey:string[]
     refrescable?: boolean
     sql?:{
+        select: string[]
         primaryKey4Delete?:string[]
         isTable?:boolean
         from?:string
         where?:string
+        broadWhere?:string
         postCreateSqls?:string
         skipEnance?: boolean
         isReferable?: boolean
@@ -338,6 +340,7 @@ export type TableDefinition = EditableDbDefinition & {
     policy?:string
     firstDisplayCount?:number
     firstDisplayOverLimit?:number
+    forInsertOnlyMode?:boolean
     description?:MarkdownDoc
     exportJsonFieldAsColumns?:string
     importCuidado?:boolean
@@ -350,6 +353,7 @@ export type TableDefinition = EditableDbDefinition & {
     functionDef?:{
         parameters?:ProcedureParameter[]
     }
+
 }
 export type TableDefinitionInternal = RequireSome<TableDefinition,
     'allow'|'sql'

package/lib/backend-plus.js

@@ -63,7 +63,37 @@ var myOwn = require('../for-client/my-things.js');
 
 var typeStore = require('type-store');
 var json4all = require('json4all');
-var XLSX = require('xlsx');
+var xlsxNow = require('xlsx-now/node');
+var xlsxNowCore = require('xlsx-now');
+var Big = require('big.js');
+
+// Los tipos que las queries devuelven y no son valores nativos de una celda.
+// Sin esto xlsx-now los rechaza, porque un objeto que nadie reclama no tiene
+// una única forma correcta de escribirse.
+var xlsxTypes = xlsxNowCore.defaultTypes;
+// Un timestamp es una fecha: se escribe como tal y no como texto.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.Datetime, {
+    convert: (value, context) => xlsxNowCore.dateValue(new Date(value.getTime()), context)
+});
+// Igual que en la exportación del cliente: días, con formato de duración.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.TimeInterval, {
+    convert: (value) => ({v:value.timeInterval.ms?value.timeInterval.ms/(1000*60*60*24):null, numFmt:'[h]:mm:ss'})
+});
+// decimal y hugeint. Como texto cuando el double ya no los representa exacto,
+// para no devolver un número redondeado con apariencia de exacto.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, Big, {
+    convert: function(value){
+        var text = value.toString();
+        var asNumber = Number(text);
+        return Number.isSafeInteger(asNumber) || String(asNumber) === text
+            ? {v:asNumber}
+            : {v:text, t:'inlineStr'};
+    }
+});
+// jsonb, jsona, gpoint, point y cualquier otro objeto sin tipo propio.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, Object, {
+    convert: (value) => ({v:JSON.stringify(value), t:'inlineStr'})
+});
 
 var loginPlus = require('login-plus');
 var dashDashDir=Array.prototype.indexOf.call(process.argv,'--dir')
@@ -85,9 +115,6 @@ function md5(text){
 const DEFAULT_ITERATIONS = 4096;
 const HASH_ALGORITHM = 'sha256';
 
-// primera version de scram sha 256. El Verifier completo tenía 64 bytes.
-const LEGACY_KEY_LENGTH = 64;
-
 // Formato nuevo/PG-Compatible: El Client Key tiene 32 bytes (SHA-256).
 const SCRAM_KEY_LENGTH = 32;
 
@@ -185,57 +212,6 @@ async function verifyScramPG(password, storedScramString) {
     return storedKeyMatch && serverKeyMatch;
 }
 
-/**
- * Verifica una contraseña contra el hash SCRAM Legacy (64 bytes).
- * Formato Legacy: SCRAM-SHA-256$<iteraciones>:<Salt>$<Verifier(64 bytes)>
- * @param {string} password - Contraseña en texto plano.
- * @param {string} storedScramString - Cadena SCRAM Legacy.
- * @returns {Promise<boolean>} True si la contraseña es válida.
- */
-async function verifyScramLegacy(password, storedScramString) {
-    if (!storedScramString.startsWith('SCRAM-SHA-256$')) {
-        // No es formato SCRAM. Debe ser MD5 u otro algoritmo.
-        return false;
-    }
-
-    // Parsea la cadena SCRAM
-    // Ejemplo: SCRAM-SHA-256$4096:SALT_BASE64$VERIFIER_BASE64
-    const parts = storedScramString.split('$');
-    if (parts.length !== 3) {
-        throw new Error('Formato SCRAM almacenado inválido.');
-    }
-
-    // Obtiene iteraciones y salt de la segunda parte (ej: '4096:SALT_BASE64')
-    const [storedIterations, storedSalt] = parts[1].split(':');
-    const storedVerifier = parts[2];
-
-    if (!storedSalt || !storedVerifier || isNaN(parseInt(storedIterations))) {
-        throw new Error('Datos de SCRAM incompletos o malformados.');
-    }
-
-    const iterations = parseInt(storedIterations);
-
-    // Deriva la clave de la contraseña ingresada
-    const generatedVerifierBuffer = await deriveKey(
-        password,
-        storedSalt,
-        iterations,
-        LEGACY_KEY_LENGTH
-    );
-    const generatedVerifier = bufferToBase64(generatedVerifierBuffer);
-
-    // Compara de manera segura contra el Verificador Almacenado
-    const storedVerifierBuffer = Buffer.from(storedVerifier, 'base64');
-    const generatedVerifierBufferFromBase64 = Buffer.from(generatedVerifier, 'base64');
-
-    // Usa crypto.timingSafeEqual para evitar ataques de temporización
-    if (generatedVerifierBufferFromBase64.length !== storedVerifierBuffer.length) {
-        return false;
-    }
-
-    return crypto.timingSafeEqual(generatedVerifierBufferFromBase64, storedVerifierBuffer);
-}
-
 var dist=regexpDistCheck.test(packagejson.main)?'dist/':'';
 
 /**
@@ -1253,7 +1229,6 @@ AppBackend.prototype.start = function start(opts){
                             done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
                             return
                         }else{
-                            let needsMigration = false;
                             const user = data.row;
                             if(!user[passFieldName]){
                                 done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
@@ -1261,34 +1236,20 @@ AppBackend.prototype.start = function start(opts){
                             }
                             const usaScramSha256 = user[passFieldName].startsWith('SCRAM-SHA-256$')
                             if (usaScramSha256){
-                                let isScramValid = false;
-                                // 1. Intento con formato PG-Compatible (Nuevo)
-                                if(await verifyScramPG(password, user[passFieldName])){
-                                    isScramValid = true;
-                                }
-
-                                // 2. Intento con formato Legacy (64 bytes)
-                                else if(await verifyScramLegacy(password, user[passFieldName])){
-                                    isScramValid = true;
-                                    needsMigration = true;
-                                }
-                                if(!isScramValid){
+                                if(!await verifyScramPG(password, user[passFieldName])){
                                     done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
                                     return
                                 }
                             }else{
                                 if (md5(password+username.toLowerCase()) === user[passFieldName]){
-                                    needsMigration = true;
+                                    if (be.config.log["pass-migration"]) console.log('Ejecutando migración a SCRAM...');
+                                    await updatePassword({client, username, password, setUpdateDate:false, errorIfNoResult:true});
+                                    if (be.config.log["pass-migration"]) console.log('Migración completada.');
                                 }else{
                                     done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
                                     return
                                 }
                             }
-                            if(needsMigration){
-                                if (be.config.log["pass-migration"]) console.log('Ejecutando migración a SCRAM...');
-                                await updatePassword({client, username, password, setUpdateDate:false, errorIfNoResult:true});
-                                if (be.config.log["pass-migration"]) console.log('Migración completada.');
-                            }
                         }
                         //continua validando
                         if(data.rowCount==1){
@@ -1358,9 +1319,6 @@ AppBackend.prototype.start = function start(opts){
                 if (oldPassword !== false) {
                     if (storedHash.startsWith('SCRAM-SHA-256$')) {//Intento SCRAM-SHA-256
                         ok = await verifyScramPG(oldPassword, storedHash);
-                        if (!ok) {
-                            ok = await verifyScramLegacy(oldPassword, storedHash);
-                        }
                     } else { //Intento MD5
                         const md5Hash = md5(oldPassword + username.toLowerCase());
                         ok = (md5Hash === storedHash);
@@ -3822,21 +3780,16 @@ AppBackend.prototype.exportacionesGenerico = async function exportacionesGeneric
     }
     if(fileName){
         context.informProgress({message:'armando XLSX'})
-        var wb = XLSX.utils.book_new();
-        result.map(({title, rows})=>{
+        var sheets = result.map(({title, rows})=>{
             var rowsA = rows.map(row=>Object.values(row));
             if(rows[0]){
-                rowsA.unshift(Object.keys(rows[0]));
+                rowsA.unshift({'#line': 'array', values:Object.keys(rows[0]), s: {bold: true}});
             }
-            var ws = XLSX.utils.aoa_to_sheet(rowsA);
-            XLSX.utils.book_append_sheet(wb, ws, title);
-            return ws;
+            return {name:title, rows:rowsA};
         })
         context.informProgress({message:`guardando XLSX: ${fileName}`})
         await bestGlobals.sleep(100);
-        await new Promise((resolve,reject)=>XLSX.writeFileAsync(`dist/client/${fileName}`,wb,{},
-            (err)=>err?reject(err):resolve()
-        ))
+        await xlsxNow.writeXlsxFile(`dist/client/${fileName}`, {sheets, types:xlsxTypes, autoWidthMax:50, freezeRows:1});
     }
     return [
         ...(fileName?[{url:fileName, label:csvFileName?'xlsx de control':fileName}]:[]),

package/lib/procedures-table.js

@@ -10,6 +10,7 @@ var likeAr=require('like-ar');
 const f = require('session-file-store');
 const { expected } = require('cast-error');
 const bestGlobals = require('best-globals');
+const { AppBackend } = require('backend-plus');
 
 const PANIC_IMPORT = true;
 
@@ -85,26 +86,29 @@ ProcedureTables = [
             {name: 'fixedFields', defaultValue:[]},
             {name: 'paramfun', defaultValue:[]},
             {name: 'pick', defaultValue:'', encoding:'plain'},
-            {name: 'retrieveIgnoringWhere', defaultValue:false}
+            {name: 'retrieveWithBroadWhere', defaultValue:false}
         ],
         coreFunction:
         /**
         *
         * @param {*} context
-        * @param {{table:string, fixedFields:{fieldName:string, value:any, range?:string, until?:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters
+        * @param {{table:string, fixedFields:{fieldName:string, value:any, range?:string, until?:string}[], paramfun:Record<string, string>, pick:string, retrieveWithBroadWhere:boolean}} parameters
         */
         async function tableDatum(context, parameters){
+            /**  @type {AppBackend} */
             var be=context.be;
             var tableName=parameters.table;
-            var defTable=be.tableStructures[tableName];
-            if(!defTable){
+            var defTableFun=be.tableStructures[tableName];
+            if(!defTableFun){
                 throw new Error('no table def for '+tableName+' (in table_data)')
             }
-            defTable=defTable(context);
+            var defTable=defTableFun(context);
             /** @type {string} */
             var sql;
             var queryValues=[];
+            /** @type {string[]} */
             var specialFixedClause=[];
+            /** @type {string[]} */
             var fixedClausule=[];
             if(defTable.functionDef){
                 parameters.fixedFields.forEach(function(pair, iPair){
@@ -155,10 +159,19 @@ ProcedureTables = [
                     fixedClausule.push(exprClausule)
                 }
             });
+
+            const getBaseWhere = (defTable, params) => {
+                if (params?.retrieveWithBroadWhere && defTable.sql?.broadWhere) return defTable.sql.broadWhere;
+                if (params?.retrieveWithBroadWhere) console.warn("No broadWhere found for retrieveWithBroadWhere. Using default configuration.");
+                return defTable.sql?.where || (defTable.allow?.select && !defTable.forInsertOnlyMode ? 'true' : 'false');
+            };
+
+            const whereCondition = getBaseWhere(defTable, parameters) + fixedClausule.join("");
+
             /** @type {string} */
             var sql="SELECT "+[...defTable.sql.select].join(', ')+
                 "\n FROM "+defTable.sql.from+
-                "\n WHERE "+((parameters.retrieveIgnoringWhere?'true':defTable.sql.where)||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
+                "\n WHERE "+whereCondition+
                 // " ORDER BY "+defTable.primaryKey.map(be.db.quoteIdent.bind(be.db)).join(',')
                 "\n ORDER BY "+(defTable.sql.orderBy||defTable.primaryKey).map(function(fieldName){ return be.db.quoteIdent(fieldName); }).join(',')
             if(specialFixedClause.length){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.7.0-beta.11",
+  "version": "2.7.0-beta.13",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -76,7 +76,7 @@
     "type-store": "^0.6.0",
     "typed-controls": "^0.12.7",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
-    "xlsx-now": "^0.1.6"
+    "xlsx-now": "^0.2.1"
   },
   "devDependencies": {
     "@types/big.js": "^7.0.0",