@tiledesk/tiledesk-server 2.3.22 → 2.3.24

package/CHANGELOG.md

@@ -1,6 +1,25 @@
 
 
+💥 TILEDESK SERVER v2.3.23 💥
+🚀        TAGGED AND PUBLISHED ON NPM           🚀
+🚀        IN PRODUCTION                        🚀
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.17) 
+
+# 2.3.23 -> PROD
+- cacheEnabler + trigger cache + subscription cache
+- project cache with cacheEnabler
+- request cache with cacheEnabler
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.10
+- Added trigger and subscription cache invalidation rules
+
+# 2.3.22
+- added cacheoose dep package.json
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.8
+
 # 2.3.21
+- log fix
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.7
+- Moved cache module to public module
 - filter request by smartAssignment
 
 # 2.3.20
@@ -11,14 +30,13 @@
 - Moved route-queue to public module
 - Disable queue module if JOB_WORKER_ENABLED is true
 
+# 2.3.18.2
+- logfix
 
+# 2.3.18.1 
+- Updated dependency @tiledesk/tiledesk-tybot-connector to 0.1.10
 
-💥 TILEDESK SERVER v2.3.18 💥
-🚀        TAGGED AND PUBLISHED ON NPM           🚀
-🚀        IN PRODUCTION                        🚀
-(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.17) 
-
-# 2.3.18 -> PROD
+# 2.3.18
 - Added profileStatus field to the project_user model
 - Added smartAssignment field to the request model                      
 - Canned responses default limit value increased from 40 to 1000

package/app.js

@@ -33,6 +33,9 @@ var roleChecker = require('./middleware/has-role');
 const MaskData = require("maskdata");
 var winston = require('./config/winston');
 
+
+// DATABASE CONNECTION
+
 // https://bretkikehara.wordpress.com/2013/05/02/nodejs-creating-your-first-global-module/
 var databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI || config.database;
 
@@ -78,7 +81,7 @@ mongoose.set('useCreateIndex', true);
 mongoose.set('useUnifiedTopology', false); 
 
 
-
+// ROUTES DECLARATION
 var auth = require('./routes/auth');
 var authtest = require('./routes/authtest');
 var authtestWithRoleCheck = require('./routes/authtestWithRoleCheck');
@@ -124,18 +127,24 @@ var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
 var schemaMigrationService = require('./services/schemaMigrationService');
 var RouterLogger = require('./models/routerLogger');
+var cacheEnabler = require("./services/cacheEnabler");
 
 require('./services/mongoose-cache-fn')(mongoose);
 
+
 var subscriptionNotifier = require('./services/subscriptionNotifier');
 subscriptionNotifier.start();
 
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 botSubscriptionNotifier.start();
  
+// job_here
+
 
 var geoService = require('./services/geoService');
-geoService.listen();
+ geoService.listen();
+
+
 
 var faqBotHandler = require('./services/faqBotHandler');
 faqBotHandler.listen();
@@ -148,6 +157,7 @@ channelManager.listen();
 
 var IPFilter = require('./middleware/ipFilter');
 
+// job_here
 var BanUserNotifier = require('./services/banUserNotifier');
 BanUserNotifier.listen();
 
@@ -310,9 +320,13 @@ var projectSetter = function (req, res, next) {
   winston.debug("projectSetter projectid:" + projectid);
 
   if (projectid) {
-    Project.findOne({_id: projectid, status: 100})
-      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+projectid)
-      .exec(function(err, project){
+    
+    let q =  Project.findOne({_id: projectid, status: 100});
+    if (cacheEnabler.project) {
+      q.cache(cacheUtil.defaultTTL, "projects:id:"+projectid)  //project_cache
+      winston.debug('project cache enabled');
+    }
+    q.exec(function(err, project){
       if (err) {
         winston.warn("Problem getting project with id: " + projectid + " req.originalUrl:  " + req.originalUrl);
       }

package/channels/chat21/chat21WebHook.js

@@ -9,6 +9,8 @@ var Project_user = require("../../models/project_user");
 var RequestConstants = require("../../models/requestConstants");
 
 var cacheUtil = require('../../utils/cacheUtil');
+var cacheEnabler = require("../../services/cacheEnabler");
+
 
 var mongoose = require('mongoose');
 var winston = require('../../config/winston');
@@ -73,11 +75,17 @@ router.post('/', function (req, res) {
     winston.debug("Chat21 message", message);
 
         // requestcachefarequi nocachepopulatereqired        
-        return Request.findOne({request_id: message.recipient}) 
+        let q = Request.findOne({request_id: message.recipient}) 
+
+        if (cacheEnabler.request) {
+          q.cache(cacheUtil.defaultTTL, "requests:request_id:"+message.recipient+":simple"); //request_cache
+                                                                                            // project_id not available
+          winston.debug('request cache enabled');
+        }
+        return q.exec(function(err, request) {
+
         // before request_id id_project unique - commented
-        // return Request.findOne({request_id: message.recipient, id_project: projectid})      
-          // .cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+requestid) project_id not available
-          .exec(function(err, request) {
+               
 
           if (err) {
             return res.status(500).send({success: false, msg: 'Error getting the request.', err:err});
@@ -296,12 +304,10 @@ router.post('/', function (req, res) {
                       // TODO it doesn't work for internal requests bacause participanets == message.sender⁄
                       if (request.participants && request.participants.indexOf(message.sender) > -1) { //update waiitng time if write an  agent (member of participants)
                         winston.debug("updateWaitingTimeByRequestId");
-                        
                         return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project).then(function(upRequest) {
                           return res.json(upRequest);
                         });
                       }else {
-                       
                         return res.json(savedMessage);
                       }
                     // });
@@ -380,9 +386,12 @@ router.post('/', function (req, res) {
               var query = {request_id: recipient_id, id_project: projectId};
               winston.debug('query:'+ projectId);
               
-              return Request.findOne(query)
-              //@DISABLED_CACHE cacheUtil.defaultTTL, projectId+":requests:request_id:"+recipient_id)
-              .exec(function(err, request) {
+              let q = Request.findOne(query);
+              // if (cacheEnabler.request) {
+              //   q.cache(cacheUtil.defaultTTL, projectId+":requests:request_id:"+recipient_id+":simple"); //request_cache NOT IMPORTANT HERE
+              //   winston.debug('project cache enabled');
+              // }
+              return q.exec(function(err, request) {
 
                 if (err) {
                   winston.error("Error finding request with query ", query);
@@ -464,7 +473,7 @@ router.post('/', function (req, res) {
       
       // requestcachefarequi populaterequired
       return Request.findOne({request_id: request_id, id_project: id_project})
-          .populate('lead') //TODO posso prenderlo da snapshot senza populate
+          .populate('lead') //TODO posso prenderlo da snapshot senza populate cache_attention
           .exec(function(err, request) {
         if (err){
           winston.error(err);
@@ -631,7 +640,7 @@ else if (req.body.event_type == "typing-start") {
   // requestcachefarequi nocachepopulatereqired
   return Request.findOne({request_id: recipient_id})
                              //TOD  errore cache sistemare e riabbilitare->
-  // .cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+recipient_id)
+  // .cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+recipient_id)   cache_attention
   .exec(function(err, request) {
   if (err){
     winston.error(err);

package/event/messageEvent.js

@@ -7,7 +7,7 @@ var MessageConstants = require("../models/messageConstants");
 var message2Event = require("../event/message2Event");
 
 var cacheUtil = require('../utils/cacheUtil');
-// var requestService = require("../services/requestService");
+var cacheEnabler = require("../services/cacheEnabler");
 
 
 class MessageEvent extends EventEmitter { 
@@ -34,14 +34,18 @@ function emitCompleteMessage(message) {
 }
 
 messageEvent.on('message.create', emitCompleteMessage);
-messageEvent.on('message.update', emitCompleteMessage);
+
+// messageEvent.on('message.update.simple', emitCompleteMessage);     //if populateMessageUpdate is disabled then you must forward message.update event from message.update.simple
+messageEvent.on('message.update', emitCompleteMessage);         // i must restore populateMessageWithRequest. see below
 
 function populateMessageCreate(message) {
   return populateMessageWithRequest(message, 'message.create');
 }
 function populateMessageUpdate(message) {
-  // return populateMessageWithRequest(message, 'message.update');
-  return; // do not populate message.update it's not used by anyone. Not used by webhook. populate for message.update is slow.
+  return populateMessageWithRequest(message, 'message.update');
+  // return; // do not populate message.update it's not used by anyone. 
+        ///it is used by \agent interceptor. Without populateMessageWithRequest \agent sent by bot doesn't work. i must restore populateMessageWithRequest
+          //  Not used by webhook. populate for message.update is slow.
 }
 
 
@@ -56,26 +60,35 @@ function populateMessageWithRequest(message, eventPrefix) {
   
     // cacherequest      // requestcachefarequi populaterequired cacheveryhightpriority
     
-  Request.findOne({request_id:  message.recipient, id_project: message.id_project}).
+  let q = Request.findOne({request_id:  message.recipient, id_project: message.id_project}).
   populate('lead').
   populate('department').  
   populate('participatingBots').
   populate('participatingAgents').       
   populate({path:'requester',populate:{path:'id_user'}}).
-  lean()
+  lean();
+
+  
   //perche lean?
   // TODO availableAgentsCount nn c'è per il lean problema trigger
   // request.department._id DA CORREGGERE ANCHE PER REQUEST.CREATE
   // request.department.hasBot 
   // request.isOpen
-  //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient)
-  .exec(function (err, request) {
+  winston.info('message Event populate');
+  if (cacheEnabler.request) {
+    q.cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient) //request_cache ma con lean????attento metti a parte
+    winston.debug('request cache enabled');
+  }
+  q.exec(function (err, request) {
 
     if (err) {
       winston.error("Error getting request on messageEvent.populateMessage",err );
       return messageEvent.emit(eventPrefix, message);
     }
 
+    winston.debug('message Event populate after query');
+
+
   if (request) {
       winston.debug("request is defined in messageEvent",request );
       
@@ -84,9 +97,14 @@ function populateMessageWithRequest(message, eventPrefix) {
     
       if (request.department && request.department.id_bot) {
         // if (request.department) {
-        Faq_kb.findById(request.department.id_bot)
-        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+request.department.id_bot)
-        .exec(function(err, bot) {
+        let qbot = Faq_kb.findById(request.department.id_bot)
+
+        if (cacheEnabler.faq_kb) {
+          qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+request.department.id_bot)
+          winston.debug('faq_kb cache enabled');
+        }
+
+        qbot.exec(function(err, bot) {
           winston.debug('bot', bot);
           requestJson.department.bot = bot
           
@@ -162,7 +180,10 @@ messageEvent.on('message.update.simple', populateMessageUpdate);
 
 
 
-// riattiva commentato per performance
+// // riattiva commentato per performance
+
+// // spostare su classe
+
 
 
 // var messageCreateKey = 'message.create';

package/middleware/passport.js

@@ -138,7 +138,7 @@ module.exports = function(passport) {
 
                       winston.debug("project id: "+ AudienceId );
                       Project.findOne({_id: AudienceId, status: 100}).select('+jwtSecret')
-                      //@DISABLED_CACHE .cache(cacheUtil.queryTTL, "projects:query:id:status:100:"+AudienceId+":select:+jwtSecret")
+                      //@DISABLED_CACHE .cache(cacheUtil.queryTTL, "projects:query:id:status:100:"+AudienceId+":select:+jwtSecret") //project_cache
                       .exec(function (err, project){
                         if (err) {
                           winston.error("auth Project err: ", {error:err, decoded: decoded} );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.22",
+  "version": "2.3.24",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -41,7 +41,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.8",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.14",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",

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

@@ -6,7 +6,8 @@
  var authEvent = require("../../event/authEvent");   
  var labelEvent = require("../../event/labelEvent");
 
-//  var subscriptionEvent = require("");   
+ var triggerEventEmitter = require("../trigger/event/triggerEventEmitter");
+ var subscriptionEvent = require("../../event/subscriptionEvent");   
 
  var winston = require('../../config/winston');
 
@@ -202,6 +203,35 @@
 
 
 
+    requestEvent.on("request.create.simple", function(request) {
+        setImmediate(() => {
+            var key = request.id_project+":requests:id:"+request.id+":simple";
+            winston.verbose("Creating cache for request.create.simple with key: " + key);
+
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.create.simple",reply);
+                winston.verbose("Created cache for request.create.simple",{err:err});
+            });
+
+
+            var key = "requests:id:"+request.request_id+":simple";  //without project for chat21 webhook
+            winston.verbose("Creating cache for request.create.simple with key: " + key);
+
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.create.simple",reply);
+                winston.verbose("Created cache for request.create.simple",{err:err});
+            });
+
+            var key = request.id_project+":requests:request_id:"+request.request_id+":simple";
+            winston.verbose("Creating cache for request.create.simple with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.create.simple",reply);
+                winston.verbose("Created cache for request.create.simple",{err:err});
+            });
+
+        })
+    });
+
     requestEvent.on("request.create", function(request) {
         setImmediate(() => {
             var key = request.id_project+":requests:id:"+request.id;
@@ -448,8 +478,82 @@
 
     // fai cache per subscription.create, .update .delete
 
-    // fai cache per trigger.create, .update .delete
 
+    if (subscriptionEvent) {
+        subscriptionEvent.on('subscription.create', function(trigger) {   
+            setImmediate(() => {    
+                
+                var key =trigger.id_project+":subscriptions:*";        
+                winston.verbose("Deleting cache for subscription.create with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for subscription.create",reply);
+                    winston.verbose("Deleted cache for subscription.create",{err:err});
+                });   
+            });
+        });
+    
+        subscriptionEvent.on('subscription.update', function(trigger) {   
+            setImmediate(() => {         
+                var key =trigger.id_project+":subscriptions:*";        
+                winston.verbose("Deleting cache for subscription.update with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for subscription.update",reply);
+                    winston.verbose("Deleted cache for subscription.update",{err:err});
+                });   
+            });
+        });
+    
+        subscriptionEvent.on("subscription.delete", function(trigger) {     
+            setImmediate(() => {         
+                var key =trigger.id_project+":subscriptions:*";         
+                winston.verbose("Deleting cache for subscription.delete with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for subscription.delete",reply);
+                    winston.verbose("Deleted cache for subscription.delete",{err:err});
+                });   
+            });
+        });
+    
+    }
+
+
+    if (triggerEventEmitter) {
+        triggerEventEmitter.on('trigger.create', function(trigger) {   
+            setImmediate(() => {    
+                
+                var key =trigger.id_project+":triggers:*";        
+                winston.verbose("Deleting cache for trigger.create with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for trigger.create",reply);
+                    winston.verbose("Deleted cache for trigger.create",{err:err});
+                });   
+            });
+        });
+    
+        triggerEventEmitter.on('trigger.update', function(trigger) {   
+            setImmediate(() => {         
+                var key =trigger.id_project+":triggers:*";        
+                winston.verbose("Deleting cache for trigger.update with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for trigger.update",reply);
+                    winston.verbose("Deleted cache for trigger.update",{err:err});
+                });   
+            });
+        });
+    
+        triggerEventEmitter.on("trigger.delete", function(trigger) {     
+            setImmediate(() => {         
+                var key =trigger.id_project+":triggers:*";         
+                winston.verbose("Deleting cache for trigger.delete with key: " + key);
+                client.del(key, function (err, reply) {
+                    winston.debug("Deleted cache for trigger.delete",reply);
+                    winston.verbose("Deleted cache for trigger.delete",{err:err});
+                });   
+            });
+        });
+    
+    }
+    
     //jwt
 
     // fai cache faq

package/pubmodules/messageTransformer/messageHandlebarsTransformerInterceptor.js

@@ -4,6 +4,7 @@ const Request = require('../../models/request');
 var winston = require('../../config/winston');
 var cacheUtil = require('../../utils/cacheUtil');
 var handlebars = require('handlebars');
+var cacheEnabler = require("../../services/cacheEnabler");
 
 class MessageHandlebarsTransformerInterceptor {
 
@@ -38,8 +39,12 @@ class MessageHandlebarsTransformerInterceptor {
                     populate({path:'requester',populate:{path:'id_user'}});
                 // }
 
+                if (cacheEnabler.request) {
+                    q1.cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient) //request_cache
+                    winston.debug('request cache enabled');
+                }
+
                 var request = await q1
-                    //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient)
                     .exec();
 
 

package/pubmodules/messageTransformer/messageTransformerInterceptor.js

@@ -5,6 +5,7 @@ const Request = require('../../models/request');
 var winston = require('../../config/winston');
 var i8nUtil = require("../../utils/i8nUtil");
 var cacheUtil = require('../../utils/cacheUtil');
+var cacheEnabler = require("../../services/cacheEnabler");
 
 //TODO rename to LabelMessageTransformerInterceptor
 class MessageTransformerInterceptor {
@@ -36,15 +37,20 @@ class MessageTransformerInterceptor {
 
                 var language = "EN";
 
-                // cacherequest       // requestcachefarequi nocachepopulatereqired
-                var request = await Request.findOne({request_id:  message.recipient, id_project: message.id_project})
+                let q = Request.findOne({request_id:  message.recipient, id_project: message.id_project});
                     // populate('lead').
                     // populate('department').  
                     // populate('participatingBots').
                     // populate('participatingAgents').       
                     // populate({path:'requester',populate:{path:'id_user'}}).
-                    //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient)
-                    .exec();
+                    
+                if (cacheEnabler.request) {
+                    q.cache(cacheUtil.defaultTTL, message.id_project+":requests:request_id:"+message.recipient+":simple") //request_cache nocachepopulatereqired
+                    winston.debug('request cache enabled');
+                }
+
+
+                var request = await q.exec();
               
                 winston.debug('request mti: ', request);
 

package/pubmodules/routing-queue/listener.js

@@ -157,7 +157,7 @@ class Listener {
             // departmentEvent.prependListener('operator.select', async (data) => {
             
               var operatorsResult = res.result;
-              winston.info('operator.select.base2 res', res);   
+              winston.debug('operator.select.base2 res', res);   
           
           
               var disableWebHookCall = res.disableWebHookCall;

package/pubmodules/trigger/rulesTrigger.js

@@ -19,6 +19,7 @@ var LeadConstants = require('../../models/leadConstants');
 var operatingHoursService = require("../../services/operatingHoursService");
 var sendMessageUtil = require("../../utils/sendMessageUtil");
 var cacheUtil = require("../../utils/cacheUtil");
+var cacheEnabler = require("../../services/cacheEnabler");
 
 
 
@@ -54,6 +55,8 @@ class RulesTrigger {
      setImmediate(() => {
 
           requestEvent.on('request.support_group.created', function(request) {
+
+
             // requestEvent.on('request.create', function(request) {
             var requestJson = request.toJSON();
             operatingHoursService.projectIsOpenNow(request.id_project, function (isOpen, err) {       
@@ -865,11 +868,12 @@ class RulesTrigger {
                     return requestService.create(new_request).then(function (savedRequest) {                   
 
 
+
                         if (attributes) {
                           attributes.sendnotification = false; //  sembra nn funzionae
                         }
                         
-                        var senderFullname = fullname || 'Guest';
+                        var senderFullname = fullname || 'Guest'; // guest_here
 
                         // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language) {
                         return messageService.create( id_user, senderFullname , savedRequest.request_id, text,
@@ -925,9 +929,17 @@ class RulesTrigger {
 
             winston.debug('trigger query', query);
 
-            Trigger.find(query)
-              .cache(cacheUtil.longTTL, event.id_project+":triggers:trigger.key:"+eventKey)
-              .exec(function(err, triggers) {
+            let q = Trigger.find(query);
+
+            if (cacheEnabler.trigger) {
+              q.cache(cacheUtil.longTTL, event.id_project+":triggers:trigger.key:"+eventKey) //CACHE_TRIGGER
+              winston.debug('trigger cache enabled');
+
+            }
+
+            q.exec(function(err, triggers) {
+              
+              
                 if (err) {
                     winston.error('Error gettting bots ', err);
                     return 0;

package/routes/message.js

@@ -13,7 +13,9 @@ var leadService = require('../services/leadService');
 var winston = require('../config/winston');
 
 var MessageConstants = require("../models/messageConstants");
+
 var cacheUtil = require('../utils/cacheUtil');
+var cacheEnabler = require("../services/cacheEnabler");
 
 const { check, validationResult } = require('express-validator');
 
@@ -51,7 +53,7 @@ async (req, res)  => {
     return res.status(422).json({ errors: errors.array() });
   }
   
- 
+
   var project_user = req.projectuser;
   var sender = req.body.sender;
   var fullname = req.body.senderFullname || req.user.fullName;
@@ -60,15 +62,19 @@ async (req, res)  => {
   let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
   winston.debug('messageStatus: ' + messageStatus);
 
+      let q = Request.findOne({request_id: req.params.request_id, id_project: req.projectid}); 
+      if (cacheEnabler.request) {
+        q.cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+req.params.request_id+":simple") //request_cache
+        winston.debug('request cache enabled');
+      }
       // cacherequest       // requestcachefarequi nocachepopulatereqired
-      return Request.findOne({request_id: req.params.request_id, id_project: req.projectid})
+      return q.exec(async(err, request) => {
         // .populate('lead')
         // .populate('department')
         // .populate('participatingBots')
         // .populate('participatingAgents')  
         // .populate({path:'requester',populate:{path:'id_user'}})
-       //@DISABLED_CACHE  .cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+req.params.request_id)
-        .exec(async(err, request) => {
+        
 
         if (err) {
           winston.log({
@@ -268,7 +274,7 @@ async (req, res)  => {
                 }).catch(function(err){
                   winston.log({
                     level: 'error',
-                    message: 'Error creating message: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
+                    message: 'Error creating message endpoint: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
                     label: req.projectid
                   });
                   // winston.error("Error creating message", err);
@@ -290,6 +296,8 @@ async (req, res)  => {
 
 
 
+
+
 // router.put('/:messageid', function(req, res) {
   
 //     console.log(req.body);

package/routes/project.js

@@ -18,7 +18,7 @@ var validtoken = require('../middleware/valid-token')
 var RoleConstants = require("../models/roleConstants");
 var cacheUtil = require('../utils/cacheUtil');
 var orgUtil = require("../utils/orgUtil");
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 router.post('/', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], async (req, res) => {
   
@@ -430,6 +430,9 @@ router.delete('/:projectid/ban/:banid', [passport.authenticate(['basic', 'jwt'],
   
   // winston.info('quiiiiii');
   //cacheinvalidation
+
+  
+  // devi prendere id utente prima di eliminarlo
 Project.findByIdAndUpdate(req.params.projectid, { $pull: { bannedUsers: { "_id": req.params.banid }}}, { new: true, upsert: false }, function (err, updatedProject) {
   if (err) {
     winston.error('Error putting project ', err);
@@ -447,9 +450,12 @@ Project.findByIdAndUpdate(req.params.projectid, { $pull: { bannedUsers: { "_id":
 //roleChecker.hasRole('agent') works because req.params.projectid is valid using :projectid of this method
 router.get('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], function (req, res) {
   winston.debug(req.body);
-  Project.findOne({_id: req.params.projectid, status:100})
-  //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+req.params.projectid)
-  .exec(function (err, project) {
+  let q = Project.findOne({_id: req.params.projectid, status:100});
+  if (cacheEnabler.project) {
+    q.cache(cacheUtil.defaultTTL, "projects:id:"+req.params.projectid)  //project_cache
+    winston.debug('project cache enabled');
+  }
+  q.exec(function (err, project) {
     if (err) {
       winston.error('Error getting project ', err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });

package/routes/request.js

@@ -16,7 +16,7 @@ var MessageConstants = require("../models/messageConstants");
 var Message = require("../models/message");
 var cacheUtil = require('../utils/cacheUtil');
 var RequestConstants = require("../models/requestConstants");
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 csv = require('csv-express');
 csv.separator = ';';
@@ -1257,17 +1257,22 @@ router.get('/:requestid', function (req, res) {
   var requestid = req.params.requestid;
   winston.debug("get request by id: "+requestid);
 
-  // cacherequest       // requestcachefarequi populaterequired
-  Request.findOne({request_id: requestid, id_project: req.projectid})
+  
+  let q = Request.findOne({request_id: requestid, id_project: req.projectid})
   // .select("+snapshot.agents")
   .populate('lead')
   .populate('department')
   .populate('participatingBots')
   .populate('participatingAgents')  
-  .populate({path:'requester',populate:{path:'id_user'}})
-  // .cache(cacheUtil.defaultTTL, "/"+req.projectid+"/requests/request_id/"+requestid)
+  .populate({path:'requester',populate:{path:'id_user'}});
+
+  // if (cacheEnabler.request) {  cache disabled beacuse cacheoose don't support .populate without lean. here cache is not important
+  //   q.cache(cacheUtil.defaultTTL, req.projectid+":requests:request_id:"+requestid) //request_cache
+  //   winston.debug('request cache enabled');
+  // }
+  // 
   //  .populate({path:'requester',populate:{path:'id_user', select:{'firstname':1, 'lastname':1}}})
-  .exec(function(err, request) {  
+  q.exec(function(err, request) {  
     if (err) {
       winston.error("error getting request by id ", err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });

package/services/cacheEnabler.js

@@ -0,0 +1,51 @@
+
+class CacheEnabler {
+    constructor() {
+        this.trigger = true;
+        if (process.env.CACHE_TRIGGER_ENABLED=="false" || process.env.CACHE_TRIGGER_ENABLED==false) {
+            this.trigger = false;
+        }
+
+        this.subscription = true;
+        if (process.env.CACHE_SUBSCRIPTION_ENABLED=="false" || process.env.CACHE_SUBSCRIPTION_ENABLED==false) {
+            this.subscription = false;
+        }
+
+        this.project = true;
+        if (process.env.CACHE_PROJECT_ENABLED=="false" || process.env.CACHE_PROJECT_ENABLED==false) {
+            this.project = false;
+        }
+
+        this.request = true;
+        if (process.env.CACHE_REQUEST_ENABLED=="false" || process.env.CACHE_REQUEST_ENABLED==false) {
+            this.request = false;
+        }
+
+        this.faq_kb = true;
+        if (process.env.CACHE_FAQ_KB_ENABLED=="false" || process.env.CACHE_FAQ_KB_ENABLED==false) {
+            this.faq_kb = false;
+        }
+
+        
+        // this.project_user = true;
+        // if (process.env.CACHE_PROJECT_USER_ENABLED=="false" || process.env.CACHE_PROJECT_USER_ENABLED==false) {
+        //     this.project_user = false;
+        // }
+
+        // this.user = true;
+        // if (process.env.CACHE_USER_ENABLED=="false" || process.env.CACHE_USER_ENABLED==false) {
+        //     this.user = false;
+        // }
+
+        // this.message = true;
+        // if (process.env.CACHE_MESSAGE_ENABLED=="false" || process.env.CACHE_MESSAGE_ENABLED==false) {
+        //     this.message = false;
+        // }
+    }
+}
+
+
+var cacheEnabler = new CacheEnabler();
+
+
+module.exports = cacheEnabler;

package/services/departmentService.js

@@ -8,6 +8,8 @@ var winston = require('../config/winston');
 const departmentEvent = require('../event/departmentEvent');
 const Request = require('../models/request');
 const RoleConstants = require ('../models/roleConstants')
+var cacheEnabler = require("../services/cacheEnabler");
+var cacheUtil = require("../utils/cacheUtil");
 
 class DepartmentService {
 
@@ -86,7 +88,7 @@ roundRobin(operatorSelectedEvent) {
 
       // let lastRequests = await 
       // requestcachefarequi nocachepopulatereqired
-      Request.find(query).sort({_id:-1}).limit(1).exec(function (err, lastRequests) {
+      Request.find(query).sort({_id:-1}).limit(1).exec(function (err, lastRequests) {  // cache_attention
           if (err) {
               winston.error('Error getting request for RoundRobinOperator', err); 
               return reject(err);
@@ -190,7 +192,12 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
        // console.log("»»» »»» --> DEPT ID ", departmentid);
 
 
-    return Project.findOne({_id: projectid, status: 100}, function(err, project) {
+    let q = Project.findOne({_id: projectid, status: 100})
+    if (cacheEnabler.project) {
+      q.cache(cacheUtil.defaultTTL, "projects:id:"+projectid)  //project_cache
+      winston.debug('project cache enabled');
+    }
+    return q.exec(function(err, project){
       if (err) {
         winston.error('Project findById ', err);
         return reject(err);
@@ -205,6 +212,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
       // TODO questo lo abiliterei solo esplicitamete se si flagga opzione su progetto per performance
       if (disableWebHookCall==undefined) {
               //if pro enabled disableWebHookCall = false
+                              //secondo me qui manca un parentesi tonda per gli or
         if (project.profile && (project.profile.type === 'free' && project.trialExpired === false) || (project.profile.type === 'payment' && project.isActiveSubscription === true)) {
           // winston.info('disableWebHookCall pro');
           disableWebHookCall = false;
@@ -389,6 +397,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
               let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, group: group, id_project: projectid, project: project,  context: context };
 
+              // var objectToReturnRoundRobin = objectToReturn;
               that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin){
 
                 winston.debug("context2",context);
@@ -450,6 +459,8 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
           let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, id_project: projectid, project: project, context: context };
 
+          // var objectToReturnRoundRobin = objectToReturn;
+
           that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin) {
             winston.debug("context2",context);
             departmentEvent.emit('operator.select.base1', {result:objectToReturnRoundRobin,  disableWebHookCall: disableWebHookCall, resolve: resolve, reject: reject, context: context});
@@ -543,8 +554,19 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
   // console.log('-- > OPERATORS [ getRandomAvailableOperator ] - PROJECT USER AVAILABLE LENGHT ', project_users_available.length);
   if (project_users_available.length > 0) {
+
+
+    // new
+                                  // num between 0 and 1 * es 3 -> 
+    // let randomIndex =  Math.round(Math.random() * project_users_available.length);
+    // // let randomIndex =  Math.floor(Math.random() * project_users_available.length);
+    
+    // console.log("randomIndex",randomIndex);
+    // var operator = project_users_available[randomIndex];
+    // // console.log('OPERATORS - SELECTED MEMBER ID', operator.id_user);
+
     var operator = project_users_available[Math.floor(Math.random() * project_users_available.length)];
-    // console.log('OPERATORS - SELECTED MEMBER ID', operator.id_user);
+
 
     return [{ id_user: operator.id_user }];
     // return [operator];

package/services/operatingHoursService.js

@@ -4,16 +4,19 @@ var Project = require("../models/project");
 var moment_tz = require('moment-timezone');
 var winston = require('../config/winston');
 var cacheUtil = require('../utils/cacheUtil');
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 class OperatingHoursService {
 
   projectIsOpenNow(projectId, callback) {
 
     // winston.debug('O ---> [ OHS ] -> PROJECT ID ', projectId)
-    Project.findOne({_id: projectId, status: 100})
-    //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+projectId)
-    .exec(function (err, project) {
+    let q = Project.findOne({_id: projectId, status: 100});
+    if (cacheEnabler.project) {
+      q.cache(cacheUtil.defaultTTL, "projects:id:"+projectId)  //project_cache
+      winston.debug('project cache enabled');
+    }
+    q.exec(function (err, project) {
       // winston.debug("XXXXXXXX project", project);
       if (err) {
         winston.error("O ---> [ OHS ] -> ERROR GETTING PROJECT ", err);
@@ -36,6 +39,8 @@ class OperatingHoursService {
 
         // IF THE TRIAL IS EXPIRED OR IF THE SUBSCIPTION IS NOT ACTIVE THE PROJECT IS ALWAYS OPEN EVEN IF activeOperatingHours IS SETTED TO true AND, FOR EXAMPLE,
         // THE USER HAS SETTED ALL DAYS TO CLOSED
+
+                              //secondo me qui manca un parentesi tonda per gli or
         if (project.profile && (project.profile.type === 'free' && project.trialExpired === true) || (project.profile.type === 'payment' && project.isActiveSubscription === false)) {
           winston.debug('O ---> [ OHS ] -> trial Expired OR Subscription NOT Active - PROJECT ALWAYS OPEN') 
           callback(true, null) ;

package/services/requestService.js

@@ -12,6 +12,7 @@ var RequestConstants = require("../models/requestConstants");
 var requestUtil = require("../utils/requestUtil");
 var cacheUtil = require("../utils/cacheUtil");
 var arrayUtil = require("../utils/arrayUtil");
+var cacheEnabler = require("../services/cacheEnabler");
 
 class RequestService {
 
@@ -226,10 +227,14 @@ class RequestService {
      winston.debug("id_project:" + id_project);
      winston.debug("nobot:"+ nobot);
 
-        return Request       
-        .findOne({request_id: request_id, id_project: id_project})     
-        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)     
-        .exec( function(err, request) {
+        let q= Request       
+        .findOne({request_id: request_id, id_project: id_project});
+
+        if (cacheEnabler.request) {
+          q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
+          winston.debug('request cache enabled');
+        }
+        return q.exec( function(err, request) {
 
           if (err) {
             winston.error(err);
@@ -378,10 +383,15 @@ class RequestService {
       // winston.debug("request_id", request_id);
       // winston.debug("newstatus", newstatus);
  
-         return Request       
-         .findOne({request_id: request_id, id_project: id_project})
-         //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)
-         .exec( function(err, request) {
+         let q = Request       
+         .findOne({request_id: request_id, id_project: id_project});
+
+         if (cacheEnabler.request) {
+          q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id+":simple")      //request_cache
+          winston.debug('request cache enabled');
+        }
+
+         return q.exec( function(err, request) {
  
            if (err) {
              winston.error(err);
@@ -502,6 +512,8 @@ class RequestService {
            try {
             //  getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
               var result = await departmentService.getOperators(departmentid, id_project, false, undefined, context);
+              console.log("************* after get operator: "+new Date().toISOString());
+
               winston.debug("getOperators", result);
            } catch(err) {
             return reject(err);
@@ -933,25 +945,27 @@ class RequestService {
 
   }
 
-  // unused
-  incrementMessagesCountByRequestId(request_id, id_project) {
 
-    return new Promise(function (resolve, reject) {
-     // winston.debug("request_id", request_id);
-     // winston.debug("newstatus", newstatus);
 
-        return Request       
-        .findOneAndUpdate({request_id: request_id, id_project: id_project}, {$inc : {'messages_count' : 1}}, {new: true, upsert:false}, function(err, updatedRequest) {
-            if (err) {
-              winston.error(err);
-              return reject(err);
-            }
-            winston.debug("Message count +1");
-            return resolve(updatedRequest);
-          });
-    });
+    // unused
+    incrementMessagesCountByRequestId(request_id, id_project) {
 
-  }
+      return new Promise(function (resolve, reject) {
+       // winston.debug("request_id", request_id);
+       // winston.debug("newstatus", newstatus);
+  
+          return Request       
+          .findOneAndUpdate({request_id: request_id, id_project: id_project}, {$inc : {'messages.messages_count' : 1}}, {new: true, upsert:false}, function(err, updatedRequest) {
+              if (err) {
+                winston.error(err);
+                return reject(err);
+              }
+              winston.debug("Message count +1");
+              return resolve(updatedRequest);
+            });
+      });
+  
+    }
 
   updateWaitingTimeByRequestId(request_id, id_project) {
 
@@ -959,15 +973,19 @@ class RequestService {
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 
-      return Request       
+      let q = Request       
       .findOne({request_id: request_id, id_project: id_project})
       .populate('lead')
       .populate('department')
       .populate('participatingBots')
       .populate('participatingAgents')  
-      .populate({path:'requester',populate:{path:'id_user'}})
-      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)     
-      .exec(function(err, request) {
+      .populate({path:'requester',populate:{path:'id_user'}});
+
+      // if (cacheEnabler.request) {  //attention this cache is not usable bacause cacheoose don't support populate without .lean.. so if cached populated field is not returned with cacheoose, updateWaitingTime is only used in chat21webhook but i thik it is important for messages route
+      //   q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)           //request_cache
+      //   winston.debug('request cache enabled');
+      // }
+      q.exec(function(err, request) {
         if (err) {
           winston.error(err);
           return reject(err);

package/services/subscriptionNotifier.js

@@ -21,6 +21,7 @@ var jwt = require('jsonwebtoken');
 var config = require('../config/database'); // get db config file
 var cacheUtil = require("../utils/cacheUtil");
 
+var cacheEnabler = require("../services/cacheEnabler");
 
 var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
 winston.debug("webhook_origin: "+webhook_origin);
@@ -36,9 +37,13 @@ class SubscriptionNotifier {
    
   findSubscriber(event, id_project) {
     return new Promise(function (resolve, reject) {
-      Subscription.find({event:event, $or:[{id_project: id_project}, {global: true}]})
-      .cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event)
-      .select("+secret +global")
+      let q = Subscription.find({event:event, $or:[{id_project: id_project}, {global: true}]});
+      if (cacheEnabler.subscription) {
+        q.cache(cacheUtil.longTTL, id_project+":subscriptions:event:"+event);  //CACHE_SUBSCRIPTION
+        winston.debug('subscription cache enabled');
+      }
+      
+      q.select("+secret +global")
       .exec(function (err, subscriptions) {
         // if (subscriptions && subscriptions.length>0) {
         //   winston.debug("Subscription.notify", event, item , "length", subscriptions.length);

package/websocket/webSocketServer.js

@@ -23,7 +23,7 @@ var mongoose = require('mongoose');
 const requestConstants = require("../models/requestConstants");
 var RoleConstants = require('../models/roleConstants');
 let configSecret = process.env.GLOBAL_SECRET || config.secret;
-
+var cacheEnabler = require("../services/cacheEnabler");
 
 
 var lastRequestsLimit = process.env.WS_HISTORY_REQUESTS_LIMIT || 100;
@@ -93,7 +93,7 @@ class WebSocketServer {
                           // winston.debug('ok websocket');
 
                           User.findOne({_id: identifier, status: 100}, 'email firstname lastname emailverified id')
-                            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+identifier)
+                            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+identifier)    //user_cache
                             .exec(function (err, user) {
                            
                     
@@ -185,9 +185,14 @@ class WebSocketServer {
             winston.debug('projectId: '+projectId);
 
 
-            return Project.findOne({ _id: projectId, status: 100})
-            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "projects:id:"+projectId)
-            .exec(function(err, project) {
+            let q = Project.findOne({ _id: projectId, status: 100})
+
+            if (cacheEnabler.project) {
+              q.cache(cacheUtil.defaultTTL, "projects:id:"+projectId) //project_cache
+              winston.debug('project cache enabled');
+            }
+            
+            return q.exec(function(err, project) {
               if (err) {
                 winston.error('WebSocket - Error getting  Project', err);  
                 return reject(err);