@tiledesk/tiledesk-server 2.3.6 → 2.3.7-1.2

package/pubmodules/tilebot/index.js

@@ -0,0 +1,11 @@
+const listener = require("./listener");
+
+const tilebot = require("@tiledesk/tiledesk-tybot-connector");
+const tilebotRoute = tilebot.router;
+
+
+
+
+
+module.exports = { listener: listener, tilebotRoute: tilebotRoute };
+

package/pubmodules/tilebot/listener.js

@@ -0,0 +1,85 @@
+const botEvent = require('../../event/botEvent');
+var Faq_kb = require("../../models/faq_kb");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+var port = process.env.PORT || '3000';
+
+const TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT || "http://localhost:" + port+ "/modules/tilebot/ext/";
+winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
+
+winston.info("Tilebot endpoint: " + TILEBOT_ENDPOINT);
+
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Rasa apiUrl: '+ apiUrl);
+
+const tybot = require("@tiledesk/tiledesk-tybot-connector");
+
+
+class Listener {
+
+    listen(config) {
+
+        winston.info('Tilebot Listener listen');
+        winston.debug("Tilebot config databaseUri: " + config.databaseUri);  
+        
+
+        var that = this;
+
+        var port = process.env.CACHE_REDIS_PORT || 6379;
+        winston.debug("Redis port: "+ port);
+
+        var host = process.env.CACHE_REDIS_HOST || "127.0.0.1"
+        winston.debug("Redis host: "+ host);
+
+        var password = process.env.CACHE_REDIS_PASSWORD;
+        winston.debug("Redis password: "+ password);
+
+        // console.log("Using: REDIS_HOST:", process.env.CACHE_REDIS_HOST);
+        // console.log("Using: REDIS_PORT", process.env.CACHE_REDIS_PORT);
+        // console.log("Using: REDIS_PASSWORD", process.env.CACHE_REDIS_PASSWORD);
+        tybot.startApp(
+            {              
+                MONGODB_URI: config.databaseUri,
+                API_ENDPOINT: apiUrl,
+                REDIS_HOST: host,
+                REDIS_PORT: port,
+                REDIS_PASSWORD: password,
+                CACHE_ENABLED: process.env.CACHE_ENABLED,
+                log: process.env.TILEBOT_LOG
+            }, () => {
+                winston.info("TileBot proxy server successfully started.");                 
+            }
+        );
+
+
+        botEvent.on('faqbot.create', function(bot) {
+            if (TILEBOT_ENDPOINT) {
+
+                winston.debug('bot.type:'+bot.type); 
+                if (bot.type==="tilebot") {
+
+                    winston.debug('qui.type:'+bot.type); 
+
+
+                    Faq_kb.findByIdAndUpdate(bot.id, {"url":TILEBOT_ENDPOINT+bot.id}, { new: true, upsert: true }, function (err, savedFaq_kb) {
+
+                    // bot.save(function (err, savedFaq_kb) {
+                        if (err) {
+                         return winston.error('error saving faqkb tilebot ', err)
+                        }
+                        winston.verbose('Saved faqkb tilebot', savedFaq_kb.toObject())      
+                    });
+                }
+            }
+        });
+        
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;

package/pubmodules/trigger/rulesTrigger.js

@@ -18,11 +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");
-
-
-
-const uuidv4 = require('uuid/v4');
+var cacheEnabler = require("../../services/cacheEnabler");
+var UIDGenerator = require("../../utils/UIDGenerator");
+const RequestConstants = require('../../models/requestConstants');
 
 
 class RulesTrigger {
@@ -54,6 +54,10 @@ class RulesTrigger {
      setImmediate(() => {
 
           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();
             operatingHoursService.projectIsOpenNow(request.id_project, function (isOpen, err) {       
@@ -63,6 +67,9 @@ class RulesTrigger {
             });
           });
 
+
+
+          // da aggiungere in dashboard
           requestEvent.on('request.participants.join',  function(data) {      
             let request = data.request;
             let member = data.member;
@@ -80,10 +87,10 @@ class RulesTrigger {
             // operatingHoursService.projectIsOpenNow(request.id_project, function (isOpen, err) {   
             that.exec(message, 'message.create.from.requester', success, error);
           });
-  // not in use
-          // messageEvent.on('message.received', function(request) {
-          //   that.exec(request, 'message.received', success, error);
-          // });
+  
+          messageEvent.on('message.received', function(message) {
+            that.exec(message, 'message.received', success, error);
+          });
 
           // event2Event.on('*', function(event){
           //   winston.verbose('event2Event this.event: ' + this.event);
@@ -174,6 +181,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, 
@@ -193,6 +203,93 @@ 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.subject || "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;
+
+               //custom ocf here
+               if (eventTrigger.event.id_project =="636a63070d942d001950c023") {
+                subject = "Apertura richiesta di supporto #" + eventTrigger.event.request.ticket_id;
+                console.log("subject",subject);
+              }
+
+            }
+            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) {
@@ -675,12 +772,14 @@ 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);
 
           
 
-          var request_id = 'support-group-'+id_project+"-"+uuidv4();
+          var request_id = 'support-group-'+id_project+"-"+UIDGenerator.generate();
           var id_user;
           var fullname;
           var email;
@@ -760,10 +859,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;
               }
@@ -856,7 +969,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
@@ -864,12 +977,14 @@ 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
                         }
                         
-                        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 +1040,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/pubmodules/trigger/start.js

@@ -102,9 +102,13 @@ projectEvent.on('project.create', async (project) => {
 */
 
         
-        winston.info("triggers created for new project");
+        winston.debug("triggers created for new project");
 
 
+
+
+        // cc
+
     });
 });
 

package/pubmodules/whatsapp/index.js

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

package/pubmodules/whatsapp/listener.js

@@ -0,0 +1,32 @@
+const whatsapp = require("@tiledesk/tiledesk-whatsapp-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Whatsapp apiUrl: ' + apiUrl);
+
+class Listener {
+
+    listen(config) {
+        winston.info("WhatsApp Listener listen");
+        if (config.databaseUri) {
+            winston.debug("whatsapp config databaseUri: " + config.databaseUri);
+        }
+
+        whatsapp.startApp({
+            MONGODB_URL: config.databaseUri,          
+            API_URL: apiUrl,
+            GRAPH_URL: process.env.META_GRAPH_URL || config.graphUrl,
+            BASE_URL: apiUrl + "/modules/whatsapp",                     
+            APPS_API_URL: apiUrl + "/modules/apps",                 
+            log: process.env.WHATSAPP_LOG
+        }, () => {
+            winston.info("Tiledesk WhatsApp Connector proxy server succesfully started.");
+        })
+
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/routes/auth.js

@@ -112,13 +112,18 @@ function (req, res) {
     winston.error("SigninAnonymously validation error", {errors: errors, reqBody: req.body, reqUrl: req.url });
     return res.status(422).json({ errors: errors.array() });
   }
-  var firstname = req.body.firstname || "Guest";
+
+  let uid = uuidv4();
+  let shortuid = uid.substring(0,4); 
+  var firstname = req.body.firstname || "guest#"+shortuid; // guest_here
+  // var firstname = req.body.firstname || "Guest"; // guest_here
+  
   
 
   //TODO togli trattini da uuidv4()
   
 // TODO remove email.sec?
-  let userAnonym = {_id: uuidv4(), firstname:firstname, lastname: req.body.lastname, email: req.body.email, attributes: req.body.attributes};
+  let userAnonym = {_id: uid, firstname:firstname, lastname: req.body.lastname, email: req.body.email, attributes: req.body.attributes};
 
   req.user = UserUtil.decorateUser(userAnonym);
 

package/routes/campaigns.js

@@ -6,8 +6,7 @@ var winston = require('../config/winston');
 var requestService = require("../services/requestService");
 var messageService = require("../services/messageService");
 var MessageConstants = require("../models/messageConstants");
-const uuidv4 = require('uuid/v4');
-
+var UIDGenerator = require("../utils/UIDGenerator");
 
 
 
@@ -19,7 +18,7 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
   winston.debug("req.user", req.user);
-  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + uuidv4();
+  var request_id = req.body.request_id || 'support-group-' + req.projectid + "-" + UIDGenerator.generate();
 
   // TODO cicla su segment
 
@@ -73,6 +72,7 @@ router.post('/direct', async function (req, res) {
 
   }
 
+  
   winston.info("recipients", recipients);
   winston.info("recipients.length: " + recipients.length);
 

package/routes/department.js

@@ -175,7 +175,8 @@ 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)) {
 
     query.default = true;
@@ -270,7 +271,7 @@ router.get('/', function (req, res) {
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.profile.type ',  req.project.trialExpired);
   winston.debug('GET DEPTS FILTERED FOR STATUS === 1 req.project.isActiveSubscription ',  req.project.isActiveSubscription);
   
-
+                                            //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)) {
 
     query.default = true;

package/routes/email.js

@@ -4,6 +4,9 @@ var router = express.Router();
 
 var emailService = require("../services/emailService");
 var winston = require('../config/winston');
+const recipientEmailUtil = require("../utils/recipientEmailUtil");
+
+
 
 router.get('/templates/:templateid', 
  async (req, res) => {
@@ -17,10 +20,10 @@ router.get('/templates/:templateid',
 router.post('/test/send', 
  async (req, res) => {
   let to = req.body.to;
-  winston.info("to",to);
+  winston.debug("to",to);
 
   let configEmail = req.body.config;
-  winston.info("configEmail", configEmail);
+  winston.debug("configEmail", configEmail);
 
   emailService.sendTest(to, configEmail, function(err,obj) {
     // winston.info("sendTest rest", err, obj);
@@ -29,4 +32,31 @@ router.post('/test/send',
     
 });
 
+//TODO add cc
+router.post('/send', 
+ async (req, res) => {
+  let to = req.body.to;
+  winston.debug("to: " + to);
+
+  let text = req.body.text;
+  winston.debug("text: " + text);
+
+  let request_id = req.body.request_id;
+  winston.debug("request_id: " + request_id);
+
+  let subject = req.body.subject;
+  winston.debug("subject: " + subject);
+
+  winston.debug("req.project", req.project);
+
+  let newto = await recipientEmailUtil.process(to, req.projectid);
+  winston.debug("newto: " + newto);
+
+             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined);
+  
+  res.json({"queued": true});
+    
+});
+
 module.exports = router;

package/routes/faq.js

@@ -61,6 +61,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
         // var row = {question: element.question, answer: element.answer, 
         //   intent_id: element.intent_id, intent_display_name: element.intent_display_name,
         //   webhook_enabled: element.webhook_enabled || false }
+
         var newFaq = new Faq({
           id_faq_kb: id_faq_kb,
           question: question,
@@ -114,6 +115,9 @@ router.post('/', function (req, res) {
       id_faq_kb: req.body.id_faq_kb,
       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,
       language: faq_kb.language,
@@ -123,6 +127,13 @@ router.post('/', function (req, res) {
       updatedBy: req.user.id
     });
 
+    if (req.body.enabled != undefined) {
+      newFaq.enabled = req.body.enabled;
+    }
+    if (req.body.actions) {
+      newFaq.actions = req.body.actions
+    }
+
     newFaq.save(function (err, savedFaq) {
       if (err) {
         if (err.code == 11000) {
@@ -177,8 +188,18 @@ router.put('/:faqid', function (req, res) {
   if (req.body.webhook_enabled!=undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
-  
-
+  if (req.body.enabled!=undefined) {
+    update.enabled = req.body.enabled;
+  }
+  if (req.body.reply!=undefined) {
+    update.reply = req.body.reply;
+  }
+  if (req.body.form!=undefined) {
+    update.form = req.body.form;
+  }
+  if (req.body.actions != undefined) {
+    update.actions = req.body.actions;
+  }
 
   Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
     if (err) {
@@ -299,10 +320,24 @@ router.get('/', function (req, res, next) {
     query.id_project = req.projectid
   }
 
+  if (req.query.intent_display_name) {
+    query.intent_display_name=req.query.intent_display_name
+  }
+  
+
   winston.debug("GET FAQ query", query);
 
   // query.$text = {"$search": "question"};
 
+// TODO ORDER BY SCORE
+  // return Faq.find(query,  {score: { $meta: "textScore" } }) 
+  // .sort( { score: { $meta: "textScore" } } ) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
+
+  // in testing...
+  // return Faq.search('a closer', (err, result) => {
+  //   console.log("result: ", result);
+  // })
+  
   return Faq.find(query).
   skip(skip).limit(limit).
   populate({path:'faq_kb'})//, match: { trashed: { $in: [null, false] } }}).