@tiledesk/tiledesk-server 2.3.53 → 2.3.55

package/CHANGELOG.md

@@ -1,9 +1,19 @@
 
 
-💥 TILEDESK SERVER v2.3.51 💥
+💥 TILEDESK SERVER v2.3.55 💥
 🚀        TAGGED AND PUBLISHED ON NPM           🚀
 🚀        IN PRODUCTION                        🚀
-(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.51) 
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.55) 
+
+# 2.3.55 -> PROD 
+- Tybot updated to 0.1.28
+
+# 2.3.54
+- Added HIDE_CLOSE_REQUEST_ERRORS env variable
+- Added email.send trigger action 
+- Added participants parameter for trigger action
+- Added status -1 for department model to hide department for dashboard and widget. It can be used for chatbot
+- Added template engine to send email trigger action
 
 # 2.3.51
 - Added message.received as trigger event
@@ -19,7 +29,7 @@
 - Updated widget.json file
 - Fixed template for: beenInvitedNewUser.html beenInvitedExistingUser.html
 
-# 2.3.49 -> PROD 
+# 2.3.49 
 - @tiledesk/tiledesk-tybot-connector": "^0.1.22
 
 # 2.3.48

package/app.js

@@ -172,6 +172,7 @@ var IPFilter = require('./middleware/ipFilter');
 
 // job_here
 var BanUserNotifier = require('./services/banUserNotifier');
+const { ChatbotService } = require('./services/chatbotService');
 BanUserNotifier.listen();
 
 var modulesManager = undefined;
@@ -207,6 +208,8 @@ var app = express();
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
+app.set('chatbot_service', new ChatbotService())
+
 
 // TODO DELETE IT IN THE NEXT RELEASE
 if (process.env.ENABLE_ALTERNATIVE_CORS_MIDDLEWARE === "true") {  

package/models/department.js

@@ -50,7 +50,7 @@ var DepartmentSchema = new Schema({
   tags: [TagSchema],
   status: {
     type: Number,
-    default: 1,
+    default: 1,     // 1: enabled; 0 hidden for widget; -1 hidden for the dashboard; 
     index: true
     // required: true
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.53",
+  "version": "2.3.55",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,7 +42,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.22",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.28",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.7.4",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/trigger/rulesTrigger.js

@@ -18,9 +18,11 @@ var leadService = require('../../services/leadService');
 var LeadConstants = require('../../models/leadConstants');
 var operatingHoursService = require("../../services/operatingHoursService");
 var sendMessageUtil = require("../../utils/sendMessageUtil");
+var sendEmailUtil = require("../../utils/sendEmailUtil");
 var cacheUtil = require("../../utils/cacheUtil");
 var cacheEnabler = require("../../services/cacheEnabler");
 var UIDGenerator = require("../../utils/UIDGenerator");
+const RequestConstants = require('../../models/requestConstants');
 
 
 class RulesTrigger {
@@ -201,6 +203,85 @@ class RulesTrigger {
       
 
 
+        triggerEventEmitter.on('email.send', function(eventTrigger) {
+
+          try {
+
+            winston.debug('runAction eventTrigger.eventSuccess:', eventTrigger.eventSuccess);
+            var trigger = eventTrigger.trigger;         
+            winston.debug('runAction trigger', trigger.toObject());
+  
+  
+            var action = eventTrigger.action;
+            winston.debug('runAction action', action.toObject());
+  
+
+            var fullname = action.parameters.fullName || "BOT";
+            winston.debug('runAction action fullname: ' + fullname);
+  
+            var subject = action.parameters.fullName || "New Email";
+            winston.debug('runAction action subject: ' + subject);
+
+            var sender = "system";
+            
+            if (action.parameters.sender) {
+              sender = action.parameters.sender;
+            }
+            winston.debug('runAction action sender: ' + sender);
+  
+            var text = action.parameters.text;
+            winston.debug('runAction action text: ' + text);
+  
+            var attributes = {};
+  
+            // var attributes = action.parameters.attributes;
+            // winston.debug('runAction action attributes: ' + attributes);
+
+  
+            var recipient;
+            if (eventTrigger.eventKey=="request.create" || eventTrigger.eventKey=="request.participants.join") {
+              recipient = eventTrigger.event.request_id;
+            }
+            if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
+              recipient = eventTrigger.event.recipient;
+            }
+            if (eventTrigger.eventKey=="event.emit") {
+              winston.debug('runAction action event.emit: ', eventTrigger.event.toObject());
+  
+              //TODO funziona?
+              recipient = eventTrigger.event.project_user.id_user;
+            }
+
+            // console.log("eventTrigger.event", eventTrigger.event);
+            
+            winston.debug('runAction action recipient: ' + recipient);
+  
+            var id_project = eventTrigger.event.id_project;
+            winston.debug('runAction action id_project: ' + id_project);
+  
+
+            var message = eventTrigger.event;
+            winston.debug('runAction action message: ', message);
+
+            if (eventTrigger.event.request && eventTrigger.event.request.lead && eventTrigger.event.request.lead.email) {
+              var to = eventTrigger.event.request.lead.email;
+              winston.debug('to ' + to);
+  
+              // sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+              sendEmailUtil.sendEmailDirect(to, text, id_project, recipient, subject, message);              
+            } else {
+              winston.info('email.send trigger. Lead email is undefined ');
+            }
+              
+  
+          } catch(e) {
+            winston.error("Error runAction", e);
+          }
+  
+          });
+        
+  
+
 
 
         triggerEventEmitter.on('request.department.route', function(eventTrigger) {
@@ -683,6 +764,8 @@ class RulesTrigger {
           var departmentid = action.parameters.departmentid;
           winston.debug('runAction action departmentid: ' + departmentid);
 
+          var participants = action.parameters.participants;
+          winston.debug('runAction action participants: ' + participants);
           // var attributes = action.parameters.attributes;
           // winston.debug('runAction action attributes: ' + attributes);
 
@@ -768,10 +851,24 @@ class RulesTrigger {
                 departmentid = eventAttributes.department;
               }
 
+             
+              
               if (eventAttributes.text) {
                 text = eventAttributes.text;
               }
 
+               // console.log("eventAttributes.participants.length"+ eventAttributes.participants.length);
+               if (eventAttributes.participants && eventAttributes.participants.length>0) { 
+                participants = eventAttributes.participants;
+                if (participants[0].indexOf("bot_")>-1) {
+                  text = "\\start";  //if participants is passed than the bot reply to the first message "welcome" so I changed "welcome" with "\start"
+                }              
+                // status = RequestConstants.ASSIGNED;
+                // console.log("eventAttributes.participants",eventAttributes.participants);
+              }
+
+              // console.log("text", text);
+
               if (eventAttributes.status) {
                 status = eventAttributes.status;
               }
@@ -864,7 +961,7 @@ class RulesTrigger {
 
                     var new_request = {
                       request_id: request_id, project_user_id: project_user_id, lead_id: createdLead._id, id_project: id_project,
-                      first_text: text, departmentid: departmentid, sourcePage: sourcePage,
+                      first_text: text, participants: participants, departmentid: departmentid, sourcePage: sourcePage,
                       language: language, userAgent: userAgent, status: status, createdBy: id_user,
                       attributes: attributes, subject: undefined, preflight: preflight, channel: undefined, location: undefined,
                       lead: createdLead, requester: puser

package/routes/department.js

@@ -175,7 +175,7 @@ router.get('/allstatus', [passport.authenticate(['basic', 'jwt'], { session: fal
 
   winston.debug("## GET ALL DEPTS req.project ", req.project)
 
-  var query = { "id_project": req.projectid };
+  var query = { "id_project": req.projectid, status: { $gte:  0 } }; // nascondi quelli con status = hidden (-1) for dashboard
                                             //secondo me qui manca un parentesi tonda per gli or
   if (req.project && req.project.profile && (req.project.profile.type === 'free' && req.project.trialExpired === true) || (req.project.profile.type === 'payment' && req.project.isActiveSubscription === false)) {
 

package/routes/faq.js

@@ -189,7 +189,7 @@ router.put('/:faqid', function (req, res) {
     update.enabled = req.body.enabled;
   }
   if (req.body.reply!=undefined) {
-    update.reply = req.body.enabled;
+    update.reply = req.body.reply;
   }
   if (req.body.form!=undefined) {
     update.form = req.body.form;

package/routes/faq_kb.js

@@ -11,6 +11,9 @@ var httpUtil = require("../utils/httpUtil");
 const { forEach } = require('lodash');
 var multer = require('multer')
 var upload = multer()
+var configGlobal = require('../config/global');
+
+var chatbot_templates_api_url = "https://chatbot-templates.herokuapp.com/chatbots/public/templates"
 
 
 router.post('/', function (req, res) {
@@ -339,55 +342,129 @@ router.get('/', function (req, res) {
 
 });
 
+router.post('/fork/:id_faq_kb', async (req, res) => {
+
+  let id_faq_kb = req.params.id_faq_kb;
+  winston.info('id_faq_kb: ' + id_faq_kb);
+
+  const api_url = process.env.API_URL || configGlobal.apiUrl;
+  winston.info("fork --> base_url: " + api_url); // check if correct
+
+  let current_project_id = req.projectid;
+  winston.info("current project id: " + current_project_id);
+
+  let landing_project_id = req.query.projectid;
+  winston.info("landing project id " + landing_project_id)
+
+  let new_bot_name = req.query.name;
+  winston.info("new bot name: " + new_bot_name);
+
+  let public = req.query.public;
+  winston.info("public " + public);
+
+  let token = req.headers.authorization;
+
+  let cs = req.app.get('chatbot_service')
+
+  let chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id);
+  winston.debug("chatbot: ", chatbot)
+
+  if (!chatbot) {
+    return res.status(500).send({ success: false, message: "Unable to get chatbot" });
+  }
+
+  //chatbot.name = new_bot_name;
+
+  let savedChatbot = await cs.createBot(api_url, token, chatbot, landing_project_id);
+  winston.info("savedChatbot: ", savedChatbot)
+
+  if (!savedChatbot) {
+    return res.status(500).send({ success: false, message: "Unable to create new chatbot" });
+  }
+
+  let import_result = await cs.importFaqs(api_url, savedChatbot._id, token, chatbot, landing_project_id);
+  winston.info("imported: ", import_result);
+
+  if (import_result.success == "false") {
+    return res.status(500).send({ success: false, message: "Unable to import intents in the new chatbot" });
+  }
+
+  return res.status(200).send({ message: "Chatbot forked successfully", bot_id: savedChatbot._id });
+
+})
+
+
 router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) => {
 
   let id_faq_kb = req.params.id_faq_kb;
   winston.debug('id_faq_kb: ', id_faq_kb);
 
-  let json_string = req.file.buffer.toString('utf-8');
-  winston.debug("json_string: ", json_string);
+  let json_string;
+  let json;
+  if (req.file) {
+    json_string = req.file.buffer.toString('utf-8');
+    json = JSON.parse(json_string);
+  } else {
+    json = req.body;
+  }
+
+  winston.info("json_string: " + json_string);
 
   if (req.query.intentsOnly == "true") {
 
     winston.info("intents only")
 
-    const json = JSON.parse(json_string)
-    console.log("\n intents --> \n")
-    console.log(json)
-
     json.intents.forEach((intent) => {
 
-      var new_faq = new Faq({
+      let new_faq = {
         id_faq_kb: id_faq_kb,
         id_project: req.projectid,
         createdBy: req.user.id,
+        intent_display_name: intent.intent_display_name,
         question: intent.question,
         answer: intent.answer,
         reply: intent.reply,
         form: intent.form,
         enabled: intent.enabled,
         webhook_enabled: intent.webhook_enabled,
-        language: intent.language,
-
-      })
+        language: intent.language
+      }
 
-      new_faq.save((err, savedFaq) => {
-        if (err) {
-          winston.error("GET FAQ-KB ERROR", err);
-          if (err.code == 11000) {
-            return res.status(409).send({ success: false, msg: 'Duplicate intent_display_name.' });
+      // overwrite duplicated intents
+      if (req.query.overwrite == "true") {
+        Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_display_name: intent.intent_display_name }, new_faq, { new: true, upsert: true, rawResult: true }, (err, savingResult) => {
+          if (err) {
+            winston.error("findOneAndUpdate (upsert) FAQ ERROR ", err);
           } else {
-            winston.debug('--- > ERROR ', err)
-            return res.status(500).send({ success: false, msg: 'Error saving intent.' });
+            if (savingResult.lastErrorObject.updatedExisting == true) {
+              winston.info("updated existing intent")
+              faqBotEvent.emit('faq.update', savingResult.value);
+            } else {
+              winston.info("new intent crated")
+              faqBotEvent.emit('faq.create', savingResult.value);
+            }
           }
-        }
-        winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
-        faqBotEvent.emit('faq.create', savedFaq);
-      })
+        })
+
+      // don't overwrite duplicated intents
+      } else {
+        Faq.create(new_faq, (err, savedFaq) => {
+          if (err) {
+            winston.debug("create new FAQ ERROR ", err);
+            if (err.code == 11000) {
+              winston.error("Duplicate intent_display_name.");
+              winston.info("Skip duplicated intent_display_name");
+            } else {
+              winston.info("new intent crated")
+              faqBotEvent.emit('faq.create', savedFaq);
+            }
+          }
+        })
+      }
 
     })
 
-    return res.status(200).send({ success: true, msg: "Intents imported successfully"})
+    return res.status(200).send({ success: true, msg: "Intents imported successfully" })
 
   } else {
 
@@ -427,33 +504,54 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
 
         json.intents.forEach((intent) => {
 
-          var new_faq = new Faq({
+          let new_faq = {
             id_faq_kb: updatedFaq_kb._id,
             id_project: req.projectid,
             createdBy: req.user.id,
+            intent_display_name: intent.intent_display_name,
             question: intent.question,
             answer: intent.answer,
             reply: intent.reply,
             form: intent.form,
             enabled: intent.enabled,
             webhook_enabled: intent.webhook_enabled,
-            language: intent.language,
-
-          })
+            language: intent.language
+          }
 
-          new_faq.save((err, savedFaq) => {
-            if (err) {
-              winston.error("GET FAQ-KB ERROR", err);
-              if (err.code == 11000) {
-                return res.status(409).send({ success: false, msg: 'Duplicate intent_display_name.' });
+          // overwrite duplicated intents
+          if (req.query.overwrite == "true") {
+            Faq.findOneAndUpdate({ id_faq_kb: id_faq_kb, intent_display_name: intent.intent_display_name }, new_faq, { new: true, upsert: true, rawResult: true }, (err, savingResult) => {
+              if (err) {
+                winston.error("findOneAndUpdate (upsert) FAQ ERROR ", err);
               } else {
-                winston.debug('--- > ERROR ', err)
-                return res.status(500).send({ success: false, msg: 'Error saving intent.' });
+
+                if (savingResult.lastErrorObject.updatedExisting == true) {
+                  winston.info("updated existing intent")
+                  faqBotEvent.emit('faq.update', savingResult.value);
+                } else {
+                  winston.info("new intent crated")
+                  faqBotEvent.emit('faq.create', savingResult.value);
+                }
+
               }
-            }
-            winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
-            faqBotEvent.emit('faq.create', savedFaq);
-          })
+
+            })
+
+            // don't overwrite duplicated intents
+          } else {
+            Faq.create(new_faq, (err, savedFaq) => {
+              if (err) {
+                winston.debug("create new FAQ ERROR ", err);
+                if (err.code == 11000) {
+                  winston.error("Duplicate intent_display_name.");
+                  winston.info("Skip duplicated intent_display_name");
+                } else {
+                  winston.info("new intent crated")
+                  faqBotEvent.emit('faq.create', savedFaq);
+                }
+              }
+            })
+          }
 
         })
 
@@ -499,12 +597,16 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
             intents: intents
           }
           let intents_string = JSON.stringify(intents_obj);
-          res.set({ "Content-Disposition": "attachment; filename=\"intents.txt\"" });
+          res.set({ "Content-Disposition": "attachment; filename=\"intents.json\"" });
           return res.send(intents_string);
 
         } else {
+
+          // if (req.query.file == "false") {
+          //   return res.status(200).send(json);
+          // }
           let json_string = JSON.stringify(json);
-          res.set({ "Content-Disposition": "attachment; filename=\"bot.txt\"" });
+          res.set({ "Content-Disposition": "attachment; filename=\"bot.json\"" });
           return res.send(json_string);
         }
 

package/routes/request.js

@@ -67,7 +67,7 @@ async (req, res)  => {
     let messageStatus = req.body.status || MessageConstants.CHAT_MESSAGE_STATUS.SENDING;
     winston.debug('messageStatus: ' + messageStatus);
 
-    var request_id = req.params.request_id || 'support-group-' + req.projectid + "-" + UIDGenerator.generate();
+    var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + UIDGenerator.generate();
     winston.debug('request_id: ' + request_id);
 
     if (sender) {

package/services/chatbotService.js

@@ -0,0 +1,101 @@
+const axios = require("axios").default;
+const winston = require('../config/winston');
+var Faq_kb = require("../models/faq_kb");
+
+class ChatbotService {
+
+  constructor() {
+    
+  }
+
+
+  async getBotById(id_faq_kb, published, api_url, chatbot_templates_api_url, token, project_id) {
+
+    winston.info("[CHATBOT SERVICE] getBotById");
+
+    // private bot
+    if (published == "false") {
+
+      return await axios({
+        url: api_url + "/" + project_id + "/faq_kb/exportjson/" + id_faq_kb,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': token
+        },
+        method: 'GET'
+      }).then((resbody) => {
+        winston.info("(CHATBOT SERVICE) forking private chatbot " + resbody.data.name)
+        let chatbot = resbody.data;
+        return chatbot;
+      }).catch((err) => {
+        winston.error('(CHATBOT SERVICE) FAQ_KB EXPORTJSON ERROR ' + err);
+        return err;
+      })
+
+    // public bot
+    } else {
+
+      return await axios({
+        url: chatbot_templates_api_url + "/" + id_faq_kb,
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        method: 'GET'
+      }).then((resbody) => {
+        winston.info("(CHATBOT SERVICE) forking public chatbot " + resbody.data);
+        let chatbot = resbody.data;
+        return chatbot
+      }).catch((err) => {
+        winston.error('(CHATBOT SERVICE) FAQ_KB CHATBOT TEMPLATES ERROR ' + err);
+        return err;
+      })
+    }
+
+  }
+
+  async createBot(api_url, token, chatbot, project_id) {
+
+    winston.info("[CHATBOT SERVICE] createBot");
+
+    return await axios({
+      url: api_url + '/' + project_id + '/faq_kb/',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': token
+      },
+      data: chatbot,
+      method: 'POST'
+    }).then((resbody) => {
+      winston.debug("(CHATBOT SERVICE) createBot resbody: ", resbody.data);
+      return resbody.data;
+    }).catch((err) => {
+      winston.error("(CHATBOT SERVICE) CREATE NEW CHATBOT ERROR " + err);
+      return err;
+    })
+
+  }
+
+  async importFaqs(api_url, id_faq_kb, token, chatbot, project_id) {
+  
+    winston.info("[CHATBOT SERVICE] importFaqs");
+
+    return await axios({
+      url: api_url + '/' + project_id + '/faq_kb/importjson/' + id_faq_kb + "?intentsOnly=true",
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': token
+      },
+      data: chatbot,
+      method: 'POST'
+    }).then((resbody) => {
+      winston.debug("(CHATBOT SERVICE) importFaqs resbody: ", resbody.data);
+      return resbody.data;
+    }).catch((err) => {
+      winston.error("(CHATBOT SERVICE) IMPORT FAQS ERROR " + err);
+      return err;
+    })
+  }
+
+}
+
+module.exports = { ChatbotService }