@tiledesk/tiledesk-server 2.3.73 → 2.3.74

package/event/botEvent.js

@@ -4,6 +4,8 @@ const Faq_kb = require('../models/faq_kb');
 var winston = require('../config/winston');
 
 class BotEvent extends EventEmitter {}
+const cacheUtil = require("../utils/cacheUtil");
+const cacheEnabler = require("../services/cacheEnabler");
 
 const botEvent = new BotEvent();
 
@@ -108,7 +110,17 @@ messageEvent.on('message.create', function(message) {
     }
 
 
-    Faq_kb.findById(botId).exec(function(err, bot) {
+    let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+
+        if (cacheEnabler.faq_kb) {
+          qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
+          winston.debug('faq_kb cache enabled');
+        }
+
+        qbot.exec(function(err, bot) {
+
+
+    
         if (err) {
           winston.error('Error getting object.', err);
           return 0;

package/middleware/passport.js

@@ -18,7 +18,7 @@ var UserUtil = require('../utils/userUtil');
 var jwt = require('jsonwebtoken');
 const url = require('url');
 var cacheUtil = require('../utils/cacheUtil');
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 const MaskData = require("maskdata");
 
@@ -114,8 +114,18 @@ module.exports = function(passport) {
                         return done(null, null);
                       }
 
-                      winston.debug("bot id: "+ AudienceId );
-                      Faq_kb.findById(AudienceId).select('+secret').exec(function (err, faq_kb){
+                      winston.debug("bot id AudienceId: "+ AudienceId );
+                      let qbot = Faq_kb.findById(AudienceId).select('+secret');
+                      
+                      if (cacheEnabler.faq_kb) {
+                        let id_project = decoded.id_project;
+                        winston.debug("decoded.id_project:"+decoded.id_project);
+                        qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+AudienceId+":secret")
+                        winston.debug('faq_kb AudienceId cache enabled');
+                      }
+
+
+                      qbot.exec(function (err, faq_kb){ //TODO add cache_bot_here
                         if (err) {
                           winston.error("auth Faq_kb err: ", {error: err, decoded:decoded} );
                           return done(null, null);
@@ -247,7 +257,18 @@ module.exports = function(passport) {
 
     if (subject == "bot") {
       winston.debug("Passport JWT bot");
-      Faq_kb.findOne({_id: identifier}, function(err, faq_kb) {
+
+        let qbot = Faq_kb.findOne({_id: identifier}); //TODO add cache_bot_here
+
+          if (cacheEnabler.faq_kb) {
+            let id_project = jwt_payload.id_project;
+            winston.debug("jwt_payload.id_project:"+jwt_payload.id_project);
+            qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+identifier)
+            winston.debug('faq_kb cache enabled');
+          }
+  
+          qbot.exec(function(err, faq_kb) {
+
           if (err) {
             winston.error("Passport JWT bot err", err);
             return done(err, false);
@@ -326,9 +347,15 @@ module.exports = function(passport) {
 
     } else {
       winston.debug("Passport JWT generic user");
-      User.findOne({_id: identifier, status: 100})
+      let quser = User.findOne({_id: identifier, status: 100})   //TODO user_cache_here
         //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+identifier)
-        .exec(function(err, user) {
+
+        if (cacheEnabler.user) {
+          quser.cache(cacheUtil.defaultTTL, "users:id:"+identifier)
+          winston.debug('user cache enabled');
+        }
+
+        quser.exec(function(err, user) {
           if (err) {
             winston.error("Passport JWT generic err ", err);
             return done(err, false);
@@ -358,7 +385,7 @@ module.exports = function(passport) {
       var email = userid.toLowerCase();
       winston.debug("email lowercase: " + email);
 
-      User.findOne({ email: email, status: 100}, 'email firstname lastname password emailverified id')
+      User.findOne({ email: email, status: 100}, 'email firstname lastname password emailverified id') //TODO user_cache_here. NOT used frequently. ma attento select. ATTENTO QUI NN USEREI LA SELECT altrimenti con JWT ho tuttto USER mentre con basich auth solo aluni campi
       //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:email:"+email)
       .exec(function (err, user) {
        

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.73",
+  "version": "2.3.74",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -43,7 +43,7 @@
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.49",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.50",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.3",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

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

@@ -201,12 +201,13 @@
                 winston.verbose("Created cache for user.signup",{err:err});
             });
 
-            var key = "users:email:"+user.email;
-            winston.verbose("Creating cache for user.signup with key: " + key);
-            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
-                winston.debug("Created cache for user.signup",reply);
-                winston.verbose("Created cache for user.signup",{err:err});
-            });
+            // NOT IN USE (TESTED)
+            // var key = "users:email:"+user.email;
+            // winston.verbose("Creating cache for user.signup with key: " + key);
+            // client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
+            //     winston.debug("Created cache for user.signup",reply);
+            //     winston.verbose("Created cache for user.signup",{err:err});
+            // });
         });
     });
 
@@ -222,12 +223,13 @@
                 winston.verbose("Updated cache for user.update",{err:err});
             });
 
-            var key = "users:email:"+user.email;
-            winston.verbose("Updating cache for user.update with key: " + key);
-            client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
-                winston.debug("Updated cache for user.update",reply);
-                winston.verbose("Updated cache for user.update",{err:err});
-            });
+            // NOT IN USE (TESTED)
+            // var key = "users:email:"+user.email;
+            // winston.verbose("Updating cache for user.update with key: " + key);
+            // client.set(key, user, cacheUtil.defaultTTL, (err, reply) => {
+            //     winston.debug("Updated cache for user.update",reply);
+            //     winston.verbose("Updated cache for user.update",{err:err});
+            // });
         });
     });
    
@@ -242,12 +244,13 @@
                 winston.verbose("Deleted cache for user.delete",{err:err});
             });
 
-            var key = "users:email:"+user.email;
-            winston.verbose("Deleting cache for user.delete with key: " + key);
-            client.del(key, (err, reply) => {
-                winston.debug("Deleted cache for user.delete",reply);
-                winston.verbose("Deleted cache for user.delete",{err:err});
-            });
+            // NOT IN USE (TESTED)
+            // var key = "users:email:"+user.email;
+            // winston.verbose("Deleting cache for user.delete with key: " + key);
+            // client.del(key, (err, reply) => {
+            //     winston.debug("Deleted cache for user.delete",reply);
+            //     winston.verbose("Deleted cache for user.delete",{err:err});
+            // });
         });
     });
 
@@ -413,6 +416,14 @@
                 winston.verbose("Created cache for faq_kb.update",{err:err});
             }); 
             
+
+            key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id+":secret";
+            winston.verbose("Deleting cache for faq_kb.update secret with key: " + key);
+            client.del(key, function (err, reply) {  //tested
+                winston.debug("Deleted cache for faq_kb.update secret",reply);
+                winston.verbose("Deleted cache for faq_kb.update secret",{err:err});
+            });   
+            
             // TODO invalidate widgets here
             winston.verbose("Deleting widgets cache for faqbot.update");
             invalidateWidgets(client, faq_kb.id_project); //TESTED
@@ -420,7 +431,7 @@
     });
 
 
-    botEvent.on("faqbot.delete", function(faq_kb) { 
+    botEvent.on("faqbot.delete", function(faq_kb) {   //LOGIC deletion for chatbot is used
         setImmediate(() => {
             var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
             winston.verbose("Deleting cache for faqbot.delete with key: " + key);
@@ -429,6 +440,14 @@
                 winston.verbose("Deleted cache for faqbot.delete",{err:err});
             });
 
+
+            key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id+":secret";
+            winston.verbose("Deleting cache for faq_kb.delete secret with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for faq_kb.delete secret",reply);
+                winston.verbose("Deleted cache for faq_kb.delete secret",{err:err});
+            });   
+
             // TODO invalidate widgets here
             winston.verbose("Deleting widgets cache for faqbot.delete");
             invalidateWidgets(client, faq_kb.id_project); //tested

package/services/BotSubscriptionNotifier.js

@@ -11,6 +11,9 @@ var request = require('retry-request', {
 var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
 winston.debug("webhook_origin: "+webhook_origin);
 
+var cacheUtil = require('../utils/cacheUtil');
+var cacheEnabler = require("../services/cacheEnabler");
+
 class BotSubscriptionNotifier {
    
   
@@ -76,7 +79,17 @@ class BotSubscriptionNotifier {
     //modify to async
     botEvent.on('bot.message.received.notify.external', function(botNotification) {
       var bot = botNotification.bot;
-      Faq_kb.findById(bot._id).select('+secret').exec(function (err, botWithSecret){
+      winston.debug('getting botWithSecret');
+      let qbot = Faq_kb.findById(bot._id).select('+secret')
+
+      if (cacheEnabler.faq_kb) {
+        let id_project = bot.id_project;
+        winston.debug("id_project.id_project:"+id_project);
+        qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+bot._id+":secret")
+        winston.debug('faq_kb BotSubscriptionNotifier cache enabled');
+      }
+
+      qbot.exec(function (err, botWithSecret){   //TODO add cache_bot_here????
         if (err) {
           winston.debug('Error getting botWithSecret', err);
         }

package/services/faqBotHandler.js

@@ -86,7 +86,7 @@ class FaqBotHandler {
            winston.debug("message.text "+ message.text);
          
 
-           Faq_kb.findById(botId)
+           Faq_kb.findById(botId)  //TODO add cache_bot_NOT_here it's internal bot that is deprecated-> skip caching
            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
            .exec(function(err, faq_kb) {
             if (err) {

package/services/faqBotSupport.js

@@ -126,7 +126,7 @@ class FaqBotSupport {
                     return resolve(messageReply);
                 }
                     
-                var botWithSecret = await Faq_kb.findById(bot._id).select('+secret').exec();
+                var botWithSecret = await Faq_kb.findById(bot._id).select('+secret').exec();  //TODO add cache_bot_nOT_here?? it's internal bot that is deprecated-> skip caching
 
                 var signOptions = {
                     issuer:  'https://tiledesk.com',

package/utils/sendMessageUtil.js

@@ -22,14 +22,14 @@ async send(sender, senderFullname, recipient, text, id_project, createdBy, attri
             var id = sender.replace("bot_","");     // botprefix
             winston.debug("bot id: "+id);
             sender = id; //change sender removing bot_
-            var bot = await Faq_kb.findById(id)
+            var bot = await Faq_kb.findById(id)    //TODO add cache_bot_here non sembra scattare.. dove viene usato?
                     //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+id)
                     .exec();
             winston.debug("bot",bot);                 
             senderFullname = bot.name;           
         } else {
             winston.debug("user id: "+sender);
-            var user = await User.findById(sender)
+            var user = await User.findById(sender)                                //TODO user_cache_here
               //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+sender)     //user_cache
               .exec()   
             winston.debug("user", user);