bonsaif 1.10.31 → 1.10.33

package/lib/hookup/redis.js

@@ -9,31 +9,48 @@
  let tag = ` ::: B[]NSAIF() ::: => redis.js `;
 
 
-const scan=async(options,db, key)=>{
+const scan=async(options,db, cursor, pattern, count)=>{  // SCAN cursor [MATCH pattern] [COUNT count]
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
   const start = Date.now();
-    return new Promise((resolve, reject)=>{
+  
+  cursor = cursor!=null ? cursor : '0';
+  pattern = pattern!=null ? pattern : '*';
+  count = count!=null ? count : 100;
+  
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ }); 
+      
+      // SCAN necesita los argumentos expandidos, no como array
+      redisConn.scan(cursor, 'MATCH', pattern, 'COUNT', count, function (err, res) {
+        if (err) {
+          reject(err);
+          return;
+        }
+        
+        const end = Date.now();
+        const time = end - start;
+        
+        // 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)
+        });
+        
         try{
-          redisConn.select(db,function() { /* ... */ }); 
-          const redisScan = require('node-redis-scan');
-          const scanner = new redisScan(redisConn);
-           scanner.scan(key,  (err, matchingKeys) => {
-              if (err) throw(err);
-              const end = Date.now();
-              const time = end - start;
-              resolve({"count":matchingKeys.length, "keys":matchingKeys,  "time":utl.milisegundosASegundos(time)});
-
-              try{
-                exec.redisClose(redisConn);
-              }catch(e){
-                utl.log('err.scan '+e);
-              }
-          });
+          exec.redisClose(redisConn);
         }catch(e){
-          utl.log('err scan: '+e);
+          utl.log('err.scan '+e);
         }
-      })
+      });
+    }catch(e){
+      utl.log('err scan: '+e);
+      reject(e);
+    }
+  })
 }
 
 const set=async(options, db, key, value, expire )=>{
@@ -743,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");
 
@@ -760,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;
@@ -772,6 +812,9 @@ 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;
 
   let r;
   switch (dml){
@@ -779,7 +822,7 @@ const api=async(options, dbm, json)=>{
     case 'get':         r = await get(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, key); break;
+    case 'scan':        r = await scan(options,dbm,cursor,pattern,scan_count); break;
     case 'incrby':      r = await incrby(options,dbm,key,value,expire,counter); break;
     case 'sadd':        r = await sadd(options,dbm,key,value,expire); break;
     case 'srem':        r = await srem(options,dbm,key,value); break;
@@ -795,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;
@@ -908,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.31",
+  "version": "1.10.33",
   "main": "index.js",
   "directories": {
     "lib": "lib"