@tiledesk/tiledesk-server 2.4.38 → 2.4.39

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
+
+// botEvent.listen(); queued
 
 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/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" + messageCreateKey + " 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,9 @@ 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');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -60,7 +63,7 @@ async function main()
     
     // require('@tiledesk-ent/tiledesk-server-queue');     
 
-    let jobsManager = new JobsManager(undefined, geoService, subscriptionNotifierQueued);
+    let jobsManager = new JobsManager(undefined, geoService, botEvent, subscriptionNotifierQueued, botSubscriptionNotifier);
 
     jobsManager.listen();
 
@@ -72,6 +75,8 @@ async function main()
     let activityArchiver = require('./pubmodules/activities').activityArchiver;    
     jobsManager.listenActivityArchiver(activityArchiver);
 
+
+
     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,12 @@ class JobsManager {
            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listeners");  
         }
         this.geoService.listen();
+        this.botEvent.listen();
+
         // this.subscriptionNotifier.start();
         this.subscriptionNotifierQueued.start();
+
+        this.botSubscriptionNotifier.start();
     }
 
     listenEmailNotification(emailNotification) {      
@@ -39,7 +44,7 @@ class JobsManager {
         this.emailNotification.requestNotification.listen();
     }
 
-
+   
 
     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.39",
   "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/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/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 () => {