@tiledesk/tiledesk-server 2.2.11 → 2.2.16

package/routes/project.js

@@ -50,6 +50,69 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
     update["settings.email.notification.conversation.pooled"] = req.body["settings.email.notification.conversation.pooled"];
   }
 
+
+
+
+  if (req.body["settings.email.templates.assignedRequest"]!=undefined) {
+    update["settings.email.templates.assignedRequest"] = req.body["settings.email.templates.assignedRequest"];
+  }
+  if (req.body["settings.email.templates.assignedEmailMessage"]!=undefined) {
+    update["settings.email.templates.assignedEmailMessage"] = req.body["settings.email.templates.assignedEmailMessage"];
+  }
+  if (req.body["settings.email.templates.pooledRequest"]!=undefined) {
+    update["settings.email.templates.pooledRequest"] = req.body["settings.email.templates.pooledRequest"];
+  }
+  if (req.body["settings.email.templates.pooledEmailMessage"]!=undefined) {
+    update["settings.email.templates.pooledEmailMessage"] = req.body["settings.email.templates.pooledEmailMessage"];
+  }
+  if (req.body["settings.email.templates.newMessage"]!=undefined) {
+    update["settings.email.templates.newMessage"] = req.body["settings.email.templates.newMessage"];
+  }
+  if (req.body["settings.email.templates.ticket"]!=undefined) {
+    update["settings.email.templates.ticket"] = req.body["settings.email.templates.ticket"];
+  }
+  if (req.body["settings.email.templates.sendTranscript"]!=undefined) {
+    update["settings.email.templates.sendTranscript"] = req.body["settings.email.templates.sendTranscript"];
+  }
+
+
+  if (req.body["settings.email.from"]!=undefined) {
+    update["settings.email.from"] = req.body["settings.email.from"];
+  }
+  if (req.body["settings.email.config.host"]!=undefined) {
+    update["settings.email.config.host"] = req.body["settings.email.config.host"];
+  }
+  if (req.body["settings.email.config.port"]!=undefined) {
+    update["settings.email.config.port"] = req.body["settings.email.config.port"];
+  }
+  if (req.body["settings.email.config.secure"]!=undefined) {
+    update["settings.email.config.secure"] = req.body["settings.email.config.secure"];
+  }
+  if (req.body["settings.email.config.user"]!=undefined) {
+    update["settings.email.config.user"] = req.body["settings.email.config.user"];
+  }
+  if (req.body["settings.email.config.pass"]!=undefined) {
+    update["settings.email.config.pass"] = req.body["settings.email.config.pass"];
+  }
+
+
+  
+  /*
+
+  if (req.body.settings.email.templates.assignedRequest!=undefined) {
+    // if (req.body["settings.email.templates.assignedRequest.html"]!=undefined) {
+    console.log("assignedRequest");
+    update["settings.email.templates.assignedRequest"] = req.body.settings.email.templates.assignedRequest;
+  }
+  if (req.body["settings.email.templates.assignedEmailMessage.html"]!=undefined) {
+    update["settings.email.templates.assignedEmailMessage.html"] = req.body["settings.email.templates.assignedEmailMessage.html"];
+  }
+  if (req.body.settings.email.templates.pooledRequest!=undefined) {
+    console.log("pooledRequest");
+    update["settings.email.templates.pooledRequest"] = req.body.settings.email.templates.pooledRequest;
+  }
+*/
+
   if (req.body["settings.chat_limit_on"]!=undefined) {
     update["settings.chat_limit_on"] = req.body["settings.chat_limit_on"];
   }
@@ -96,7 +159,7 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   
   winston.debug('UPDATE PROJECT REQ BODY ', update);
 
-
+  // console.log("update",JSON.stringify(update));
 
   Project.findByIdAndUpdate(req.params.projectid, update, { new: true, upsert: true }, function (err, updatedProject) {
     if (err) {
@@ -143,6 +206,50 @@ router.patch('/:projectid', [passport.authenticate(['basic', 'jwt'], { session:
   }
 
 
+  
+  if (req.body["settings.email.templates.assignedRequest"]!=undefined) {
+    update["settings.email.templates.assignedRequest"] = req.body["settings.email.templates.assignedRequest"];
+  }
+  if (req.body["settings.email.templates.assignedEmailMessage"]!=undefined) {
+    update["settings.email.templates.assignedEmailMessage"] = req.body["settings.email.templates.assignedEmailMessage"];
+  }
+  if (req.body["settings.email.templates.pooledRequest"]!=undefined) {
+    update["settings.email.templates.pooledRequest"] = req.body["settings.email.templates.pooledRequest"];
+  }
+  if (req.body["settings.email.templates.pooledEmailMessage"]!=undefined) {
+    update["settings.email.templates.pooledEmailMessage"] = req.body["settings.email.templates.pooledEmailMessage"];
+  }
+  if (req.body["settings.email.templates.newMessage"]!=undefined) {
+    update["settings.email.templates.newMessage"] = req.body["settings.email.templates.newMessage"];
+  }
+  if (req.body["settings.email.templates.ticket"]!=undefined) {
+    update["settings.email.templates.ticket"] = req.body["settings.email.templates.ticket"];
+  }
+  if (req.body["settings.email.templates.sendTranscript"]!=undefined) {
+    update["settings.email.templates.sendTranscript"] = req.body["settings.email.templates.sendTranscript"];
+  }
+
+
+  if (req.body["settings.email.from"]!=undefined) {
+    update["settings.email.from"] = req.body["settings.email.from"];
+  }
+  if (req.body["settings.email.config.host"]!=undefined) {
+    update["settings.email.config.host"] = req.body["settings.email.config.host"];
+  }
+  if (req.body["settings.email.config.port"]!=undefined) {
+    update["settings.email.config.port"] = req.body["settings.email.config.port"];
+  }
+  if (req.body["settings.email.config.secure"]!=undefined) {
+    update["settings.email.config.secure"] = req.body["settings.email.config.secure"];
+  }
+  if (req.body["settings.email.config.user"]!=undefined) {
+    update["settings.email.config.user"] = req.body["settings.email.config.user"];
+  }
+  if (req.body["settings.email.config.pass"]!=undefined) {
+    update["settings.email.config.pass"] = req.body["settings.email.config.pass"];
+  }
+
+
   if (req.body["settings.chat_limit_on"]!=undefined) {
     update["settings.chat_limit_on"] = req.body["settings.chat_limit_on"];
   }

package/routes/request.js

@@ -184,7 +184,8 @@ router.patch('/:requestid', function (req, res) {
     }
 
     requestEvent.emit("request.update", request);
-    requestEvent.emit("request.update.comment", {comment:"PATCH",request:request});
+    requestEvent.emit("request.update.comment", {comment:"PATCH",request:request}); //Deprecated
+    requestEvent.emit("request.updated", {comment:"PATCH",request:request, patch:  update});
     return res.json(request);
   });
 
@@ -455,7 +456,8 @@ router.patch('/:requestid/attributes',  function (req, res) {
           }
           winston.verbose(" saved request attributes",savedRequest.toObject())
           requestEvent.emit("request.update", savedRequest);
-          requestEvent.emit("request.update.comment", {comment:"ATTRIBUTES_PATCH",request:savedRequest});
+          requestEvent.emit("request.update.comment", {comment:"ATTRIBUTES_PATCH",request:savedRequest});//Deprecated
+          requestEvent.emit("request.updated", {comment:"ATTRIBUTES_PATCH",request:savedRequest, patch:  {attributes:data}});
           requestEvent.emit("request.attributes.update", savedRequest);
             res.json(savedRequest);
           });
@@ -483,7 +485,9 @@ router.post('/:requestid/notes',  function (req, res) {
       return res.status(500).send({ success: false, msg: 'Error adding request object.' });
     }
     requestEvent.emit("request.update", updatedRequest);
-    requestEvent.emit("request.update.comment", {comment:"NOTE_ADD",request:updatedRequest});
+    requestEvent.emit("request.update.comment", {comment:"NOTE_ADD",request:updatedRequest});//Deprecated
+    requestEvent.emit("request.updated", {comment:"NOTE_ADD",request:updatedRequest, patch:  {notes:note}});
+
     return res.json(updatedRequest);
   });
 
@@ -506,7 +510,9 @@ router.delete('/:requestid/notes/:noteid',  function (req, res) {
       return res.status(500).send({ success: false, msg: 'Error adding request object.' });
     }
     requestEvent.emit("request.update", updatedRequest);
-    requestEvent.emit("request.update.comment", {comment:"NOTE_DELETE",request:updatedRequest});
+    requestEvent.emit("request.update.comment", {comment:"NOTE_DELETE",request:updatedRequest});//Deprecated
+    // requestEvent.emit("request.updated", {comment:"NOTE_DELETE",request:updatedRequest, patch:  {notes:req.params.noteid}});
+
     return res.json(updatedRequest);
   });
 

package/routes/user-request.js

@@ -45,7 +45,9 @@ router.patch('/:requestid/rating', function (req, res) {
     }
 
     requestEvent.emit("request.update", request);
-    requestEvent.emit("request.update.comment", {comment:"PATCH",request:request});
+    requestEvent.emit("request.update.comment", {comment:"PATCH",request:request});//Deprecated
+    requestEvent.emit("request.updated", {comment:"PATCH",request:request, patch:  update});
+
     return res.json(request);
   });
 

package/services/emailService.js

@@ -119,6 +119,7 @@ class EmailService {
   }
 
   readTemplate(templateName, settings) {
+    // aggiunsta questo
     var that = this;
     winston.debug('EmailService readTemplate: '+ templateName + '  ' + JSON.stringify(settings)); 
     
@@ -246,11 +247,19 @@ class EmailService {
 
     // send mail with defined transport object
     this.getTransport(mail.config).sendMail(mailOptions, (error, info) => {
-      if (error) {
+      if (error) {    
+        if (mail.callback){
+          mail.callback(error, {info:info});
+        }
         return winston.error("Error sending email ", {error:error,  mailOptions:mailOptions});
       }
       winston.verbose('Email sent:', {info: info});
       winston.debug('Email sent:', {info: info, mailOptions: mailOptions});
+
+      if (mail.callback){
+        mail.callback(error, {info:info});
+      }
+      
       // Preview only available when sending through an Ethereal account
       // winston.debug('Preview URL: %s', nodemailer.getTestMessageUrl(info));
 
@@ -260,7 +269,7 @@ class EmailService {
   }
 
 
-  async sendTest(to) {      
+  async sendTest(to, configEmail, callback) {      
 
     var that = this;
 
@@ -268,19 +277,12 @@ class EmailService {
 
     var template = handlebars.compile(html);
 
-    var replacements = {        
-      user: {name: "andrea"},
-      enabled: true   
+    var replacements = {              
     };
 
     var html = template(replacements);
-
-    that.send({to:to, subject:`TileDesk test email`,html: html});
-
-    //that.send(that.bcc, `TileDesk test email - notification`, html);
-
-
-
+    
+    return that.send({to:to, subject:`TileDesk test email`, config: configEmail, html: html, callback: callback});
     
   }
 

package/services/faqBotHandler.js

@@ -12,6 +12,10 @@ var eventService = require('../pubmodules/events/eventService');
 var mongoose = require('mongoose');
 const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
 const ActionsConstants = require('../models/actionsConstants');
+var httpUtil = require('../utils/httpUtil');
+
+var webhook_origin = process.env.WEBHOOK_ORIGIN || "http://localhost:3000";
+winston.debug("webhook_origin: "+webhook_origin);
 
 class FaqBotHandler {
  
@@ -137,7 +141,7 @@ class FaqBotHandler {
 
             Faq.find(query) 
             .lean().               
-             exec(function (err, faqs) {
+             exec(async (err, faqs) => {
                if (err) {
                 return winston.error("Error getting faq object.",err);                
                }
@@ -209,7 +213,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                                                
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -224,7 +234,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, bot_answer.text, 
                                     message.id_project, sender, attr, bot_answer.type, bot_answer.metadata, bot_answer.language).then(function(savedMessage){
                                         winston.debug("faqbot message botAns ", savedMessage.toObject());  
-                                });                         
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                    
                             // }
                             
                                                     
@@ -238,20 +254,57 @@ class FaqBotHandler {
 
                } else {
  
+
                 query = { "id_project": message.id_project, "id_faq_kb": faq_kb._id};
-        
-                var search_obj = {"$search": message.text};
+                var mongoproject = undefined;
+                var sort = undefined;
 
-                if (faq_kb.language) {
-                    search_obj["$language"] = faq_kb.language;
-                }
-                query.$text = search_obj;
-                winston.debug("fulltext search query", query);   
+                //make http request external   
+                if (faq_kb.url) {
+
+                                                                                        
+                    var url = faq_kb.url+"/parse";
+                    winston.debug("fulltext search external url " + url);   
 
-                Faq.find(query,  {score: { $meta: "textScore" } })  
-                .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+                    var json = {text: message.text, language: faq_kb.language, id_project: message.id_project, id_faq_kb: faq_kb._id};
+                    winston.debug("fulltext search external json", json);   
+
+                    var headers = {
+                        'Content-Type' : 'application/json', 
+                        'User-Agent': 'tiledesk-bot',
+                        'Origin': webhook_origin
+                        };
+
+                    var res = await httpUtil.call(url, headers, json, "POST")
+                    winston.debug("res", res);
+                    
+                    if (res && res.intent && res.intent.name) {
+                        var intent_name = res.intent.name;
+                        winston.debug("intent_name", intent_name);
+                        //filtra su intent name
+                        query.intent_display_name = intent_name;
+                        winston.debug("query",query);                        
+                    
+                    }
+                } else {
+
+                    var search_obj = {"$search": message.text};
+
+                    if (faq_kb.language) {
+                        search_obj["$language"] = faq_kb.language;
+                    }
+                    query.$text = search_obj;
+                    winston.debug("fulltext search query", query);   
+                    
+                    mongoproject = {score: { $meta: "textScore" } };
+                    sort = { score: { $meta: "textScore" } } //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+                }               
+        
+            
+                Faq.find(query,  mongoproject)  
+                .sort(sort) 
                 .lean().               
-                exec(function (err, faqs) {
+                exec(async (err, faqs) => {
                     if (err) {
                         return winston.error('Error getting fulltext objects.', err);      
                     }
@@ -266,6 +319,53 @@ class FaqBotHandler {
                     if (faqs && faqs.length>0 && faqs[0].answer) {
                         answerObj = faqs[0];                
 
+
+                        // non fare la ricerca fulltext 
+                        //make http request external   
+                        /*
+                        if (faq_kb.url) {
+
+                                                                                                
+                            var url = faq_kb.url+"/parse";
+                            winston.verbose("fulltext search external url " + url);   
+
+                            var json = {text: message.text, language: faq_kb.language, id_project: message.id_project, id_faq_kb: faq_kb._id};
+                            winston.verbose("fulltext search external json", json);   
+
+                            var headers = {
+                                'Content-Type' : 'application/json', 
+                                'User-Agent': 'tiledesk-bot',
+                                'Origin': webhook_origin
+                                };
+
+                            var res = await httpUtil.call(url, headers, json, "POST")
+                            console.log("res", res);
+                            
+                            if (res && res.intent && res.intent.name) {
+                                var intent_name = res.intent.name;
+                                console.log("intent_name", intent_name);
+                                                        //filtra su intent name
+                                var queryExternal = { id_project: message.id_project, id_faq_kb: faq_kb._id, intent_display_name: intent_name};
+                                winston.verbose("queryExternal",queryExternal);
+
+                                var faqExternal = await Faq.findOne(queryExternal) 
+                                    .lean().               
+                                    exec();
+
+                                winston.verbose("faqExternal",faqExternal);
+
+                                if (faqExternal) {
+                                    answerObj = faqExternal;
+                                }
+                            
+                            }
+                        }
+                        */
+
+
+
+
+
                         // qui
                         faqBotSupport.getParsedMessage(answerObj.answer, message, faq_kb, answerObj).then(function(bot_answer) {
 
@@ -315,7 +415,14 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });           
+
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -330,7 +437,13 @@ class FaqBotHandler {
                                     message.id_project, sender, attr, bot_answer.type, bot_answer.metadata, bot_answer.language).then(function(savedMessage){
 
                                         winston.debug("faqbot message sending ", savedMessage.toObject());  
-                                });
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });           
                         });
                         
         
@@ -408,7 +521,13 @@ class FaqBotHandler {
                                 messageService.send(sender, botName, message.recipient, command_parsed.command, 
                                     message.id_project, sender, {subtype: "info"}, 'text', undefined).then(function(savedMessage){
                                         winston.debug("agent_handoff faqs agent sent ", savedMessage.toObject());  
-                                });                                                       
+                                }).catch(function(err){    
+                                    winston.log({
+                                      level: 'error',
+                                      message: 'Error sending message bot: '+ JSON.stringify(err) ,
+                                      label: message.id_project
+                                    });
+                                });                                                      
                                  // PATCH: Chat clients (i.e. web widget) remove messages with text = null
                                 // command_parsed.text contains the eventual text before the \agent command
                                 // or 'all the message text' if \agent was not found
@@ -423,6 +542,13 @@ class FaqBotHandler {
                             messageService.send(sender, botName, message.recipient, botAns.text, 
                                 message.id_project, sender, attr, botAns.type, botAns.metadata, botAns.language).then(function(savedMessage){
                                     winston.debug("faqbot message botAns " ,savedMessage.toObject());  
+                            })
+                            .catch(function(err){    
+                                winston.log({
+                                  level: 'error',
+                                  message: 'Error sending message bot: '+ JSON.stringify(err) + " " + JSON.stringify(botAns.text) ,
+                                  label: message.id_project
+                                });
                             });
                         }