bonsaif 1.10.39 → 1.10.40

package/lib/hookup/redis.js

@@ -129,28 +129,18 @@ const set=async(options, db, key, value, expire )=>{
         if (expire>0){
             redisConn.expire(key, expire, function(expErr,expRes){
               resolve({"set":key, "expire":expire, "expRes":expRes, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
-              try{
-                exec.redisClose(redisConn);
-              }catch(e){
-                utl.log('err.set.close '+e);
-              }
             });
         }else{
           resolve({"set":key, "expire":expire, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
-          try{
-            exec.redisClose(redisConn);
-          }catch(e){
-            utl.log('err.set.close '+e);
-          }
+        }
+        try{
+          exec.redisClose(redisConn);
+        }catch(e){
+          utl.log('err.set '+e);
         }
       });
     }catch(e){
       utl.log('err setKey'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.set.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -171,16 +161,11 @@ const get=async( options, db, key )=>{
         try{
           exec.redisClose(redisConn);
         }catch(e){
-          utl.log('err.get.close '+e);
+          utl.log('err.get '+e);
         }
       });
     }catch(e){
       utl.log('err getKey'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.get.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -201,16 +186,11 @@ const type=async( options, db, key )=>{  // TYPE key
         try{
           exec.redisClose(redisConn);
         }catch(e){
-          utl.log('err.type.close '+e);
+          utl.log('err.type '+e);
         }
       });
     }catch(e){
       utl.log('err type'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.type.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -218,6 +198,7 @@ const type=async( options, db, key )=>{  // TYPE key
 
 const incrby=async(options, db, key,value,expire, counter )=>{
   const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);  
   expire = expire!=null?expire*1:0;  // tls en segundo
   counter = counter!=null?counter*1:0;  // incremental
   value = value ? !isNaN(value) ? value*1: 1 :1;  // valor
@@ -228,23 +209,22 @@ const incrby=async(options, db, key,value,expire, counter )=>{
       if (r.res==null){  // no existe
           set(options,db,key,value,expire)
           .then(r=>{
+            console.log({r});
             const end = Date.now();
             const time = end - start;
             resolve({"set":key, "expire":expire, "err":null, "res":value, "counter":0,  "time":utl.milisegundosASegundos(time)});
           });
       }else{
-        const redisConn = exec.redisConn(options).then(conn=>{
-          conn.select(db,function() { /* ... */ });  
-          conn.incrby(key, counter, function (err, res) {
-            const end = Date.now();
-            const time = end - start;
-            resolve({"set":key, "expire":expire, "err":err, "res":res, "counter":counter,  "time":utl.milisegundosASegundos(time)});
-            try{
-              exec.redisClose(conn);
-            }catch(e){
-              utl.log('err.incr.close '+e);
-            }
-          });
+        redisConn.select(db,function() { /* ... */ });  
+        redisConn.incrby(key, counter, function (err, res) {
+          const end = Date.now();
+          const time = end - start;
+          resolve({"set":key, "expire":expire, "err":err, "res":res, "counter":counter,  "time":utl.milisegundosASegundos(time)});
+          try{
+            exec.redisClose(redisConn);
+          }catch(e){
+            utl.log('err.incr '+e);
+          }
         });
       }
     });
@@ -254,6 +234,7 @@ const incrby=async(options, db, key,value,expire, counter )=>{
 
 const incrbyfloat=async( options,db, key, value, expire, counter )=>{
   const exec        = require("./exec");
+  const redisConn = await exec.redisConn(options);  
   expire = expire!=null?expire*1:0;  // tls en segundo
   counter = counter!=null?counter*1:0;  // incremental
   value = value ? !isNaN(value) ? value*1: 1 :1; // valor
@@ -264,26 +245,25 @@ const incrbyfloat=async( options,db, key, value, expire, counter )=>{
       if (r.res==null){  // no existe
           set(options,db,key,value,expire)
           .then(r=>{
+            console.log({r});
             const end = Date.now();
             const time = end - start;
 
             resolve({"set":key, "expire":expire, "err":null, "res":value, "counter":0,  "time":utl.milisegundosASegundos(time)});
           });
       }else{
-        exec.redisConn(options).then(conn=>{
-          conn.select(db,function() { /* ... */ });  
-          conn.incrbyfloat(key,counter, function (err, res) {
-            const end = Date.now();
-            const time = end - start;
+        redisConn.select(db,function() { /* ... */ });  
+        redisConn.incrbyfloat(key,counter, function (err, res) {
+          const end = Date.now();
+          const time = end - start;
 
-            resolve({"set":key, "expire":expire, "err":err, "res":res, "counter":counter,  "time":utl.milisegundosASegundos(time)});
+          resolve({"set":key, "expire":expire, "err":err, "res":res, "counter":counter,  "time":utl.milisegundosASegundos(time)});
 
-            try{
-              exec.redisClose(conn);
-            }catch(e){
-              utl.log('err.incr.close '+e);
-            }
-          });
+          try{
+            exec.redisClose(redisConn);
+          }catch(e){
+            utl.log('err.incr '+e);
+          }
         });
       }
     });
@@ -316,11 +296,6 @@ const sadd=async(options, db, key, value )=>{  // SADD key member [member ...]
       });
     }catch(e){
       utl.log('err sadd'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.sadd.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -350,11 +325,6 @@ const srem=async( options,db, key, value )=>{  //key member [member ...]
       });
     }catch(e){
       utl.log('err del'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.srem.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -382,11 +352,6 @@ const smembers=async( options, db, key, toJson )=>{  // SMEMBERS key
       });
     }catch(e){
       utl.log('err smembers'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.smembers.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -417,11 +382,6 @@ const sinter=async(options, db, keys)=>{  // SINTER key [key ...]
       });
     }catch(e){
       utl.log('err sinter'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.sinter.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -447,11 +407,6 @@ const scard=async( options, db, key )=>{  // SCARD key
       });
     }catch(e){
       utl.log('err scard'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.scard.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -483,11 +438,6 @@ const sunionstore=async( options, db, destination, keys )=>{  // SUNIONSTORE des
       });
     }catch(e){
       utl.log('err sunionstore'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.sunionstore.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -519,11 +469,6 @@ const hset=async( options,db, key, values )=>{  // HSET key field value [ field
       });
     }catch(e){
       utl.log('err hset'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.hset.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -547,11 +492,6 @@ const hgetall=async(options, db, key )=>{  // HGETALL key
       });
     }catch(e){
       utl.log('err hgetall'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.hgetall.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -590,11 +530,6 @@ const hmget=async(options, db, key, fields )=>{  // HMGET key field [field ...]
       });
     }catch(e){
       utl.log('err hmget'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.hmget.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -619,11 +554,6 @@ const del=async( options,db, key )=>{  //DEL key [key ...]
       });
     }catch(e){
       utl.log('err del'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.del.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -734,16 +664,11 @@ const expireat=async(options, db, key, expire )=>{
         try{
           exec.redisClose(redisConn);
         }catch(e){
-          utl.log('err.expireat.close:'+e);
+          utl.log('err.expireat:'+e);
         }
       });
     }catch(e){
       utl.log('err expireat:'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.expireat.close.catch:'+closeErr);
-      }
     }
   })
 }
@@ -762,28 +687,18 @@ const setnx=async(options, db, key, value, expire )=>{
         if (expire>0){
             redisConn.expire(key, expire, function(expErr,expRes){
               resolve({"set":key, "expire":expire, "expRes":expRes, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
-              try{
-                exec.redisClose(redisConn);
-              }catch(e){
-                utl.log('err.setnx.close '+e);
-              }
             });
         }else{
           resolve({"set":key, "expire":expire, "err":err, "res":res, "time":utl.milisegundosASegundos(time)});
-          try{
-            exec.redisClose(redisConn);
-          }catch(e){
-            utl.log('err.setnx.close '+e);
-          }
+        }
+        try{
+          exec.redisClose(redisConn);
+        }catch(e){
+          utl.log('err.set '+e);
         }
       });
     }catch(e){
       utl.log('err setKey'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.setnx.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -810,28 +725,18 @@ const hsetnx=async( options,db, key, values, expire )=>{  // HSET key field valu
           if (expire>0){
               redisConn.expire(key, expire, function(expErr,expRes){
               resolve({"hsetnx":key, "expire":expire, "expRes":expRes, "err":err, "res":res,  "value":values, "time":utl.milisegundosASegundos(time)});
-              try{
-                exec.redisClose(redisConn);
-              }catch(e){
-                utl.log('err.hsetnx.close '+e);
-              }
               });
           }else{
             resolve({"hsetnx":key, "expire":expire, "err":err, "res":res,  "value":values, "time":utl.milisegundosASegundos(time)});
-            try{
-              exec.redisClose(redisConn);
-            }catch(e){
-              utl.log('err.hsetnx.close '+e);
-            }
+          }
+          try{
+            exec.redisClose(redisConn);
+          }catch(e){
+            utl.log('err.hsetnx '+e);
           }
       });
     }catch(e){
       utl.log('err hsetnx'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.hsetnx.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -863,11 +768,6 @@ const hmset=async( options,db, key, values )=>{  // HSET key field value [ field
       });
     }catch(e){
       utl.log('err hmset'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.hmset.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -894,11 +794,6 @@ const expire=async( options,db, key, expire )=>{  // EXPIRE key seconds
       });
     }catch(e){
       utl.log('err expire'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.expire.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -924,11 +819,6 @@ const lrange=async( options, db, key, start, stop )=>{  // LRANGE key start stop
       });
     }catch(e){
       utl.log('err lrange'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.lrange.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -953,11 +843,6 @@ const keys=async( options, db, pattern )=>{  // KEYS pattern
       });
     }catch(e){
       utl.log('err keys'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.keys.close.catch '+closeErr);
-      }
     }
   })
 }
@@ -981,11 +866,6 @@ const dbsize=async( options, db )=>{  // DBSIZE
       });
     }catch(e){
       utl.log('err dbsize'+e);
-      try{
-        exec.redisClose(redisConn);
-      }catch(closeErr){
-        utl.log('err.dbsize.close.catch '+closeErr);
-      }
     }
   })
 }

package/package.json

@@ -12,12 +12,9 @@
     "request": "^2.88.2",
     "ua-parser-js": "^1.0.37"
   },
-  "optionalDependencies": {
-    "mongoose": "^8.23.1"
-  },
   "name": "bonsaif",
   "description": "bonsaif is a library to connect to bonsaif apis",
-  "version": "1.10.39",
+  "version": "1.10.40",
   "main": "index.js",
   "directories": {
     "lib": "lib"
@@ -35,10 +32,10 @@
     "query",
     "redis",
     "mongodb",
-    "mongoose",
     "mariadb",
     "postgres"
   ],
   "author": "vsampablo",
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {}
 }