@tiledesk/tiledesk-server 2.3.109 → 2.3.111

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.109",
+  "version": "2.3.111",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -36,15 +36,16 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-apps": "^1.0.14",
+    "@tiledesk/tiledesk-apps": "^1.0.15",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.3",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.65",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.39",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.67",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.40",
+    "@tiledesk/tiledesk-messenger-connector": "0.1.1",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/messenger/index.js

@@ -0,0 +1,7 @@
+const listener = require("./listener");
+
+const messenger = require("@tiledesk/tiledesk-messenger-connector");
+const messengerRoute = messenger.router;
+
+
+module.exports = { listener: listener, messengerRoute: messengerRoute }

package/pubmodules/messenger/listener.js

@@ -0,0 +1,50 @@
+const messenger = require("@tiledesk/tiledesk-messenger-connector");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+//winston.info('Messenger apiUrl: ' + apiUrl);
+
+class Listener {
+
+    listen(config) {
+        winston.info("Messenger Listener listen");
+        if (config.databaseUri) {
+            winston.debug("messenger config databaseUri: " + config.databaseUri);
+        }
+
+        let graph_url = process.env.META_GRAPH_URL || config.graphUrl || "https://graph.facebook.com/v14.0/"
+        winston.debug("Messenger graph_url: " + graph_url);
+
+        let log = process.env.MESSENGER_LOG || false
+        winston.debug("Messenger log: " + log);
+
+        let fb_app_id = process.env.FB_APP_ID;
+        winston.debug("Messenger fb_app_id: ", fb_app_id);
+
+        let fb_app_secret = process.env.FB_APP_SECRET;
+        winston.debug("Messenger fb_app_secret: ", fb_app_secret);
+
+        let dashboard_base_url = process.env.DASHBOARD_BASE_URL;
+        winston.debug("Messenger dashboard_base_url: ", dashboard_base_url);
+
+        messenger.startApp({
+            MONGODB_URL: config.databaseUri,          
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/messenger",
+            APPS_API_URL: apiUrl + "/modules/apps",
+            FB_APP_ID: fb_app_id,
+            FB_APP_SECRET: fb_app_secret,
+            GRAPH_URL: graph_url,
+            DASHBOARD_BASE_URL: dashboard_base_url,
+            log: log
+        }, () => {
+            winston.info("Tiledesk Messenger Connector proxy server succesfully started.");
+        })
+
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/pubmodules/pubModulesManager.js

@@ -27,6 +27,9 @@ class PubModulesManager {
         this.whatsapp = undefined;
         this.whatsappRoute = undefined;
 
+        this.messenger = undefined;
+        this.messengerRoute = undefined;
+
         this.kaleyra = undefined;
         this.kaleyraRoute = undefined;
 
@@ -70,6 +73,10 @@ class PubModulesManager {
             app.use('/modules/whatsapp', this.whatsappRoute);
             winston.info("PubModulesManager whatsappRoute controller loaded");
         }
+        if (this.messengerRoute) {
+            app.use('/modules/messenger', this.messengerRoute);
+            winston.info("PubModulesManager messengerRoute controller loaded");
+        }
         if (this.kaleyraRoute) {
             app.use('/modules/kaleyra', this.kaleyraRoute);
             winston.info("PubModulesManager kaleyraRoute controller loaded");
@@ -269,6 +276,22 @@ class PubModulesManager {
                 winston.info("PubModulesManager error initializing init apps module", err);
             }
         }
+
+        try {
+            this.messenger = require('./messenger');
+            winston.info("this.messenger: " + this.messenger);
+            this.messenger.listener.listen(config);
+
+            this.messengerRoute = this.messenger.messengerRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found ");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
         
         try {
             this.kaleyra = require('./kaleyra');

package/routes/faq_kb.js

@@ -19,7 +19,8 @@ let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 router.post('/', function (req, res) {
   winston.debug('create BOT ', req.body);
   //create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template)
-  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template, req.body.mainCategory, req.body.intentsEngine).then(function (savedFaq_kb) {
+  //faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, undefined, undefined, req.body.language, req.body.template, req.body.mainCategory, req.body.intentsEngine).then(function (savedFaq_kb) {
+  faqService.create(req.body.name, req.body.url, req.projectid, req.user.id, req.body.type, req.body.description, req.body.webhook_url, req.body.webhook_enabled, req.body.language, req.body.template, req.body.mainCategory, req.body.intentsEngine, req.body.attributes).then(function (savedFaq_kb) {
     res.json(savedFaq_kb);
   });
 

package/routes/request.js

@@ -6,6 +6,7 @@ var Schema = mongoose.Schema,
   ObjectId = Schema.ObjectId;
 var moment = require('moment');
 var requestService = require('../services/requestService');
+var departmentService = require('../services/departmentService');
 var winston = require('../config/winston');
 const requestEvent = require('../event/requestEvent');
 var Subscription = require("../models/subscription");
@@ -454,6 +455,40 @@ router.put('/:requestid/departments', function (req, res) {
 });
 
 
+router.put('/:requestid/agent', async (req, res) => {
+  winston.debug(req.body);
+   //route(request_id, departmentid, id_project) { 
+   
+   
+   var request = await Request.findOne({"request_id":req.params.requestid, id_project:req.projectid})   
+   .exec();
+    
+    if (!request) {
+      return res.status(404).send({ success: false, msg: 'Object not found.' });
+    }
+
+    var departmentid = request.department;
+    winston.debug("departmentid before: "+ departmentid);
+
+    if (!departmentid) {
+      var defaultDepartment = await departmentService.getDefaultDepartment(req.projectid);
+      winston.debug("defaultDepartment: ", defaultDepartment);
+      departmentid = defaultDepartment.id;
+    }
+    winston.debug("departmentid after: "+ departmentid);
+
+    requestService.route(req.params.requestid, departmentid, req.projectid, true, undefined).then(function(updatedRequest) {
+      
+        winston.debug("department changed", updatedRequest);
+
+        return res.json(updatedRequest);
+    }).catch(function(error)  {
+      winston.error('Error changing the department.', error)
+      return res.status(500).send({ success: false, msg: 'Error changing the department.' });
+    })
+
+
+});
 
 // router.post('/:requestid/attributes', function (req, res) {
 //   winston.debug(req.body);
@@ -692,6 +727,7 @@ router.delete('/:requestid',  function (req, res) {
           winston.verbose('Messages deleted for the recipient: '+ req.params.requestid );
    });
 
+
   Request.remove({ request_id: req.params.requestid }, function (err, request) {
     if (err) {
       winston.error('--- > ERROR ', err);

package/services/departmentService.js

@@ -548,7 +548,29 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
 
 
  
+getDefaultDepartment(projectid) {
+  return new Promise(function (resolve, reject) {
+    let query = { default: true, id_project: projectid };
+    winston.debug('query ', query)
+    // console.log('query', query);
+    return Department.findOne(query).exec(function (err, department) {
+      // return Department.findOne(query).exec().then(function (department) {
 
+      if (err) {
+        winston.error('-- > 1 DEPT FIND BY ID ERR ', err)
+        return reject(err);
+      }
+      // console.log("department", department);
+      if (!department) {
+        winston.error("Department not found for projectid: "+ projectid +" for query: ", query, context);
+        return reject({ success: false, msg: 'Department not found for projectid: '+ projectid +' for query: ' + JSON.stringify(query) });
+      }
+      winston.debug('department ', department);
+
+      return resolve(department);
+    });
+  });
+}
 
  getRandomAvailableOperator(project_users_available) {
 

package/services/requestService.js

@@ -399,8 +399,16 @@ class RequestService {
              winston.error(err);
              return reject(err);
            }
-                 
+
            winston.debug("here reroute1 ");
+
+            //  Cannot read property 'toString' of undefined at /usr/src/app/services/requestService.js:404:61 at /usr/src/app/node_modules/cachegoose/out/extend-query.js:44:13 at Command.cb [as callback] (/usr/src/app/node_modules/cacheman-redis/node/index.js:142:9) at normal_reply (/usr/src/app/node_modules/redis/index.js:655:21) at RedisClient.return_reply (/usr/src/app/node_modules/redis/index.js:753:9) at JavascriptRedisParser.returnReply (/usr/src/app/node_modules/redis/index.js:138:18) at JavascriptRedisParser.execute (/usr/src/app/node_modules/redis-parser/lib/parser.js:544:14) at Socket.<anonymous> (/usr/src/app/node_modules/redis/index.js:219:27) at Socket.emit (events.js:314:20) at addChunk (_stream_readable.js:297:12) at readableAddChunk (_stream_readable.js:272:9) at Socket.Readable.push (_stream_readable.js:213:10) at TCP.onStreamRead (internal/stream_base_commons.js:188:23) {"date":"Tue Mar 21 2023 18:45:47 GMT+0000 (Coordinated Unive
+           if (request.department === undefined) {
+            winston.error("Request with request_id " + request_id + "  has empty department. So I can't reroute");
+            return reject("Request with request_id " + request_id + "  has empty department. So I can't reroute");
+           }
+
+            
            return that.route(request_id, request.department.toString(), id_project, nobot).then(function(routedRequest){
 
             var endDate = new Date();
@@ -525,7 +533,6 @@ class RequestService {
           
            agents = result.agents;
 
-
           if (status == 50) {
                 // skip assignment
                 if (participants.length == 0 ) {
@@ -630,7 +637,6 @@ class RequestService {
                 auto_close: auto_close,
                 followers: followers
               });
-                    
 
               winston.debug('newRequest.',newRequest);
 

package/websocket/webSocketServer.js

@@ -636,7 +636,10 @@ class WebSocketServer {
 
         if (request.preflight===false) {
 
-          var requestJSON = request;
+          //TODO ATTENTION change value by reference requestJSON.snapshot
+          let requestJSON = Object.assign({}, request);
+          // var requestJSON = request;
+
           if (request.toObject) {
              requestJSON = request.toObject();
           }
@@ -659,6 +662,7 @@ class WebSocketServer {
               snapshotAgents.snapshot.agents.forEach(a => {
                 agentsnew.push({id_user: a.id_user}) 
               });
+              //TODO ATTENTION change value by reference  requestJSON.snapshot.agents. but it's fixed with line 640
               requestJSON.snapshot.agents = agentsnew;
             }
             winston.debug('requestJSON',requestJSON);  
@@ -685,7 +689,10 @@ class WebSocketServer {
         winston.debug('requestEvent websocket server: '+requestUpdateKey, request);  
         if (request.preflight===false && request.status > requestConstants.TEMP) {     
 
-          var requestJSON = request;
+          //TODO ATTENTION change value by reference requestJSON.snapshot
+          let requestJSON = Object.assign({}, request);
+          // var requestJSON = request;
+
           if (request.toObject) {
              requestJSON = request.toObject();
           }
@@ -706,6 +713,7 @@ class WebSocketServer {
               snapshotAgents.snapshot.agents.forEach(a => {
                 agentsnew.push({id_user: a.id_user}) 
               });
+               //TODO ATTENTION change value by reference requestJSON.snapshot.agents . fixed with line 693
               requestJSON.snapshot.agents = agentsnew;
             }
             winston.debug('requestJSON',requestJSON);