@tiledesk/tiledesk-server 2.3.19 → 2.3.21

package/CHANGELOG.md

@@ -1,20 +1,62 @@
-# 2.3.17 -> PROD
-- Webhook chat21 fix return
+
+
+# 2.3.21
+- filter request by smartAssignment
+
+# 2.3.20
+- Performance: Removed populate for message.update messages. This event is not used by anyone. 
+
+# 2.3.19
+- Moved queue module to public module
+- Moved route-queue to public module
+- Disable queue module if JOB_WORKER_ENABLED is true
+
+
+
+💥 TILEDESK SERVER v2.3.18 💥
+🚀        TAGGED AND PUBLISHED ON NPM           🚀
+🚀        IN PRODUCTION                        🚀
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.17) 
+
+# 2.3.18 -> PROD
+- Added profileStatus field to the project_user model
+- Added smartAssignment field to the request model                      
+- Canned responses default limit value increased from 40 to 1000
+- Now you change channel name from REST endpoint
+- New Tybot 0.1.5
+- GeoService setImmediate added
+- Websocket setImmediate and topic validation
+- Do not trigger requestNotification send email method for preflight request
+- Removed deprecated .count with .countDocument
+- Added workingStatus to request model                                     
+- Changed Anonymous signin from Guest to guest#shortuid
+- Updated chat21/chat21-node-sdk to 1.1.7. Now group parameter is supported.
+- Moved queue module to public modules folder
+- Created JobManager and Job runner files
+- Now activity archiver module uses queue engine
+- Now geoService uses queue engine
+- Added GEO_SERVICE_ENABLED to enable disable ip lookup to latitude and longitude
+- Added EMAIL_NOTIFICATION_ENABLED to enable disable email notification
+
+
+# 2.3.17 
+- Webhook chat21 fix
+- Chat21 Cloud Function: when an agent leaves a conversation an info message is sent to notify it to the visitor 
 
 # 2.3.16
-- Request close activity added as event
-- Log fix webhook chat21
+- Request close activity added as event. Now you can see from the Activity menu who has closed the conversation and when.
+- Log fix for webhook chat21
 
 # 2.3.15
-- Endpoint Widget fix undefined project.widget
+- BugFix: Endpoint Widget fix for undefined of the project.widget object
 
 # 2.3.14 
 - Added ip filter with Deny roles and ban User roles
-- Ban notifier
-- Middleware decodeJwt before passport with passport fallback
-- Removed unused requestService.incrementMessagesCountByRequestId from chat21Webhook
-- Enable agent to manage groups endpoint
-- Added tilebot chat server
+- Ban notifier module
+- Created a new Middleware decodeJwt before passport with passport fallback
+- Removed unused requestService.incrementMessagesCountByRequestId code from chat21Webhook
+- Allow agents to manage groups endpoint
+- Embedded the new Tilebot chat server
 
 # 2.3.13 
 - Getting ip fix

package/event/messageEvent.js

@@ -7,7 +7,7 @@ var MessageConstants = require("../models/messageConstants");
 var message2Event = require("../event/message2Event");
 
 var cacheUtil = require('../utils/cacheUtil');
-
+// var requestService = require("../services/requestService");
 
 
 class MessageEvent extends EventEmitter { 
@@ -40,7 +40,8 @@ function populateMessageCreate(message) {
   return populateMessageWithRequest(message, 'message.create');
 }
 function populateMessageUpdate(message) {
-  return populateMessageWithRequest(message, 'message.update');
+  // return populateMessageWithRequest(message, 'message.update');
+  return; // do not populate message.update it's not used by anyone. Not used by webhook. populate for message.update is slow.
 }
 
 
@@ -48,6 +49,7 @@ function populateMessageWithRequest(message, eventPrefix) {
 
   
   winston.debug("populateMessageWithRequest "+eventPrefix, message.toObject());
+  winston.debug("populateMessageWithRequest "+eventPrefix +" "+ message.text);
   
   var messageJson = message.toJSON();
 
@@ -159,4 +161,82 @@ messageEvent.on('message.create.simple', populateMessageCreate);
 messageEvent.on('message.update.simple', populateMessageUpdate);
 
 
+
+// riattiva commentato per performance
+
+
+// var messageCreateKey = 'message.create';
+// if (messageEvent.queueEnabled) {
+//   messageCreateKey = 'message.create.queue';
+// }
+// winston.debug("messageEvent.queueEnabled: "+messageEvent.queueEnabled); 
+
+// winston.debug("messageCreateKey: "+messageCreateKey); 
+
+// messageEvent.on(messageCreateKey, function(message) {
+//   setImmediate(() => {      
+//     winston.debug("message.create before");
+//     if (!message.request) {
+//       return;
+//     }
+//     let request_id = message.request.request_id;
+//     let id_project = message.request.id_project;
+
+
+//     //update waiitng time if write an  agent (member of participants)
+//     let visitor_sent_last_message = false;
+//     // winston.info(" message.request.snapshot.lead.lead_id: "+  message.request.snapshot.lead.lead_id);
+//     // winston.info(" message.sender: "+  message.sender);
+
+//     if (message.request.snapshot && message.request.snapshot.lead.lead_id == message.sender) { 
+//       visitor_sent_last_message = true;
+//     }
+
+
+
+//     // don't work for recursive call
+//     // requestService.incrementMessagesCountByRequestId(message.request._id, message.request.id_project).then(function (savedRequest) {
+//     //   winston.info("incremented request", savedRequest);
+//     // });
+//     let clonedmessage = Object.assign({}, message);
+//     delete clonedmessage.request
+    
+    
+//     let data = {
+//       $push: {
+//         "snapshot.messages.data": {
+//               $each: [ clonedmessage ],
+//               $slice: -30
+//             }
+//       },
+//       $inc : {'snapshot.messages.messages_count' : 1},
+//       "snapshot.messages.visitor_sent_last_message": visitor_sent_last_message,
+//       "snapshot.messages.last_message_timestamp": message.createdAt
+//     };
+
+//     // db.getCollection('requests').find({"$expr": { "$gt": [ "$snapshot.messages.visitor_last_message_timestamp", "$snapshot.messages.agent_last_message_timestamp"]}})
+    
+    
+//     if (visitor_sent_last_message) {
+//       data["snapshot.messages.visitor_last_message_timestamp"]= message.createdAt;
+//     } else {
+//       data["snapshot.messages.agent_last_message_timestamp"]= message.createdAt;
+//     }
+//     // db.getCollection('requests').updateOne({"request_id":"support-group-630600bfaf7cd942116bc993-3da378ec63924bb9b4934b2835b37a7c"},{"$push":{"snapshot.messages.data":{"$each":["s"],"$slice":-5}}}}})
+//     winston.debug("data", data);
+
+//     return Request       
+//             .findOneAndUpdate({request_id: request_id, id_project: id_project}, data, {new: true, upsert:false}, function(err, updatedRequest) {
+//                 if (err) {
+//                   winston.error(err);
+//                   return reject(err);
+//                 }
+//                 winston.info("Message count +1");
+                
+//               });
+
+//   });
+// });
+
+
 module.exports = messageEvent;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.19",
+  "version": "2.3.21",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -29,7 +29,6 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
-    "@tiledesk-ent/tiledesk-server-cache": "^1.1.10",
     "@tiledesk-ent/tiledesk-server-dialogflow": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
@@ -42,13 +41,14 @@
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.5",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.7",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "csv-express": "^1.2.2",
+    "cachegoose": "^8.0.0",
     "debug": "^4.3.4",
     "dotenv": "^8.6.0",
     "email-templates": "^8.1.0",

package/pubmodules/cache/index.js

@@ -0,0 +1,2 @@
+const mongooseCachegoose = require("./mongoose-cachegoose-fn");
+module.exports = {cachegoose:mongooseCachegoose};

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -0,0 +1,505 @@
+ var requestEvent = require("../../event/requestEvent");   
+ var messageEvent = require("../../event/messageEvent");   
+ var projectEvent = require("../../event/projectEvent");   
+ var botEvent = require("../../event/botEvent");   
+ var departmentEvent = require("../../event/departmentEvent");   
+ var authEvent = require("../../event/authEvent");   
+ var labelEvent = require("../../event/labelEvent");
+
+//  var subscriptionEvent = require("");   
+
+ var winston = require('../../config/winston');
+
+ var cachegoose = require('cachegoose');
+
+ var defaultTTL = process.env.CACHE_DEFAULT_TTL || 120;
+ 
+
+ function listen(client) {
+
+    projectEvent.on("project.create", function(project) {
+        setImmediate(() => {
+            var key = "projects:id:"+project.id;
+            winston.verbose("Creating cache for project.create with key: " + key);
+            client.set(key, project, defaultTTL, (err, reply) => {
+                winston.verbose("Created cache for project.create",{err:err});
+                winston.debug("Created cache for project.create reply",reply);
+            });
+
+            key = "projects:query:*";
+            winston.verbose("Deleting cache for project.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.verbose("Deleted cache for project.create",{err:err});
+                winston.debug("Deleted cache for project.create",reply);
+
+            }); 
+        });  
+    });
+
+    projectEvent.on("project.update", function(project) {
+        setImmediate(() => {
+            var key = "projects:id:"+project.id;
+            winston.verbose("Updating cache for project.update with key: " + key);
+            client.set(key, project, defaultTTL, (err, reply) => {
+                winston.verbose("Updated cache for project.update",{err:err});
+                winston.debug("Updated cache for project.update",reply);
+
+            });
+
+            key = "projects:query:*";
+            winston.verbose("Deleting cache for project.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for project.create",reply);
+                winston.verbose("Deleted cache for project.create",{err:err});
+            });   
+        });
+
+    });
+
+    projectEvent.on("project.delete", function(project) {
+        setImmediate(() => {
+            var key = "projects:id:"+project.id;
+            winston.verbose("Deleting cache for project.delete with key: " + key);
+            client.del(key, (err, reply) => {
+                winston.debug("Deleted cache for project.delete",reply);
+                winston.verbose("Deleted cache for project.delete",{err:err});
+            });
+
+            key = "projects:query:*";
+            winston.verbose("Deleting cache for project.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for project.create",reply);
+                winston.verbose("Deleted cache for project.create",{err:err});
+            });   
+        });
+    });
+
+    projectEvent.on("project.downgrade", function(project) {
+        setImmediate(() => {
+            var key = "projects:id:"+project.id;
+            winston.verbose("Updating cache for project.downgrade with key: " + key);
+
+            client.set(key, project, defaultTTL, (err, reply) => {
+                winston.debug("Updated cache for project.downgrade",reply);
+                winston.verbose("Updated cache for project.downgrade",{err:err});
+            });
+
+            key = "projects:query:*";
+            winston.verbose("Deleting cache for project.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for project.create",reply);
+                winston.verbose("Deleted cache for project.create",{err:err});
+            });   
+        });
+    });
+
+
+
+
+    
+
+    authEvent.on('project_user.update', function(data) {
+        setImmediate(() => {
+
+            var project_user = data.updatedProject_userPopulated;
+
+            var key = project_user.id_project+":project_users:id:"+project_user.id;
+            winston.verbose("Updating cache for project_user.update with key: " + key);
+            client.set(key, project_user, defaultTTL, (err, reply) => {
+                winston.debug("Updated cache for project_user.update",reply);
+                winston.verbose("Updated cache for project_user.update",{err:err});
+            });
+
+            var role = project_user.role;
+
+            var TEAMMATE_ROLES =  {       
+                "agent": ["guest","user","agent"],
+                "admin": ["guest","user","agent", "admin",],
+                "owner": ["guest","user","agent", "admin", "owner"],
+            }
+            // controllare bene
+
+            var hierarchicalRoles = TEAMMATE_ROLES[role];
+            winston.debug("hierarchicalRoles", hierarchicalRoles);
+        
+            if ( hierarchicalRoles && hierarchicalRoles.includes(role)) {
+
+                var key = project_user.id_project+":project_users:role:teammate:"+project_user.id;
+                winston.verbose("Updating cache for project_user.update with key: " + key);
+                client.set(key, project_user, defaultTTL, (err, reply) => {
+                    winston.debug("Updated cache for project_user.update",reply);
+                    winston.verbose("Updated cache for project_user.update",{err:err});
+                });
+            }
+        });
+    });
+   
+
+
+
+
+    authEvent.on('user.signup', function(data) {
+        setImmediate(() => {
+            var user = data.savedUser;
+
+            var key = "users:id:"+user.id;
+            winston.verbose("Creating cache for user.signup with key: " + key);
+            client.set(key, user, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for user.signup",reply);
+                winston.verbose("Created cache for user.signup",{err:err});
+            });
+
+            var key = "users:email:"+user.email;
+            winston.verbose("Creating cache for user.signup with key: " + key);
+            client.set(key, user, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for user.signup",reply);
+                winston.verbose("Created cache for user.signup",{err:err});
+            });
+        });
+    });
+
+
+    authEvent.on('user.update', function(data) {
+        setImmediate(() => {
+            var user = data.updatedUser;
+
+            var key = "users:id:"+user.id;
+            winston.verbose("Updating cache for user.update with key: " + key);
+            client.set(key, user, defaultTTL, (err, reply) => {
+                winston.debug("Updated cache for user.update",reply);
+                winston.verbose("Updated cache for user.update",{err:err});
+            });
+
+            var key = "users:email:"+user.email;
+            winston.verbose("Updating cache for user.update with key: " + key);
+            client.set(key, user, defaultTTL, (err, reply) => {
+                winston.debug("Updated cache for user.update",reply);
+                winston.verbose("Updated cache for user.update",{err:err});
+            });
+        });
+    });
+   
+    authEvent.on('user.delete', function(data) {
+        setImmediate(() => {
+            var user = data.user;
+
+            var key = "users:id:"+user.id;
+            winston.verbose("Deleting cache for user.delete with key: " + key);
+            client.del(key, (err, reply) => {
+                winston.debug("Deleted cache for user.delete",reply);
+                winston.verbose("Deleted cache for user.delete",{err:err});
+            });
+
+            var key = "users:email:"+user.email;
+            winston.verbose("Deleting cache for user.delete with key: " + key);
+            client.del(key, (err, reply) => {
+                winston.debug("Deleted cache for user.delete",reply);
+                winston.verbose("Deleted cache for user.delete",{err:err});
+            });
+        });
+    });
+
+
+
+
+    requestEvent.on("request.create", function(request) {
+        setImmediate(() => {
+            var key = request.id_project+":requests:id:"+request.id;
+            winston.verbose("Creating cache for request.create with key: " + key);
+
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.create",reply);
+                winston.verbose("Created cache for request.create",{err:err});
+            });
+
+            var key = request.id_project+":requests:request_id:"+request.request_id;
+            winston.verbose("Creating cache for request.create with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.create",reply);
+                winston.verbose("Created cache for request.create",{err:err});
+            });
+
+            key = request.id_project+":requests:query:*";
+            winston.verbose("Deleting cache for request.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for request.create",reply);
+                winston.verbose("Deleted cache for request.create",{err:err});
+            });   
+        });
+    });
+
+
+
+    requestEvent.on("request.update", function(request) {  
+        setImmediate(() => {
+            var key = request.id_project+":requests:id:"+request.id;
+            winston.verbose("Creating cache for request.update with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.update",reply);
+                winston.verbose("Created cache for request.update",{err:err});
+            });
+
+            var key = request.id_project+":requests:request_id:"+request.request_id;
+            winston.verbose("Creating cache for request.update with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.update",reply);
+                winston.verbose("Created cache for request.update",{err:err});
+            });
+
+            key = request.id_project+":requests:query:*";
+            winston.verbose("Deleting cache for request.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for request.create",reply);
+                winston.verbose("Deleted cache for request.create",{err:err});
+            });   
+        });
+    });
+
+
+    requestEvent.on("request.close", function(request) { 
+        setImmediate(() => {
+            var key = request.id_project+":requests:id:"+request.id;
+            winston.verbose("Creating cache for request.close with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.close",reply);
+                winston.verbose("Created cache for request.close",{err:err});
+            });
+
+            var key = request.id_project+":requests:request_id:"+request.request_id;
+            winston.verbose("Creating cache for request.close with key: " + key);
+            client.set(key, request, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for request.close",reply);
+                winston.verbose("Created cache for request.close",{err:err});
+            });
+
+            key = request.id_project+":requests:query:*";
+            winston.verbose("Deleting cache for request.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for request.create",reply);
+                winston.verbose("Deleted cache for request.create",{err:err});
+            });   
+        });
+    });
+
+
+
+
+// non serve tanto
+    // messageEvent.on("message.create", function(message) { 
+    //     setImmediate(() => {
+    //         var key = message.id_project+":requests:id:"+message.request._id + ":messages:id:" + message._id;
+    //         winston.verbose("Creating cache for message.create with key: " + key);
+    //         client.set(key, message, defaultTTL, (err, reply) => {
+    //             winston.verbose("Created cache for message.create",{err:err, reply:reply});
+    //         });
+
+    //         var key = message.id_project+":requests:request_id:"+message.request.request_id + ":messages:id:" + message._id;        
+    //         winston.verbose("Creating cache for message.create with key: " + key);
+    //         client.set(key, message, defaultTTL, (err, reply) => {
+    //             winston.verbose("Created cache for message.create",{err:err, reply:reply});
+    //         });
+    //     });
+    // });
+
+
+
+    botEvent.on("faqbot.create", function(faq_kb) {
+        setImmediate(() => {
+            var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
+            winston.verbose("Creating cache for faq_kb.create with key: " + key);
+            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for faq_kb.create",reply);
+                winston.verbose("Created cache for faq_kb.create",{err:err});
+            });
+        });
+    });
+
+
+
+    botEvent.on("faqbot.update", function(faq_kb) { 
+        setImmediate(() => {
+            var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
+            winston.verbose("Creating cache for faq_kb.update with key: " + key);
+            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for faq_kb.create",reply);
+                winston.verbose("Created cache for faq_kb.update",{err:err});
+            });       
+        });
+    });
+
+
+    botEvent.on("faqbot.delete", function(faq_kb) { 
+        setImmediate(() => {
+            var key = faq_kb.id_project+":faq_kbs:id:"+faq_kb._id;
+            winston.verbose("Creating cache for faqbot.delete with key: " + key);
+            client.set(key, faq_kb, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for faqbot.delete",reply);
+                winston.verbose("Created cache for faqbot.delete",{err:err});
+            });
+        });
+    });
+
+
+    departmentEvent.on("department.create", function(department) {
+        setImmediate(() => {
+            var key = department.id_project+":departments:id:"+department._id;
+            winston.verbose("Creating cache for department.create with key: " + key);
+            client.set(key, department, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for department.create",reply);
+                winston.verbose("Created cache for department.create",{err:err});
+            });
+            
+            key = department.id_project+":departments:query:*";        
+            winston.verbose("Deleting cache for department.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for department.create",reply);
+                winston.verbose("Deleted cache for department.create",{err:err});
+            });   
+        });
+    });
+
+
+
+    departmentEvent.on("department.update", function(department) {  
+        setImmediate(() => {
+            var key = department.id_project+":departments:id:"+department._id;
+            winston.verbose("Creating cache for department.update with key: " + key);
+            client.set(key, department, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for department.update",reply);
+                winston.verbose("Created cache for department.update",{err:err});
+            });    
+
+            key = department.id_project+":departments:query:*";        
+            winston.verbose("Deleting cache for department.update with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for department.update",reply);
+                winston.verbose("Deleted cache for department.update",{err:err});
+            });   
+        });
+    });
+
+
+    departmentEvent.on("department.delete", function(department) { 
+        setImmediate(() => {
+            var key = department.id_project+":departments:id:"+department._id;
+            winston.verbose("Creating cache for department.delete with key: " + key);
+            client.set(key, department, defaultTTL, (err, reply) => {
+                winston.debug("Created cache for department.delete",reply);
+                winston.verbose("Created cache for department.delete",{err:err});
+            });
+
+            key = department.id_project+":departments:query:*";        
+            winston.verbose("Deleting cache for department.delete with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for department.delete",reply);
+                winston.verbose("Deleted cache for department.delete",{err:err});
+            });   
+        });
+    });
+
+
+    labelEvent.on("label.create", function(label) { 
+        setImmediate(() => {    
+            var key = label.id_project+":labels:query:*";        
+            winston.verbose("Deleting cache for label.create with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for label.create",reply);
+                winston.verbose("Deleted cache for label.create",{err:err});
+            });   
+        });
+    });
+
+
+
+    labelEvent.on("label.update", function(label) {        
+        setImmediate(() => {    
+            var key = label.id_project+":labels:query:*";        
+            winston.verbose("Deleting cache for label.update with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for label.update",reply);
+                winston.verbose("Deleted cache for label.update",{err:err});
+            });   
+        });
+    });
+
+
+    labelEvent.on("label.clone", function(label) {    
+        setImmediate(() => {         
+            var key = label.id_project+":labels:query:*";        
+            winston.verbose("Deleting cache for label.clone with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for label.clone",reply);
+                winston.verbose("Deleted cache for label.clone",{err:err});
+            });   
+        });
+    });
+
+
+    labelEvent.on("label.delete", function(label) {     
+        setImmediate(() => {         
+            var key = label.id_project+":labels:query:*";        
+            winston.verbose("Deleting cache for label.delete with key: " + key);
+            client.del(key, function (err, reply) {
+                winston.debug("Deleted cache for label.delete",reply);
+                winston.verbose("Deleted cache for label.delete",{err:err});
+            });   
+        });
+    });
+
+    // fai cache per subscription.create, .update .delete
+
+    // fai cache per trigger.create, .update .delete
+
+    //jwt
+
+    // fai cache faq
+
+ }
+
+module.exports = function (mongoose, option) {
+
+    if (process.env.CACHE_ENABLED == "true") {
+        var engine = process.env.CACHE_ENGINE;
+        winston.debug("Redis engine: "+ engine);
+
+        // var endPoint = process.env.CACHE_REDIS_ENDPOINT || "redis://127.0.0.1:6379";
+        // winston.debug("Redis endpoint: "+ endPoint);
+
+        var port = process.env.CACHE_REDIS_PORT || 6379;
+        winston.debug("Redis port: "+ port);
+
+        var host = process.env.CACHE_REDIS_HOST || "127.0.0.1"
+        winston.debug("Redis host: "+ host);
+
+        var password = process.env.CACHE_REDIS_PASSWORD;
+        winston.debug("Redis password: "+ password);
+        
+        winston.info("Mongoose Cachegoose fn initialized, engine: " + engine + ", port: "+ port + ", host: "+ host  + " defaultTTL: " +defaultTTL + ", password: "+ password);
+        // winston.info("Mongoose Cachegoose fn initialized, engine: " + engine + ", endpoint: "+endPoint +", port: "+ port + ", host: "+ host + ", password: "+ password);
+
+
+
+        
+        // cachegoose(mongoose, endPoint);
+        
+        cachegoose(mongoose, {
+            engine: engine,    /* If you don't specify the redis engine,      */
+            port: port,         /* the query results will be cached in memory. */            
+            host: host,
+            password: password           
+          });
+
+        var client = cachegoose._cache;
+        listen(client);
+    }else {
+        winston.info("Mongoose Cachegoose disabled");
+    }
+
+    // console.log("init",init);  
+    // console.log("cachegoose._cache",cachegoose._cache);  
+    // cachegoose._cache.get("/projects/5ea800091147f28c72b90c5e", (err, cachedResults) => { //
+    //     console.log("cachedResults",cachedResults);  
+    // });
+
+  
+}

package/pubmodules/canned/cannedResponseRoute.js

@@ -121,7 +121,6 @@ router.get('/', function (req, res) {
   winston.debug('CannedResponse ROUTE - SKIP PAGE ', skip);
 
   // var query = { "id_project": req.projectid, "status": {$lt:1000}};
-  console.log("canned_req.user: ", req.user);
   var query = {"id_project": req.projectid, "status": { $lt:1000 }, $or:[ { shared: true }, { createdBy: req.user._id } ] }
 
   if (req.query.full_text) {

package/pubmodules/events/eventRoute.js

@@ -39,8 +39,10 @@ router.post('/', [
       pu = req.projectuser.id
     }   
     
-    console.log("************* emit event"+new Date().toISOString());
 
+
+    // // da qui
+    // console.log("************* emit event"+new Date().toISOString());
     // // message.senderFullname,     message.recipient, 
     //             // message.recipient_fullname, message.text, message.sender, attributes, message.type, message.metadata, timestamp, message.group
     // var recipient = req.body.attributes.request_id;
@@ -48,8 +50,7 @@ router.post('/', [
     // var sender = req.user.id;
     // console.log("sender",sender);
 
-    // messageEvent.emit("message.test", 
-    // {
+    // let message = {
     //   recipient: recipient,
     //   recipient_fullname: "pluto",
     //   // sender:"bb0d809b-b093-419b-8b48-11a192cc3619",
@@ -59,14 +60,21 @@ router.post('/', [
     //   group: {
     //     members: {
     //       // "bb0d809b-b093-419b-8b48-11a192cc3619": 1,
-    //       sender: 1
+    //       // sender: 1
           
     //     }
     //   }
-    // }
-    // );
+    // };
+    // message.group.members[sender]= 1;
+    // console.log("message", message)
+
+    // messageEvent.emit("message.test", message);
+    // res.json({"event":"1"});
+
+    // //fino qui
 
-    // emit(name, attributes, id_project, project_user, createdBy, status, user) {
+ 
+    // // emit(name, attributes, id_project, project_user, createdBy, status, user) {
     eventService.emit(req.body.name, req.body.attributes, req.projectid, pu, req.user.id, undefined, req.user).then(function(event) {
 
       res.json(event);
@@ -75,22 +83,6 @@ router.post('/', [
       return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
     });
 
-  // var newEvent = new Event({
-  //   name: req.body.name,
-  //   attributes: req.body.attributes,
-  //   id_project: req.projectid,
-  //   createdBy: req.user.id,
-  //   updatedBy: req.user.id
-  // });
-
-  // newEvent.save(function(err, savedEvent) {
-  //   if (err) {
-  //     winston.error('Error saving the event '+ JSON.stringify(savedEvent), err)
-  //     return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(savedEvent)});
-  //   }
-
-  //   res.json(savedEvent);
-  // });
 });
 
 

package/pubmodules/pubModulesManager.js

@@ -39,6 +39,8 @@ class PubModulesManager {
         this.jobsManager = undefined;
 
         this.routingQueue = undefined;
+
+        this.cache = undefined;
     }
 
   
@@ -321,6 +323,19 @@ class PubModulesManager {
         }
 
 
+        try {            
+            this.cache = require('./cache').cachegoose(config.mongoose);            
+            winston.debug("this.cache:"+ this.cache);           
+            winston.info("PubModulesManager cache initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("PubModulesManager init cache module not found");
+            }else {
+                winston.error("PubModulesManager error initializing init cache module", err);
+            } 
+        }
+
+
     }
 
     start() {

package/routes/request.js

@@ -900,6 +900,11 @@ router.get('/', function (req, res, next) {
     winston.debug('REQUEST ROUTE - QUERY snap_lead_email', query.snap_lead_email);
   }
 
+  if (req.query.smartAssignment) {
+    query.smartAssignment = req.query.smartAssignment;
+    winston.debug('REQUEST ROUTE - QUERY smartAssignment', query.smartAssignment);
+  }
+
   if (req.query.channel) {
     if (req.query.channel === "offline") {
       query["channel.name"] =  {"$in" : ["email", "form"]}

package/services/modulesManager.js

@@ -41,7 +41,7 @@ class ModulesManager {
         this.requestHistoryRoute = undefined;
         // this.routingQueue = undefined;
         // this.queue = undefined;
-        this.cache = undefined;
+        // this.cache = undefined;
         this.visitorCounterRoute = undefined;
         this.visitorCounterMiddleware = undefined;
         this.widgetsRoute = undefined;
@@ -247,17 +247,17 @@ class ModulesManager {
         // }
 
 
-        try {            
-            this.cache = require('@tiledesk-ent/tiledesk-server-cache').cachegoose(config.mongoose);            
-            winston.debug("this.cache:"+ this.cache);           
-            winston.info("ModulesManager cache initialized");
-        } catch(err) {
-            if (err.code == 'MODULE_NOT_FOUND') {
-                winston.info("ModulesManager init cache module not found");
-            }else {
-                winston.error("ModulesManager error initializing init cache module", err);
-            }
-        }
+    //    try {            
+    //         this.cache = require('@tiledesk-ent/tiledesk-server-cache').cachegoose(config.mongoose);            
+    //         winston.debug("this.cache:"+ this.cache);           
+    //         winston.info("ModulesManager cache initialized");
+    //     } catch(err) {
+    //         if (err.code == 'MODULE_NOT_FOUND') {
+    //             winston.info("ModulesManager init cache module not found");
+    //         }else {
+    //             winston.error("ModulesManager error initializing init cache module", err);
+    //         } 
+    //     }
 
 
         

package/template/email/assignedEmailMessage.html

@@ -82,7 +82,8 @@
 
             <div style="text-align:center">
             <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <!--<img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">-->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
             </a>
             </div>
             </tr>

package/template/email/assignedRequest.html

@@ -82,7 +82,8 @@
 
             <div style="text-align:center">
             <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
             </a>
             </div>
             </tr>

package/template/email/beenInvitedExistingUser.html

@@ -72,7 +72,8 @@
 
               <div style="text-align:center">
                 <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
               </a>
             </div>
             <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">

package/template/email/beenInvitedNewUser.html

@@ -73,7 +73,8 @@
 
             <div style="text-align:center">
                 <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
             </a>
             </div>
             <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">

package/template/email/newMessage.html

@@ -80,7 +80,8 @@
 
             <div style="text-align:center">
               <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
               </a>
             </div>
             </tr>

package/template/email/newMessageFollower.html

@@ -75,7 +75,8 @@
               
                 <div style="text-align:center">
                   <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                    <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                    <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                    <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
                   </a>
                 </div>
               </td>

package/template/email/passwordChanged.html

@@ -72,7 +72,8 @@
 
                 <div style="text-align:center">
                 <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd">
+                    <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd"> -->
+                    <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
                 </a>
             </div>
             <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff">

package/template/email/pooledEmailMessage.html

@@ -82,7 +82,8 @@
 
             <div style="text-align:center">
             <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
             </a>
             </div>
             </tr>

package/template/email/pooledRequest.html

@@ -82,7 +82,8 @@
 
             <div style="text-align:center">
               <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
+                <!--<img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="max-width:250px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">-->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
               </a>
             </div>
             </tr>

package/template/email/resetPassword.html

@@ -71,7 +71,8 @@
 
             <div style="text-align:center">
               <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd">
+                <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:50%;outline:none;text-decoration:none;border:none;" class="CToWUd"> -->
+                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
               </a>
             </div>
 

package/template/email/sendTranscript.html

@@ -75,7 +75,8 @@
 
                   <div style="text-align:center">
                     <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                      <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                      <!-- <img src="https://tiledesk.com/tiledesk-logo.png" style="width:50%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                      <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
                     </a>
                   </div>
                   </tr>

package/template/email/ticket.html

@@ -75,7 +75,8 @@
               
                 <div style="text-align:center">
                   <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                    <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">
+                    <!-- <img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:20%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd"> -->
+                    <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
                   </a>
                 </div>
               </td>

package/test/cannedRoute.js

@@ -32,7 +32,6 @@ describe('CannedRoute', () => {
                     .set('content-type', 'application/json')
                     .send({ "title": "Test Title", "text": "Test Text" })
                     .end((err, res) => {
-                        console.log("res.body", res.body);
                         res.should.have.status(200);
                         res.body.should.be.a('object');
                         res.body.should.have.property('title').eql("Test Title");
@@ -53,7 +52,6 @@ describe('CannedRoute', () => {
         userService.signup(email, pwd, "Test Firstname", "Test Lastname").then(savedUser => {
             projectService.create("test1", savedUser._id).then(savedProject => {
 
-                console.log("RoleConstants.AGENT: ", RoleConstants.AGENT);
                 Project_user.findOneAndUpdate({id_project: savedProject._id, id_user: savedUser._id }, { role: RoleConstants.AGENT }, function(err, savedProject_user){
                     chai.request(server)
                     .post('/' + savedProject._id + '/canned/')
@@ -61,7 +59,6 @@ describe('CannedRoute', () => {
                     .set('content-type', 'application/json')
                     .send({ title: "Test Title", text: "Test Text" })
                     .end((err, res) => {
-                        console.log("res.body", res.body);
                         res.body.should.be.a('object');
                         res.body.should.have.property('title').eql("Test Title");
                         res.body.should.have.property('text').eql("Test Text");
@@ -92,7 +89,6 @@ describe('CannedRoute', () => {
                         .set('content-type', 'application/json')
                         .send({ email: email_agent, role: "agent", userAvailable: false })
                         .end((err, res) => {
-                            console.log("res.boy", res.body)
                             res.should.have.status(200);
 
 
@@ -103,7 +99,6 @@ describe('CannedRoute', () => {
                                 .send({ title: "Test1 Title", text: "Test1 Text" })
                                 .end((err, res) => {
 
-                                    console.log("res.body", res.body);
                                     res.should.have.status(200);
                                     res.body.should.be.a('object');
 
@@ -114,7 +109,6 @@ describe('CannedRoute', () => {
                                         .send({ title: "Test2 Title", text: "Test2 Text" })
                                         .end((err, res) => {
                                             
-                                            console.log("res.body",  res.body);
                                             res.should.have.status(200);
                                             res.body.should.be.a('object');
 
@@ -125,7 +119,6 @@ describe('CannedRoute', () => {
                                                 .send()
                                                 .end((err, res) => {
 
-                                                    console.log("res.body",  res.body);
                                                     res.should.have.status(200);
                                                     //res.body.should.be.a('array');
                                                     
@@ -139,8 +132,6 @@ describe('CannedRoute', () => {
                                                         .send()
                                                         .end((err, res) => {
 
-                                                        console.log("res.body",  res.body);
-                                                        console.log("\n --> body.length", res.body.length);
                                                         res.should.have.status(200);
                                                         //res.body.should.be.a('array');
                                                         

package/test/messageRoute.js

@@ -1016,7 +1016,7 @@ describe('/SendMessageSigninAnonym', () => {
                           var userId = res.body.user._id;
                           expect(res.body.success).to.equal(true);                                                                                                                     
                           expect(res.body.user.email).to.equal(undefined);  
-                          expect(res.body.user.firstname).to.equal("Guest");                                               
+                          expect(res.body.user.firstname).to.contains("guest#");      // guest_here                                          
                          
                           expect(res.body.token).to.not.equal(undefined);  
                                           
@@ -1065,7 +1065,7 @@ describe('/SendMessageSigninAnonym', () => {
                                         console.log("res.body",  res.body);
                                         expect(res.body.lead.lead_id).to.equal(userId);
                                         expect(res.body.lead.email).to.equal(undefined);
-                                        expect(res.body.lead.fullname).to.equal("Guest ");
+                                        expect(res.body.lead.fullname).to.contains("guest#"); // guest_here
                                         expect(res.body.requester.role).to.equal("guest");
                                         expect(res.body.requester.uuid_user).to.equal(userId);
                                         expect(res.body.requester.id_user).to.equal(undefined);