@tiledesk/tiledesk-server 2.2.38 → 2.3.1-8.1

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/messageActions/messageActionsInterceptor.js

@@ -149,8 +149,10 @@ class MessageActionsInterceptor {
             if (request) {
                 // setTimeout(function() {
                     // winston.info("delayed")
-                     // closeRequestByRequestId(request_id, id_project, notify) {
-                    requestService.closeRequestByRequestId(request.request_id, request.id_project );
+                    
+                    // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+                    const closed_by = message.sender;
+                    requestService.closeRequestByRequestId(request.request_id, request.id_project, false, true, closed_by );
                 //   }, 1500);
 
                

package/pubmodules/pubModulesManager.js

@@ -1,10 +1,9 @@
 
 var winston = require('../config/winston');
-// var validtoken = require('../middleware/valid-token');
-// var roleChecker = require('../middleware/has-role');
-// var passport = require('passport');
-// require('../middleware/passport')(passport);
-
+var validtoken = require('../middleware/valid-token');
+var roleChecker = require('../middleware/has-role');
+var passport = require('passport');
+require('../middleware/passport')(passport);
 
 class PubModulesManager {
 
@@ -20,12 +19,35 @@ class PubModulesManager {
         this.scheduler = undefined;
 
         this.rasa = undefined;
+        this.rasaRoute = undefined;
+
+        this.activityArchiver = undefined;
+        this.activityRoute = undefined;
+
+        this.analyticsRoute = undefined;
+
+        this.cannedResponseRoute = undefined;
+
+        this.trigger = undefined;
+        this.triggerRoute = undefined;
+
+        this.tilebot = undefined;
+        this.tilebotRoute = undefined;
     }
 
   
 
     use(app) {
         
+        if (this.rasaRoute) {
+            app.use('/modules/rasa', this.rasaRoute);
+            winston.info("ModulesManager rasaRoute controller loaded");       
+        }
+        if (this.tilebotRoute) {
+            app.use('/modules/tilebot', this.tilebotRoute);
+            winston.info("ModulesManager tilebot controller loaded");       
+        }
+
     }
     useUnderProjects(app) {
         var that = this;
@@ -39,10 +61,31 @@ class PubModulesManager {
             winston.info("ModulesManager eventsRoute controller loaded");       
         }
         
+
+        if (this.activityRoute) {
+            app.use('/:projectid/activities', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.activityRoute);
+             winston.info("ModulesManager activities controller loaded");       
+        }
+
+        if (this.analyticsRoute) {
+            app.use('/:projectid/analytics', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], this.analyticsRoute);
+             winston.info("ModulesManager analytics controller loaded");       
+         }
+
+         if (this.cannedResponseRoute) {            
+            app.use('/:projectid/canned', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], this.cannedResponseRoute);
+            winston.info("ModulesManager canned controller loaded");       
+        }
+
+        if (this.triggerRoute) {
+            app.use('/:projectid/modules/triggers', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], this.triggerRoute);
+            winston.info("ModulesManager trigger controller loaded");       
+        }
+
     }
 
    
-    init() {
+    init(config) {
         winston.debug("PubModulesManager init");
 
         try {
@@ -145,7 +188,10 @@ class PubModulesManager {
         try {
             this.rasa = require('./rasa');
             winston.debug("this.rasa:"+ this.rasa);    
-            this.rasa.listener.listen();      
+            this.rasa.listener.listen(config);      
+
+            this.rasaRoute = this.rasa.rasaRoute;
+
             winston.info("PubModulesManager initialized rasa.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') { 
@@ -157,8 +203,85 @@ class PubModulesManager {
 
 
 
+
+        try {
+            this.activityArchiver = require('./activities').activityArchiver;
+            // this.activityArchiver.listen();
+            winston.debug("this.activityArchiver:"+ this.activityArchiver);   
+            
+            this.activityRoute = require('./activities').activityRoute;
+            winston.debug("this.activityRoute:"+ this.activityRoute);
+
+            winston.info("ModulesManager activities initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("ModulesManager init activities module not found");
+            }else {
+                winston.error("ModulesManager error initializing init activities module", err);
+            }
+        }
+
+
+        try {
+            this.analyticsRoute = require('./analytics').analyticsRoute;
+            winston.debug("this.analyticsRoute:"+ this.analyticsRoute);        
+            winston.info("ModulesManager analyticsRoute initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("ModulesManager init analytics module not found");
+            }else {
+                winston.error("ModulesManager error initializing init analytics module", err);
+            }
+        }
+
+
+
+        try {
+            this.cannedResponseRoute = require('./canned').cannedResponseRoute;
+            winston.debug("this.cannedResponseRoute:"+ this.cannedResponseRoute);        
+            winston.info("ModulesManager cannedResponseRoute initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("ModulesManager init canned module not found");
+            }else {
+                winston.error("ModulesManager error initializing init canned module", err);
+            }
+        }
+
       
+        try {
+            this.trigger = require('./trigger').start;
+            winston.debug("this.trigger:"+ this.trigger);
+            this.triggerRoute = require('./trigger').triggerRoute;
+            winston.debug("this.triggerRoute:"+ this.triggerRoute);       
+            winston.info("ModulesManager trigger initialized");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') {
+                winston.info("ModulesManager init trigger module not found");
+            }else {
+                winston.error("ModulesManager error initializing init trigger module", err);
+            }
+        }
         
+
+
+
+        try {
+            this.tilebot = require('./tilebot');
+            winston.debug("this.tilebot:"+ this.tilebot);    
+            this.tilebot.listener.listen(config);      
+            this.tilebotRoute = this.tilebot.tilebotRoute;
+
+            winston.info("PubModulesManager initialized tilebot.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init tilebot module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init tilebot module", err);
+            }
+        }
+
+
     }
 
     start() {
@@ -212,6 +335,16 @@ class PubModulesManager {
         } 
 
 
+        if (this.activityArchiver) {
+            try {
+                this.activityArchiver.listen();
+                winston.info("ModulesManager activityArchiver started");
+            } catch(err) {        
+                winston.info("ModulesManager error starting activityArchiver module", err);            
+            }
+        }
+
+
     }
 
 

package/pubmodules/rasa/index.js

@@ -1,3 +1,10 @@
 const listener = require("./listener");
 
-module.exports = {listener:listener };
+const rasa = require("@tiledesk/tiledesk-rasa-connector");
+const rasaRoute = rasa.router;
+
+
+
+
+
+module.exports = { listener: listener, rasaRoute: rasaRoute };

package/pubmodules/rasa/listener.js

@@ -1,32 +1,53 @@
 const botEvent = require('../../event/botEvent');
 var Faq_kb = require("../../models/faq_kb");
 var winston = require('../../config/winston');
+const rasa = require("@tiledesk/tiledesk-rasa-connector");
+var configGlobal = require('../../config/global');
 
-const BOT_RASA_ENDPOINT = process.env.BOT_RASA_ENDPOINT;
+var port = process.env.PORT || '3000';
+
+const BOT_RASA_ENDPOINT = process.env.BOT_RASA_ENDPOINT || "http://localhost:" + port+ "/modules/rasa/rasabot";
 winston.debug("BOT_RASA_ENDPOINT: " + BOT_RASA_ENDPOINT);
 
-if (BOT_RASA_ENDPOINT) {
+// if (BOT_RASA_ENDPOINT) {
   winston.info("Rasa endpoint: " + BOT_RASA_ENDPOINT);
-} else {
-   winston.info("Rasa endpoint not configured");
-}
+// } else {
+//    winston.info("Rasa endpoint not configured");
+// }
 
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Rasa apiUrl: '+ apiUrl);
 
 class Listener {
 
-    listen() {
+    listen(config) {
 
-        winston.debug('rasa Listener listen');   
+        winston.info('Rasa Listener listen');
+        winston.debug("rasa config databaseUri: " + config.databaseUri);  
+        
 
         var that = this;
 
+
+        rasa.startRasa(
+            {
+                KVBASE_COLLECTION : process.env.KVBASE_COLLECTION,
+                MONGODB_URI: config.databaseUri,          
+                API_ENDPOINT: apiUrl,   
+                log: process.env.RASABOT_LOG
+            }, () => {
+                winston.info("RASA proxy server successfully started.");   
+            });
+
+
+      
         botEvent.on('faqbot.create', function(bot) {
             if (BOT_RASA_ENDPOINT) {
 
-                winston.info('bot.type:'+bot.type); 
+                winston.debug('bot.type:'+bot.type); 
                 if (bot.type==="rasa") {
 
-                    winston.info('qui.type:'+bot.type); 
+                    winston.debug('qui.type:'+bot.type); 
 
 
                     Faq_kb.findByIdAndUpdate(bot.id, {"url":BOT_RASA_ENDPOINT}, { new: true, upsert: true }, function (err, savedFaq_kb) {

package/pubmodules/rules/conciergeBot.js

@@ -188,7 +188,7 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
             setImmediate(() => {
                                       
-                        winston.debug("ConciergeBot send close bot message");     
+                        winston.debug("ConciergeBot send close bot message",request);     
                                             
                         // send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type, metadata, language) 
                             messageService.send(
@@ -198,7 +198,7 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                                 "Chat closed", 
                                 request.id_project,
                                 'system', 
-                                {subtype:"info/support", "updateconversation" : false, messagelabel: {key: "CHAT_CLOSED"}},
+                                {subtype:"info/support", "updateconversation" : false, messagelabel: {key: "CHAT_CLOSED"}},  
                                 undefined,
                                 request.language
                             );
@@ -228,8 +228,8 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                                 request.request_id,
                                 "Chat reopened", 
                                 request.id_project,
-                                'system', 
-                                {subtype:"info/support", "updateconversation" : false, messagelabel: {key: "CHAT_REOPENED"}},
+                                'system',                                      
+                                {subtype:"info/support", "updateconversation" : true, messagelabel: {key: "CHAT_REOPENED"}},
                                 undefined,
                                 request.language
 

package/pubmodules/scheduler/tasks/closeAgentUnresponsiveRequestTask.js

@@ -84,7 +84,9 @@ findUnresponsiveRequests() {
       requests.forEach(request => {
         winston.debug("********unresponsive request ", request);
 
-        return requestService.closeRequestByRequestId(request.request_id, request.id_project, false, false).then(function(updatedStatusRequest) {
+        // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+        const closed_by = "_bot_unresponsive";
+        return requestService.closeRequestByRequestId(request.request_id, request.id_project, false, false, closed_by).then(function(updatedStatusRequest) {
           winston.verbose("CloseAgentUnresponsiveRequestTask: Request closed with request_id: " + request.request_id);
           // winston.info("Request closed",updatedStatusRequest);
         }).catch(function(err) {

package/pubmodules/scheduler/tasks/closeBotUnresponsiveRequestTask.js

@@ -50,8 +50,8 @@ scheduleUnresponsiveRequests() {
  //https://crontab.guru/examples.html
  var s= schedule.scheduleJob(this.cronExp, function(fireDate){   //TODO aggiungi un bias random
 
-    let timeInMs = Math.random() * (1000);  // avoid cluster concurrent jobs in multiple nodes between 0 and 1sec
-    winston.info('timeInMs => '+ timeInMs);
+    let timeInMs = Math.random() * (1000);  // avoid cluster concurrent jobs in multiple nodes delay between 0 and 1sec
+    winston.debug('timeInMs => '+ timeInMs);
 
     setTimeout(function () {
       winston.debug('CloseBotUnresponsiveRequestTask scheduleUnresponsiveRequests job was supposed to run at ' + fireDate + ', but actually ran at ' + new Date());
@@ -95,7 +95,9 @@ findUnresponsiveRequests() {
 
         winston.debug("********unresponsive request ", request);
 
-        return requestService.closeRequestByRequestId(request.request_id, request.id_project, false, false).then(function(updatedStatusRequest) {
+         //  closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+        const closed_by = "_bot_unresponsive";
+        return requestService.closeRequestByRequestId(request.request_id, request.id_project, false, false, closed_by).then(function(updatedStatusRequest) {
           winston.info("CloseBotUnresponsiveRequestTask: Request closed with request_id: " + request.request_id);
           // winston.info("Request closed",updatedStatusRequest);
         }).catch(function(err) {

package/pubmodules/tilebot/index.js

@@ -0,0 +1,11 @@
+const listener = require("./listener");
+
+const tilebot = require("@tiledesk/tiledesk-tybot-connector");
+const tilebotRoute = tilebot.router;
+
+
+
+
+
+module.exports = { listener: listener, tilebotRoute: tilebotRoute };
+

package/pubmodules/tilebot/listener.js

@@ -0,0 +1,69 @@
+const botEvent = require('../../event/botEvent');
+var Faq_kb = require("../../models/faq_kb");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+var port = process.env.PORT || '3000';
+
+const TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT || "http://localhost:" + port+ "/modules/tilebot/ext/";
+winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
+
+winston.info("Tilebot endpoint: " + TILEBOT_ENDPOINT);
+
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info('Rasa apiUrl: '+ apiUrl);
+
+const tybot = require("@tiledesk/tiledesk-tybot-connector");
+
+
+class Listener {
+
+    listen(config) {
+
+        winston.info('Tilebot Listener listen');
+        winston.debug("Tilebot config databaseUri: " + config.databaseUri);  
+        
+
+        var that = this;
+       
+        tybot.startApp(
+            {              
+              MONGODB_URI: config.databaseUri,
+              API_ENDPOINT: apiUrl,
+              log: process.env.TILEBOT_LOG
+            }, () => {
+              winston.info("TileBot proxy server successfully started.");                 
+            }
+          );
+
+
+        botEvent.on('faqbot.create', function(bot) {
+            if (TILEBOT_ENDPOINT) {
+
+                winston.debug('bot.type:'+bot.type); 
+                if (bot.type==="tilebot") {
+
+                    winston.debug('qui.type:'+bot.type); 
+
+
+                    Faq_kb.findByIdAndUpdate(bot.id, {"url":TILEBOT_ENDPOINT+bot.id}, { new: true, upsert: true }, function (err, savedFaq_kb) {
+
+                    // bot.save(function (err, savedFaq_kb) {
+                        if (err) {
+                         return winston.error('error saving faqkb tilebot ', err)
+                        }
+                        winston.verbose('Saved faqkb tilebot', savedFaq_kb.toObject())      
+                    });
+                }
+            }
+        });
+        
+    }
+
+}
+
+var listener = new Listener();
+
+
+module.exports = listener;