@tiledesk/tiledesk-server 2.4.36 → 2.4.37

package/app.js

@@ -142,6 +142,9 @@ require('./services/mongoose-cache-fn')(mongoose);
 var subscriptionNotifier = require('./services/subscriptionNotifier');
 subscriptionNotifier.start();
 
+var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued');
+
+
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 botSubscriptionNotifier.start();
 
@@ -150,9 +153,8 @@ trainingService.start();
  
 // job_here
 
-
 var geoService = require('./services/geoService');
-// geoService.listen();
+// geoService.listen(); //queued
 
 let JobsManager = require('./jobsManager');
 
@@ -162,7 +164,7 @@ if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED ==
 }
 winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
 
-let jobsManager = new JobsManager(jobWorkerEnabled,geoService);
+let jobsManager = new JobsManager(jobWorkerEnabled, geoService, subscriptionNotifierQueued);
 jobsManager.listen();
 
 

package/jobs.js

@@ -21,6 +21,12 @@ let JobsManager = require('./jobsManager');
 
 
 let geoService = require('./services/geoService');
+// let subscriptionNotifier = require('./services/subscriptionNotifier');
+var subscriptionNotifierQueued = require('./services/subscriptionNotifierQueued');
+
+require('./services/mongoose-cache-fn')(mongoose);
+
+
 var config = require('./config/database');
 
 
@@ -39,8 +45,8 @@ var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoI
     winston.error('Failed to connect to MongoDB on ' + databaseUri + " ", err);
     process.exit(1);
   }
+winston.info("Mongoose connection done on host: "+mongoose.connection.host + " on port: " + mongoose.connection.port + " with name: "+ mongoose.connection.name)// , mongoose.connection.db);
 });
-
 // winston.info("mongoose.connection",mongoose.connection);
 // module.exports = jobsManager;
 
@@ -49,10 +55,12 @@ var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoI
 async function main()
 {
 
-    require('./pubmodules/queue');     
+   //************* LOAD QUEUE ************ //
+    require('./pubmodules/queue');   
+    
     // require('@tiledesk-ent/tiledesk-server-queue');     
 
-    let jobsManager = new JobsManager(undefined, geoService);
+    let jobsManager = new JobsManager(undefined, geoService, subscriptionNotifierQueued);
 
     jobsManager.listen();
 

package/jobsManager.js

@@ -2,11 +2,15 @@
 var winston = require('./config/winston');
 
 class JobsManager {
-    constructor(jobWorkerEnabled, geoService) {
+    constructor(jobWorkerEnabled, geoService, subscriptionNotifierQueued) {
         this.geoService = geoService;
+        // this.subscriptionNotifier = subscriptionNotifier;
+        this.subscriptionNotifierQueued = subscriptionNotifierQueued;
+
         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) {
@@ -22,6 +26,8 @@ class JobsManager {
            return winston.info("JobsManager jobWorkerEnabled is enabled. Skipping listeners");  
         }
         this.geoService.listen();
+        // this.subscriptionNotifier.start();
+        this.subscriptionNotifierQueued.start();
     }
 
     listenEmailNotification(emailNotification) {      
@@ -33,6 +39,8 @@ class JobsManager {
         this.emailNotification.requestNotification.listen();
     }
 
+
+
     listenActivityArchiver(activityArchiver) {
         winston.info("JobsManager listenActivityArchiver started"); 
         if ( this.jobWorkerEnabled == true) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.36",
+  "version": "2.4.37",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/activities/activityArchiver.js

@@ -46,7 +46,7 @@ class ActivityArchiver {
       // if (authEvent.queueEnabled) { //queue not supported.
       //   authProjectUserInvitePendingKey = 'project_user.invite.pending.queue';
       // }
-      winston.info('ActivityArchiver authProjectUserInvitePendingKey: ' + authProjectUserInvitePendingKey);
+      winston.debug('ActivityArchiver authProjectUserInvitePendingKey: ' + authProjectUserInvitePendingKey);
 
         authEvent.on(authProjectUserInvitePendingKey,  function(event) { 
           setImmediate(() => {
@@ -67,7 +67,7 @@ class ActivityArchiver {
         // if (authEvent.queueEnabled) { //queue not supported
         //   authProjectUserInviteKey = 'project_user.invite.queue';
         // }
-        winston.info('ActivityArchiver authProjectUserInviteKey: ' + authProjectUserInviteKey);
+        winston.debug('ActivityArchiver authProjectUserInviteKey: ' + authProjectUserInviteKey);
   
         authEvent.on(authProjectUserInviteKey,  function(event) { 
           setImmediate(() => {
@@ -90,7 +90,7 @@ class ActivityArchiver {
         if (authEvent.queueEnabled) {
           authProjectUserUpdateKey = 'project_user.update.queue';
         }
-        winston.info('ActivityArchiver authProjectUserUpdateKey: ' + authProjectUserUpdateKey);
+        winston.debug('ActivityArchiver authProjectUserUpdateKey: ' + authProjectUserUpdateKey);
   
        authEvent.on(authProjectUserUpdateKey,  function(event) { 
         setImmediate(() => {   
@@ -130,7 +130,7 @@ class ActivityArchiver {
       //  if (authEvent.queueEnabled) { //queue not supported
       //   authProjectUserDeleteKey = 'project_user.delete.queue';
       //  }
-       winston.info('ActivityArchiver authProjectUserDeleteKey: ' + authProjectUserDeleteKey);
+       winston.debug('ActivityArchiver authProjectUserDeleteKey: ' + authProjectUserDeleteKey);
  
 
       authEvent.on(authProjectUserDeleteKey,  function(event) { 
@@ -297,7 +297,7 @@ class ActivityArchiver {
        if (requestEvent.queueEnabled) {
          requestCreateKey = 'request.create.queue';
        }
-       winston.info('ActivityArchiver requestCreateKey: ' + requestCreateKey);
+       winston.debug('ActivityArchiver requestCreateKey: ' + requestCreateKey);
 
         requestEvent.on(requestCreateKey,  function(request) {   
           setImmediate(() => {        
@@ -341,7 +341,7 @@ class ActivityArchiver {
         if (requestEvent.queueEnabled) {
           requestUpdatePreflightKey = 'request.update.preflight.queue';
         }
-        winston.info('ActivityArchiver requestUpdatePreflightKey: ' + requestUpdatePreflightKey);
+        winston.debug('ActivityArchiver requestUpdatePreflightKey: ' + requestUpdatePreflightKey);
 
         
         requestEvent.on(requestUpdatePreflightKey,  function(request) {
@@ -371,14 +371,15 @@ class ActivityArchiver {
 
 
         // verified with queue
-        var requestCloseKey = 'request.close';
+        var requestCloseKey = 'request.close';   //request.close event here queued under job
         if (requestEvent.queueEnabled) {
           requestCloseKey = 'request.close.queue';
         }
-        winston.info('ActivityArchiver requestCloseKey: ' + requestCloseKey);
+        winston.debug('ActivityArchiver requestCloseKey: ' + requestCloseKey);
 
 
         requestEvent.on(requestCloseKey,  function(request) {   
+          winston.debug("request.close event here 7")
           setImmediate(() => {           
        
               try {

package/pubmodules/queue/reconnect.js

@@ -2,6 +2,8 @@ var amqp = require('amqplib/callback_api');
 var winston = require('../../config/winston');
 const requestEvent = require('../../event/requestEvent');
 const messageEvent = require('../../event/messageEvent');
+const leadEvent = require('../../event/leadEvent');
+
 const botEvent = require('../../event/botEvent');
 const authEvent = require('../../event/authEvent');
 // https://elements.heroku.com/addons/cloudamqp
@@ -16,9 +18,9 @@ var url = process.env.CLOUDAMQP_URL + "?heartbeat=60" || "amqp://localhost";
 // var url = process.env.AMQP_URL + "?heartbeat=60" || "amqp://localhost?heartbeat=60";
 
 var durable = false;
-if (process.env.ENABLE_DURABLE_QUEUE == true || process.env.ENABLE_DURABLE_QUEUE == "true") {
-  durable = true;
-}
+// if (process.env.ENABLE_DURABLE_QUEUE == false || process.env.ENABLE_DURABLE_QUEUE == "false") {
+//   durable = false;
+// }
 
 var persistent = false;
 if (process.env.ENABLE_PERSISTENT_QUEUE == true || process.env.ENABLE_PERSISTENT_QUEUE == "true") {
@@ -175,6 +177,12 @@ function startWorker() {
           winston.info("Data queue", oka)
         });
 
+        ch.bindQueue(_ok.queue, exchange, "lead_create", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: lead_create");
+          winston.info("Data queue", oka)
+        });
+
+
 
         ch.consume(queueName, processMsg, { noAck: false });
         winston.info("Worker is started");
@@ -255,6 +263,14 @@ function work(msg, cb) {
     // requestEvent.emit('request.update.queue',  msg.content);
     botEvent.emit('faqbot.update.queue',  JSON.parse(message_string));
   }
+
+  if (topic === 'lead_create') {
+    winston.debug("reconnect here topic lead_create:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    leadEvent.emit('lead.create.queue',  JSON.parse(message_string));
+  }
+
+
   cb(true);
 //   WebSocket.cb(true);
 //   requestEvent.on(msg.KEYYYYYYY+'.ws', msg.content);
@@ -360,6 +376,15 @@ function listen() {
       });
     });
 
+
+    leadEvent.on('lead.create', function(lead) {
+      setImmediate(() => {
+        winston.debug("reconnect lead.create")
+        publish(exchange, "lead_create", Buffer.from(JSON.stringify(lead)));
+        winston.debug("reconnect: "+ Buffer.from(JSON.stringify(lead)))
+      });
+    });
+
 }
 
 if (process.env.QUEUE_ENABLED === "true") {
@@ -367,6 +392,7 @@ if (process.env.QUEUE_ENABLED === "true") {
     messageEvent.queueEnabled = true;
     authEvent.queueEnabled = true;
     botEvent.queueEnabled = true;
+    leadEvent.queueEnabled = true;
     listen();
     start();
     winston.info("Queue enabled. endpint: " + url );

package/routes/email.js

@@ -322,8 +322,11 @@ router.post('/send',
   let newto = await recipientEmailUtil.process(to, req.projectid);
   winston.debug("newto: " + newto);
 
+  let replyto = req.body.replyto;
+  winston.debug("replyto: " + replyto);
+
              //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
-  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined);
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
   
   res.json({"queued": true});
     

package/services/emailService.js

@@ -401,9 +401,9 @@ class EmailService {
                   "X-TILEDESK-TICKET-ID":request.ticket_id,
                 };
 
-      winston.verbose("messageId: " + messageId);
-      winston.verbose("replyTo: " + replyTo);
-      winston.verbose("email headers", headers);
+      winston.debug("messageId: " + messageId);
+      winston.debug("replyTo: " + replyTo);
+      winston.debug("email headers", headers);
     }
 
     let inReplyTo;
@@ -416,19 +416,19 @@ class EmailService {
         references = request.attributes.email_references;
         }
     }
-    winston.verbose("email inReplyTo: "+ inReplyTo);
-    winston.verbose("email references: "+ references);
+    winston.debug("email inReplyTo: "+ inReplyTo);
+    winston.debug("email references: "+ references);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("custom email configEmail setting found: ", configEmail);
+        winston.debug("custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: "+ from);
       }
     }
 
@@ -554,9 +554,9 @@ class EmailService {
       
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
 
-      winston.verbose("sendNewAssignedAgentMessageEmailNotification messageId: " + messageId);
-      winston.verbose("sendNewAssignedAgentMessageEmailNotification replyTo: " + replyTo);
-      winston.verbose("sendNewAssignedAgentMessageEmailNotification email headers", headers);
+      winston.debug("sendNewAssignedAgentMessageEmailNotification messageId: " + messageId);
+      winston.debug("sendNewAssignedAgentMessageEmailNotification replyTo: " + replyTo);
+      winston.debug("sendNewAssignedAgentMessageEmailNotification email headers", headers);
     }
 
     let inReplyTo;
@@ -569,19 +569,19 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.verbose("sendNewAssignedAgentMessageEmailNotification email inReplyTo: "+ inReplyTo);
-    winston.verbose("sendNewAssignedAgentMessageEmailNotification email references: "+ references);
+    winston.debug("sendNewAssignedAgentMessageEmailNotification email inReplyTo: "+ inReplyTo);
+    winston.debug("sendNewAssignedAgentMessageEmailNotification email references: "+ references);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("sendNewAssignedAgentMessageEmailNotification custom email configEmail setting found: ", configEmail);
+        winston.debug("sendNewAssignedAgentMessageEmailNotification custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("sendNewAssignedAgentMessageEmailNotification custom from email setting found: "+ from);
+        winston.debug("sendNewAssignedAgentMessageEmailNotification custom from email setting found: "+ from);
       }
     }
 
@@ -671,7 +671,7 @@ class EmailService {
       msgText = marked(msgText);
     }
 
-    winston.verbose("msgText: " + msgText);
+    winston.debug("msgText: " + msgText);
 
     var replacements = {        
       request: request,
@@ -701,9 +701,9 @@ class EmailService {
 
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": request.request_id, "X-TILEDESK-TICKET-ID":request.ticket_id };
 
-      winston.verbose("sendNewPooledRequestNotification messageId: " + messageId);
-      winston.verbose("sendNewPooledRequestNotification replyTo: " + replyTo);
-      winston.verbose("sendNewPooledRequestNotification email headers", headers);
+      winston.debug("sendNewPooledRequestNotification messageId: " + messageId);
+      winston.debug("sendNewPooledRequestNotification replyTo: " + replyTo);
+      winston.debug("sendNewPooledRequestNotification email headers", headers);
     }
 
     let inReplyTo;
@@ -716,19 +716,19 @@ class EmailService {
         references = request.attributes.email_references;
         }
     }
-    winston.verbose("sendNewPooledRequestNotification email inReplyTo: "+ inReplyTo);
-    winston.verbose("sendNewPooledRequestNotification email references: "+ references);
+    winston.debug("sendNewPooledRequestNotification email inReplyTo: "+ inReplyTo);
+    winston.debug("sendNewPooledRequestNotification email references: "+ references);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("sendNewPooledRequestNotification custom email configEmail setting found: ", configEmail);
+        winston.debug("sendNewPooledRequestNotification custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("sendNewPooledRequestNotification custom from email setting found: "+ from);
+        winston.debug("sendNewPooledRequestNotification custom from email setting found: "+ from);
       }
     }
 
@@ -807,7 +807,7 @@ class EmailService {
       msgText = marked(msgText);
     }
 
-    winston.verbose("msgText: " + msgText);
+    winston.debug("msgText: " + msgText);
 
     // passa anche tutti i messages in modo da stampare tutto
 // Stampa anche contact.email
@@ -845,9 +845,9 @@ class EmailService {
       
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
 
-      winston.verbose("sendNewPooledMessageEmailNotification messageId: " + messageId);
-      winston.verbose("sendNewPooledMessageEmailNotification replyTo: " + replyTo);
-      winston.verbose("sendNewPooledMessageEmailNotification email headers", headers);
+      winston.debug("sendNewPooledMessageEmailNotification messageId: " + messageId);
+      winston.debug("sendNewPooledMessageEmailNotification replyTo: " + replyTo);
+      winston.debug("sendNewPooledMessageEmailNotification email headers", headers);
     }
 
     let inReplyTo;
@@ -860,19 +860,19 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.verbose("sendNewPooledMessageEmailNotification email inReplyTo: "+ inReplyTo);
-    winston.verbose("sendNewPooledMessageEmailNotification email references: "+ references);
+    winston.debug("sendNewPooledMessageEmailNotification email inReplyTo: "+ inReplyTo);
+    winston.debug("sendNewPooledMessageEmailNotification email references: "+ references);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("sendNewPooledMessageEmailNotification custom email configEmail setting found: ", configEmail);
+        winston.debug("sendNewPooledMessageEmailNotification custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("sendNewPooledMessageEmailNotification custom from email setting found: "+ from);
+        winston.debug("sendNewPooledMessageEmailNotification custom from email setting found: "+ from);
       }
     }
 
@@ -990,9 +990,9 @@ class EmailService {
       
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
 
-      winston.verbose("messageId: " + messageId);
-      winston.verbose("replyTo: " + replyTo);
-      winston.verbose("email headers", headers);
+      winston.debug("messageId: " + messageId);
+      winston.debug("replyTo: " + replyTo);
+      winston.debug("email headers", headers);
     }
 
     let inReplyTo;
@@ -1006,19 +1006,19 @@ class EmailService {
         references = message.request.attributes.email_references;
       }
     }
-    winston.verbose("email inReplyTo: "+ inReplyTo);
-    winston.verbose("email references: "+ references);
+    winston.debug("email inReplyTo: "+ inReplyTo);
+    winston.debug("email references: "+ references);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("custom email configEmail setting found: ", configEmail);
+        winston.debug("custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: "+ from);
       }
     }
 
@@ -1128,9 +1128,9 @@ class EmailService {
      
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
 
-      winston.verbose("messageId: " + messageId);
-      winston.verbose("replyTo: " + replyTo);
-      winston.verbose("email headers", headers);
+      winston.debug("messageId: " + messageId);
+      winston.debug("replyTo: " + replyTo);
+      winston.debug("email headers", headers);
     }
     
 
@@ -1161,21 +1161,21 @@ class EmailService {
       }
       
     }
-    winston.verbose("email inReplyTo: "+ inReplyTo);
-    winston.verbose("email references: "+ references);
-    winston.verbose("email cc: ", cc);
-    winston.verbose("email ccString: "+ ccString);
+    winston.debug("email inReplyTo: "+ inReplyTo);
+    winston.debug("email references: "+ references);
+    winston.debug("email cc: ", cc);
+    winston.debug("email ccString: "+ ccString);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("custom email configEmail setting found: ", configEmail);
+        winston.debug("custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: "+ from);
       }
     }
 
@@ -1312,9 +1312,9 @@ class EmailService {
      
       headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": message.request.request_id, "X-TILEDESK-TICKET-ID":message.request.ticket_id };
 
-      winston.verbose("messageId: " + messageId);
-      winston.verbose("replyTo: " + replyTo);
-      winston.verbose("email headers", headers);
+      winston.debug("messageId: " + messageId);
+      winston.debug("replyTo: " + replyTo);
+      winston.debug("email headers", headers);
     }
     
 
@@ -1344,21 +1344,21 @@ class EmailService {
         }
       }
     }
-    winston.verbose("email inReplyTo: "+ inReplyTo);
-    winston.verbose("email references: "+ references);
-    winston.verbose("email cc: ", cc);
-    winston.verbose("email ccString: "+ ccString);
+    winston.debug("email inReplyTo: "+ inReplyTo);
+    winston.debug("email references: "+ references);
+    winston.debug("email cc: ", cc);
+    winston.debug("email ccString: "+ ccString);
 
     let from;
     let configEmail;
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("custom email configEmail setting found: ", configEmail);
+        winston.debug("custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: "+ from);
       }
     }
 
@@ -1457,7 +1457,7 @@ class EmailService {
 
 
   
-async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload) {
+async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload, replyTo) {
 
   var that = this;
 
@@ -1507,8 +1507,9 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
   winston.debug("html: " + html);
 
   
-  let replyTo;
-  if (this.replyEnabled && request_id) {
+  // let replyTo;
+
+  if (!replyTo && this.replyEnabled && request_id) {
     replyTo = request_id + this.inboundDomainDomainWithAt;
   }
 
@@ -1517,11 +1518,11 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
   if (project && project.settings && project.settings.email) {
     if (project.settings.email.config) {
       configEmail = project.settings.email.config;
-      winston.verbose("custom email configEmail setting found: ", configEmail);
+      winston.debug("custom email configEmail setting found: ", configEmail);
     }
     if (project.settings.email.from) {
       from = project.settings.email.from;
-      winston.verbose("custom from email setting found: "+ from);
+      winston.debug("custom from email setting found: "+ from);
     }
   }
 
@@ -1820,11 +1821,11 @@ async sendRequestTranscript(to, messages, request, project) {
     if (project && project.settings && project.settings.email) {
       if (project.settings.email.config) {
         configEmail = project.settings.email.config;
-        winston.verbose("custom email configEmail setting found: ", configEmail);
+        winston.debug("custom email configEmail setting found: ", configEmail);
       }
       if (project.settings.email.from) {
         from = project.settings.email.from;
-        winston.verbose("custom from email setting found: "+ from);
+        winston.debug("custom from email setting found: "+ from);
       }
     }
 
@@ -1878,11 +1879,11 @@ parseText(text, payload) {
 formatText(templateName, defaultText, payload, settings) {
 
   let text = defaultText;
-  winston.verbose("formatText defaultText: "+ defaultText);
+  winston.debug("formatText defaultText: "+ defaultText);
 
   let template = this.getTemplate(templateName, settings);
 
-  winston.verbose("formatText template: "+ template);
+  winston.debug("formatText template: "+ template);
 
   if (template) {
     text = template;
@@ -1891,7 +1892,7 @@ formatText(templateName, defaultText, payload, settings) {
   var baseScope = JSON.parse(JSON.stringify(this));
   delete baseScope.pass;
 
-  winston.verbose("formatText text: "+ text);
+  winston.debug("formatText text: "+ text);
 
   var templateHand = handlebars.compile(text);
 
@@ -1902,7 +1903,7 @@ formatText(templateName, defaultText, payload, settings) {
   };
 
   var textTemplate = templateHand(replacements);
-  winston.verbose("formatText textTemplate: "+ textTemplate);
+  winston.debug("formatText textTemplate: "+ textTemplate);
 
   return textTemplate;
 
@@ -1911,21 +1912,21 @@ formatText(templateName, defaultText, payload, settings) {
 getTemplate(templateName, settings) {
 
    var that = this;
-    winston.verbose('getTemplate formatSubject: ' + JSON.stringify(settings)); 
+    winston.debug('getTemplate formatSubject: ' + JSON.stringify(settings)); 
     
 
       if (settings && settings.email && settings.email.templates) {
-        winston.verbose('getTemplate settings.email.templates: ',settings.email.templates); 
+        winston.debug('getTemplate settings.email.templates: ',settings.email.templates); 
 
        var templates = settings.email.templates;
-       winston.verbose('getTemplate templates: ',templates); 
+       winston.debug('getTemplate templates: ',templates); 
 
        var templateDbName = templateName.replace(".subject", "");
-       winston.verbose('getTemplate templateDbName: '+templateDbName); 
+       winston.debug('getTemplate templateDbName: '+templateDbName); 
 
 
        var template = templates[templateDbName];
-       winston.verbose('getTemplate template: '+template); 
+       winston.debug('getTemplate template: '+template); 
 
         if (template) {
         // that.callback(template);

package/services/subscriptionNotifier.js

@@ -202,18 +202,23 @@ class SubscriptionNotifier {
       return 0;
     }
 
+// queued 
+    // var messageCreateKey = 'message.create';
+    // if (messageEvent.queueEnabled) {
+    //   messageCreateKey = 'message.create.queue';
+    // }
+    // messageEvent.on(messageCreateKey, function(message) {   //queued tested
+    //   setImmediate(() => {
+    //     winston.info('SubscriptionNotifier message.create');
+    //     subscriptionNotifier.subscribe('message.create', message);
+    //   });
+    // });
 
-    messageEvent.on('message.create', function(message) {
-      setImmediate(() => {
-        subscriptionNotifier.subscribe('message.create', message);
-      });
-    });
-
-    message2Event.on('message.create.**.channel.*', function(message) {
+    message2Event.on('message.create.**.channel.*', function(message) {    //notqueued high
       // message2Event.on('message.create.request.channel.*', function(message) {
       winston.debug("message2Event: "+this.event, message);
       subscriptionNotifier.subscribe(this.event, message);         
-  }, {async: true});
+    }, {async: true});
 
 
 
@@ -235,72 +240,103 @@ class SubscriptionNotifier {
     // });
 
 
-    requestEvent.on('request.create', function(request) {
-      setImmediate(() => {
-        subscriptionNotifier.subscribe('request.create', request);       
-      });
-    });
 
-    requestEvent.on('request.update', function(request) {
-      setImmediate(() => {
-        subscriptionNotifier.subscribe('request.update', request);
-      });        
-    });
+// queued 
+    // var requestCreateKey = 'request.create';
+    // if (requestEvent.queueEnabled) {
+    //   requestCreateKey = 'request.create.queue';
+    // }
+    // requestEvent.on(requestCreateKey, function(request) {  //queued tested
+    //   setImmediate(() => {
+    //     winston.info('SubscriptionNotifier request.create');
+    //     subscriptionNotifier.subscribe('request.create', request);       
+    //   });
+    // });
 
-    requestEvent.on('request.close', function(request) {
-      setImmediate(() => {
-        Message.find({recipient:  request.request_id, id_project: request.id_project}).sort({updatedAt: 'asc'}).exec(function(err, messages) {
-          var requestJson = request.toJSON();
-          requestJson.messages = messages;
-          subscriptionNotifier.subscribe('request.close', requestJson);
-        });   
-      });
-    });
+
+// queued 
+    // var requestUpdateKey = 'request.update';
+    // if (requestEvent.queueEnabled) {
+    //   requestUpdateKey = 'request.update.queue';
+    // }
+    // requestEvent.on(requestUpdateKey, function(request) {    //queued tested
+    //   setImmediate(() => {
+    //     winston.info('SubscriptionNotifier request.update');
+    //     subscriptionNotifier.subscribe('request.update', request);
+    //   });        
+    // });
 
 
-      leadEvent.on('lead.create', function(lead) {
-        setImmediate(() => {
-          subscriptionNotifier.subscribe('lead.create', lead);
-        });
-      });
+    // queued 
+    // var requestCloseKey = 'request.close';   //request.close event here queued under job
+    // if (requestEvent.queueEnabled) {
+    //   requestCloseKey = 'request.close.queue';
+    // }
+    // requestEvent.on(requestCloseKey, function(request) {   //request.close event here noqueued     //queued tested
+    //   winston.info('SubscriptionNotifier request.close');
+    //   winston.info("request.close event here 1")
+    //   setImmediate(() => {
+    //     Message.find({recipient:  request.request_id, id_project: request.id_project}).sort({updatedAt: 'asc'}).exec(function(err, messages) {
+    //       var requestJson = request;
+    //       if (request.toJSON) {
+    //         requestJson = request.toJSON();
+    //       }
+          
+    //       requestJson.messages = messages;
+    //       subscriptionNotifier.subscribe('request.close', requestJson);
+    //     });   
+    //   });
+    // });
 
 
-      botEvent.on('faqbot.create', function(faqBot) {
+    // queued 
+    // var leadCreateKey = 'lead.create';   //request.close event here queued under job
+    // if (leadEvent.queueEnabled) {
+    //   leadCreateKey = 'lead.create.queue';
+    // }
+    // leadEvent.on(leadCreateKey, function(lead) {    //notqueued high
+    //   setImmediate(() => {
+    //     subscriptionNotifier.subscribe('lead.create', lead);
+    //   });
+    // });
+
+
+      botEvent.on('faqbot.create', function(faqBot) {  //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faqbot.create', faqBot);
         });
       });
 
-      botEvent.on('faqbot.update', function(faqBot) {
+      botEvent.on('faqbot.update', function(faqBot) {    //queued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faqbot.update', faqBot);
         });
       });
 
-      botEvent.on('faqbot.delete', function(faqBot) {
+      botEvent.on('faqbot.delete', function(faqBot) {    //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faqbot.delete', faqBot);
         });
       });
 
-      faqBotEvent.on('faq.create', function(faq) {
+      faqBotEvent.on('faq.create', function(faq) {       //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faq.create', faq);
         });
       });
 
-      faqBotEvent.on('faq.update', function(faq) {
+      faqBotEvent.on('faq.update', function(faq) {       //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faq.update', faq);
         });
       });
-      faqBotEvent.on('faq.delete', function(faq) {
+      faqBotEvent.on('faq.delete', function(faq) {      //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('faq.delete', faq);
         });
       });
 
-      authEvent.on('user.signup',  function(event) { 
+      authEvent.on('user.signup',  function(event) {    //notqueued
         setImmediate(() => {
           var user = event.savedUser;
           delete user.password;
@@ -312,7 +348,7 @@ class SubscriptionNotifier {
 
       // authEvent.emit('project_user.invite', {req:req, savedProject_userPopulated: savedProject_userPopulated});
 
-      authEvent.on('project_user.invite',  function(event) { 
+      authEvent.on('project_user.invite',  function(event) {   //notqueued
         setImmediate(() => {
           subscriptionNotifier.subscribe('project_user.invite', event.savedProject_userPopulated);         
         });
@@ -320,15 +356,21 @@ class SubscriptionNotifier {
     
       // authEvent.emit('project_user.update', {updatedProject_userPopulated:updatedProject_userPopulated, req: req});
 
-      authEvent.on('project_user.update',  function(event) {      
-        setImmediate(() => {
-          subscriptionNotifier.subscribe('project_user.update', event.updatedProject_userPopulated);         
-        });
-      });
+
+      // queued 
+      // var authProjectUserUpdateKey = 'project_user.update';
+      // if (authEvent.queueEnabled) {
+      //   authProjectUserUpdateKey = 'project_user.update.queue';
+      // }
+      // authEvent.on(authProjectUserUpdateKey,  function(event) {    //notqueued  high
+      //   setImmediate(() => {
+      //     subscriptionNotifier.subscribe('project_user.update', event.updatedProject_userPopulated);         
+      //   });
+      // });
     
       // authEvent.emit('project_user.delete', {req: req, project_userPopulated: project_userPopulated});
 
-     authEvent.on('project_user.delete',  function(event) { 
+     authEvent.on('project_user.delete',  function(event) {      //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('project_user.delete', event.project_userPopulated);               
       });
@@ -337,7 +379,7 @@ class SubscriptionNotifier {
 
      //TODO lanciare user.signin in questo modo uno esternamente con webhook può creare proactive greetings
 
-    departmentEvent.on('operator.select',  function(result) { 
+    departmentEvent.on('operator.select',  function(result) {     //notqueued
       winston.debug("departmentEvent.on(operator.select");
 
       var operatorSelectedEvent = result.result;
@@ -376,53 +418,53 @@ class SubscriptionNotifier {
     });
 
 
-    departmentEvent.on('department.create',  function(department) { 
+    departmentEvent.on('department.create',  function(department) {      //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('department.create', department);         
       });
     });
   
   
-    departmentEvent.on('department.update',  function(department) { 
+    departmentEvent.on('department.update',  function(department) {       //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('department.update', department);         
       });
     });
 
-    departmentEvent.on('department.delete',  function(department) { 
+    departmentEvent.on('department.delete',  function(department) {        //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('department.delete', department);         
       });
     });
 
 
-    groupEvent.on('group.create',  function(group) { 
+    groupEvent.on('group.create',  function(group) {                      //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('group.create', group);         
       });
     });
   
   
-    groupEvent.on('group.update',  function(group) { 
+    groupEvent.on('group.update',  function(group) {                      //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('group.update', group);         
       });
     });
 
-    groupEvent.on('group.delete',  function(group) { 
+    groupEvent.on('group.delete',  function(group) {                      //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('group.delete', group);         
       });
     });
 
-    eventEvent.on('event.emit',  function(event) { 
+    eventEvent.on('event.emit',  function(event) {                        //notqueued
       setImmediate(() => {
         subscriptionNotifier.subscribe('event.emit', event);         
       });
     });
 
     // event2Event.on(name, savedEventPopulated);
-    event2Event.on('**', function(savedEventPopulated) {
+    event2Event.on('**', function(savedEventPopulated) {                //notqueued
       setImmediate(() => {
         winston.debug("eventname",this.event);
         subscriptionNotifier.subscribe('event.emit.'+this.event, savedEventPopulated);         
@@ -430,7 +472,7 @@ class SubscriptionNotifier {
     });
 
 
-    projectEvent.on('project.create',  function(project) { 
+    projectEvent.on('project.create',  function(project) {              //notqueued
       setImmediate(() => {
         var projectJson = project.toJSON();
         projectJson.id_project = projectJson._id;
@@ -438,7 +480,7 @@ class SubscriptionNotifier {
       });
     });
 
-    projectEvent.on('project.update',  function(project) { 
+    projectEvent.on('project.update',  function(project) {              //notqueued
       setImmediate(() => {
         var projectJson = project.toJSON();
         projectJson.id_project = projectJson._id;
@@ -446,7 +488,7 @@ class SubscriptionNotifier {
       });
     });
 
-    projectEvent.on('project.downgrade',  function(project) { 
+    projectEvent.on('project.downgrade',  function(project) {           //notqueued
       setImmediate(() => {
         var projectJson = project.toJSON();
         projectJson.id_project = projectJson._id;
@@ -454,7 +496,7 @@ class SubscriptionNotifier {
       });
     });
 
-    projectEvent.on('project.delete',  function(project) { 
+    projectEvent.on('project.delete',  function(project) {              //notqueued
       setImmediate(() => {
         var projectJson = project.toJSON();
         projectJson.id_project = projectJson._id;

package/services/subscriptionNotifierQueued.js

@@ -0,0 +1,124 @@
+const requestEvent = require('../event/requestEvent');
+const messageEvent = require('../event/messageEvent');
+const leadEvent = require('../event/leadEvent');
+const authEvent = require('../event/authEvent');
+
+var Message = require("../models/message");
+var winston = require('../config/winston');
+var subscriptionNotifier = require('../services/subscriptionNotifier');
+
+class SubscriptionNotifierQueued {
+
+  start() {
+    winston.debug('SubscriptionNotifierQueued start');
+
+    var enabled = process.env.RESTHOOK_ENABLED || "false";
+    winston.debug('SubscriptionNotifierQueued enabled:'+enabled);
+
+    if (enabled==="true") {
+      winston.debug('SubscriptionNotifierQueued enabled');
+    }else {
+      winston.info('Resthook Queued disabled');
+      return 0;
+    }
+
+
+    var messageCreateKey = 'message.create';
+    if (messageEvent.queueEnabled) {
+      messageCreateKey = 'message.create.queue';
+    }
+    messageEvent.on(messageCreateKey, function(message) {   //queued tested
+      setImmediate(() => {
+        winston.debug('SubscriptionNotifier message.create');
+        subscriptionNotifier.subscribe('message.create', message);
+        winston.debug('SubscriptionNotifier message.create sent');
+      });
+    });
+
+
+
+    var requestCreateKey = 'request.create';
+    if (requestEvent.queueEnabled) {
+      requestCreateKey = 'request.create.queue';
+    }
+    requestEvent.on(requestCreateKey, function(request) {  //queued tested
+      setImmediate(() => {
+        winston.debug('SubscriptionNotifier request.create');
+        subscriptionNotifier.subscribe('request.create', request);  
+        winston.debug('SubscriptionNotifier request.create sent');     
+      });
+    });
+
+
+
+    var requestUpdateKey = 'request.update';
+    if (requestEvent.queueEnabled) {
+      requestUpdateKey = 'request.update.queue';
+    }
+    requestEvent.on(requestUpdateKey, function(request) {    //queued tested
+      setImmediate(() => {
+        winston.debug('SubscriptionNotifier request.update');
+        subscriptionNotifier.subscribe('request.update', request);
+        winston.debug('SubscriptionNotifier request.update sent');     
+
+      });        
+    });
+
+
+    var requestCloseKey = 'request.close';   //request.close event here queued under job
+    if (requestEvent.queueEnabled) {
+      requestCloseKey = 'request.close.queue';
+    }
+    requestEvent.on(requestCloseKey, function(request) {   //request.close event here noqueued     //queued tested
+      winston.debug('SubscriptionNotifier request.close');
+      winston.debug("request.close event here 1")
+      setImmediate(() => {
+        Message.find({recipient:  request.request_id, id_project: request.id_project}).sort({updatedAt: 'asc'}).exec(function(err, messages) {
+          var requestJson = request;
+          if (request.toJSON) {
+            requestJson = request.toJSON();
+          }
+          
+          requestJson.messages = messages;
+          subscriptionNotifier.subscribe('request.close', requestJson);
+          winston.debug('SubscriptionNotifier request.close sent');     
+
+        });   
+      });
+    });
+
+
+    var leadCreateKey = 'lead.create';   //lead.create event here queued under job
+    if (leadEvent.queueEnabled) {
+      leadCreateKey = 'lead.create.queue';
+    }
+    leadEvent.on(leadCreateKey, function(lead) {    //notqueued high
+      setImmediate(() => {
+        subscriptionNotifier.subscribe('lead.create', lead);
+        winston.debug('SubscriptionNotifier lead.create sent');     
+      });
+    });
+
+    var authProjectUserUpdateKey = 'project_user.update';
+    if (authEvent.queueEnabled) {
+      authProjectUserUpdateKey = 'project_user.update.queue';
+    }
+    authEvent.on(authProjectUserUpdateKey,  function(event) {    //notqueued  high
+      setImmediate(() => {
+        subscriptionNotifier.subscribe('project_user.update', event.updatedProject_userPopulated);     
+        winston.debug('SubscriptionNotifier project_user.update sent');     
+      });
+    });
+    
+    winston.info('SubscriptionNotifierQueued started');
+  }
+
+
+
+
+};
+
+var subscriptionNotifierQueued = new SubscriptionNotifierQueued();
+
+
+module.exports = subscriptionNotifierQueued;