@tiledesk/tiledesk-server 2.5.3 → 2.7.1

package/event/botEvent.js

@@ -33,9 +33,30 @@ class BotEvent extends EventEmitter {
             winston.debug("message", message);
 
             // TODO usa meglio se attributes.reply_always=true
-            if (message.sender === "system" && message.text && message.text!="\\start") {
-                winston.debug("it s a message sent from system, exit");
-                return null;
+
+            // if (message.sender === "system" && message.text && message.text!="\\start") {
+            //     winston.debug("it s a message sent from system, exit");
+            //     return null;
+            // }
+
+
+            //sbagliato
+            // if (message.sender === "system" && message.text && (message.text=="\\start" || message.text=="/start") ) {
+            //     winston.debug("it s a start message");
+            // } else {
+            //     winston.debug("it s a message sent from system, exit");
+            //     return null;
+            // }
+
+            if (message.sender === "system") {
+                if (message.text && (message.text=="\\start" || message.text=="/start") ) {
+                    winston.debug("it s a start message");
+                } else {
+                    winston.debug("it s a message sent from system, exit");
+                    return null;
+                }
+            } else {
+                winston.debug("it s a message sent from other let s go");
             }
             
             if (message.text && ( message.text.indexOf("\\agent") > -1 || message.text.indexOf("\\close") > -1)) { //not reply to a message containing \\agent

package/jobs.js

@@ -28,6 +28,9 @@ var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 const botEvent = require('./event/botEvent');
 var channelManager = require('./channels/channelManager');
 
+var updateLeadQueued = require('./services/updateLeadQueued');
+
+
 require('./services/mongoose-cache-fn')(mongoose);
 
 
@@ -80,7 +83,7 @@ async function main()
     
 
 
-    let jobsManager = new JobsManager(undefined, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier);
+    let jobsManager = new JobsManager(undefined, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier, updateLeadQueued);
 
     jobsManager.listen();
 
@@ -101,6 +104,11 @@ async function main()
     winston.info("whatsappQueue");
     jobsManager.listenWhatsappQueue(whatsappQueue);
 
+    let trainingQueue = require('@tiledesk/tiledesk-train-jobworker');
+    winston.info("trainingQueue");
+    jobsManager.listenTrainingQueue(trainingQueue);
+
+
     let scheduler = require('./pubmodules/scheduler');    
     jobsManager.listenScheduler(scheduler);
 

package/jobsManager.js

@@ -2,7 +2,7 @@
 var winston = require('./config/winston');
 
 class JobsManager {
-    constructor(jobWorkerEnabled, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier) {
+    constructor(jobWorkerEnabled, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier, updateLeadQueued) {
         this.geoService = geoService;
         this.botEvent = botEvent;
         // this.subscriptionNotifier = subscriptionNotifier;
@@ -19,6 +19,8 @@ class JobsManager {
         //     this.jobWorkerEnabled = true;
         // }
         // winston.info("JobsManager jobWorkerEnabled: "+ this.jobWorkerEnabled);  
+
+        this.updateLeadQueued = updateLeadQueued;
     }
 
 
@@ -34,6 +36,8 @@ class JobsManager {
         // this.subscriptionNotifier.start();
         this.subscriptionNotifierQueued.start();
 
+        this.updateLeadQueued.listen();
+
         // this.botSubscriptionNotifier.start(); // disabled
     }
 
@@ -82,6 +86,14 @@ class JobsManager {
         // this.whatsappWorker = whatsappQueue;
         // this.whatsappQueue.listen(); // oppure codice
     }
+
+    listenTrainingQueue(trainingQueue) {
+        console.log("JobsManager listenTrainingQueue started");
+        console.log("trainingQueue is: ", trainingQueue)
+        if (this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for Training Queue");  
+        }
+    }
 }
 
 

package/middleware/fetchLabels.js

@@ -4,20 +4,30 @@ var path = require('path');
 var winston = require('../config/winston');
 
 
-var labelsDir = __dirname+"/../config/labels/";
+var labelsDir = __dirname + "/../config/labels/";
 winston.debug('labelsDir: ' + labelsDir);
 
 
-module.exports = function(req, res, next) {
-        var filePath = path.join(labelsDir, 'widget.json');
-   
-        fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
-          if (err) {
-              winston.error('Error getting labels', err);
-              return res.status(500).send({ success: false, msg: 'Error reading object.' });
-          }
-          winston.debug('label fetched', data);
-          req.labels = JSON.parse(data);
-          next();
-        });
+module.exports = function (req, res, next) {
+  var filePath = path.join(labelsDir, 'widget.json');
+
+  fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
+    if (err) {
+      winston.error('Error getting labels', err);
+      return res.status(500).send({ success: false, msg: 'Error reading object.' });
+    }
+    winston.debug('label fetched', data);
+
+    // Replace {{ BRAND_NAME }} with process.env.BRAND_NAME value (default value "Tiledesk")
+    let brand_name = process.env.BRAND_NAME;
+
+    if (brand_name) {
+      data = data.replaceAll("Tiledesk", brand_name);
+      data = data.replaceAll("tiledesk", brand_name.toLowerCase());
+
+    }
+
+    req.labels = JSON.parse(data);
+    next();
+  });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.5.3",
+  "version": "2.7.1",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -38,18 +38,19 @@
   "dependencies": {
     "@tiledesk/tiledesk-apps": "^1.0.17",
     "@tiledesk/tiledesk-chat21-app": "^1.1.8",
+    "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
+    "@tiledesk/tiledesk-client": "^0.10.10",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "^0.1.18",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.56",
+    "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.57",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.64",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
-    "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
-    "@tiledesk/tiledesk-client": "^0.10.10",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
@@ -105,6 +106,7 @@
     "retry-request": "^4.2.2",
     "serve-favicon": "~2.5.0",
     "sharp": "^0.27.2",
+    "sitemapper": "^3.2.8",
     "stripe": "^7.2.0",
     "uniqid": "^5.4.0",
     "uuid": "^3.3.3",

package/pubmodules/queue/reconnect.js

@@ -194,6 +194,19 @@ function startWorker() {
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "lead_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: lead_update");
+          winston.info("Data queue", oka)
+        });
+
+        ch.bindQueue(_ok.queue, exchange, "lead_fullname_email_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: lead_fullname_email_update");
+          winston.info("Data queue", oka)
+        });
+
+        
+
+
 
 
         ch.consume(queueName, processMsg, { noAck: false });
@@ -295,6 +308,19 @@ function work(msg, cb) {
     leadEvent.emit('lead.create.queue',  JSON.parse(message_string));
   }
 
+  if (topic === 'lead_update') {
+    winston.debug("reconnect here topic lead_update:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    leadEvent.emit('lead.update.queue',  JSON.parse(message_string));
+  }
+
+  if (topic === 'lead_fullname_email_update') {
+    winston.debug("reconnect here topic lead_fullname_email_update:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    leadEvent.emit('lead.fullname.email.update.queue',  JSON.parse(message_string));
+  }
+
+
 
   cb(true);
 //   WebSocket.cb(true);
@@ -422,6 +448,27 @@ function listen() {
       });
     });
 
+
+    leadEvent.on('lead.update', function(lead) {
+      setImmediate(() => {
+        winston.debug("reconnect lead.update")
+        publish(exchange, "lead_update", Buffer.from(JSON.stringify(lead)));
+        winston.debug("reconnect: "+ Buffer.from(JSON.stringify(lead)))
+      });
+    });
+
+
+    leadEvent.on('lead.fullname.email.update', function(lead) {
+      setImmediate(() => {
+        winston.debug("reconnect lead.fullname.email.update")
+        publish(exchange, "lead_fullname_email_update", Buffer.from(JSON.stringify(lead)));
+        winston.debug("reconnect: "+ Buffer.from(JSON.stringify(lead)))
+      });
+    });
+
+
+    
+
 }
 
 if (process.env.QUEUE_ENABLED === "true") {

package/pubmodules/trigger/default.js

@@ -121,7 +121,7 @@ var tInviteBotObj = {
                     {key:'request.departmentHasBot',fact: 'json',path: 'department.hasBot', operator:'equal', value: true},
                     {key:'request.first_text',fact: 'json',path: 'first_text', operator:'equal', value: 'welcome'}
                 ]},
-    actions: [{key:'request.department.bot.launch'}], 
+    actions: [{key:'request.department.bot.launch', parameters: {text:"/start"}}], 
     enabled:true,
     code: 's_invite_bot_01',
     type: 'internal',
@@ -196,7 +196,7 @@ var tInviteProactiveGreetingBotObj = {
                     {key:'request.departmentHasBot',fact: 'json',path: 'department.hasBot', operator:'equal', value: true},
                     {key:'request.first_text',fact: 'json',path: 'first_text', operator:'equal', value: 'callout'}
                 ]},
-    actions: [{key:'request.department.bot.launch'}], 
+    actions: [{key:'request.department.bot.launch', parameters: {text:"/start"}}], 
     enabled:true,
     code: 's_invite_proactive_greeting_bot_01',
     type: 'internal',

package/pubmodules/trigger/rulesTrigger.js

@@ -686,6 +686,9 @@ class RulesTrigger {
 
             try {
     
+              winston.debug('triggerEventEmitter eventTrigger:', eventTrigger);
+
+
               winston.debug('runAction eventTrigger.eventSuccess:', eventTrigger.eventSuccess);
               var trigger = eventTrigger.trigger;         
               winston.debug('runAction trigger', trigger.toObject());
@@ -706,6 +709,15 @@ class RulesTrigger {
               var id_project = eventTrigger.event.id_project;
               winston.debug('runAction action id_project: ' + id_project);
   
+
+
+              var startText = "\\start";
+              if (action.parameters && action.parameters.text) {
+                startText = action.parameters.text;
+              }
+              winston.debug('runAction action startText: ' + startText);
+
+
               // reroute(request_id, id_project, nobot) {
               requestService.reroute(request_id, id_project).then(function(request) {
 
@@ -716,7 +728,7 @@ class RulesTrigger {
                   'system', 
                   'Bot',                                     
                   request_id,
-                  '\\start',
+                  startText, // /start controlla se chatbot nuovo manda /start altrimenti per i vecchi \start
                   id_project,
                   null,
                   {subtype:'info', updateconversation : false}
@@ -775,7 +787,7 @@ class RulesTrigger {
                     'system', 
                     'Bot',                                     
                     request_id,
-                    '\\start',
+                    '\\start', // / start
                     id_project,
                     null,
                     {subtype:'info', updateconversation : false}