@tiledesk/tiledesk-server 2.3.17 → 2.3.19

package/channels/chat21/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-chat21-app",
   "description": "The Tiledesk Chat21 module",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "private": false,
   "author": "Andrea Leo - Frontiere21 SRL",
   "license": "AGPL-3.0",
@@ -11,7 +11,7 @@
     "url": "https://github.com/Tiledesk/tiledesk-server"
   },
   "dependencies": {
-    "@chat21/chat21-node-sdk": "^1.1.4",
+    "@chat21/chat21-node-sdk": "^1.1.7",
     "winston": "^3.3.3",
     "firebase-admin": "^9.5.0"
   },

package/models/project_user.js

@@ -37,6 +37,9 @@ var TagSchema = require("../models/tag");
       index: true
       // required: true
     },
+    profileStatus: {
+      type: String,
+    },
     presence: PresenceSchema,
     attributes: {
       type: Object,
@@ -108,5 +111,6 @@ Project_userSchema.virtual('isAuthenticated').get(function () {
   // Project_user.find({ id_project: projectid, id_user: { $in : group[0].members}, role: { $in : [RoleConstants.OWNER, RoleConstants.ADMIN, RoleConstants.AGENT]} })
   Project_userSchema.index({ id_project: 1, id_user:1, role: 1 }); 
 
+ 
   module.exports = mongoose.model('project_user', Project_userSchema);;
 

package/models/request.js

@@ -273,7 +273,16 @@ var RequestSchema = new Schema({
     required: true,
     index: true
   },
-
+  smartAssignment: {
+    type: Boolean,
+    default: true,
+    index: true
+  },
+  workingStatus: { //new, pending
+    type: String,
+    required: false,
+    index: true
+  },
   createdBy: {
     type: String,
     required: true
@@ -465,6 +474,8 @@ RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
 RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
 
 
+
+
 //   cannot index parallel arrays [agents] [participants] {"driv
 // RequestSchema.index({ id_project: 1, status: 1, preflight:1, participants:1, "agents.id_user":1, updatedAt: -1 }); //NN LO APPLICA
  

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.17",
+  "version": "2.3.19",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -33,18 +33,16 @@
     "@tiledesk-ent/tiledesk-server-dialogflow": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
-    "@tiledesk-ent/tiledesk-server-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
-    "@tiledesk-ent/tiledesk-server-routing-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-chat21-app": "^1.1.4",
+    "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@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.4",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",

package/pubmodules/activities/activityArchiver.js

@@ -275,7 +275,7 @@ class ActivityArchiver {
           setImmediate(() => {           
        
               try {
-                winston.error('ActivityArchiver close');
+                winston.debug('ActivityArchiver close');
                
                 var activity = new Activity({actor: {type:"user", id: request.closed_by}, 
                 verb: "REQUEST_CLOSE", actionObj: request, 

package/pubmodules/activities/routes/activity.js

@@ -154,7 +154,7 @@ router.get('/', function (req, res) {
         return (err);
       }
 
-      return Activity.count(query, function (err, totalRowCount) {
+      return Activity.countDocuments(query, function (err, totalRowCount) {
         if (err) {
           winston.error('Activity ROUTE - REQUEST FIND ERR ', err)
           return (err);

package/pubmodules/canned/cannedResponse.js

@@ -14,6 +14,10 @@ var CannedResponseSchema = new Schema({
     type: String,
     required: true,
   },
+  shared: {
+    type: Boolean,
+    required: true
+  },
   attributes: {
     type: Object,
   },

package/pubmodules/canned/cannedResponseRoute.js

@@ -12,12 +12,18 @@ router.post('/', function (req, res) {
 
   var newCannedResponse = new CannedResponse({
     title: req.body.title,  
-    text: req.body.text,  
+    text: req.body.text,
     id_project: req.projectid,
     createdBy: req.user.id,
     updatedBy: req.user.id
   });
 
+  if (req.projectuser.role == 'owner' || req.projectuser.role == 'admin') {
+    newCannedResponse.shared = true;
+  } else {
+    newCannedResponse.shared = false;
+  }
+
   newCannedResponse.save(function (err, savedCannedResponse) {
     if (err) {
       winston.error('--- > ERROR ', err)
@@ -104,7 +110,7 @@ router.get('/:cannedResponseid', function (req, res) {
 });
 
 router.get('/', function (req, res) {
-  var limit = 40; // Number of CannedResponses per page
+  var limit = 1000; // Number of CannedResponses per page
   var page = 0;
 
   if (req.query.page) {
@@ -114,15 +120,15 @@ router.get('/', function (req, res) {
   var skip = page * limit;
   winston.debug('CannedResponse ROUTE - SKIP PAGE ', skip);
 
-
-  var query = { "id_project": req.projectid, "status": {$lt:1000}};
+  // 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) {
     winston.debug('CannedResponse ROUTE req.query.fulltext', req.query.full_text);
     query.$text = { "$search": req.query.full_text };
   }
 
-
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

package/pubmodules/emailNotification/requestNotification.js

@@ -31,11 +31,25 @@ winston.debug('********* RequestNotification apiUrl: ' + apiUrl);
 
 class RequestNotification {
 
+  constructor() {
+    this.enabled = true;
+    if (process.env.EMAIL_NOTIFICATION_ENABLED=="false" || process.env.EMAIL_NOTIFICATION_ENABLED==false) {
+        this.enabled = false;
+    }
+    winston.debug("RequestNotification this.enabled: "+ this.enabled);
+}
 
 listen() {
-    var that = this;
+    var that = this; 
     
 
+      
+    if (this.enabled==true) {
+      winston.info("RequestNotification listener started");
+    } else {
+        return winston.info("RequestNotification listener disabled");
+    }
+
 
     var messageCreateKey = 'message.create';
     if (messageEvent.queueEnabled) {
@@ -813,7 +827,12 @@ sendAgentEmail(projectid, savedRequest) {
     // send email
     try {
    
-   
+  //  console.log("sendAgentEmail")
+    if (savedRequest.preflight === true) {   //only for channel email and form preflight is false otherwise request.participants.update is used i think?
+      winston.debug("preflight request sendAgentEmail disabled")
+      return 0;
+    }
+
     Project.findOne({_id: projectid, status: 100}).select("+settings").exec( async function(err, project){
        if (err) {
          return winston.error(err);
@@ -834,6 +853,8 @@ sendAgentEmail(projectid, savedRequest) {
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
 
+                  winston.debug("savedRequest.status==RequestConstants.UNASSIGNED");        
+
                   if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.pooled == false ) {
                     return winston.info("RequestNotification email notification for the project with id : " + projectid + " for the pooled conversation is disabled");
                   }
@@ -906,6 +927,8 @@ sendAgentEmail(projectid, savedRequest) {
                    // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                    else if (savedRequest.status==RequestConstants.ASSIGNED) { //ASSIGNED
 
+                    winston.debug("savedRequest.status==RequestConstants.ASSIGNED");        
+
                     if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.assigned == false ) {
                       return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for the assigned conversation is disabled");
                     }

package/pubmodules/events/eventRoute.js

@@ -2,7 +2,6 @@ var express = require('express');
 var router = express.Router({mergeParams: true});
 var Event = require("./event");
 var winston = require('../../config/winston');
-const eventEvent = require('./eventEvent');
 var validtoken = require('../../middleware/valid-token');
 const eventService = require('./eventService');
 const { check, validationResult } = require('express-validator');
@@ -10,6 +9,9 @@ var passport = require('passport');
 require('../../middleware/passport')(passport);
 var roleChecker = require('../../middleware/has-role');
 
+const messageEvent = require('../../event/messageEvent');
+
+
 router.post('/', [
   passport.authenticate(['basic', 'jwt'], 
   { session: false }), 
@@ -37,13 +39,41 @@ router.post('/', [
       pu = req.projectuser.id
     }   
     
+    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;
+    // console.log("recipient",recipient);
+    // var sender = req.user.id;
+    // console.log("sender",sender);
+
+    // messageEvent.emit("message.test", 
+    // {
+    //   recipient: recipient,
+    //   recipient_fullname: "pluto",
+    //   // sender:"bb0d809b-b093-419b-8b48-11a192cc3619",
+    //   sender: sender,
+    //   senderFullname: "Tiledesk",
+    //   text:"welcome",
+    //   group: {
+    //     members: {
+    //       // "bb0d809b-b093-419b-8b48-11a192cc3619": 1,
+    //       sender: 1
+          
+    //     }
+    //   }
+    // }
+    // );
+
     // 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);
-  }).catch(function(err) {
-    winston.error('Error saving the event '+ JSON.stringify(event), err)
-    return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
-  });
+
+      res.json(event);
+    }).catch(function(err) {
+      winston.error('Error saving the event '+ JSON.stringify(event), err)
+      return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
+    });
 
   // var newEvent = new Event({
   //   name: req.body.name,
@@ -137,7 +167,7 @@ router.get('/',   [passport.authenticate(['basic', 'jwt'],
       }
 
       //  collection.count is deprecated, and will be removed in a future version. Use Collection.countDocuments or Collection.estimatedDocumentCount instead
-      return Event.count(query, function (err, totalRowCount) {
+      return Event.countDocuments(query, function (err, totalRowCount) {
 
         var objectToReturn = {
           perPage: limit,

package/pubmodules/pubModulesManager.js

@@ -33,6 +33,12 @@ class PubModulesManager {
 
         this.tilebot = undefined;
         this.tilebotRoute = undefined;
+
+        this.queue = undefined;
+
+        this.jobsManager = undefined;
+
+        this.routingQueue = undefined;
     }
 
   
@@ -88,6 +94,8 @@ class PubModulesManager {
     init(config) {
         winston.debug("PubModulesManager init");
 
+        // this.jobsManager = config.jobsManager;
+
         try {
             this.appRules = require('./rules/appRules');
             // this.appRules.start();
@@ -128,7 +136,6 @@ class PubModulesManager {
         }
         
         
-        
          try {
             this.emailNotification = require('./emailNotification');
             winston.debug("this.emailNotification:"+ this.emailNotification);
@@ -203,7 +210,6 @@ class PubModulesManager {
 
 
 
-
         try {
             this.activityArchiver = require('./activities').activityArchiver;
             // this.activityArchiver.listen();
@@ -282,6 +288,39 @@ class PubModulesManager {
         }
 
 
+
+
+        try {
+            this.queue = require('./queue');
+            winston.debug("this.queue:"+ this.queue);                
+
+            winston.info("PubModulesManager initialized queue.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init queue module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init queue module", err);
+            }
+        }
+
+
+
+
+        try {
+            this.routingQueue = require('./routing-queue').listener;
+            // this.routingQueue.listen();
+            winston.debug("this.routingQueue:"+ this.routingQueue);           
+
+            winston.info("PubModulesManager routing queue initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("PubModulesManager init routing queue module not found");
+            }else {
+                winston.error("PubModulesManager error initializing init routing queue module", err);
+            }
+        }
+
+
     }
 
     start() {
@@ -316,9 +355,11 @@ class PubModulesManager {
             
         }
         
+        // job_here
         if (this.emailNotification) {
             try {
                 this.emailNotification.requestNotification.listen();
+                // this.jobsManager.listenEmailNotification(this.emailNotification);
                 winston.info("PubModulesManager emailNotification started.");   
             } catch(err) {        
                 winston.info("PubModulesManager error starting requestNotification module", err);            
@@ -334,13 +375,24 @@ class PubModulesManager {
             }
         } 
 
-
+        // job_here
         if (this.activityArchiver) {
             try {
                 this.activityArchiver.listen();
-                winston.info("ModulesManager activityArchiver started");
+                // this.jobsManager.listenActivityArchiver(this.activityArchiver);
+                winston.info("PubModulesManager activityArchiver started");
+            } catch(err) {        
+                winston.info("PubModulesManager error starting activityArchiver module", err);            
+            }
+        }
+
+
+        if (this.routingQueue) {
+            try {
+                this.routingQueue.listen();
+                winston.info("PubModulesManager routingQueue started");
             } catch(err) {        
-                winston.info("ModulesManager error starting activityArchiver module", err);            
+                winston.info("PubModulesManager error starting routingQueue module", err);            
             }
         }
 

package/pubmodules/queue/index.js

@@ -0,0 +1,4 @@
+const reconnect = require("./reconnect");
+const reconnectFanout = require("./reconnectFanout");
+
+module.exports = {reconnect:reconnect,reconnectFanout: reconnectFanout };

package/pubmodules/queue/reconnect.js

@@ -0,0 +1,247 @@
+var amqp = require('amqplib/callback_api');
+var winston = require('../../config/winston');
+const requestEvent = require('../../event/requestEvent');
+const messageEvent = require('../../event/messageEvent');
+const authEvent = require('../../event/authEvent');
+// https://elements.heroku.com/addons/cloudamqp
+// https://gist.github.com/carlhoerberg/006b01ac17a0a94859ba#file-reconnect-js
+// http://www.rabbitmq.com/tutorials/tutorial-one-javascript.html
+
+// if the connection is closed or fails to be established at all, we will reconnect
+var amqpConn = null;
+
+var url = process.env.CLOUDAMQP_URL + "?heartbeat=60" || "amqp://localhost";
+// attento devi aggiornare configMap di PRE E PROD
+// var url = process.env.AMQP_URL + "?heartbeat=60" || "amqp://localhost?heartbeat=60";
+
+var exchange = 'amq.topic';
+
+function start() {
+  amqp.connect(url, function(err, conn) {
+    if (err) {
+      winston.error("[AMQP]", err.message);
+      return setTimeout(start, 1000);
+    }
+    conn.on("error", function(err) {
+      if (err.message !== "Connection closing") {
+        winston.error("[AMQP] conn error", err);
+      }
+    });
+    conn.on("close", function() {
+      winston.error("[AMQP] reconnecting");
+      return setTimeout(start, 1000);
+    });
+
+    winston.info("[AMQP] connected");
+    amqpConn = conn;
+
+    whenConnected();
+  });
+}
+
+function whenConnected() {
+  startPublisher();
+
+
+  let jobWorkerEnabled = false;
+  if (process.env.JOB_WORKER_ENABLED=="true" || process.env.JOB_WORKER_ENABLED == true) {
+      jobWorkerEnabled = true;
+  }
+  winston.info("JobsManager jobWorkerEnabled: "+ jobWorkerEnabled);  
+
+  if (jobWorkerEnabled == false) {
+    winston.info("Queue Reconnect start worker");
+    startWorker();
+  } else {
+    winston.info("Queue Reconnect without worker because external worker is enabled");
+  }
+  
+}
+
+var pubChannel = null;
+var offlinePubQueue = [];
+function startPublisher() {
+  amqpConn.createConfirmChannel(function(err, ch) {
+    if (closeOnErr(err)) return;
+    ch.on("error", function(err) {
+      winston.error("[AMQP] channel error", err);
+    });
+    ch.on("close", function() {
+      winston.info("[AMQP] channel closed");
+    });
+
+    pubChannel = ch;
+    while (true) {
+      var m = offlinePubQueue.shift();
+      if (!m) break;
+      publish(m[0], m[1], m[2]);
+    }
+  });
+}
+
+// method to publish a message, will queue messages internally if the connection is down and resend later
+function publish(exchange, routingKey, content) {
+  try {
+    pubChannel.publish(exchange, routingKey, content, { persistent: true },
+                       function(err, ok) {
+                         if (err) {
+                          winston.error("[AMQP] publish", err);
+                           offlinePubQueue.push([exchange, routingKey, content]);
+                           pubChannel.connection.close();
+                         }
+                       });
+  } catch (e) {
+    winston.error("[AMQP] publish", e);
+    offlinePubQueue.push([exchange, routingKey, content]);
+  }
+}
+
+// A worker that acks messages only if processed succesfully
+// var channel;
+function startWorker() {
+    amqpConn.createChannel(function(err, ch) {
+      if (closeOnErr(err)) return;
+      ch.on("error", function(err) {
+        winston.error("[AMQP] channel error", err);
+      });
+      ch.on("close", function() {
+        winston.info("[AMQP] channel closed");
+      });
+      ch.prefetch(10);//leggila da env
+      ch.assertExchange(exchange, 'topic', {
+        durable: true
+      });
+      ch.assertQueue("jobs", { durable: true }, function(err, _ok) {
+        if (closeOnErr(err)) return;
+        ch.bindQueue(_ok.queue, exchange, "request_create", {}, function(err3, oka) {
+            winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_create");
+            winston.info("Data queue", oka)
+        });
+        ch.bindQueue(_ok.queue, exchange, "request_update", {}, function(err3, oka) {
+            winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: request_update");
+            winston.info("Data queue", oka)
+        });
+        ch.bindQueue(_ok.queue, exchange, "message_create", {}, function(err3, oka) {
+              winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: message_create");
+              winston.info("Data queue", oka)
+        });
+        ch.bindQueue(_ok.queue, exchange, "project_user_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: project_user_update");
+          winston.info("Data queue", oka)
+        });
+        ch.consume("jobs", processMsg, { noAck: false });
+        winston.info("Worker is started");
+      });
+  
+
+    function processMsg(msg) {
+      work(msg, function(ok) {
+        try {
+          if (ok)
+            ch.ack(msg);
+          else
+            ch.reject(msg, true);
+        } catch (e) {
+          closeOnErr(e);
+        }
+      });
+    }
+  });
+}
+
+function work(msg, cb) {
+  const message_string = msg.content.toString();
+  const topic = msg.fields.routingKey //.replace(/[.]/g, '/');
+
+  winston.debug("Got msg topic:" + topic);
+
+  winston.debug("Got msg:"+ message_string +  " topic:" + topic);
+
+  if (topic === 'request_create') {
+    winston.info("here topic:" + topic);
+    // requestEvent.emit('request.create.queue', msg.content);
+    requestEvent.emit('request.create.queue', JSON.parse(message_string));
+  }
+  if (topic === 'request_update') {
+    winston.info("here topic:" + topic);
+    // requestEvent.emit('request.update.queue',  msg.content);
+    requestEvent.emit('request.update.queue',  JSON.parse(message_string));
+  }
+  if (topic === 'message_create') {
+    winston.debug("here topic:" + topic);
+    // requestEvent.emit('request.create.queue', msg.content);
+    messageEvent.emit('message.create.queue', JSON.parse(message_string));
+  }
+  if (topic === 'project_user_update') {
+    winston.debug("here topic:" + topic);
+    // requestEvent.emit('request.create.queue', msg.content);
+    authEvent.emit('project_user.update.queue', JSON.parse(message_string));
+  }
+  cb(true);
+//   WebSocket.cb(true);
+//   requestEvent.on(msg.KEYYYYYYY+'.ws', msg.content);
+}
+
+
+function closeOnErr(err) {
+  if (!err) return false;
+  winston.error("[AMQP] error", err);
+  amqpConn.close();
+  return true;
+}
+
+// setInterval(function() {
+//     var d = new Date();
+//   publish(exchange, "request_create", Buffer.from("work work work: "+d));
+//   publish(exchange, "request_update", Buffer.from("work2 work work: "+d));
+// }, 1000);
+
+
+function listen() {
+
+    // http://www.squaremobius.net/amqp.node/channel_api.html
+    // https://docs.parseplatform.org/parse-server/guide/#scalability
+
+    requestEvent.on('request.create', function(request) {
+      setImmediate(() => {
+        winston.info("reconnect request.create")
+        publish(exchange, "request_create", Buffer.from(JSON.stringify(request)));
+      });
+    });
+
+    requestEvent.on('request.update', function(request) {
+      setImmediate(() => {
+        winston.info("reconnect request.update")
+        publish(exchange, "request_update", Buffer.from(JSON.stringify(request)));
+      });
+    });
+
+
+    messageEvent.on('message.create', function(message) {
+      setImmediate(() => {
+        publish(exchange, "message_create", Buffer.from(JSON.stringify(message)));
+      });
+    });
+
+    authEvent.on('project_user.update',function(data) {
+      setImmediate(() => {
+        let user = undefined;
+        if (data.req && data.req.user) { //i think is null from chat21webhook 
+          user = data.req.user;
+        }
+        var dat = {updatedProject_userPopulated: data.updatedProject_userPopulated, req: {user: user}}; //remove request
+        publish(exchange, "project_user_update", Buffer.from(JSON.stringify(dat)));
+      });
+    });
+
+}
+
+if (process.env.QUEUE_ENABLED === "true") {
+    requestEvent.queueEnabled = true;
+    messageEvent.queueEnabled = true;
+    authEvent.queueEnabled = true;
+    listen();
+    start();
+    winston.info("Queue enabled. endpint: " + url );
+} 
+