@tiledesk/tiledesk-server 2.3.6 → 2.3.7-1.2

package/pubmodules/dialogflow/index.js

@@ -0,0 +1,10 @@
+const listener = require("./listener");
+
+const dialogflow = require("@tiledesk/tiledesk-dialogflow-connector");
+const dialogflowRoute = dialogflow.router;
+
+
+
+
+
+module.exports = { listener: listener, dialogflowRoute: dialogflowRoute };

package/pubmodules/dialogflow/listener.js

@@ -0,0 +1,66 @@
+const botEvent = require('../../event/botEvent');
+var Faq_kb = require("../../models/faq_kb");
+var winston = require('../../config/winston');
+const df = require("@tiledesk/tiledesk-dialogflow-connector");
+var configGlobal = require('../../config/global');
+
+var port = process.env.PORT || '3000';
+
+const BOT_DIALOGFLOW_ENDPOINT = process.env.BOT_DIALOGFLOW_ENDPOINT || "http://localhost:" + port+ "/modules/dialogflow/tdbot/";
+winston.debug("BOT_DIALOGFLOW_ENDPOINT: " + BOT_DIALOGFLOW_ENDPOINT);
+
+// if (BOT_DIALOGFLOW_ENDPOINT) {
+  winston.info("Dialogflow endpoint: " + BOT_DIALOGFLOW_ENDPOINT);
+// } else {
+//    winston.info("Dialogflow endpoint not configured");
+// }
+
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Dialogflow apiUrl: '+ apiUrl);
+
+class Listener {
+
+    listen(config) {
+
+        winston.debug('dialogflow Listener listen');   
+
+        var that = this;
+
+
+        df.startApp(
+            {
+              MONGODB_URI: config.databaseUri,   
+              API_ENDPOINT: apiUrl,
+              log: process.env.DIALOGFLOW_LOG
+            }, () => {
+              winston.info("Dialogflow route successfully started.");                           
+            }
+          ); 
+
+        botEvent.on('faqbot.create', function(bot) {
+            if (BOT_DIALOGFLOW_ENDPOINT) {
+
+                if (bot.type==="dialogflow") {
+                    // bot.url = BOT_DIALOGFLOW_ENDPOINT;
+
+                    Faq_kb.findByIdAndUpdate(bot.id, {"url":BOT_DIALOGFLOW_ENDPOINT}, { new: true, upsert: true }, function (err, savedFaq_kb) {
+
+                    // bot.save(function (err, savedFaq_kb) {
+                        if (err) {
+                         return winston.error('error saving faqkb dialogflow ', err)
+                        }
+                        winston.verbose('Saved faqkb dialogflow', savedFaq_kb.toObject())      
+                    });
+                }
+            }
+        });
+        
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;

package/pubmodules/emailNotification/requestNotification.js

@@ -31,11 +31,25 @@ winston.debug('********* RequestNotification apiUrl: ' + apiUrl);
 
 class RequestNotification {
 
+  constructor() {
+    this.enabled = true;
+    if (process.env.EMAIL_NOTIFICATION_ENABLED=="false" || process.env.EMAIL_NOTIFICATION_ENABLED==false) {
+        this.enabled = false;
+    }
+    winston.debug("RequestNotification this.enabled: "+ this.enabled);
+}
 
 listen() {
-    var that = this;
+    var that = this; 
     
 
+      
+    if (this.enabled==true) {
+      winston.info("RequestNotification listener started");
+    } else {
+        return winston.info("RequestNotification listener disabled");
+    }
+
 
     var messageCreateKey = 'message.create';
     if (messageEvent.queueEnabled) {
@@ -78,7 +92,7 @@ listen() {
         } else {
           winston.debug("sendUserEmail chat channel");
                        
-            //TODO  mandare email se ultimo messaggio > X MINUTI configurato in Notification . potresti usare request.updated_at ?
+            //TODO     mandare email se ultimo messaggio > X MINUTI configurato in Notification . potresti usare request.updated_at ?
 
             
             
@@ -110,7 +124,7 @@ listen() {
      winston.debug('RequestNotification requestCreateKey: ' + requestCreateKey);
 
      requestEvent.on(requestCreateKey, function(request) {
-      // winston.info('quiiiiiiiiiiiii');
+      winston.debug('requestEvent.on(requestCreateKey');
       setImmediate(() => {
    
         /*
@@ -127,10 +141,9 @@ listen() {
 
 
      var requestParticipantsUpdateKey = 'request.participants.update';
-    //  this is not queued
-    //  if (requestEvent.queueEnabled) {
-    //   requestParticipantsUpdateKey = 'request.participants.update.queue';
-    //  }
+     if (requestEvent.queueEnabled) {
+      requestParticipantsUpdateKey = 'request.participants.update.queue';
+     }
      winston.debug('RequestNotification requestParticipantsUpdateKey: ' + requestParticipantsUpdateKey);
 
      requestEvent.on(requestParticipantsUpdateKey, function(data) {
@@ -163,12 +176,12 @@ listen() {
     //  TODO Send email also for addAgent and reassign. Alessio request for pooled only?
 
     var requestCloseExtendedKey = 'request.close.extended';
-        //  this is not queued
-    // if (requestEvent.queueEnabled) {
-    //   requestCloseExtendedKey = 'request.close.extended.queue';
-    // }
+    if (requestEvent.queueEnabled) {
+      requestCloseExtendedKey = 'request.close.extended.queue';
+    }
     winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);
     requestEvent.on(requestCloseExtendedKey, function(data) {
+      winston.debug('requestEvent.on(requestCloseExtendedKey ' + requestCloseExtendedKey);
       setImmediate(() => {
         var request = data.request;
         var notify = data.notify;
@@ -341,7 +354,7 @@ sendToUserEmailChannelEmail(projectid, message) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -356,7 +369,14 @@ async notifyFollowers(savedRequest, project, message) {
     return winston.debug("not sending notifyFollowers for attributes.subtype info messages");
   }
 
-  var reqWithFollowers = await Request.findById(savedRequest._id).populate('followers').exec();
+  if (!savedRequest) {
+    return winston.debug("not sending notifyFollowers for direct messages");
+  }
+
+  // Cannot read property '_id' of undefined at RequestNotification.notifyFollowers (/usr/src/app/pubmodules/emailNotification/requestNotification.js:358:62) at /usr/src/app
+  // forse meglio .id
+  
+  var reqWithFollowers = await Request.findById(savedRequest._id).populate('followers').exec();  // cache_attention
   winston.debug("reqWithFollowers");
   winston.debug("reqWithFollowers",reqWithFollowers);
   // console.log("reqWithFollowers",reqWithFollowers);
@@ -376,7 +396,7 @@ async notifyFollowers(savedRequest, project, message) {
        }                  
         
          User.findOne({_id: userid , status: 100})
-          //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)
+          //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)  //user_cache
           .exec(function (err, user) {
            if (err) {
            //  winston.debug(err);
@@ -439,7 +459,7 @@ sendToFollower(projectid, message) {
           }
         })
     } catch (e) {
-      winston.warn("Error sending email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
+      winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
     }
 }
 
@@ -518,7 +538,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
                      }                  
                       
                        User.findOne({_id: userid , status: 100})
-                        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)
+                        //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)   //user_cache
                         .exec(function (err, user) {
                          if (err) {
                          //  winston.debug(err);
@@ -572,10 +592,10 @@ sendToAgentEmailChannelEmail(projectid, message) {
                           }
         
                           User.findOne({_id: assignedId, status: 100})
-                            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)
+                            //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)    //user_cache
                             .exec(function (err, user) {
                             if (err) {
-                              winston.error("Error sending email to " + savedRequest.participants[0], err);
+                              winston.error("Error sending requestNotification email to " + savedRequest.participants[0], err);
                             }
                             if (!user) {
                               winston.warn("User not found",  savedRequest.participants[0]);
@@ -605,7 +625,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
      });
      
      } catch (e) {
-       winston.warn("Error sending email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
+       winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, message: message, savedRequest:savedRequest}); //it's better to view error email at this stage
      }
      //end send email
      
@@ -646,7 +666,7 @@ sendEmailChannelTakingNotification(projectid, request) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -684,7 +704,7 @@ sendUserEmail(projectid, message) {
 
 
       if (process.env.DISABLE_SEND_OFFLINE_EMAIL === "true" || process.env.DISABLE_SEND_OFFLINE_EMAIL === true ) {
-        return winston.info("DISABLE_SEND_OFFLINE_EMAIL disabled");
+        return winston.debug("DISABLE_SEND_OFFLINE_EMAIL disabled");
       }
       if (message.attributes && message.attributes.subtype==='info/support') {
         return winston.debug("not sending sendUserEmail for attributes.subtype info/support messages");
@@ -697,7 +717,7 @@ sendUserEmail(projectid, message) {
 
       
       if (!message.request.lead || !message.request.lead.email) {
-        return winston.info("The lead object is undefined or has empty email");
+        return winston.debug("The lead object is undefined or has empty email");
       }
 
       if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.offline && project.settings.email.notification.conversation.offline.blocked == true ) {
@@ -786,6 +806,7 @@ sendUserEmail(projectid, message) {
                   }
                   winston.debug("tokenQueryString:  "+tokenQueryString);
                   
+                  //send email unverified so spam check?
                   emailService.sendNewMessageNotification(lead.email, message, project, tokenQueryString, sourcePage);
               } 
                 
@@ -799,7 +820,7 @@ sendUserEmail(projectid, message) {
     });
 
   } catch(e) {
-    winston.error("Error sending email", {error:e, projectid:projectid, message:message});
+    winston.error("Error sending requestNotification email", {error:e, projectid:projectid, message:message});
   }
 }
 
@@ -807,7 +828,12 @@ sendAgentEmail(projectid, savedRequest) {
     // send email
     try {
    
-   
+  //  console.log("sendAgentEmail")
+    if (savedRequest.preflight === true) {   //only for channel email and form preflight is false otherwise request.participants.update is used i think?
+      winston.debug("preflight request sendAgentEmail disabled")
+      return 0;
+    }
+
     Project.findOne({_id: projectid, status: 100}).select("+settings").exec( async function(err, project){
        if (err) {
          return winston.error(err);
@@ -828,6 +854,8 @@ sendAgentEmail(projectid, savedRequest) {
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
 
+                  winston.debug("savedRequest.status==RequestConstants.UNASSIGNED");        
+
                   if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.pooled == false ) {
                     return winston.info("RequestNotification email notification for the project with id : " + projectid + " for the pooled conversation is disabled");
                   }
@@ -875,7 +903,7 @@ sendAgentEmail(projectid, savedRequest) {
                    }                  
                     
                      User.findOne({_id: userid , status: 100})
-                      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)
+                      //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+userid)    //user_cache
                       .exec(function (err, user) {
                        if (err) {
                        //  winston.debug(err);
@@ -900,6 +928,8 @@ sendAgentEmail(projectid, savedRequest) {
                    // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                    else if (savedRequest.status==RequestConstants.ASSIGNED) { //ASSIGNED
 
+                    winston.debug("savedRequest.status==RequestConstants.ASSIGNED");        
+
                     if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.assigned == false ) {
                       return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for the assigned conversation is disabled");
                     }
@@ -937,10 +967,10 @@ sendAgentEmail(projectid, savedRequest) {
                           return winston.warn("RequestNotification email notification for the user with id : " + assignedId + " not found project_user");
                         }
                         User.findOne({_id: assignedId, status: 100})
-                          //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)
+                          //@DISABLED_CACHE .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)    //user_cache
                           .exec(function (err, user) {
                           if (err) {
-                            winston.error("Error sending email to " + savedRequest.participants[0], err);
+                            winston.error("Error sending requestNotification email to " + savedRequest.participants[0], err);
                           }
                           if (!user) {
                             winston.warn("User not found",  savedRequest.participants[0]);
@@ -988,7 +1018,7 @@ sendAgentEmail(projectid, savedRequest) {
    });
    
    } catch (e) {
-     winston.warn("Error sending email", {error:e, projectid:projectid, savedRequest:savedRequest}); //it's better to view error email at this stage
+     winston.warn("Error sending requestNotification email", {error:e, projectid:projectid, savedRequest:savedRequest}); //it's better to view error email at this stage
    }
    //end send email
    

package/pubmodules/events/eventRoute.js

@@ -2,7 +2,6 @@ var express = require('express');
 var router = express.Router({mergeParams: true});
 var Event = require("./event");
 var winston = require('../../config/winston');
-const eventEvent = require('./eventEvent');
 var validtoken = require('../../middleware/valid-token');
 const eventService = require('./eventService');
 const { check, validationResult } = require('express-validator');
@@ -10,6 +9,9 @@ var passport = require('passport');
 require('../../middleware/passport')(passport);
 var roleChecker = require('../../middleware/has-role');
 
+const messageEvent = require('../../event/messageEvent');
+
+
 router.post('/', [
   passport.authenticate(['basic', 'jwt'], 
   { session: false }), 
@@ -37,30 +39,53 @@ router.post('/', [
       pu = req.projectuser.id
     }   
     
-    // emit(name, attributes, id_project, project_user, createdBy, status, user) {
+
+
+    // // da qui
+    
+    // performance log
+    // console.log("************* emit event"+new Date().toISOString());
+
+    // // message.senderFullname,     message.recipient, 
+    //             // message.recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp, message.group
+    // var recipient = req.body.attributes.request_id;
+    // console.log("recipient",recipient);
+    // var sender = req.user.id;
+    // console.log("sender",sender);
+
+    // let message = {
+    //   recipient: recipient,
+    //   recipient_fullname: "pluto",
+    //   // sender:"bb0d809b-b093-419b-8b48-11a192cc3619",
+    //   sender: sender,
+    //   senderFullname: "Tiledesk",
+    //   text:"welcome",
+    //   group: {
+    //     members: {
+    //       // "bb0d809b-b093-419b-8b48-11a192cc3619": 1,
+    //       // sender: 1
+          
+    //     }
+    //   }
+    // };
+    // message.group.members[sender]= 1;
+    // console.log("message", message)
+
+    // messageEvent.emit("message.test", message);
+    // res.json({"event":"1"});
+
+    // //fino qui
+
+ 
+    // // emit(name, attributes, id_project, project_user, createdBy, status, user) {
     eventService.emit(req.body.name, req.body.attributes, req.projectid, pu, req.user.id, undefined, req.user).then(function(event) {
-    res.json(event);
-  }).catch(function(err) {
-    winston.error('Error saving the event '+ JSON.stringify(event), err)
-    return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
-  });
 
-  // var newEvent = new Event({
-  //   name: req.body.name,
-  //   attributes: req.body.attributes,
-  //   id_project: req.projectid,
-  //   createdBy: req.user.id,
-  //   updatedBy: req.user.id
-  // });
-
-  // newEvent.save(function(err, savedEvent) {
-  //   if (err) {
-  //     winston.error('Error saving the event '+ JSON.stringify(savedEvent), err)
-  //     return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(savedEvent)});
-  //   }
-
-  //   res.json(savedEvent);
-  // });
+      res.json(event);
+    }).catch(function(err) {
+      winston.error('Error saving the event '+ JSON.stringify(event), err)
+      return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
+    });
+
 });
 
 
@@ -137,7 +162,7 @@ router.get('/',   [passport.authenticate(['basic', 'jwt'],
       }
 
       //  collection.count is deprecated, and will be removed in a future version. Use Collection.countDocuments or Collection.estimatedDocumentCount instead
-      return Event.count(query, function (err, totalRowCount) {
+      return Event.countDocuments(query, function (err, totalRowCount) {
 
         var objectToReturn = {
           perPage: limit,

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);