@tiledesk/tiledesk-server 2.4.45 → 2.4.47

package/event/botEvent.js

@@ -65,13 +65,15 @@ class BotEvent extends EventEmitter {
             }
 
             // qui potresti leggere anche +secret ed evitare prossima query in botNotification
-            let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+            // let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+            let qbot = Faq_kb.findById(botId).select('+secret')
         //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.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
+                    qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId+":secret")
+                    winston.debug('faq_kb cache enabled');
                 }
 
                 qbot.exec(function(err, bot) {
@@ -87,6 +89,7 @@ class BotEvent extends EventEmitter {
                 }
 
                 winston.debug("bot debug", bot);
+                winston.debug('bot debug secret: '+ bot.secret);
 
                 if (bot) {
                     if (bot.type==="internal") {

package/jobs.js

@@ -93,9 +93,9 @@ async function main()
     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 routingQueueQueued = require('./pubmodules/routing-queue').listenerQueued;
+    winston.debug("routingQueueQueued"); 
+    jobsManager.listenRoutingQueue(routingQueueQueued);
 
 
 

package/jobsManager.js

@@ -45,14 +45,14 @@ 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();
-    // }
+    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");  

package/package.json

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

package/pubmodules/pubModulesManager.js

@@ -51,6 +51,7 @@ class PubModulesManager {
         this.jobsManager = undefined;
 
         this.routingQueue = undefined;
+        this.routingQueueQueued = undefined;
 
         this.cache = undefined;
 
@@ -407,8 +408,11 @@ class PubModulesManager {
 
         try {
             this.routingQueue = require('./routing-queue').listener;
+            this.routingQueueQueued = require('./routing-queue').listenerQueued;
+
             // this.routingQueue.listen();
             winston.debug("this.routingQueue:"+ this.routingQueue);           
+            winston.debug("this.routingQueueQueued:"+ this.routingQueueQueued);           
 
             winston.info("PubModulesManager routing queue initialized");
         } catch(err) {
@@ -515,13 +519,21 @@ class PubModulesManager {
 
         if (this.routingQueue) {
             try {
-                this.routingQueue.listen();
-                // this.jobsManager.listenRoutingQueue(this.routingQueue);
+                this.routingQueue.listen();  
                 winston.info("PubModulesManager routingQueue started");
             } catch(err) {        
                 winston.info("PubModulesManager error starting routingQueue module", err);            
             }
         }
+        if (this.routingQueueQueued) {
+            try {
+                // this.routingQueueQueued.listen();  
+                this.jobsManager.listenRoutingQueue(this.routingQueueQueued);
+                winston.info("PubModulesManager routingQueue queued started");
+            } catch(err) {        
+                winston.info("PubModulesManager error starting routingQueue queued module", err);            
+            }
+        }
 
         // if (this.dialogFlow) {
         //     try {

package/pubmodules/routing-queue/index.js

@@ -1,3 +1,5 @@
 const listener = require("./listener");
+const listenerQueued = require("./listenerQueued");
 
-module.exports = {listener:listener };
+
+module.exports = {listener:listener, listenerQueued: listenerQueued };

package/pubmodules/routing-queue/listener.js

@@ -1,13 +1,7 @@
-const projectEvent = require('../../event/projectEvent');
 const departmentEvent = require('../../event/departmentEvent');
-const authEvent = require('../../event/authEvent');
-const requestEvent = require('../../event/requestEvent');
 var Request = require('../../models/request');
-var Project = require('../../models/project');
-var Project_user = require('../../models/project_user');
 var winston = require('../../config/winston');
 
-var ProjectUserUtil = require("../../utils/project_userUtil");
 
 // var request = require('retry-request', {
 //     request: require('request')
@@ -55,42 +49,6 @@ class Listener {
         // };
       }
 
-      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
-
-
-    updateProjectUser(id_user, id_project, operation) {
-      winston.debug("updateProjectUser start");
-      return Project_user       
-                    .findOneAndUpdate({id_user: id_user, id_project: id_project}, {$inc : {'number_assigned_requests' : operation}}, {new: true, upsert:false}, function(err, updatedPU) {
-                    if (err) {
-                     return winston.error(err);
-                    }
-                    winston.debug("number_assigned_requests +1 :" + updatedPU.id);
-
-                    updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
-
-                      var pu = updatedProject_userPopulated.toJSON();
-
-                      return Project.findById(id_project).exec(function(err, project) {
-                        pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);                  
-                        winston.debug("pu.isBusy: "+ pu.isBusy);
-                        authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true});
-                      })
-                      
-                    });
-
-                });
-    }
-
-    updateParticipatingProjectUsers(request, operation) {
-        winston.debug("request.participatingAgents", request.participatingAgents);
-        if (request.participatingAgents.length>0) {
-            request.participatingAgents.forEach(user => {
-              winston.debug("request.participatingAgents user",user); //it is a user and not a project_user
-                this.updateProjectUser(user.id, request.id_project, operation);                
-            });
-        } 
-      }  
 
     listen() {
 
@@ -101,57 +59,6 @@ class Listener {
       }
 
         var that = this;
- 
-        // TODO fai versione che passa anche project
-        requestEvent.on('request.create', async (request) => {
-            setImmediate(() => {
-              this.updateParticipatingProjectUsers(request, +1);  
-            });
-        });
-
-          // TODO usa versione complete con project per evitare query??
-        requestEvent.on('request.close', async (request) => {
-          setImmediate(() => {
-            this.updateParticipatingProjectUsers(request, -1);          
-          });
-        });
-
-
-        requestEvent.on('request.participants.join', async (data) => {
-          var request = data.request;
-          var member = data.member;
-          setImmediate(() => {
-            this.updateProjectUser(member, request.id_project, 1);          
-          });
-        });
-
-        requestEvent.on('request.participants.leave', async (data) => {
-          var request = data.request;
-          var member = data.member;
-          setImmediate(() => {
-            this.updateProjectUser(member, request.id_project, -1);          
-          });
-        });
-
-        requestEvent.on('request.participants.update', async (data) => {
-          var request = data.request;
-          var removedParticipants = data.removedParticipants;
-          var addedParticipants = data.addedParticipants;
-
-          setImmediate(() => {
-
-            addedParticipants.forEach(participant => {
-              winston.debug('addedParticipants participant', participant);
-              this.updateProjectUser(participant, request.id_project, 1);          
-            });
-
-            removedParticipants.forEach(participant => {
-              winston.debug('removedParticipants participant', participant);
-              this.updateProjectUser(participant, request.id_project, -1);          
-            });
-
-          });
-        });
 
         departmentEvent.on('operator.select.base2', async (res) => {
             // departmentEvent.prependListener('operator.select', async (data) => {
@@ -170,9 +77,7 @@ class Listener {
           
             }
           
-          
-          
-          
+        
           
           
           

package/pubmodules/routing-queue/listenerQueued.js

@@ -0,0 +1,194 @@
+const authEvent = require('../../event/authEvent');
+const requestEvent = require('../../event/requestEvent');
+var Project = require('../../models/project');
+var Project_user = require('../../models/project_user');
+var winston = require('../../config/winston');
+
+var ProjectUserUtil = require("../../utils/project_userUtil");
+
+// var request = require('retry-request', {
+//     request: require('request')
+//   });
+
+// TODO riabilitare questo
+
+// const ROUTE_QUEUE_ENDPOINT = process.env.ROUTE_QUEUE_ENDPOINT;
+// winston.debug("ROUTE_QUEUE_ENDPOINT: " + ROUTE_QUEUE_ENDPOINT);
+
+// if (ROUTE_QUEUE_ENDPOINT) {
+//   winston.info("Route queue endpoint: " + ROUTE_QUEUE_ENDPOINT);
+// } else {
+//    winston.info("Route queue endpoint not configured");
+// }
+
+
+
+
+// TODO web socket is not supported with queue
+class Listener {
+
+ 
+  constructor() {
+    this.enabled = true;
+    if (process.env.ROUTE_QUEUE_ENABLED=="false" || process.env.ROUTE_QUEUE_ENABLED==false) {
+        this.enabled = false;
+    }
+    winston.debug("Listener this.enabled: "+ this.enabled);
+}
+
+ 
+      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+
+
+    updateProjectUser(id_user, id_project, operation) {
+      winston.debug("Route queue updateProjectUser start");
+      return Project_user       
+                    .findOneAndUpdate({id_user: id_user, id_project: id_project}, {$inc : {'number_assigned_requests' : operation}}, {new: true, upsert:false}, function(err, updatedPU) {
+                    if (err) {
+                     return winston.error(err);
+                    }
+                    winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+
+                    updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
+
+                      var pu = updatedProject_userPopulated.toJSON();
+
+                      return Project.findById(id_project).exec(function(err, project) {
+                        pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);                  
+                        winston.debug("Route queue pu.isBusy: "+ pu.isBusy);
+                                               
+                        authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true}); //if queued with jobs -> websocket notification on project_user.update doesn't work??? forse si in quanto viene convertito in .pub.queue e poi rifunziiona
+
+
+                        // project_user.update triggers activityArchiver(tested), cache invalidation(tested), subscriptionNotifierQueued and websocket(tested works from queue i trigger ws)
+                        if (requestEvent.queueEnabled) {  //force to .queue to be catched into the queue (activity archiver, subscriptionNotifierQueued )
+                          authEvent.emit('project_user.update.queue', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true});
+                        }
+
+                      })
+                      
+                    });
+
+                });
+    }
+
+    updateParticipatingProjectUsers(request, operation) {
+        winston.debug("Route queue request.participatingAgents", request.participatingAgents);
+        if (request.participatingAgents.length>0) {
+            request.participatingAgents.forEach(user => {
+              winston.debug("request.participatingAgents user",user); //it is a user and not a project_user
+                this.updateProjectUser(user.id, request.id_project, operation);                
+            });
+        } 
+      }  
+
+    listen() {
+
+      if (this.enabled==true) {
+        winston.info("Route queue with queue Listener listen");
+      } else {
+          return winston.info("Route queue with queue Listener disabled");
+      }
+
+        var that = this;
+ 
+        // TODO fai versione che passa anche project
+        var requestCreateKey = 'request.create';
+        if (requestEvent.queueEnabled) {
+          requestCreateKey = 'request.create.queue';
+        }
+        winston.debug('Route queue requestCreateKey: ' + requestCreateKey);
+   
+        requestEvent.on(requestCreateKey, async (request) => {
+            setImmediate(() => {
+              winston.debug('Route queue requestCreate');
+              this.updateParticipatingProjectUsers(request, +1);  
+            });
+        });
+
+          // TODO usa versione complete con project per evitare query??
+        var requestCloseKey = 'request.close';   //request.close event here queued under job
+        if (requestEvent.queueEnabled) {
+          requestCloseKey = 'request.close.queue';
+        }
+        winston.debug('Route queue requestCloseKey: ' + requestCloseKey);
+
+        requestEvent.on(requestCloseKey, async (request) => {    //request.close event here noqueued
+          winston.debug("request.close event here 4")
+          setImmediate(() => {
+            winston.debug('Route queue requestClose');
+            this.updateParticipatingProjectUsers(request, -1);          
+          });
+        });
+
+
+        var requestParticipantsJoinKey = 'request.participants.join';
+        if (requestEvent.queueEnabled) {
+          requestParticipantsJoinKey = 'request.participants.join.queue';
+        }
+        winston.debug('Route queue  requestParticipantsJoinKey: ' + requestParticipantsJoinKey);
+   
+        requestEvent.on(requestParticipantsJoinKey, async (data) => {
+          winston.debug('Route queue ParticipantsJoin');
+
+          var request = data.request;
+          var member = data.member;
+          setImmediate(() => {
+            this.updateProjectUser(member, request.id_project, 1);          
+          });
+        });
+
+        var requestParticipantsLeaveKey = 'request.participants.leave';
+        if (requestEvent.queueEnabled) {
+          requestParticipantsLeaveKey = 'request.participants.leave.queue';
+        }
+        winston.debug('Route queue  requestParticipantsLeaveKey: ' + requestParticipantsLeaveKey);
+   
+        requestEvent.on(requestParticipantsLeaveKey, async (data) => {
+          winston.debug('Route queue ParticipantsLeave');
+
+          var request = data.request;
+          var member = data.member;
+          setImmediate(() => {
+            this.updateProjectUser(member, request.id_project, -1);          
+          });
+        });
+
+        var requestParticipantsUpdateKey = 'request.participants.update';
+        if (requestEvent.queueEnabled) {
+         requestParticipantsUpdateKey = 'request.participants.update.queue';
+        }
+        winston.debug('Route queue  requestParticipantsUpdateKey: ' + requestParticipantsUpdateKey);
+   
+        requestEvent.on(requestParticipantsUpdateKey, async (data) => {
+          winston.debug('Route queue Participants Update');
+
+          var request = data.request;
+          var removedParticipants = data.removedParticipants;
+          var addedParticipants = data.addedParticipants;
+
+          setImmediate(() => {
+
+            addedParticipants.forEach(participant => {
+              winston.debug('addedParticipants participant', participant);
+              this.updateProjectUser(participant, request.id_project, 1);          
+            });
+
+            removedParticipants.forEach(participant => {
+              winston.debug('removedParticipants participant', participant);
+              this.updateProjectUser(participant, request.id_project, -1);          
+            });
+
+          });
+        });
+
+     
+       
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;

package/routes/auth.js

@@ -471,10 +471,10 @@ function (req, res) {
 // Redirect the user to the Google signin page</em> 
 // router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
 router.get("/google", function(req,res,next){
-  winston.info("redirect_url: "+ req.query.redirect_url );
+  winston.debug("redirect_url: "+ req.query.redirect_url );
   req.session.redirect_url = req.query.redirect_url;
 
-  winston.info("forced_redirect_url: "+ req.query.forced_redirect_url );
+  winston.debug("forced_redirect_url: "+ req.query.forced_redirect_url );
   req.session.forced_redirect_url = req.query.forced_redirect_url;
 
   // req._toParam = 'Hello';
@@ -542,7 +542,7 @@ router.get("/google/callback", passport.authenticate("google", { session: false
     url = req.session.forced_redirect_url+"?jwt=JWT "+token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
   }
 
-  winston.info("Google Redirect: "+ url);
+  winston.debug("Google Redirect: "+ url);
 
   res.redirect(url);
 

package/routes/request.js

@@ -459,7 +459,7 @@ router.put('/:requestid/agent', async (req, res) => {
   winston.debug(req.body);
    //route(request_id, departmentid, id_project) { 
    
-   
+
    var request = await Request.findOne({"request_id":req.params.requestid, id_project:req.projectid})   
    .exec();
     
@@ -817,7 +817,7 @@ router.get('/', function (req, res, next) {
 
   if (req.user instanceof Subscription) {
       //all request 
-  } else if (projectuser && projectuser.role == "owner" || projectuser.role == "admin") {
+  } else if (projectuser && (projectuser.role == "owner" || projectuser.role == "admin")) {
       //all request 
       // per uni mostrare solo quelle priprio quindi solo participants
     if (req.query.mine) {
@@ -1030,6 +1030,8 @@ router.get('/', function (req, res, next) {
   }
 
 
+  
+
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

package/services/BotSubscriptionNotifier.js

@@ -14,10 +14,13 @@ winston.debug("webhook_origin: "+webhook_origin);
 var cacheUtil = require('../utils/cacheUtil');
 var cacheEnabler = require("../services/cacheEnabler");
 
+
+
+
 class BotSubscriptionNotifier {
    
   
-  notify(bot,botWithSecret, payload) {
+  notify(bot,secret, payload) {
   
       winston.debug("BotSubscriptionNotifier bot", bot.toObject());
       winston.debug("BotSubscriptionNotifier payload", payload );
@@ -58,7 +61,7 @@ class BotSubscriptionNotifier {
       delete botPayload.description;
       delete botPayload.attributes;
 
-      var token = jwt.sign(botPayload, botWithSecret.secret, signOptions);
+      var token = jwt.sign(botPayload, secret, signOptions);
       json["token"] = token;
 
 
@@ -93,25 +96,33 @@ class BotSubscriptionNotifier {
     //modify to async
     botEvent.on('bot.message.received.notify.external', function(botNotification) {
       var bot = botNotification.bot;
-      winston.debug('getting botWithSecret');
-      let qbot = Faq_kb.findById(bot._id).select('+secret')
-
-      if (cacheEnabler.faq_kb) {
-        let id_project = bot.id_project;
-        winston.debug("id_project.id_project:"+id_project);
-        qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+bot._id+":secret")
-        winston.debug('faq_kb BotSubscriptionNotifier cache enabled');
-      }
-
-      qbot.exec(function (err, botWithSecret){   //TODO add cache_bot_here????
-        if (err) {
-          winston.debug('Error getting botWithSecret', err);
-        }
-        botSubscriptionNotifier.notify(bot, botWithSecret, botNotification.message);
-      });
+      var secret = bot.secret;
+      winston.debug('bot.message.received.notify.external: '+secret);
+
+    //   winston.debug('getting botWithSecret');
+    //   let qbot = Faq_kb.findById(bot._id).select('+secret')
+
+    //   if (cacheEnabler.faq_kb) {
+    //     let id_project = bot.id_project;
+    //     winston.debug("id_project.id_project:"+id_project);
+    //     qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+bot._id+":secret")
+    //     winston.debug('faq_kb BotSubscriptionNotifier cache enabled');
+    //   }
+
+    //   qbot.exec(function (err, botWithSecret){   //TODO add cache_bot_here????
+    //     if (err) {
+    //       winston.debug('Error getting botWithSecret', err);
+    //     }
+    //     botSubscriptionNotifier.notify(bot, botWithSecret, botNotification.message);
+    //   });
       
+    botSubscriptionNotifier.notify(bot, secret, botNotification.message);
+
+
     });
 
+
+
     winston.info('BotSubscriptionNotifier started');
 
   }