@tiledesk/tiledesk-server 2.4.22 → 2.4.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.22",
+  "version": "2.4.24",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -18,23 +18,36 @@
  var RoleConstants = require("../../models/roleConstants");
 
  
- function del(client, key, callback) {
-    winston.debug("here1")
-    client.del(key, function (err, data) {
-        if (err) {
-            return callback(error);
-        } else {
-            return callback(null, data);
-        }
-    });
+ async function del(client, key, callback) {
+    key = "cacheman:cachegoose-cache:" + key;
+    winston.debug("key: "+key)
+   
+    // client.del(key, function (err, data) {
+    //     if (err) {
+    //         return callback(error);
+    //     } else {
+    //         winston.info("del data: "+ data)
+
+    //         return callback(null, data);
+    //     }
+    // });
 
     // client.del(key).then(function(result) {
-    //     winston.debug("here2")
+    //     winston.info("result", result)
     //     return callback(null, result);
     // }).catch(function(error) {
-    //     winston.debug("here3")
+    //     winston.error("here3", error)
     //     return callback(error);
     // });
+
+    var res = await client.del(key)
+    winston.debug("result: "+ res)
+    if (res) {
+        return callback(null, res); 
+    } else {
+        var error = "error";
+        return callback(error);
+    }
  }
 
  function listen(client) {
@@ -311,8 +324,11 @@
     function invalidatRequestSimple(client, project_id, rid, request_id) {
         var key = project_id+":requests:id:"+rid+":simple";
         winston.verbose("Deleting cache for widgets with key: " + key);
+
         // found del
+        winston.debug("Deleted4545");
         del(client._cache._engine.client, key, function (err, reply) {  //tested
+        
         // client.del(key, function (err, reply) {
             winston.debug("Deleted cache for invalidatRequestSimple",reply);
             winston.verbose("Deleted cache for invalidatRequestSimple",{err:err});
@@ -713,12 +729,14 @@
 
 
     if (subscriptionEvent) {
-        subscriptionEvent.on('subscription.create', function(trigger) {   
+        subscriptionEvent.on('subscription.create', function(subscription) {   
             setImmediate(() => {    
                 
                 //TODO i think you must clone trigger and remove .secret before caching
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";        
+                // q.cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event);  //CACHE_SUBSCRIPTION
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =trigger.id_project+":subscriptions:*";        //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.create with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -729,10 +747,11 @@
             });
         });
     
-        subscriptionEvent.on('subscription.update', function(trigger) {   
+        subscriptionEvent.on('subscription.update', function(subscription) {   
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";        
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =subscription.id_project+":subscriptions:*";         //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.update with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -743,10 +762,11 @@
             });
         });
     
-        subscriptionEvent.on("subscription.delete", function(trigger) {     
+        subscriptionEvent.on("subscription.delete", function(subscription) {     
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":subscriptions:*";         
+                var key =subscription.id_project+":subscriptions:event:"+subscription.event;    
+
+                // var key =subscription.id_project+":subscriptions:*";          //wildcardcache //tested
                 winston.verbose("Deleting cache for subscription.delete with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -763,8 +783,9 @@
     if (triggerEventEmitter) {
         triggerEventEmitter.on('trigger.create', function(trigger) {   
             setImmediate(() => {    
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":triggers:*";        
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+
+                // var key =trigger.id_project+":triggers:*";         //wildcardcache //tested
                 winston.verbose("Deleting cache for trigger.create with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -777,8 +798,9 @@
     
         triggerEventEmitter.on('trigger.update', function(trigger) {   
             setImmediate(() => {         
-                // elimina delete con * e fai cancellazione puntuale
-                var key =trigger.id_project+":triggers:*";        
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+                // var key =trigger.id_project+":triggers:*";         //wildcardcache //tested
+
                 winston.verbose("Deleting cache for trigger.update with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -790,9 +812,10 @@
         });
     
         triggerEventEmitter.on("trigger.delete", function(trigger) {     
-            setImmediate(() => {       
-                // elimina delete con * e fai cancellazione puntuale  
-                var key =trigger.id_project+":triggers:*";         
+            setImmediate(() => {      
+                var key =trigger.id_project+":triggers:trigger.key:"+trigger.trigger.key;
+
+                // var key =trigger.id_project+":triggers:*";          //wildcardcache
                 winston.verbose("Deleting cache for trigger.delete with key: " + key);
                 // found del
                 del(client._cache._engine.client, key, function (err, reply) {  //tested
@@ -807,7 +830,11 @@
     
 
     function invalidateFaq(client, faq) {
-        key = "faqs:botid:"+faq.id_faq_kb+":faq:id:*";
+
+        // let faqCacheKey = "cacheman:cachegoose-cache:faqs:botid:"+ botId + ":faq:id:" + key;
+
+        key = "faqs:botid:"+faq.id_faq_kb+":faq:id:"+faq._id;
+        // key = "faqs:botid:"+faq.id_faq_kb+":faq:id:*";
         winston.verbose("Deleting cache for faq with key: " + key);
         // found del
         del(client._cache._engine.client, key, function (err, reply) {  //tested

package/pubmodules/trigger/triggerRoute.js

@@ -108,8 +108,8 @@ router.put('/:triggercode/reset', function (req, res) {
 router.delete('/:triggerid', function (req, res) {
 
   winston.debug(req.body);
-
-  Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
+  Trigger.findByIdAndRemove(req.params.triggerid, { new: false}, function (err, trigger) {
+  // Trigger.remove({ _id: req.params.triggerid }, function (err, trigger) {
     if (err) {
       winston.error('--- > ERROR ', err);
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });

package/routes/subscription.js

@@ -66,7 +66,8 @@ router.delete('/:subscriptionid', function (req, res) {
 
   winston.debug(req.body);
 
-  Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
+  Subscription.findByIdAndRemove(req.params.subscriptionid, { new: false}, function (err, subscriptionUpd) {
+    // Subscription.remove({ _id: req.params.subscriptionid }, function (err, subscriptionUpd) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error deleting object.' });
     }

package/services/requestService.js

@@ -400,6 +400,8 @@ class RequestService {
              return reject(err);
            }
 
+           winston.debug('request cache simple 3', request);
+
            winston.debug("here reroute1 ");
 
             //  Cannot read property 'toString' of undefined at /usr/src/app/services/requestService.js:404:61 at /usr/src/app/node_modules/cachegoose/out/extend-query.js:44:13 at Command.cb [as callback] (/usr/src/app/node_modules/cacheman-redis/node/index.js:142:9) at normal_reply (/usr/src/app/node_modules/redis/index.js:655:21) at RedisClient.return_reply (/usr/src/app/node_modules/redis/index.js:753:9) at JavascriptRedisParser.returnReply (/usr/src/app/node_modules/redis/index.js:138:18) at JavascriptRedisParser.execute (/usr/src/app/node_modules/redis-parser/lib/parser.js:544:14) at Socket.<anonymous> (/usr/src/app/node_modules/redis/index.js:219:27) at Socket.emit (events.js:314:20) at addChunk (_stream_readable.js:297:12) at readableAddChunk (_stream_readable.js:272:9) at Socket.Readable.push (_stream_readable.js:213:10) at TCP.onStreamRead (internal/stream_base_commons.js:188:23) {"date":"Tue Mar 21 2023 18:45:47 GMT+0000 (Coordinated Unive
@@ -1020,7 +1022,18 @@ class RequestService {
             // winston.debug(" request",  request);
             winston.debug("Request  waitingTime setted");
               //cacheinvalidation
-          return resolve(request.save());
+          // return resolve(request.save());
+          request.save(function(err, savedRequest) {
+            if (err) {
+              return reject(err);
+            }
+            requestEvent.emit('request.update', savedRequest);
+
+            return resolve(savedRequest);
+          });
+
+
+
         }else {
           return resolve(request);
         }