bonsaif 1.10.32 → 1.10.34

package/lib/hookup/redis.js

@@ -14,48 +14,103 @@ const scan=async(options,db, cursor, pattern, count)=>{  // SCAN cursor [MATCH p
   const redisConn = await exec.redisConn(options);
   const start = Date.now();
   
-  cursor = cursor!=null ? cursor : '0';
+  cursor = cursor!=null ? String(cursor) : '0';
   pattern = pattern!=null ? pattern : '*';
-  count = count!=null ? count : 100;
+  count = count!=null ? parseInt(count) : 100;
   
   return new Promise((resolve, reject)=>{
     try{
-      redisConn.select(db,function() { /* ... */ }); 
-      
-      let args = [cursor];
-      if (pattern) {
-        args.push('MATCH', pattern);
-      }
-      if (count) {
-        args.push('COUNT', count);
-      }
-      
-      redisConn.scan(args, function (err, res) {
-        if (err) {
-          reject(err);
+      // Esperar a que se seleccione la DB antes de ejecutar SCAN
+      redisConn.select(db, function(selectErr) {
+        if (selectErr) {
+          const end = Date.now();
+          const time = end - start;
+          resolve({"scan":"error", "cursor":"0", "keys":[], "count":0, "iterations":0, "err":selectErr, "time":utl.milisegundosASegundos(time)});
+          try{ exec.redisClose(redisConn); }catch(e){}
           return;
         }
         
-        const end = Date.now();
-        const time = end - start;
+        // Iterar automáticamente hasta obtener todas las keys
+        let allKeys = [];
+        let currentCursor = cursor;
+        let iterations = 0;
+        const maxIterations = 10000; // Protección contra loops infinitos
         
-        // res[0] es el nuevo cursor, res[1] es el array de keys
-        resolve({
-          "cursor": res[0], 
-          "keys": res[1], 
-          "count": res[1].length, 
-          "time": utl.milisegundosASegundos(time)
-        });
+        const scanIteration = () => {
+          iterations++;
+          
+          if (iterations > maxIterations) {
+            const end = Date.now();
+            const time = end - start;
+            resolve({"scan":"max_iterations", "cursor":currentCursor, "keys":allKeys, "count":allKeys.length, "iterations":iterations, "err":"SCAN: max iterations exceeded", "time":utl.milisegundosASegundos(time)});
+            try{ exec.redisClose(redisConn); }catch(e){}
+            return;
+          }
+          
+          redisConn.scan(currentCursor, 'MATCH', pattern, 'COUNT', count, function (err, res) {
+            if (err) {
+              const end = Date.now();
+              const time = end - start;
+              resolve({"scan":"error", "cursor":currentCursor, "keys":allKeys, "count":allKeys.length, "iterations":iterations, "err":err, "time":utl.milisegundosASegundos(time)});
+              try{ exec.redisClose(redisConn); }catch(e){}
+              return;
+            }
+            
+            const newCursor = res[0];
+            const keys = res[1] || [];
+            
+            // Acumular keys
+            allKeys = allKeys.concat(keys);
+            
+            utl.log(`${tag} SCAN iteration=${iterations} cursor=${currentCursor}->${newCursor} keys=${keys.length} total=${allKeys.length}`);
+            
+            // Si el cursor es "0", terminamos
+            if (newCursor === '0') {
+              const end = Date.now();
+              const time = end - start;
+              
+              const result = {
+                "scan": "ok",
+                "cursor": newCursor, 
+                "keys": allKeys, 
+                "count": allKeys.length, 
+                "iterations": iterations,
+                "err": null,
+                "time": utl.milisegundosASegundos(time)
+              };
+              
+              utl.log(`${tag} SCAN COMPLETE: returning ${allKeys.length} keys in ${iterations} iterations`);
+              
+              resolve(result);
+              
+              try{
+                exec.redisClose(redisConn);
+                utl.log(`${tag} SCAN connection closed successfully`);
+              }catch(e){
+                utl.log(`${tag} err.scan close: ${e}`);
+              }
+            } else {
+              // Continuar iterando
+              currentCursor = newCursor;
+              scanIteration();
+            }
+          });
+        };
         
-        try{
-          exec.redisClose(redisConn);
-        }catch(e){
-          utl.log('err.scan '+e);
-        }
-      });
+        // Iniciar iteración
+        scanIteration();
+      }); 
     }catch(e){
-      utl.log('err scan: '+e);
-      reject(e);
+      utl.log(`${tag} err scan: ${e}`);
+      const end = Date.now();
+      const time = end - start;
+      // Cerrar conexión en caso de error
+      try{
+        exec.redisClose(redisConn);
+      }catch(closeErr){
+        utl.log(`${tag} err closing connection after error: ${closeErr}`);
+      }
+      resolve({"scan":"error", "cursor":"0", "keys":[], "count":0, "iterations":0, "err":e, "time":utl.milisegundosASegundos(time)});
     }
   })
 }
@@ -115,6 +170,31 @@ const get=async( options, db, key )=>{
   })
 }
 
+const type=async( options, db, key )=>{  // TYPE key
+  const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);  
+  const start = Date.now();
+
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ });  
+      redisConn.type(key, function (err, res) {
+        const end = Date.now();
+        const time = end - start;
+
+        resolve({"type":key, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
+        try{
+          exec.redisClose(redisConn);
+        }catch(e){
+          utl.log('err.type '+e);
+        }
+      });
+    }catch(e){
+      utl.log('err type'+e);
+    }
+  })
+}
+
 
 const incrby=async(options, db, key,value,expire, counter )=>{
   const exec        = require("./exec");
@@ -767,7 +847,31 @@ const keys=async( options, db, pattern )=>{  // KEYS pattern
   })
 }
 
+const dbsize=async( options, db )=>{  // DBSIZE
+  const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);
+  const start = Date.now();
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ });
+      redisConn.dbsize(function (err, res) {
+        const end = Date.now();
+        const time = end - start;
+        resolve({"dbsize":db, "count":res, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
+        try{
+          exec.redisClose(redisConn);
+        }catch(e){
+          utl.log('err.dbsize '+e);
+        }
+      });
+    }catch(e){
+      utl.log('err dbsize'+e);
+    }
+  })
+}
+
 const api=async(options, dbm, json)=>{
+  //utl.log('json recibido: '+JSON.stringify(json));
   const exec        = require("./exec");
 
   const start = Date.now();
@@ -784,7 +888,7 @@ const api=async(options, dbm, json)=>{
   let lstop  = json.stop!=null?json.stop*1:-1;
   let {field:id, val:vid} = getFirstField(filter);
 
-  let ltdml = ['sinter','sunionstore','scard','hmget','hfind','upsert','set','get','scan','incrby','sadd','srem','smembers','hset','hgetall','del','incrbyfloat','expireat','setnx','hsetnx','hmset','expire','lrange','keys'];
+  let ltdml = ['sinter','sunionstore','scard','hmget','hfind','upsert','set','get','type','scan','incrby','sadd','srem','smembers','hset','hgetall','del','incrbyfloat','expireat','setnx','hsetnx','hmset','expire','lrange','keys','dbsize'];
   for (let x of ltdml){
     if (utl.ObjectEmpty(json,x)){
       dml = x; break;
@@ -796,14 +900,36 @@ const api=async(options, dbm, json)=>{
   let keysArray = json.keys!=null ? json.keys : [];
   let fieldsArray = json.fields!=null ? json.fields : [];
   let destination = json.destination!=null ? json.destination : '';
-  let cursor = json.cursor!=null ? json.cursor : '0';
-  let pattern = json.pattern!=null ? json.pattern : key;
-  let scan_count = json.count!=null ? json.count : 100;
+  
+  // Parsear parámetros específicos para SCAN
+  let cursor = '0';
+  let pattern = '*';
+  let scan_count = 100;
+  
+  if (dml === 'scan' && Array.isArray(key)) {
+    // Si scan viene como array: ["0", "COUNT", "100"] o ["0", "MATCH", "pattern", "COUNT", "100"]
+    cursor = key[0] || '0';
+    for (let i = 1; i < key.length; i++) {
+      if (key[i] === 'MATCH' && i + 1 < key.length) {
+        pattern = key[i + 1];
+        i++;
+      } else if (key[i] === 'COUNT' && i + 1 < key.length) {
+        scan_count = parseInt(key[i + 1]);
+        i++;
+      }
+    }
+  } else {
+    // Parámetros tradicionales
+    cursor = json.cursor!=null ? json.cursor : '0';
+    pattern = json.pattern!=null ? json.pattern : (typeof key === 'string' ? key : '*');
+    scan_count = json.count!=null ? json.count : 100;
+  }
 
   let r;
   switch (dml){
     case 'set':         r = await set(options,dbm,key,value,expire); break;
     case 'get':         r = await get(options,dbm,key); break;
+    case 'type':        r = await type(options,dbm,key); break;
     case 'hfind':       r = await hfind(options,dbm,key,filter,order,limit); break;
     case 'upsert':      r = await upsert(options,dbm,key,value,id,vid,expire); break;
     case 'scan':        r = await scan(options,dbm,cursor,pattern,scan_count); break;
@@ -822,6 +948,7 @@ const api=async(options, dbm, json)=>{
     case 'expire':      r = await expire(options,dbm,key,expire); break;
     case 'lrange':      r = await lrange(options,dbm,key,lstart,lstop); break;
     case 'keys':        r = await keys(options,dbm,key); break;
+    case 'dbsize':      r = await dbsize(options,dbm); break;
     case 'sinter':      r = await sinter(options,dbm,Array.isArray(key) ? key : [key]); break;
     case 'hmget':       r = await hmget(options,dbm,key,fieldsArray); break;
     case 'sunionstore': r = await sunionstore(options,dbm,destination,keysArray); break;
@@ -917,6 +1044,7 @@ module.exports ={
     scan,
     set,
     get,
+    type,
     incrby,
     sadd,
     srem,
@@ -935,5 +1063,6 @@ module.exports ={
     expire,
     expireat,
     lrange,
-    keys
+    keys,
+    dbsize
   }

package/package.json

@@ -14,7 +14,7 @@
   },
   "name": "bonsaif",
   "description": "bonsaif is a library to connect to bonsaif apis",
-  "version": "1.10.32",
+  "version": "1.10.34",
   "main": "index.js",
   "directories": {
     "lib": "lib"