bonsaif 1.10.29 → 1.10.31

package/lib/hookup/redis.js

@@ -252,6 +252,36 @@ const smembers=async( options, db, key, toJson )=>{  // SMEMBERS key
   })
 }
 
+const sinter=async(options, db, keys)=>{  // SINTER key [key ...]
+  const exec = require("./exec");
+  const redisConn = await exec.redisConn(options);
+  const start = Date.now();
+  
+  // Asegurarse de que keys sea un array
+  if (!Array.isArray(keys)) {
+    keys = [keys];
+  }
+  
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ });  //base 1
+      redisConn.sinter(keys, function (err, res) {
+         const end = Date.now();
+         const time = end - start;
+         
+         resolve({"sinter":keys, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
+        try{
+            exec.redisClose(redisConn);
+        }catch(e){
+            utl.log('err.sinter '+e);
+        }
+      });
+    }catch(e){
+      utl.log('err sinter'+e);
+    }
+  })
+}
+
 const scard=async( options, db, key )=>{  // SCARD key
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
@@ -277,6 +307,37 @@ const scard=async( options, db, key )=>{  // SCARD key
   })
 }
 
+const sunionstore=async( options, db, destination, keys )=>{  // SUNIONSTORE destination key [key ...]
+  const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);
+  const start = Date.now();
+  
+  // Asegurarse de que keys sea un array
+  if (!Array.isArray(keys)) {
+    keys = [keys];
+  }
+  
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ });  //base 1
+      redisConn.sunionstore([destination, ...keys], function (err, res) {
+
+         const end = Date.now();
+         const time = end - start;
+         
+         resolve({"sunionstore":destination, "keys":keys, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
+        try{
+            exec.redisClose(redisConn);
+        }catch(e){
+            utl.log('err.sunionstore '+e);
+        }
+      });
+    }catch(e){
+      utl.log('err sunionstore'+e);
+    }
+  })
+}
+
 const hset=async( options,db, key, values )=>{  // HSET key field value [ field value ...]
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
@@ -308,7 +369,7 @@ const hset=async( options,db, key, values )=>{  // HSET key field value [ field
   })
 }
 
-const hgetall=async(options, db, key )=>{  // SMEMBERS key
+const hgetall=async(options, db, key )=>{  // HGETALL key
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
   const start = Date.now();
@@ -331,6 +392,44 @@ const hgetall=async(options, db, key )=>{  // SMEMBERS key
   })
 }
 
+const hmget=async(options, db, key, fields )=>{  // HMGET key field [field ...]
+  const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);
+  const start = Date.now();
+  
+  // Asegurarse de que fields sea un array
+  if (!Array.isArray(fields)) {
+    fields = [fields];
+  }
+  
+  return new Promise((resolve, reject)=>{
+    try{
+      redisConn.select(db,function() { /* ... */ });  //base 1
+      redisConn.hmget(key, fields, function (err, res) {
+        const end = Date.now();
+        const time = end - start;
+        
+        // Crear un objeto con los campos y valores
+        let result = {};
+        if (res) {
+          fields.forEach((field, index) => {
+            result[field] = res[index];
+          });
+        }
+        
+        resolve({"hmget":key, "fields":fields, "err":err, "res":result, "time":utl.milisegundosASegundos(time)});
+        try{
+          exec.redisClose(redisConn);
+        }catch(e){
+          utl.log('err.hmget '+e);
+        }
+      });
+    }catch(e){
+      utl.log('err hmget'+e);
+    }
+  })
+}
+
 const del=async( options,db, key )=>{  //DEL key [key ...]
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
@@ -570,7 +669,7 @@ const hmset=async( options,db, key, values )=>{  // HSET key field value [ field
 }
 
 
-const expire_=async( options,db, key, expire )=>{  // HSET key field value [ field value ...]
+const expire=async( options,db, key, expire )=>{  // EXPIRE key seconds
   const exec        = require("./exec");
   const redisConn = await exec.redisConn(options);
   const start = Date.now();
@@ -579,7 +678,6 @@ const expire_=async( options,db, key, expire )=>{  // HSET key field value [ fie
   return new Promise((resolve, reject)=>{
     try{
       redisConn.select(db,function() { /* ... */ });  //base 1
-      // hset con multiples campos esta depreciado en versiones mayores a node 6
       redisConn.expire(key, expire, function (err, res) {
          const end = Date.now();
          const time = end - start;
@@ -662,7 +760,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 = ['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'];
   for (let x of ltdml){
     if (utl.ObjectEmpty(json,x)){
       dml = x; break;
@@ -671,6 +769,10 @@ const api=async(options, dbm, json)=>{
 
   try{ eval(`  key = json.${dml};  `); } catch(e){}
 
+  let keysArray = json.keys!=null ? json.keys : [];
+  let fieldsArray = json.fields!=null ? json.fields : [];
+  let destination = json.destination!=null ? json.destination : '';
+
   let r;
   switch (dml){
     case 'set':         r = await set(options,dbm,key,value,expire); break;
@@ -690,9 +792,13 @@ const api=async(options, dbm, json)=>{
     case 'setnx':       r = await setnx(options,dbm,key,value,expire); break;
     case 'hsetnx':      r = await hsetnx(options,dbm,key,value,expire); break;
     case 'hmset':       r = await hmset(options,dbm,key,value,expire); break;
-    //case 'expire':      r = await expire_(options,dbm,key,expire); break;
+    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 '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;
+    case 'scard':       r = await scard(options,dbm,key); break;
     default:            r = {"dml":"404", "err":"dml not found."};
   }
 
@@ -788,14 +894,18 @@ module.exports ={
     sadd,
     srem,
     smembers,
+    sinter,
     scard,
+    sunionstore,
     hset,
     hgetall,
+    hmget,
     del,
     hfind,
     upsert,
     api,
     incrbyfloat,
+    expire,
     expireat,
     lrange,
     keys

package/package.json

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