@tiledesk/tiledesk-server 2.4.38 → 2.4.40

package/CHANGELOG.md

@@ -5,12 +5,20 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.39
+- Queued botSubscriptionNotifier
+- added lead.create to the queue????? testare di nuovo
+- @tiledesk/tiledesk-tybot-connector: 0.1.89
+- jobsManager.listen(); //listen after pubmodules to enabled queued *.queueEnabled events
+
+# 2.4.38
+- str fix
 
 # 2.4.37
 - added replyto to email endpoint
 - tiledesk/tiledesk-tybot-connector: 0.1.88
 - added lead.create to the queue
-- added subscriptionNotifiedQueued for the most common events (request.create, request.update, request.close, lead.create, project_user.update)
+- added subscriptionNotifiedQueued for the most common events (message.create, request.create, request.update, request.close, lead.create, project_user.update)
 
 
 # 2.4.36
@@ -19,7 +27,7 @@
 # 2.4.35
 - tiledesk/tiledesk-tybot-connector: 0.1.87
 
-# 2.4.34
+# 2.4.34 -> ERRORE PAGAMENTO
 - tiledesk/tiledesk-tybot-connector:0.1.83
 - stateless as default for Google Strategy
 - added redis session for google auth. To enable it put ENABLE_REDIS_SESSION to true otherwise standard passport session is used

package/app.js

@@ -135,6 +135,7 @@ var RouterLogger = require('./models/routerLogger');
 var cacheEnabler = require("./services/cacheEnabler");
 const session = require('express-session');
 const RedisStore = require("connect-redis").default
+const botEvent = require('./event/botEvent');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -146,7 +147,9 @@ var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued'
 
 
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
-botSubscriptionNotifier.start();
+botSubscriptionNotifier.start(); //queued but disabled
+
+botEvent.listen(); //queued but disabled
 
 var trainingService = require('./services/trainingService');
 trainingService.start();
@@ -164,10 +167,7 @@ if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED ==
 }
 winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
 
-let jobsManager = new JobsManager(jobWorkerEnabled, geoService, subscriptionNotifierQueued);
-jobsManager.listen();
-
-
+let jobsManager = new JobsManager(jobWorkerEnabled, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier);
 
 var faqBotHandler = require('./services/faqBotHandler');
 faqBotHandler.listen();
@@ -175,6 +175,8 @@ faqBotHandler.listen();
 var pubModulesManager = require('./pubmodules/pubModulesManager');
 pubModulesManager.init({express:express, mongoose:mongoose, passport:passport, databaseUri:databaseUri, routes:{}, jobsManager:jobsManager});
   
+jobsManager.listen(); //listen after pubmodules to enabled queued *.queueEnabled events
+
 var channelManager = require('./channels/channelManager');
 channelManager.listen(); 
 

package/channels/chat21/chat21Handler.js

@@ -85,6 +85,8 @@ class Chat21Handler {
 
         
       
+        // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
+
         // su projectUser create e update
         authEvent.on('user.signup', function(userData) {
             var firstName = userData.savedUser.firstname;
@@ -258,7 +260,7 @@ class Chat21Handler {
                         });
         });
        
-
+        // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
         messageEvent.on('message.sending', function(message) {
 
             // setImmediate(() => {
@@ -358,7 +360,7 @@ class Chat21Handler {
                            return  chat21.messages.sendToGroup(message.senderFullname,     message.recipient, 
                                 recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp)
                                         .then(function(data){
-                                            winston.verbose("Chat21Sender sendToGroup sent: "+ JSON.stringify(data));
+                                            winston.verbose("Chat21Sender sendToGroup sent: "+ JSON.stringify(data) + " for text message " + message.text);
                                     
 
                                             // chat21.conversations.stopTyping(message.recipient,message.sender);
@@ -520,6 +522,8 @@ class Chat21Handler {
             //     });
             // });
 
+
+            // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
             requestEvent.on('request.create',  function(request) {          
 
                 winston.debug("chat21Handler requestEvent request.create called" , request);
@@ -632,9 +636,10 @@ class Chat21Handler {
             });
     
 
-            
-            requestEvent.on('request.close',  function(request) {          
+            // chat21Handler on worker is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
 
+            requestEvent.on('request.close',  function(request) {          //request.close event here noqueued
+                winston.debug("request.close event here 8")
                 winston.debug("chat21Handler requestEvent request.close called" , request);
 
                 setImmediate(() => {

package/event/botEvent.js

@@ -14,6 +14,102 @@ class BotEvent extends EventEmitter {
         this.queueEnabled = false;
         this.setMaxListeners(11);
       }
+
+
+      listen() {
+        //TODO modify to async
+        //messageEvent.on('message.received', function(message) {
+
+
+        var messageCreateKey = 'message.create';
+        if (messageEvent.queueEnabled) {
+            messageCreateKey = 'message.create.queue';
+        }
+
+        winston.info("Listening " + messageCreateKey + " event for Chatbot messages");
+
+        messageEvent.on(messageCreateKey, function(message) {
+
+            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.text && ( message.text.indexOf("\\agent") > -1 || message.text.indexOf("\\close") > -1)) { //not reply to a message containing \\agent
+                return 0;
+            }
+
+            // if (message.text.startsWith("\\")) { //not reply to a message containing \
+            //     return null;
+            // }
+            
+        var botId = getBotId(message);
+
+        winston.debug("botId: " + botId);
+
+        if (!botId) {
+                return null;
+            }else {
+                                                        //loop fix for messages sent from external bot    
+                // botprefix         
+                if (message.sender === 'bot_'+botId || message.sender === botId) {
+                    winston.debug("it s a message sent from bot, exit");
+                    return null;        
+                }else {
+                    messageEvent.emit('message.received.for.bot', message);  //UNUSED
+                }
+
+            }
+
+            // qui potresti leggere anche +secret ed evitare prossima query in botNotification
+            let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+        //TODO unselect secret. secret is unselectable by default in the model
+
+                if (cacheEnabler.faq_kb) {
+                    winston.debug('message.id_project+":faq_kbs:id:"+botId: '+ message.id_project+":faq_kbs:id:"+botId);  
+                qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
+                winston.debug('faq_kb cache enabled');
+                }
+
+                qbot.exec(function(err, bot) {
+
+
+            
+                if (err) {
+                winston.error('Error getting object.', err);
+                return 0;
+                }
+                if (!bot) {
+                    winston.warn('Bot not found with id '+botId);
+                }
+
+                winston.debug("bot debug", bot);
+
+                if (bot) {
+                    if (bot.type==="internal") {
+                        botEvent.emit('bot.message.received.notify.internal', message);
+                    
+                    }else {  //external 
+                        if (bot.url) {
+                            var botNotification = {bot: bot, message: message};
+                            botEvent.emit('bot.message.received.notify.external', botNotification);
+                        }else {
+                            winston.warn("bot url is not defined", bot);
+                        }
+                    }
+                } 
+
+            });
+            
+
+
+        });
+
+      }
+
 }
 
 const botEvent = new BotEvent();
@@ -79,87 +175,6 @@ function getBotId(message) {
  
 }
 
-//TODO modify to async
-//messageEvent.on('message.received', function(message) {
-messageEvent.on('message.create', function(message) {
-
-    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.text && ( message.text.indexOf("\\agent") > -1 || message.text.indexOf("\\close") > -1)) { //not reply to a message containing \\agent
-        return 0;
-    }
-
-    // if (message.text.startsWith("\\")) { //not reply to a message containing \
-    //     return null;
-    // }
-    
-   var botId = getBotId(message);
-
-   winston.debug("botId: " + botId);
-
-   if (!botId) {
-        return null;
-    }else {
-                                                //loop fix for messages sent from external bot    
-        // botprefix         
-        if (message.sender === 'bot_'+botId || message.sender === botId) {
-            winston.debug("it s a message sent from bot, exit");
-            return null;        
-        }else {
-            messageEvent.emit('message.received.for.bot', message);
-        }
-
-    }
-
-
-    let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
-//TODO unselect secret. secret is unselectable by default in the model
-
-        if (cacheEnabler.faq_kb) {
-            winston.debug('message.id_project+":faq_kbs:id:"+botId: '+ message.id_project+":faq_kbs:id:"+botId);  
-          qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
-          winston.debug('faq_kb cache enabled');
-        }
-
-        qbot.exec(function(err, bot) {
-
-
-    
-        if (err) {
-          winston.error('Error getting object.', err);
-          return 0;
-        }
-        if (!bot) {
-            winston.warn('Bot not found with id '+botId);
-        }
-
-        winston.debug("bot", bot);
-
-        if (bot) {
-            if (bot.type==="internal") {
-                botEvent.emit('bot.message.received.notify.internal', message);
-               
-            }else {  //external 
-                if (bot.url) {
-                    var botNotification = {bot: bot, message: message};
-                    botEvent.emit('bot.message.received.notify.external', botNotification);
-                }else {
-                    winston.warn("bot url is not defined", bot);
-                }
-            }
-        } 
-
-    });
-    
-
-
-});
 
 
 module.exports = botEvent;

package/event/leadEvent.js

@@ -1,10 +1,14 @@
 const EventEmitter = require('events');
 
-class LeadEvent extends EventEmitter {}
+class LeadEvent extends EventEmitter {
+    constructor() {
+        super();
+        this.queueEnabled = false;
+        this.setMaxListeners(11);
+      }
+}
 
 const leadEvent = new LeadEvent();
 
 
-
-
 module.exports = leadEvent;

package/jobs.js

@@ -23,6 +23,10 @@ let JobsManager = require('./jobsManager');
 let geoService = require('./services/geoService');
 // let subscriptionNotifier = require('./services/subscriptionNotifier');
 var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued');
+var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
+
+const botEvent = require('./event/botEvent');
+var channelManager = require('./channels/channelManager');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -55,12 +59,28 @@ winston.info("Mongoose connection done on host: "+mongoose.connection.host + " o
 async function main()
 {
 
-   //************* LOAD QUEUE ************ //
-    require('./pubmodules/queue');   
-    
+  ////************* LOAD QUEUE ************ //
+  require('./pubmodules/cache').cachegoose(mongoose);            
+      
+
+  ////************* LOAD CONCIERGE BOT ************ //
+  require('./pubmodules/rules/appRules').start();
+
+
+  // require('./pubmodules/trigger/rulesTrigger').listen(); request.close trigger event is not triggered by anyone now?
+   
+
+  //************* LOAD QUEUE ************ //
+  require('./pubmodules/queue');   
     // require('@tiledesk-ent/tiledesk-server-queue');     
 
-    let jobsManager = new JobsManager(undefined, geoService, subscriptionNotifierQueued);
+   //************* LOAD CHAT21 ************ //
+   channelManager.listen(); // chat21Handler is loaded with stadard events like request.create and NOT request.create.queue because it is used internally by the worker when the request is closed by ChatUnhandledRequestScheduler
+
+    
+
+
+    let jobsManager = new JobsManager(undefined, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier);
 
     jobsManager.listen();
 
@@ -72,6 +92,17 @@ async function main()
     let activityArchiver = require('./pubmodules/activities').activityArchiver;    
     jobsManager.listenActivityArchiver(activityArchiver);
 
+
+    // let routingQueue = require('./pubmodules/routing-queue').listener;    //ci sono altri eventi che nn gestisco in queue request.participants.join etc
+    // winston.info("routingQueue1"); 
+    // jobsManager.listenRoutingQueue(routingQueue);
+
+
+
+    let scheduler = require('./pubmodules/scheduler');    
+    jobsManager.listenScheduler(scheduler);
+
+
     winston.info("Jobs started"); 
 
     await new Promise(function () {});

package/jobsManager.js

@@ -2,15 +2,16 @@
 var winston = require('./config/winston');
 
 class JobsManager {
-    constructor(jobWorkerEnabled, geoService, subscriptionNotifierQueued) {
+    constructor(jobWorkerEnabled, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier) {
         this.geoService = geoService;
+        this.botEvent = botEvent;
         // this.subscriptionNotifier = subscriptionNotifier;
         this.subscriptionNotifierQueued = subscriptionNotifierQueued;
+        this.botSubscriptionNotifier = botSubscriptionNotifier;
 
         this.emailNotificatio = undefined;
         this.activityArchiver = undefined;
-
-
+     
         this.jobWorkerEnabled = jobWorkerEnabled;
         // this.jobWorkerEnabled = false;
         // if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED == true) {
@@ -26,8 +27,13 @@ class JobsManager {
            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listeners");  
         }
         this.geoService.listen();
+        
+        // this.botEvent.listen(); // disabled
+
         // this.subscriptionNotifier.start();
         this.subscriptionNotifierQueued.start();
+
+        // this.botSubscriptionNotifier.start(); // disabled
     }
 
     listenEmailNotification(emailNotification) {      
@@ -39,7 +45,23 @@ class JobsManager {
         this.emailNotification.requestNotification.listen();
     }
 
+    // listenRoutingQueue(routingQueue) {
+    //     winston.info("JobsManager routingQueue started");  
+    //     if ( this.jobWorkerEnabled == true) {
+    //         return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for routingQueue");  
+    //     }
+    //     this.routingQueue = routingQueue;
+    //     this.routingQueue.listen();
+    // }
 
+    listenScheduler(scheduler) {
+        winston.info("JobsManager scheduler started");  
+        if ( this.jobWorkerEnabled == true) {
+            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listener for scheduler");  
+        }
+        this.scheduler = scheduler;
+        this.scheduler.taskRunner.start();    
+    }
 
     listenActivityArchiver(activityArchiver) {
         winston.info("JobsManager listenActivityArchiver started"); 

package/models/user.js

@@ -15,7 +15,7 @@ var UserSchema = new Schema({
         type: String,
         required: true,
         // https://stackoverflow.com/questions/12096262/how-to-protect-the-password-field-in-mongoose-mongodb-so-it-wont-return-in-a-qu
-        select: false 
+        select: false
     },
     firstname: {
         type: String,
@@ -31,10 +31,10 @@ var UserSchema = new Schema({
     },
     resetpswrequestid: {
         type: String,
-        select: false 
+        select: false
     },
     signedInAt: {
-        type:Date
+        type: Date
     },
 
     // db.users.find({authUrl: {$exists : false }}).forEach(function(mydoc) {
@@ -43,7 +43,7 @@ var UserSchema = new Schema({
 
     authUrl: {
         type: String,
-        index:true
+        index: true
     },
     attributes: {
         type: Object,
@@ -54,10 +54,18 @@ var UserSchema = new Schema({
         default: 100,
         index: true,
         // select: false
-    }, 
+    },
     description: {
         type: String,
     },
+    public_email: {
+        type: String,
+        required: false
+    },
+    public_website: {
+        type: String,
+        required: false
+    }
     // authType: { // update db old data
     //     type: String,
     //     index:true,
@@ -68,9 +76,9 @@ var UserSchema = new Schema({
     //     ref: 'auth',
     //     //required: true
     //   },       
-    },{
-      timestamps: true
-    }
+}, {
+    timestamps: true
+}
 );
 
 // UserSchema.set('toJSON', {
@@ -111,8 +119,8 @@ UserSchema.methods.comparePassword = function (passw, cb) {
 
 UserSchema.virtual('fullName').get(function () {
     return (this.firstname || '') + ' ' + (this.lastname || '');
-  });
-  
+});
+
 
 //UserSchema.index({ email: 1, authType: 1 }, { unique: true }); 
 
@@ -126,6 +134,6 @@ var UserModel = mongoose.model('user', UserSchema);
 if (process.env.MONGOOSE_SYNCINDEX) {
     UserModel.syncIndexes();
     winston.info("UserModel syncIndexes")
-  }
+}
 
 module.exports = UserModel;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.38",
+  "version": "2.4.40",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,7 +44,7 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.87",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.89",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.50",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/activities/activityArchiver.js

@@ -42,6 +42,7 @@ class ActivityArchiver {
         activityEvent.on('lead.download.csv', this.save);
 */
       
+//  works only if worker is disabled
       var authProjectUserInvitePendingKey = 'project_user.invite.pending';  //Don't work if job_worker enabled because queue.worker is disabled
       // if (authEvent.queueEnabled) { //queue not supported.
       //   authProjectUserInvitePendingKey = 'project_user.invite.pending.queue';
@@ -63,6 +64,10 @@ class ActivityArchiver {
        
         });
       
+
+
+
+//  works only if worker is disabled
         var authProjectUserInviteKey = 'project_user.invite';   //Don't work if job_worker enabled because queue.worker is disabled
         // if (authEvent.queueEnabled) { //queue not supported
         //   authProjectUserInviteKey = 'project_user.invite.queue';
@@ -84,6 +89,9 @@ class ActivityArchiver {
             
           });
         });
+
+
+
       
       // verified with queue
         var authProjectUserUpdateKey = 'project_user.update';
@@ -125,7 +133,7 @@ class ActivityArchiver {
         
        });
       
-
+//  works only if worker is disabled
        var authProjectUserDeleteKey = 'project_user.delete';     //Don't work if job_worker enabled because queue.worker is disabled
       //  if (authEvent.queueEnabled) { //queue not supported
       //   authProjectUserDeleteKey = 'project_user.delete.queue';
@@ -147,8 +155,10 @@ class ActivityArchiver {
           
         });
       });
-      
 
+
+      
+// disabled why? performance?
       // var authUserSignineKey = 'user.signin';
       // // if (authEvent.queueEnabled) { //queue not supported
       // //   authUserSignineKey = 'user.signin.queue';

package/pubmodules/emailNotification/requestNotification.js

@@ -83,14 +83,14 @@ listen() {
 
           //messages sent from admins or agents to requester
           if (message.sender != message.request.lead.lead_id) {
-            winston.verbose("sending sendToUserEmailChannelEmail for EMAIL or FORM channel");
+            winston.debug("sending sendToUserEmailChannelEmail for EMAIL or FORM channel");
              
             //send email notification to requester (send also to followers)
             return that.sendToUserEmailChannelEmail(message.id_project, message);        
           } else { //messages sent from requester to agents or admins
 
             if (message.text != message.request.first_text) {              
-              winston.verbose("sending sendToAgentEmailChannelEmail for EMAIL or FORM channel");
+              winston.debug("sending sendToAgentEmailChannelEmail for EMAIL or FORM channel");
 
               //send email notification to admins and agents(send also to followers)
               return that.sendToAgentEmailChannelEmail(message.id_project, message);           
@@ -140,7 +140,7 @@ listen() {
    
         /*
         if (request && (request.channel.name===ChannelConstants.EMAIL || request.channel.name===ChannelConstants.FORM )) {
-          winston.verbose("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
+          winston.debug("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
          that.sendEmailChannelTakingNotification(request.id_project, request)
         } 
         */
@@ -190,7 +190,7 @@ listen() {
     if (requestEvent.queueEnabled) {
       requestCloseExtendedKey = 'request.close.extended.queue';
     }
-    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);
+    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);    //request.close event here queued under job
     requestEvent.on(requestCloseExtendedKey, function(data) {
       winston.debug('requestEvent.on(requestCloseExtendedKey ' + requestCloseExtendedKey);
       setImmediate(() => {
@@ -563,7 +563,7 @@ sendToAgentEmailChannelEmail(projectid, message) {
                          if (!user) {
                           winston.warn("User not found", userid);
                          } else {
-                           winston.verbose("Sending sendNewPooledMessageNotification to user with email: "+ user.email);
+                           winston.debug("Sending sendNewPooledMessageNotification to user with email: "+ user.email);
                            if (user.emailverified) {
                              emailService.sendNewPooledMessageEmailNotification(user.email, savedRequest, project, message);
                            }else {
@@ -997,7 +997,7 @@ sendAgentEmail(projectid, savedRequest) {
                           if (!user) {
                             winston.warn("User not found",  savedRequest.participants[0]);
                           } else {
-                            winston.verbose("Sending sendNewAssignedRequestNotification to user with email", user.email);
+                            winston.debug("Sending sendNewAssignedRequestNotification to user with email", user.email);
                             //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account    
                             
                             

package/pubmodules/pubModulesManager.js

@@ -493,7 +493,8 @@ class PubModulesManager {
         
         if (this.scheduler) {
             try {
-                this.scheduler.taskRunner.start();     
+                // this.scheduler.taskRunner.start();     
+                this.jobsManager.listenScheduler(this.scheduler);
                 winston.info("PubModulesManager scheduler started.");   
             } catch(err) {        
                 winston.info("PubModulesManager error starting scheduler module", err);            
@@ -515,6 +516,7 @@ class PubModulesManager {
         if (this.routingQueue) {
             try {
                 this.routingQueue.listen();
+                // this.jobsManager.listenRoutingQueue(this.routingQueue);
                 winston.info("PubModulesManager routingQueue started");
             } catch(err) {        
                 winston.info("PubModulesManager error starting routingQueue module", err);            

package/pubmodules/queue/reconnect.js

@@ -17,7 +17,9 @@ var url = process.env.CLOUDAMQP_URL + "?heartbeat=60" || "amqp://localhost";
 // attento devi aggiornare configMap di PRE E PROD
 // var url = process.env.AMQP_URL + "?heartbeat=60" || "amqp://localhost?heartbeat=60";
 
+// var durable = true;
 var durable = false;
+
 // if (process.env.ENABLE_DURABLE_QUEUE == false || process.env.ENABLE_DURABLE_QUEUE == "false") {
 //   durable = false;
 // }
@@ -67,10 +69,10 @@ function whenConnected() {
   winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
 
   if (jobWorkerEnabled == false) {
-    winston.info("Queue Reconnect start worker");
+    winston.info("Queue Reconnect starts queue worker (queue observer)");
     startWorker();
   } else {
-    winston.info("Queue Reconnect without worker because external worker is enabled");
+    winston.info("Queue Reconnect without queue worker (queue observer) because external worker is enabled");
   }
   
 }
@@ -328,9 +330,10 @@ function listen() {
       });
     });
 
-
+    // winston.debug("sub to reconnect request.close");
     requestEvent.on('request.close', function(request) {
       setImmediate(() => {
+        winston.debug("reconnect request.close");
         publish(exchange, "request_close", Buffer.from(JSON.stringify(request)));
       });
     });
@@ -395,6 +398,6 @@ if (process.env.QUEUE_ENABLED === "true") {
     leadEvent.queueEnabled = true;
     listen();
     start();
-    winston.info("Queue enabled. endpint: " + url );
+    winston.info("Queue enabled. endpoint: " + url );
 } 
 

package/routes/faq.js

@@ -10,6 +10,7 @@ const faqEvent = require('../event/faqBotEvent')
 
 var parsecsv = require("fast-csv");
 const botEvent = require('../event/botEvent');
+const uuidv4 = require('uuid/v4');
 csv = require('csv-express');
 csv.separator = ';';
 
@@ -21,21 +22,22 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
   winston.debug(' -> FILE ', req.file);
 
   var id_faq_kb = req.body.id_faq_kb;
-  winston.debug('id_faq_kb: '+id_faq_kb);
+  winston.debug('id_faq_kb: ' + id_faq_kb);
 
   var delimiter = req.body.delimiter || ";";
-  winston.debug('delimiter: '+delimiter);
+  winston.debug('delimiter: ' + delimiter);
 
   var csv = req.file.buffer.toString('utf8');
+  console.log("--> csv: ", csv)
   // winston.debug(' -> CSV STRING ', csv);
 
   // res.json({ success: true, msg: 'Importing CSV...' });
 
   // PARSE CSV
- 
 
 
-  Faq_kb.findById(id_faq_kb).exec(function(err, faq_kb) {
+
+  Faq_kb.findById(id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -44,18 +46,45 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
     }
     winston.debug('faq_kb ', faq_kb.toJSON());
 
-  // getFaqKbKeyById(req.body.id_faq_kb, function (remote_faqkb_key) {
+    // getFaqKbKeyById(req.body.id_faq_kb, function (remote_faqkb_key) {
 
     parsecsv.parseString(csv, { headers: false, delimiter: delimiter })
       .on("data", function (data) {
         winston.debug('PARSED CSV ', data);
 
+        console.log('--> PARSED CSV ', data);
+
         var question = data[0]
-        var answer = data[1]
+        //var answer = data[1]
         var intent_id = data[2];
         var intent_display_name = data[3];
         var webhook_enabled = data[4];
 
+
+        var actions = [
+          {
+            _tdActionType: "reply",
+            _tdActionId: uuidv4(),
+            text: data[1],
+            attributes: {
+              commands: [
+                {
+                  type: "wait",
+                  time: 500
+                },
+                {
+                  type: "message",
+                  message: {
+                    type: "text",
+                    text: data[1]
+                  }
+                }
+              ]
+            }
+
+          }
+        ]
+
         var webhook_enabled_boolean = false;
         if (webhook_enabled) {
           webhook_enabled_boolean = (webhook_enabled == 'true');
@@ -67,8 +96,9 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
         var newFaq = new Faq({
           id_faq_kb: id_faq_kb,
           question: question,
-          answer: answer,
-          intent_id:intent_id,
+          //answer: answer,
+          actions: actions,
+          intent_id: intent_id,
           intent_display_name: intent_display_name,
           webhook_enabled: webhook_enabled_boolean,
           language: faq_kb.language,
@@ -77,6 +107,8 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
           updatedBy: req.user.id
         });
 
+        console.log("--> newFaq: ", JSON.stringify(newFaq, null, 2));
+
         newFaq.save(function (err, savedFaq) {
           if (err) {
             winston.error('--- > ERROR uploadcsv', err)
@@ -85,7 +117,7 @@ router.post('/uploadcsv', upload.single('uploadFile'), function (req, res, next)
           } else {
             faqBotEvent.emit('faq.create', savedFaq);
           }
-          
+
         });
       })
       .on("end", function () {
@@ -105,7 +137,7 @@ router.post('/', function (req, res) {
 
   winston.debug(req.body);
 
-  Faq_kb.findById(req.body.id_faq_kb).exec(function(err, faq_kb) {
+  Faq_kb.findById(req.body.id_faq_kb).exec(function (err, faq_kb) {
     if (err) {
       return res.status(500).send({ success: false, msg: 'Error getting object.' });
     }
@@ -148,7 +180,7 @@ router.post('/', function (req, res) {
         } else {
           winston.debug('--- > ERROR ', err)
           return res.status(500).send({ success: false, msg: 'Error saving object.' });
-        }     
+        }
       }
       winston.debug('1. ID OF THE NEW FAQ CREATED ', savedFaq._id)
       winston.debug('1. QUESTION OF THE NEW FAQ CREATED ', savedFaq.question)
@@ -160,7 +192,7 @@ router.post('/', function (req, res) {
 
       res.json(savedFaq);
 
-    
+
     });
   });
 });
@@ -187,7 +219,7 @@ router.patch('/:faqid/attributes', function (req, res) {
 
     winston.debug("updatedFaq attributes", updatedFaq.attributes);
 
-    Object.keys(data).forEach(function(key) {
+    Object.keys(data).forEach(function (key) {
       var val = data[key];
       winston.debug("data attributes" + key + " " + val);
       updatedFaq.attributes[key] = val;
@@ -221,38 +253,38 @@ router.put('/:faqid', function (req, res) {
   winston.debug('UPDATE FAQ ', req.body);
 
   var update = {};
-  
-  if (req.body.intent!=undefined) {
+
+  if (req.body.intent != undefined) {
     update.intent = req.body.intent;
   }
-  if (req.body.question!=undefined) {
+  if (req.body.question != undefined) {
     update.question = req.body.question;
   }
-  if (req.body.answer!=undefined) {
+  if (req.body.answer != undefined) {
     update.answer = req.body.answer;
   }
-  if (req.body.topic!=undefined) {
+  if (req.body.topic != undefined) {
     update.topic = req.body.topic;
   }
-  if (req.body.status!=undefined) {
+  if (req.body.status != undefined) {
     update.status = req.body.status;
   }
-  if (req.body.language!=undefined) {
+  if (req.body.language != undefined) {
     update.language = req.body.language;
   }
-  if (req.body.intent_display_name!=undefined) {
+  if (req.body.intent_display_name != undefined) {
     update.intent_display_name = req.body.intent_display_name;
   }
-  if (req.body.webhook_enabled!=undefined) {
+  if (req.body.webhook_enabled != undefined) {
     update.webhook_enabled = req.body.webhook_enabled;
   }
-  if (req.body.enabled!=undefined) {
+  if (req.body.enabled != undefined) {
     update.enabled = req.body.enabled;
   }
-  if (req.body.reply!=undefined) {
+  if (req.body.reply != undefined) {
     update.reply = req.body.reply;
   }
-  if (req.body.form!=undefined) {
+  if (req.body.form != undefined) {
     update.form = req.body.form;
   }
   if (req.body.actions != undefined) {
@@ -266,7 +298,7 @@ router.put('/:faqid', function (req, res) {
     if (err) {
       if (err.code == 11000) {
         return res.status(409).send({ success: false, msg: 'Duplicate  intent_display_name.' });
-      }else {
+      } else {
         return res.status(500).send({ success: false, msg: 'Error updating object.' });
       }
     }
@@ -315,16 +347,18 @@ router.get('/csv', function (req, res) {
 
   winston.debug('EXPORT FAQS TO CSV QUERY', query);
 
-   Faq.find(query, 'question answer intent_id intent_display_name webhook_enabled -_id').lean().exec(function (err, faqs) {
+  Faq.find(query, 'question answer intent_id intent_display_name webhook_enabled -_id').lean().exec(function (err, faqs) {
     if (err) {
       winston.debug('EXPORT FAQS TO CSV ERR', err)
       return (err)
     };
     var csv = [];
-    faqs.forEach(function(element) {
-      var row = {question: element.question, answer: element.answer, 
+    faqs.forEach(function (element) {
+      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 }
+        webhook_enabled: element.webhook_enabled || false
+      }
       csv.push(row);
     });
     winston.debug('EXPORT FAQ TO CSV FAQS', csv)
@@ -363,9 +397,9 @@ router.get('/', function (req, res, next) {
 
   var limit = 3000; // Number of request per page
 
-  if (req.query.limit) {    
+  if (req.query.limit) {
     limit = parseInt(req.query.limit);
-    winston.debug('faq ROUTE - limit: '+limit);
+    winston.debug('faq ROUTE - limit: ' + limit);
   }
 
   var page = 0;
@@ -388,15 +422,15 @@ router.get('/', function (req, res, next) {
   }
 
   if (req.query.intent_display_name) {
-    query.intent_display_name=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
+  // 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
 
@@ -404,11 +438,11 @@ router.get('/', function (req, res, next) {
   // 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] } }}).
-  .exec(function (err, faq) {
+    skip(skip).limit(limit).
+    populate({ path: 'faq_kb' })//, match: { trashed: { $in: [null, false] } }}).
+    .exec(function (err, faq) {
       winston.debug("GET FAQ ", faq);
 
       if (err) {
@@ -420,7 +454,7 @@ router.get('/', function (req, res, next) {
 
     });
 
-  
+
 });
 
 

package/routes/users-util.js

@@ -21,7 +21,7 @@ router.get('/:userid', function (req, res) {
     return res.status(404).send({ success: false, msg: 'User id not found' });
   }
 
-  User.findById(userid, 'firstname lastname _id', function (err, user) {
+  User.findById(userid, 'firstname lastname _id public_website public_email description', function (err, user) {
     if (err) {
       winston.error('Error getting object.',err);
       return res.status(500).send({ success: false, msg: 'Error getting object.' });

package/routes/users.js

@@ -7,23 +7,36 @@ var winston = require('../config/winston');
 const authEvent = require('../event/authEvent');
 const uuidv4 = require('uuid/v4');
 
-
-
-
-
 router.put('/', function (req, res) {
 
   winston.debug('UPDATE USER - REQ BODY ', req.body);
 
   var update = {};
-  
-  update.firstname = req.body.firstname;
-  update.lastname = req.body.lastname;
-  update.attributes = req.body.attributes;
-  update.description = req.body.description;
-  
-  
 
+  // update.firstname = req.body.firstname;
+  // update.lastname = req.body.lastname;
+  // update.attributes = req.body.attributes;
+  // update.description = req.body.description;
+
+  if (req.body.firstname != undefined) {
+    update.firstname = req.body.firstname;
+  }
+  if (req.body.lastname != undefined) {
+    update.lastname = req.body.lastname;
+  }
+  if (req.body.attributes != undefined) {
+    update.attributes = req.body.attributes;
+  }
+  if (req.body.description != undefined) {
+    update.description = req.body.description;
+  }
+  if (req.body.public_email != undefined) {
+    update.public_email = req.body.public_email;
+  }
+  if (req.body.public_website != undefined) {
+    update.public_website = req.body.public_website;
+  }
+ 
   User.findByIdAndUpdate(req.user.id, update, { new: true, upsert: true }, function (err, updatedUser) {
     if (err) {
       winston.error("Error putting user",err);

package/services/BotSubscriptionNotifier.js

@@ -19,7 +19,7 @@ class BotSubscriptionNotifier {
   
   notify(bot,botWithSecret, payload) {
   
-      winston.verbose("BotSubscriptionNotifier bot", bot.toObject());
+      winston.debug("BotSubscriptionNotifier bot", bot.toObject());
       winston.debug("BotSubscriptionNotifier payload", payload );
 
       var url = bot.url;

package/services/subscriptionNotifierQueued.js

@@ -27,11 +27,13 @@ class SubscriptionNotifierQueued {
     if (messageEvent.queueEnabled) {
       messageCreateKey = 'message.create.queue';
     }
+    winston.debug('SubscriptionNotifierQueued messageCreateKey: ' + messageCreateKey);
+
     messageEvent.on(messageCreateKey, function(message) {   //queued tested
       setImmediate(() => {
-        winston.debug('SubscriptionNotifier message.create');
+        winston.debug('SubscriptionNotifierQueued message.create');
         subscriptionNotifier.subscribe('message.create', message);
-        winston.debug('SubscriptionNotifier message.create sent');
+        winston.debug('SubscriptionNotifierQueued message.create sent');
       });
     });
 

package/websocket/webSocketServer.js

@@ -643,7 +643,7 @@ class WebSocketServer {
     if (messageEvent.queueEnabled) {
       messageCreateKey = 'message.create.queue.pubsub';
     }
-    winston.debug('messageCreateKey: ' + messageCreateKey);
+    winston.debug('WS messageCreateKey: ' + messageCreateKey);
 
     messageEvent.on(messageCreateKey, function (message) {
       setImmediate(async () => {