bonsaif 1.10.39 → 1.10.41

package/lib/hookup/mongoose.js

@@ -1,6 +1,7 @@
 /**
  * ::: B[]NSAIF() ::: => 2024
  * Hookup para Mongoose (MongoDB ORM)
+ * Compatible con múltiples versiones de Node y Mongoose
  */
 
 'use strict';
@@ -9,15 +10,64 @@ const utl = require('../utl');
 let debug = false;
 let tag = ` ::: B[]NSAIF() ::: => mongoose.js `;
 
+// Validar disponibilidad de Mongoose
+let mongoose = null;
+let isMongooseAvailable = false;
+let mongooseVersion = null;
+
+try {
+  mongoose = require('mongoose');
+  isMongooseAvailable = true;
+  mongooseVersion = mongoose.version;
+  
+  // Validar versión de Node
+  const nodeVersion = process.version;
+  const nodeMajor = parseInt(nodeVersion.split('.')[0].substring(1));
+  
+  if (nodeMajor < 12) {
+    utl.log(`${tag} WARNING: Node ${nodeVersion} no es compatible con Mongoose. Se requiere Node >= 12.0.0`);
+    isMongooseAvailable = false;
+  }
+  
+} catch (e) {
+  utl.log(`${tag} Mongoose no está instalado. Para usar mongoose, instala: npm install mongoose@"^6.12.0" (Node 12-14) o mongoose@"^8.0.0" (Node >= 16.20.1)`);
+  isMongooseAvailable = false;
+}
+
 // Cache de modelos dinámicos por base de datos y colección
 const modelCache = new Map();
 
+/**
+ * Validar que Mongoose esté disponible
+ */
+const checkMongooseAvailable = () => {
+  if (!isMongooseAvailable) {
+    return {
+      result: {
+        dml: 'error',
+        time: 0,
+        code: 503,
+        error: 1,
+        msg: 'Mongoose no está disponible en este sistema',
+        details: {
+          nodeVersion: process.version,
+          mongooseInstalled: mongoose !== null,
+          recommendation: process.version.startsWith('v12') || process.version.startsWith('v14') 
+            ? 'Instala: npm install mongoose@^6.12.0' 
+            : 'Instala: npm install mongoose@^8.0.0 (requiere Node >= 16.20.1)'
+        }
+      },
+      data: []
+    };
+  }
+  return null;
+};
+
 /**
  * Parsear schema dinámico recibido del cliente
  * Convierte definición simple a Schema de Mongoose
  */
 const parseSchema = (schemaDefinition) => {
-  const mongoose = require('mongoose');
   const parsedSchema = {};
   
   for (const [field, def] of Object.entries(schemaDefinition)) {
@@ -72,7 +122,9 @@ const parseSchema = (schemaDefinition) => {
  * Conectar a MongoDB usando Mongoose
  */
 const connect = async (options) => {
-  const mongoose = require('mongoose');
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) throw new Error(availabilityError.result.msg);
+  
   const { uri = '', poolSize = 10, debug: debugMode = false } = options.endpoint;
   
   try {
@@ -81,15 +133,31 @@ const connect = async (options) => {
       return mongoose.connection;
     }
     
-    await mongoose.connect(uri, {
-      maxPoolSize: poolSize,
-      minPoolSize: 2,
+    // Opciones compatibles con múltiples versiones de Mongoose
+    const connectOptions = {
       serverSelectionTimeoutMS: 15000,
       socketTimeoutMS: 45000,
       connectTimeoutMS: 10000
-    });
+    };
     
-    debugMode ? utl.log(`${tag} [Mongoose] conectado a ${uri}`) : '';
+    // Mongoose 6.x y 7.x usan useNewUrlParser, useUnifiedTopology
+    // Mongoose 8.x los depreca
+    const majorVersion = parseInt(mongooseVersion.split('.')[0]);
+    
+    if (majorVersion >= 6) {
+      // Mongoose 6.x, 7.x, 8.x
+      connectOptions.maxPoolSize = poolSize;
+      connectOptions.minPoolSize = 2;
+    } else {
+      // Mongoose 5.x
+      connectOptions.poolSize = poolSize;
+      connectOptions.useNewUrlParser = true;
+      connectOptions.useUnifiedTopology = true;
+    }
+    
+    await mongoose.connect(uri, connectOptions);
+    
+    debugMode ? utl.log(`${tag} [Mongoose ${mongooseVersion}] conectado a ${uri}`) : '';
     return mongoose.connection;
   } catch (e) {
     utl.log(`${tag} [Mongoose] error de conexión:`, e);
@@ -101,7 +169,6 @@ const connect = async (options) => {
  * Obtener o crear modelo dinámico para una colección
  */
 const getModel = (db, collection, schemaDefinition = null) => {
-  const mongoose = require('mongoose');
   const cacheKey = schemaDefinition 
     ? `${db}.${collection}.custom.${JSON.stringify(schemaDefinition)}` 
     : `${db}.${collection}.generic`;
@@ -147,6 +214,9 @@ const getModel = (db, collection, schemaDefinition = null) => {
  * FIND - Búsqueda dinámica
  */
 const find = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -200,6 +270,9 @@ const find = async (options, db, collection, query) => {
  * FINDONE - Buscar un solo documento
  */
 const findOne = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -250,6 +323,9 @@ const findOne = async (options, db, collection, query) => {
  * COUNT - Contar documentos
  */
 const count = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -295,6 +371,9 @@ const count = async (options, db, collection, query) => {
  * INSERT - Crear documento
  */
 const insert = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -346,6 +425,9 @@ const insert = async (options, db, collection, query) => {
  * INSERTMANY - Crear múltiples documentos
  */
 const insertMany = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -392,6 +474,9 @@ const insertMany = async (options, db, collection, query) => {
  * UPDATE - Actualizar documento(s)
  */
 const update = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -442,6 +527,9 @@ const update = async (options, db, collection, query) => {
  * UPDATEMANY - Actualizar múltiples documentos
  */
 const updateMany = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -492,6 +580,9 @@ const updateMany = async (options, db, collection, query) => {
  * UPSERT - Actualizar o insertar
  */
 const upsert = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -554,6 +645,9 @@ const upsert = async (options, db, collection, query) => {
  * DELETE - Eliminar documento(s)
  */
 const deleteOne = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -600,6 +694,9 @@ const deleteOne = async (options, db, collection, query) => {
  * DELETEMANY - Eliminar múltiples documentos
  */
 const deleteMany = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -646,6 +743,9 @@ const deleteMany = async (options, db, collection, query) => {
  * AGGREGATE - Pipeline de agregación
  */
 const aggregate = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -691,6 +791,9 @@ const aggregate = async (options, db, collection, query) => {
  * DISTINCT - Valores únicos
  */
 const distinct = async (options, db, collection, query) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
@@ -736,10 +839,12 @@ const distinct = async (options, db, collection, query) => {
  * DBS - Listar todas las bases de datos
  */
 const dbs = async (options) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
-    const mongoose = require('mongoose');
     await connect(options);
     
     const adminDb = mongoose.connection.db.admin();
@@ -780,10 +885,12 @@ const dbs = async (options) => {
  * COLLECTIONS - Listar todas las colecciones de una base de datos
  */
 const collections = async (options, db) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
-    const mongoose = require('mongoose');
     await connect(options);
     
     const dbConn = mongoose.connection.useDb(db);
@@ -825,10 +932,12 @@ const collections = async (options, db) => {
  * DROP - Eliminar una colección completa
  */
 const drop = async (options, db, collection) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   const start = Date.now();
   
   try {
-    const mongoose = require('mongoose');
     await connect(options);
     
     const dbConn = mongoose.connection.useDb(db);
@@ -870,6 +979,9 @@ const drop = async (options, db, collection) => {
  * API - Router principal para todas las operaciones
  */
 const api = async (options, db, body) => {
+  const availabilityError = checkMongooseAvailable();
+  if (availabilityError) return availabilityError;
+  
   let { dml = '', collection = '' } = body;
   
   // Si dml es 'api', buscar el DML real en el body
@@ -984,5 +1096,7 @@ module.exports = {
   collections,
   drop,
   connect,
-  getModel
+  getModel,
+  isMongooseAvailable,
+  mongooseVersion
 };

package/lib/hookup/postgres.js

@@ -13,19 +13,16 @@ const qson = async (o, alias, query,dml,ip)=>{
    let headers = '';
    const start = Date.now();
    let tipo = 'query';
-   
    return new Promise(function(resolve, reject) {
+     //2022/08/27 VRSZ Se cambia el la utileria para consumirmo por mysql ya que mariadb no regresa los campos de las columnas
      const {port='', uri = '', user='', password='', debug=false } = o.endpoint ? o.endpoint:{};
      const {db=''} = o.options ? o.options : {};
  
      const { Client } = require('pg');
      const client = new Client({ host:uri, user, port , password, database :db });
-     
      client.connect(function(e){
             if(e){
              utl.log(`${tag} [postgres] is OFFline`,e);
-             resolve({"result":{dml, headers,  time:0, code:e.code ? e.code:0, error:1, msg:e.message ? e.message:''}, results:e});
-             return;
             }else{
                 debug ? utl.log(`${tag} [postgres] connection is online `):'';
             }
@@ -35,6 +32,7 @@ const qson = async (o, alias, query,dml,ip)=>{
        tipo = 'select';
      }
  
+     //2023/11/07 Recuperar id
      if (query.toLowerCase().includes("insert ") && query.toLowerCase().includes(" into ")){
          query = query.replace(';','');
          query = query + ' RETURNING id';
@@ -44,40 +42,34 @@ const qson = async (o, alias, query,dml,ip)=>{
     client.query(query, function(err, res) {
         const end = Date.now();
         const time = end - start;
-        
-        try{
-          if (err) {
-              resolve({"result":{dml, headers,  time:utl.milisegundosASegundos(time), code:err.code ? err.code:0, error:1, msg:err.routine ? err.routine:''}, results:err});
-          }
-          else { 
-           data = res.rows ? res.rows: []; 
-           let rowCount = res.rowCount ? res.rowCount:0;
-           
-           if (tipo!='select'){
-             data =[{"insert_id":data[0] ? data[0].id : 0, "changed_rows":rowCount}]; 
-             headers =  'insert_id|changed_rows';
-           }else{
-             if (data.length==0){
-               let {fields=[]} = res ? res : {};
-               for (let field of fields ){
-                 if (headers.length>0){
-                   headers = headers+'|';
-                 }
-                 headers = headers+field.name;
+        client.end(function(){
+            debug ? utl.log(`${tag} [postgres] connection is closing connection `):'';
+        });
+ 
+        if (err) {
+            resolve({"result":{dml, headers,  time:utl.milisegundosASegundos(time), code:err.code ? err.code:0, error:1, msg:err.routine ? err.routine:''}, results:err});
+        }
+        else { 
+         data = res.rows ? res.rows: []; 
+         let rowCount = res.rowCount ? res.rowCount:0;
+         
+         if (tipo!='select'){
+           data =[{"insert_id":data[0] ? data[0].id : 0, "changed_rows":rowCount}]; 
+           headers =  'insert_id|changed_rows';
+         }else{
+           if (data.length==0){
+             let {fields=[]} = res ? res : {};
+             for (let field of fields ){
+               if (headers.length>0){
+                 headers = headers+'|';
                }
-             }else{
-               try{ headers = Object.keys(data[0]); headers = headers.join("|"); }catch(e){}
+               headers = headers+field.name;
              }
+           }else{
+             try{ headers = Object.keys(data[0]); headers = headers.join("|"); }catch(e){}
            }
-           resolve({"result":{dml, headers,  time:utl.milisegundosASegundos(time), code:200, error:0}, data});
-          }
-        }catch(e){
-          resolve({"result":{dml, headers,  time:utl.milisegundosASegundos(time), code:500, error:1, msg:e.message}, results:e});
-        }finally{
-          // Cerrar conexión SIEMPRE
-          client.end(function(){
-            debug ? utl.log(`${tag} [postgres] connection is closing connection `):'';
-          });
+         }
+         resolve({"result":{dml, headers,  time:utl.milisegundosASegundos(time), code:200, error:0}, data});
         }
     });
    });