@tiledesk/tiledesk-server 2.3.35 → 2.3.37

package/pubmodules/queue/reconnect.js

@@ -19,7 +19,7 @@ var exchange = 'amq.topic';
 function start() {
   amqp.connect(url, function(err, conn) {
     if (err) {
-      winston.error("[AMQP]", err.message);
+      winston.error("[AMQP]", err);
       return setTimeout(start, 1000);
     }
     conn.on("error", function(err) {
@@ -117,10 +117,30 @@ function startWorker() {
             winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_create");
             winston.info("Data queue", oka)
         });
-        ch.bindQueue(_ok.queue, exchange, "request_update", {}, function(err3, oka) {
-            winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update");
+        ch.bindQueue(_ok.queue, exchange, "request_update_preflight", {}, function(err3, oka) {
+            winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update_preflight");
             winston.info("Data queue", oka)
         });
+        ch.bindQueue(_ok.queue, exchange, "request_participants_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_participants_update");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "request_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "request_close", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_close");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "request_close_extended", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_close_extended");
+          winston.info("Data queue", oka)
+        });
+
         ch.bindQueue(_ok.queue, exchange, "message_create", {}, function(err3, oka) {
               winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: message_create");
               winston.info("Data queue", oka)
@@ -158,22 +178,47 @@ function work(msg, cb) {
   winston.debug("Got msg:"+ message_string +  " topic:" + topic);
 
   if (topic === 'request_create') {
-    winston.info("here topic:" + topic);
+    winston.debug("reconnect here topic:" + topic); 
     // requestEvent.emit('request.create.queue', msg.content);
     requestEvent.emit('request.create.queue', JSON.parse(message_string));
   }
   if (topic === 'request_update') {
-    winston.info("here topic:" + topic);
+    winston.debug("reconnect here topic:" + topic); 
     // requestEvent.emit('request.update.queue',  msg.content);
     requestEvent.emit('request.update.queue',  JSON.parse(message_string));
   }
+
+  if (topic === 'request_update_preflight') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.update.preflight.queue',  JSON.parse(message_string));
+  }    
+  
+  if (topic === 'request_participants_update') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.participants.update.queue',  JSON.parse(message_string));
+  }   
+  
+  if (topic === 'request_close') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.close.queue',  JSON.parse(message_string));
+  }     
+  
+  if (topic === 'request_close_extended') {
+    winston.debug("reconnect here topic:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.close.extended.queue',  JSON.parse(message_string));
+  }     
+
   if (topic === 'message_create') {
-    winston.debug("here topic:" + topic);
+    winston.debug("reconnect here topic:" + topic);
     // requestEvent.emit('request.create.queue', msg.content);
     messageEvent.emit('message.create.queue', JSON.parse(message_string));
   }
   if (topic === 'project_user_update') {
-    winston.debug("here topic:" + topic);
+    winston.debug("reconnect here topic:" + topic);
     // requestEvent.emit('request.create.queue', msg.content);
     authEvent.emit('project_user.update.queue', JSON.parse(message_string));
   }
@@ -204,19 +249,51 @@ function listen() {
 
     requestEvent.on('request.create', function(request) {
       setImmediate(() => {
-        winston.info("reconnect request.create")
+        winston.debug("reconnect request.create")
         publish(exchange, "request_create", Buffer.from(JSON.stringify(request)));
       });
     });
 
     requestEvent.on('request.update', function(request) {
       setImmediate(() => {
-        winston.info("reconnect request.update")
+        winston.debug("reconnect request.update")
         publish(exchange, "request_update", Buffer.from(JSON.stringify(request)));
       });
     });
 
 
+    
+
+    requestEvent.on('request.participants.update', function(request) {
+      setImmediate(() => {
+        publish(exchange, "request_participants_update", Buffer.from(JSON.stringify(request)));
+        winston.debug("reconnect participants.update published")
+      });
+    });
+
+    requestEvent.on('request.update.preflight', function(request) {
+      setImmediate(() => {
+        // winston.info("reconnect request.update.preflight")
+        publish(exchange, "request_update_preflight", Buffer.from(JSON.stringify(request)));
+        winston.debug("reconnect request.update.preflight published")
+      });
+    });
+
+
+    requestEvent.on('request.close', function(request) {
+      setImmediate(() => {
+        publish(exchange, "request_close", Buffer.from(JSON.stringify(request)));
+      });
+    });
+
+    requestEvent.on('request.close.extended', function(request) {
+      setImmediate(() => {
+        publish(exchange, "request_close_extended", Buffer.from(JSON.stringify(request)));
+      });
+    });
+
+
+
     messageEvent.on('message.create', function(message) {
       setImmediate(() => {
         publish(exchange, "message_create", Buffer.from(JSON.stringify(message)));
@@ -226,10 +303,17 @@ function listen() {
     authEvent.on('project_user.update',function(data) {
       setImmediate(() => {
         let user = undefined;
-        if (data.req && data.req.user) { //i think is null from chat21webhook 
-          user = data.req.user;
+        let body = undefined;
+        if (data.req ) {
+          if (data.req.user) { //i think is null from chat21webhook 
+            user = data.req.user;
+          }
+          if (data.req.body) { 
+            body = data.req.body;
+          }
         }
-        var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user}}; //remove request
+        var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user, body: body}}; //remove request
+        winston.debug("dat",dat);
         publish(exchange, "project_user_update", Buffer.from(JSON.stringify(dat)));
       });
     });

package/pubmodules/queue/reconnectFanout.js

@@ -19,7 +19,7 @@ var exchange = 'ws';
 function start() {
   amqp.connect(url, function(err, conn) {
     if (err) {
-      winston.error("[AMQP Fanout]", err.message);
+      winston.error("[AMQP Fanout]", err);
       return setTimeout(start, 1000);
     }
     conn.on("error", function(err) {
@@ -115,7 +115,7 @@ function startWorker() {
       //MOD4 
         ch.bindQueue(_ok.queue, exchange, '', {}, function(err3, oka) {
           winston.info("Queue Fanout bind: "+_ok.queue+ " err: "+err3);
-          winston.info("Data Queue", oka)
+          winston.info("Data Queue Fanout", oka)
         });
 
         // ch.bindQueue(_ok.queue, exchange, "request_create", {}, function(err3, oka) {
@@ -163,20 +163,20 @@ function work(msg, cb) {
   winston.debug("Got Fanout msg:"+ message_string +  " topic:" + topic);
 
   if (topic === 'request_create') {
-    winston.debug("here topic:" + topic);
-    winston.info("reconnect request.update")
+    winston.debug("reconnectfanout here topic:" + topic);
+    winston.debug("reconnect request.update")
     requestEvent.emit('request.create.queue.pubsub', JSON.parse(message_string));
   }
   if (topic === 'request_update') {
-    winston.debug("here topic:" + topic);
+    winston.debug("reconnectfanout here topic:" + topic);
     requestEvent.emit('request.update.queue.pubsub',  JSON.parse(message_string));
   }
   if (topic === 'message_create') {
-    winston.debug("here topic:" + topic);
+    winston.debug("reconnectfanout here topic:" + topic);
     messageEvent.emit('message.create.queue.pubsub', JSON.parse(message_string));
   }
   if (topic === 'project_user_update') {
-    winston.debug("here topic:" + topic);
+    winston.debug("reconnectfanout here topic:" + topic);
     authEvent.emit('project_user.update.queue.pubsub', JSON.parse(message_string));
   }
   cb(true);
@@ -227,12 +227,18 @@ function listen() {
   
   authEvent.on('project_user.update',function(data) {
     setImmediate(() => {
-
       let user = undefined;
-      if (data.req && data.req.user) { //i think is null from chat21webhook 
-        user = data.req.user;
-      }
-      var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user}}; //remove request
+      let body = undefined;
+        if (data.req ) {
+          if (data.req.user) { //i think is null from chat21webhook 
+            user = data.req.user;
+          }
+          if (data.req.body) {
+            body = data.req.body;
+          }
+        }
+        var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user, body: body}}; //remove request
+        winston.debug("dat",dat);
 
       publish(exchange, "project_user_update", Buffer.from(JSON.stringify(dat)));
     });

package/pubmodules/trigger/rulesTrigger.js

@@ -53,6 +53,8 @@ class RulesTrigger {
 
           requestEvent.on('request.support_group.created', function(request) {
 
+            // performance console log
+            // console.log("************* request.support_group.created: "+new Date().toISOString());
 
             // requestEvent.on('request.create', function(request) {
             var requestJson = request.toJSON();
@@ -174,6 +176,9 @@ class RulesTrigger {
             //   attributes
             // );
             
+            // performance console log
+            // console.log("************* send message trigger: "+new Date().toISOString(), text);
+
             // send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type, metadata, language) {
             sendMessageUtil.send(
               sender, 
@@ -864,7 +869,8 @@ class RulesTrigger {
       
                     return requestService.create(new_request).then(function (savedRequest) {                   
 
-
+                      // performance console log
+                      // console.log("************* request created trigger: "+new Date().toISOString());
 
                         if (attributes) {
                           attributes.sendnotification = false; //  sembra nn funzionae

package/routes/faq.js

@@ -116,6 +116,7 @@ router.post('/', function (req, res) {
       question: req.body.question,
       answer: req.body.answer,
       reply: req.body.reply,
+      form: req.body.form,
       enabled: true,
       id_project: req.projectid,
       topic: req.body.topic,
@@ -188,7 +189,10 @@ router.put('/:faqid', function (req, res) {
     update.enabled = req.body.enabled;
   }
   if (req.body.reply!=undefined) {
-    updated.reply = req.body.enabled;
+    update.reply = req.body.enabled;
+  }
+  if (req.body.form!=undefined) {
+    update.form = req.body.form;
   }
   
 

package/routes/faq_kb.js

@@ -5,16 +5,20 @@ var Faq= require("../models/faq");
 var Department = require("../models/department");
 var faqService = require("../services/faqService");
 const botEvent = require('../event/botEvent');
+const faqBotEvent = require('../event/faqBotEvent');
 var winston = require('../config/winston');
 var httpUtil = require("../utils/httpUtil");
+const { forEach } = require('lodash');
+var multer = require('multer')
+var upload = multer()
+
 
 router.post('/', function (req, res) {
-  winston.info('create BOT ', req.body);
-              // create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
+    winston.info('create BOT ', req.body);
+    //create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
     faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template).then(function(savedFaq_kb) {
-    res.json(savedFaq_kb);
-  });
-
+      res.json(savedFaq_kb);
+    });
 
 });
 
@@ -335,4 +339,126 @@ router.get('/', function (req, res) {
 
 });
 
+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);
+
+  Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
+    if (err) {
+      winston.error("GET FAQ-KB ERROR", err);
+      return res.status(500).send({ success: false, msg: "Error getting bot." }); 
+    }
+    if (!faq_kb) {
+      return res.status(404).send({ success: false, msg: 'Bot not found.'});
+    }
+
+    const json = JSON.parse(json_string);
+
+    if (json.webhook_enabled) {
+      faq_kb.webhook_enabled = json.webhook_enabled;
+    }
+    if (json.webhook_url) {
+      faq_kb.webhook_url = json.webhook_url;
+    }
+    if (json.language) {
+      faq_kb.language = json.language;
+    }
+    if (json.name) {
+      faq_kb.name = json.name;
+    }
+    if (json.description) {
+      faq_kb.description = json.description;
+    }
+
+    Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, (err, updatedFaq_kb) => {
+      if (err) {
+        return res.status(500).send({ success: false, msg: "Error updating bot." }); 
+      }
+      
+      botEvent.emit('faqbot.update', updatedFaq_kb);
+
+      json.intents.forEach((intent) => {
+        
+        var new_faq = new Faq({
+          id_faq_kb: updatedFaq_kb._id,
+          id_project: req.projectid,
+          createdBy: req.user.id,
+          question: intent.question,
+          answer: intent.answer,
+          reply: intent.reply,
+          form: intent.form,
+          enabled: intent.enabled,
+          webhook_enabled: intent.webhook_enabled,
+          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.' });
+            } else {
+              winston.debug('--- > ERROR ', err)
+              return res.status(500).send({ success: false, msg: 'Error saving intent.' });
+            }  
+          }
+          winston.debug("NEW FAQ CREATED WITH ID: ", savedFaq._id);
+          faqBotEvent.emit('faq.create', savedFaq);
+        })
+        
+      })
+
+      res.send(updatedFaq_kb);
+
+    })
+    
+  }) 
+
+})
+
+router.get('/exportjson/:id_faq_kb', (req, res) => {
+
+  let id_faq_kb = req.params.id_faq_kb;
+
+  Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
+    if (err){
+      winston.error('GET FAQ-KB ERROR ', err)
+      return res.status(500).send({ success: false, msg: 'Error getting bot.' });
+    } else {
+      winston.debug('FAQ-KB: ', faq_kb)
+
+
+      faqService.getAll(id_faq_kb).then((faqs) => {
+        
+        const intents = faqs.map(({_id, id_project, topic, status, id_faq_kb, createdBy, intent_id, createdAt, updatedAt, __v, ...keepAttrs}) => keepAttrs)
+      
+        let json = {
+          webhook_enabled: faq_kb.webhook_enabled,
+          webhook_url: faq_kb.webhook_url,
+          language: faq_kb.language,
+          name: faq_kb.name,
+          description: faq_kb.description,
+          intents: intents
+        }
+
+        let json_string = JSON.stringify(json);
+
+        res.set({"Content-Disposition":"attachment; filename=\"bot.txt\""});
+        return res.send(json_string);
+
+      }).catch((err) => {
+        winston.error('GET FAQ ERROR: ', err)
+        return res.status(500).send({ success: false, msg: 'Error getting faqs.' });
+      })
+    }
+  })
+  
+})
+
+
 module.exports = router;

package/routes/users-util.js

@@ -3,6 +3,7 @@ var router = express.Router();
 
 var User = require("../models/user");
 var winston = require('../config/winston');
+var mongoose = require('mongoose');
 
 
 
@@ -13,13 +14,20 @@ router.get('/:userid', function (req, res) {
   winston.debug("users");
   var userid = req.params.userid;
 
+  var isObjectId = mongoose.Types.ObjectId.isValid(userid);
+  winston.debug("isObjectId:"+ isObjectId);
+
+  if (!isObjectId) {
+    return res.status(404).send({ success: false, msg: 'User id not found' });
+  }
+
   User.findById(userid, 'firstname lastname _id', function (err, user) {
     if (err) {
       winston.error('Error getting object.',err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
     if (!user) {
-      winston.warn("Object not found with id " +req.user.id);
+      winston.warn("Object not found with id " +userid);
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
     winston.debug("GET USER BY ID RES JSON", user);

package/services/emailService.js

@@ -98,7 +98,11 @@ class EmailService {
     this.host = process.env.EMAIL_HOST || config.host;
     winston.info('EmailService host: ' + this.host);
 
-    this.secure  = process.env.EMAIL_SECURE || false;     
+    this.secure  = false;     
+    if (process.env.EMAIL_SECURE == "true" || process.env.EMAIL_SECURE ==true) {
+      this.secure  = true;     
+    }
+    // this.secure  = process.env.EMAIL_SECURE || false;     
     winston.info('EmailService secure: ' + this.secure);
 
     this.user  = process.env.EMAIL_USERNAME || config.username;
@@ -108,7 +112,11 @@ class EmailService {
     winston.info('EmailService port: ' + this.port);
 
 
-    this.markdown = process.env.EMAIL_MARKDOWN || true;
+    this.markdown = true;
+    if (process.env.EMAIL_MARKDOWN =="false" || process.env.EMAIL_MARKDOWN ==false) {
+      this.markdown = false;
+    }
+    // this.markdown = process.env.EMAIL_MARKDOWN || true;
     winston.info('EmailService markdown: '+ this.markdown);
 
     this.headers = {
@@ -252,6 +260,8 @@ class EmailService {
     };
 
     winston.debug('mailOptions', mailOptions);
+    winston.debug(' mail.config',  mail.config);
+   
     if (!mail.to) {
       return winston.warn("EmailService send method. to field is not defined", mailOptions);
     }
@@ -1683,6 +1693,6 @@ async sendRequestTranscript(to, messages, request, project) {
 
 var emailService = new EmailService();
 
-//  emailService.sendTest("asd.");
+//  emailService.sendTest("abc@abc.it");
 
 module.exports = emailService;

package/services/faqService.js

@@ -151,6 +151,21 @@ class FaqService {
     });
   }
 
+  getAll(faq_kb_id) {
+
+    winston.debug("(Service) GET ALL FAQ OF THE BOT ID (req.query): ", faq_kb_id);
+
+    return new Promise((resolve, reject) => {
+      
+      Faq.find({ id_faq_kb: faq_kb_id}, (err, faqs) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(faqs);
+      }).lean().exec()
+    })
+  }
+
 
 }
 

package/services/geoService.js

@@ -50,10 +50,10 @@ class GeoService {
 
 
   var requestCreateKey = 'request.create';
-//   if (requestEvent.queueEnabled) {
-//     requestCreateKey = 'request.create.queue';
-//   }
-//   winston.debug('GeoService requestCreateKey: ' + requestCreateKey);
+  if (requestEvent.queueEnabled) {
+    requestCreateKey = 'request.create.queue';
+  }
+  winston.debug('GeoService requestCreateKey: ' + requestCreateKey);
 
 
   requestEvent.on(requestCreateKey, function(request) {
@@ -66,7 +66,7 @@ class GeoService {
     winston.debug("ip" + ip);
     if (ip) {
         var geo = geoip.lookup(ip);  
-        winston.verbose("Geo result", geo);
+        winston.debug("Geo result", geo);
 
         // var update = {};
         if (geo) {

package/services/requestService.js

@@ -822,6 +822,7 @@ class RequestService {
 
 
     return new Promise(function (resolve, reject) {
+      winston.debug("changeFirstTextAndPreflightByRequestId", request_id);
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 

package/test/example-json.txt

@@ -0,0 +1 @@
+{"webhook_enabled":false,"language":"en","name":"examplebot","intents":[{"webhook_enabled":false,"enabled":true,"question":"\\start","answer":"Hello","intent_display_name":"start","language":"en"},{"webhook_enabled":false,"enabled":true,"question":"defaultFallback","answer":"I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent","intent_display_name":"defaultFallback","language":"en"}]}