@tiledesk/tiledesk-server 2.10.15 → 2.10.16

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.16
+- changed bodyParser.urlencoded extended to TRUE
+- updated tybot-connector to 0.2.130
+- added twilio voice module
+- updated messenger-connectorto 0.1.22
+
 # 2.10.15
 - Readded event on fully_abandoned request
 

package/app.js

@@ -280,6 +280,7 @@ if (process.env.ENABLE_ALTERNATIVE_CORS_MIDDLEWARE === "true") {
 
 // https://stackoverflow.com/questions/18710225/node-js-get-raw-request-body-using-express
 
+
 const JSON_BODY_LIMIT = process.env.JSON_BODY_LIMIT || '500KB';
 winston.debug("JSON_BODY_LIMIT : " + JSON_BODY_LIMIT);
 
@@ -293,7 +294,7 @@ app.use(bodyParser.json({limit: JSON_BODY_LIMIT,
   }
 }));
 
-app.use(bodyParser.urlencoded({limit: JSON_BODY_LIMIT, extended: false }));
+app.use(bodyParser.urlencoded({limit: JSON_BODY_LIMIT, extended: true }));
 
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));

package/models/request.js

@@ -492,6 +492,14 @@ RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
 //suggested by atlas profiler. Used by auto closing requests
 RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
 
+// Evaluate following indexes
+RequestSchema.index({ "channel.name": 1, id_project: 1, preflight: 1, "snapshot.requester.uuid_user": 1, createdAt: - 1, status: 1 })
+RequestSchema.index({ id_project: 1, preflight: 1, "snapshot.agents.id_user": 1, updatedAt: -1, draft: 1, status: 1 })
+RequestSchema.index({ id_project: 1, participants: 1, preflight: 1, updatedAt: -1, draft: 1, status: 1 })
+RequestSchema.index({ id_project: 1, preflight: 1, updatedAt: -1, draft: 1, status: 1 })
+RequestSchema.index({ id_project: 1, preflight: 1, "snapshot.requester.uuid_user": 1, createdAt: -1, status: 1 })
+RequestSchema.index({ department: 1, id_project: 1, participants: 1, preflight: 1, createdAt: -1, status: 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.10.15",
+  "version": "2.10.16",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,15 +44,16 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "^0.1.21",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.22",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.127",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.130",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.73",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.10",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.49",
+    "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.7",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/pubmodules/activities/test/activityRoute.js

@@ -12,6 +12,8 @@ let server = require('../../../app');
 let should = chai.should();
 var winston = require('../../../config/winston');
 
+let log = false;
+
 // chai.config.includeStack = true;
 
 var expect = chai.expect;
@@ -56,8 +58,10 @@ describe('ActivityRoute', () => {
                         .get('/'+ savedProject._id + '/activities')
                         .auth(email, pwd)
                         .end((err, res) => {
-                            //console.log("res",  res);
-                            console.log("res.body",  res.body);
+
+                            if (err) { console.error("err: ", err); }
+                            if (log) { console.log("res.body",  res.body); }
+                            
                             res.should.have.status(200);
                             res.body.activities.should.be.a('array');
                             expect(res.body.count).to.equal(1);                                                                              

package/pubmodules/events/test/eventRoute.js

@@ -13,6 +13,8 @@ let chaiHttp = require('chai-http');
 let server = require('../../../app');
 let should = chai.should();
 
+let log = false;
+
 // chai.config.includeStack = true;
 
 var expect = chai.expect;
@@ -40,8 +42,10 @@ describe('EventRoute', () => {
                         .auth(email, pwd)
                         .send({"name":"event1", attributes: {"attr1":"val1"}})
                         .end((err, res) => {
-                            //console.log("res",  res);
-                            console.log("res.body",  res.body);
+
+                            if (err) { console.error("err: ", err); }
+                            if (log) { console.log("res.body",  res.body); }
+
                             res.should.have.status(200);
                             res.body.should.be.a('object');
                             expect(res.body.name).to.equal("event1");                                                                              
@@ -50,7 +54,7 @@ describe('EventRoute', () => {
                             Project_user.findOne({ id_user:  savedUser.id, status: "active"} )
                             .populate('events')
                             .exec(function (err, project_user) {
-                                console.log("project_user",  project_user.toJSON());
+                                if (log) { console.log("project_user",  project_user.toJSON()); }
                                 expect(project_user.events.length).to.equal(1);  
                                 done();
                             });

package/pubmodules/pubModulesManager.js

@@ -39,6 +39,9 @@ class PubModulesManager {
         this.voice = undefined;
         this.voiceRoute = undefined;
 
+        this.voiceTwilio = undefined;
+        this.voiceTwilioRoute = undefined;
+
         this.mqttTest = undefined;
         this.mqttTestRoute = undefined;
 
@@ -105,6 +108,10 @@ class PubModulesManager {
             app.use('/modules/voice', this.voiceRoute);
             winston.info("PubModulesManager voiceRoute controller loaded");
         }
+        if (this.voiceTwilioRoute) {
+            app.use('/modules/voice-twilio', this.voiceTwilioRoute);
+            winston.info("PubModulesManager voiceTwilioRoute controller loaded");
+        }
         if (this.mqttTestRoute) {
             app.use('/modules/mqttTest', this.mqttTestRoute);
             winston.info("PubModulesManager mqttTestRoute controller loaded");
@@ -364,6 +371,23 @@ class PubModulesManager {
             }
         }
 
+        try {
+            this.voiceTwilio = require('./voice-twilio');
+            winston.info("this.voiceTwilio: " + this.voiceTwilio);
+            this.voiceTwilio.listener.listen(config);
+
+            this.voiceTwilioRoute = this.voice.voiceTwilioRoute;
+
+            winston.info("PubModulesManager initialized apps (voiceTwilio).")
+        } catch(err) {
+            console.log("\n Unable to start voiceTwilio connector: ", 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.sms = require('./sms');
             winston.info("this.sms: " + this.sms);

package/pubmodules/voice-twilio/index.js

@@ -0,0 +1,6 @@
+const listener = require("./listener");
+
+const twilio_voice = require('@tiledesk/tiledesk-voice-twilio-connector');
+const twilioVoiceRoute = twilio_voice.router;
+
+module.exports = { listener: listener, twilioVoiceRoute: twilioVoiceRoute }

package/pubmodules/voice-twilio/listener.js

@@ -0,0 +1,59 @@
+const voice_twilio = require('@tiledesk/tiledesk-voice-twilio-connector');
+let winston = require('../../config/winston');
+let configGlobal = require('../../config/global');
+const mongoose = require('mongoose');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info("TwilioVoice apiUrl: " + apiUrl);
+
+const dbConnection = mongoose.connection;
+
+class Listener {
+
+    listen(config) {
+
+        winston.info("TwilioVoice Listener listen");
+        if (config.databaseUri) {
+            winston.debug("TwilioVoice config databaseUri: " +  config.databaseUri);
+        }
+
+        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);
+
+        let brand_name = null;
+        if (process.env.BRAND_NAME) {
+            brand_name = process.env.BRAND_NAME
+        }
+
+        let log = process.env.VOICE_TWILIO_LOG || false
+        winston.debug("Voice log: "+ log);
+        
+        voice_twilio.startApp({
+            MONGODB_URI: config.databaseUri,          
+            dbconnection: dbConnection,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/voice",                     
+            REDIS_HOST: host,
+            REDIS_PORT: port,
+            REDIS_PASSWORD: password,
+            BRAND_NAME: brand_name,
+            log: log
+        }, (err) => {
+            if (!err) {
+                winston.info("Tiledesk Twilio Voice Connector proxy server succesfully started.");
+            } else {
+                winston.info("unable to start Tiledesk Twilio Voice Connector. " + err);
+            }    
+        })
+    }
+}
+
+let listener = new Listener();
+
+module.exports = listener;

package/routes/campaigns.js

@@ -325,7 +325,7 @@ router.post('/direct', async function (req, res) {
     channel_type: MessageConstants.CHANNEL_TYPE.DIRECT, 
     channel: req.body.channel
   };
-
+  
   winston.info("message before", message);
 
   jobManager.publish(

package/routes/files.js

@@ -30,11 +30,13 @@ curl -u andrea.leo@f21.it:123456 \
   */
 
 router.post('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], upload.single('file'), (req, res, next) => {
+
+  console.log("asdasd")
   winston.info("files/users")
-      return res.status(201).json({
-          message: 'File uploded successfully',
-          filename: req.file.filename
-      });    
+  return res.status(201).json({
+    message: 'File uploded successfully',
+    filename: req.file.filename
+  });
 
 });
 

package/routes/images.js

@@ -211,7 +211,6 @@ uploadAvatar.single('file'), async (req, res, next) => {
         winston.error("Error finding project user: ", err);
         return res.status(500).send({ success: false, error: "Unable to find project user for user " + userid + "in project " + id_project });
       })
-
       if (!puser) {
         winston.warn("User" + userid + "don't belongs the project " + id_project);
         return res.status(401).send({ success: false, error: "You don't belong the chatbot's project" })
@@ -225,7 +224,6 @@ uploadAvatar.single('file'), async (req, res, next) => {
       entity_id = bot_id;
     }
 
-    
      var destinationFolder = 'uploads/users/' + entity_id + "/images/";
      winston.debug("destinationFolder:"+destinationFolder);
 

package/routes/kb.js

@@ -514,6 +514,10 @@ router.get('/namespace/:id/chunks/:content_id', async (req, res) => {
   let engine = ns.engine || default_engine;
   delete engine._id;
 
+  if (process.env.NODE_ENV === 'test') {
+    return res.status(200).send({ success: true, message: "Get chunks skipped in test environment"});
+  }
+
   openaiService.getContentChunks(namespace_id, content_id, engine).then((resp) => {
     let chunks = resp.data;
     winston.debug("chunks for content " + content_id);
@@ -1119,7 +1123,9 @@ router.post('/multi', upload.single('uploadFile'), async (req, res) => {
     });
     winston.verbose("resources to be sent to worker: ", resources);
 
-    scheduleScrape(resources);
+    if (!process.env.NODE_ENV) {
+      scheduleScrape(resources);
+    }
     res.status(200).send(result);
 
   }).catch((err) => {

package/routes/users.js

@@ -215,11 +215,11 @@ router.post('/loginemail', function (req, res) {
   let namespace_id = req.body.namespace_id;
 
   if (!project_id) {
-    res.status(500).send({ success: false, error: "missing 'id_project' field" });
+    return res.status(500).send({ success: false, error: "missing 'id_project' field" });
   }
 
   if (!chatbot_id && !namespace_id) {
-    res.status(500).send({ success: false, error: "missing 'bot_id' or 'namespace_id' field" });
+    return res.status(500).send({ success: false, error: "missing 'bot_id' or 'namespace_id' field" });
   }
 
   User.findById(user_id, (err, user) => {

package/services/fileGridFsService.js

@@ -20,6 +20,9 @@ class FileGridFsService extends FileService {
         // DB
         this.mongoURI = process.env.DATABASE_URI || process.env.MONGODB_URI || config.database;
 
+        if (process.env.NODE_ENV === 'test') {
+            this.mongoURI = config.databasetest;
+        }
 
         // // connection
         this.conn = mongoose.createConnection(this.mongoURI, {
@@ -133,8 +136,8 @@ class FileGridFsService extends FileService {
     }
 
     getStorage(folderName) {
-        const storageMongo = new GridFsStorage({ 
-            url : this.mongoURI,
+        const storageMongo = new GridFsStorage({
+            url: this.mongoURI,
             options: { useNewUrlParser: true, useUnifiedTopology: true },
             file: (req, file) => {
                 var folder = uuidv4();
@@ -154,32 +157,31 @@ class FileGridFsService extends FileService {
                 // console.log("XXX file",file)
 
                 // if (req.body.folder) {
-                    
+
                 //     folder = req.body.folder;
                 // }
 
                 var subfolder = "/public";
                 if (req.user && req.user.id) {
-                  subfolder = "/users/"+req.user.id;
+                    subfolder = "/users/" + req.user.id;
                 }
-                const path = 'uploads'+ subfolder + "/" + folderName + "/" + folder ;
+                const path = 'uploads' + subfolder + "/" + folderName + "/" + folder;
                 req.folder = folder;
-
                 // const match = ["image/png", "image/jpeg"];
-    
+
                 // if (match.indexOf(file.mimetype) === -1) {
                 //     const filename = `${Date.now()}-${file.originalname}`;
                 //     return filename;
                 // }
-    
+
                 return {
                     bucketName: folderName,
                     filename: `${path}/${file.originalname}`
                 };
             }
-            });
+        });
 
-       return storageMongo;     
+        return storageMongo;
     }
 
 

package/services/requestService.js

@@ -774,6 +774,7 @@ class RequestService {
     })
   }
 
+  // DEPRECATED
   async _create(request) {
 
     var startDate = new Date();
@@ -1072,7 +1073,7 @@ class RequestService {
     
   }
 
-
+  // DEPRECATED
   async __create(request) {
 
     var startDate = new Date();

package/test/app-test.js

@@ -1,4 +1,5 @@
 process.env.NODE_ENV = 'test';
+process.env.LOG_LEVEL = 'critical'
 
 let chai = require('chai');
 let chaiHttp = require('chai-http');
@@ -18,7 +19,7 @@ describe('Root Test', () => {
 
     /**
      * Try to perform a request with an invalid id project.
-     * A fake id or non existent mongo id (like user id) is passed.
+     * A fake id is passed.
      * This test must respond with status 400 and with an error.
      */
     it("Wrong request url", (done) => {
@@ -31,6 +32,39 @@ describe('Root Test', () => {
 
                 let fake_id_project = "fake1234"
 
+                chai.request(server)
+                    //.get('/' + savedUser._id + '/faq_kb')
+                    .get('/' + fake_id_project + '/faq_kb')
+                    .auth(email, pwd)
+                    .end((err, res) => {
+                        if (err) { console.error("err: ", err); }
+                        if (log) { console.log("res.body", res.body); }
+                        
+                        res.should.have.status(400);
+                        assert.notEqual(res.body.error, null);
+                        expect(res.body.error).to.equal("Invalid project id: " + fake_id_project)
+                        done();
+                    })
+            })
+        })
+    }).timeout(5000)
+
+    /**
+     * Try to perform a request with an invalid id project.
+     * A non existent mongo id (like user id) is passed.
+     * This test must respond with status 400 and with an error.
+     */
+    it("Wrong request url", (done) => {
+
+        var email = "test-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email, pwd, "Test Firstname", "Test Lastname").then((savedUser) => {
+            projectService.create("test-root-project", savedUser._id).then((savedProject) => {
+
+                // A real valid mongo id without a corresponding project
+                let fake_id_project = savedUser._id;
+
                 chai.request(server)
                     //.get('/' + savedUser._id + '/faq_kb')
                     .get('/' + fake_id_project + '/faq_kb')
@@ -47,4 +81,5 @@ describe('Root Test', () => {
             })
         })
     }).timeout(5000)
+
 })