bonsaif 1.10.32 → 1.10.33

package/lib/hookup/redis.js

@@ -22,15 +22,8 @@ const scan=async(options,db, cursor, pattern, count)=>{  // SCAN cursor [MATCH p
     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) {
+      // SCAN necesita los argumentos expandidos, no como array
+      redisConn.scan(cursor, 'MATCH', pattern, 'COUNT', count, function (err, res) {
         if (err) {
           reject(err);
           return;
@@ -767,6 +760,29 @@ 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)=>{
   const exec        = require("./exec");
 
@@ -784,7 +800,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','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;
@@ -822,6 +838,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;
@@ -935,5 +952,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.33",
   "main": "index.js",
   "directories": {
     "lib": "lib"