@tiledesk/tiledesk-server 2.9.25 → 2.9.27

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.27
+- Updated tybot-connector to 0.2.107
+- Improved quotas slots
+- Improved requests quota count (temporary conversation will no longer counted)
+- Fixed bug: savedFaq is not defined in /importjson
+
+# 2.9.26
+- Updated tybot-connector to 0.2.105
+- Added route for faqs csv file uploading on /kb
+
 # 2.9.25
 - Updated vxml-connector to 0.1.44
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.25",
+  "version": "2.9.27",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@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.104",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.107",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.73",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.10",

package/pubmodules/pubModulesManager.js

@@ -33,11 +33,11 @@ class PubModulesManager {
         this.telegram = undefined;
         this.telegramRoute = undefined;
 
-        this.sms = undefined;
-        this.smsRoute = undefined;
+        // this.sms = undefined;
+        // this.smsRoute = undefined;
         
-        this.voice = undefined;
-        this.voiceRoute = undefined;
+        // this.voice = undefined;
+        // this.voiceRoute = undefined;
 
         this.mqttTest = undefined;
         this.mqttTestRoute = undefined;
@@ -97,14 +97,14 @@ class PubModulesManager {
             app.use('/modules/telegram', this.telegramRoute);
             winston.info("PubModulesManager telegramRoute controller loaded");
         }
-        if (this.smsRoute) {
-            app.use('/modules/sms', this.smsRoute);
-            winston.info("PubModulesManager smsRoute controller loaded");
-        }
-        if (this.voiceRoute) {
-            app.use('/modules/voice', this.voiceRoute);
-            winston.info("PubModulesManager voiceRoute controller loaded");
-        }
+        // if (this.smsRoute) {
+        //     app.use('/modules/sms', this.smsRoute);
+        //     winston.info("PubModulesManager smsRoute controller loaded");
+        // }
+        // if (this.voiceRoute) {
+        //     app.use('/modules/voice', this.voiceRoute);
+        //     winston.info("PubModulesManager voiceRoute controller loaded");
+        // }
         if (this.mqttTestRoute) {
             app.use('/modules/mqttTest', this.mqttTestRoute);
             winston.info("PubModulesManager mqttTestRoute controller loaded");
@@ -345,40 +345,40 @@ class PubModulesManager {
             }
         }
 
-        if (process.env.VOICE_TOKEN === process.env.VOICE_SECRET) {
-            try {
-                this.voice = require('./voice');
-                winston.info("this.voice: " + this.voice);
-                this.voice.listener.listen(config);
+        // if (process.env.VOICE_TOKEN === process.env.VOICE_SECRET) {
+        //     try {
+        //         this.voice = require('./voice');
+        //         winston.info("this.voice: " + this.voice);
+        //         this.voice.listener.listen(config);
     
-                this.voiceRoute = this.voice.voiceRoute;
+        //         this.voiceRoute = this.voice.voiceRoute;
     
-                winston.info("PubModulesManager initialized apps (voice).")
-            } catch(err) {
-                console.log("\n Unable to start voice 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);
-                }
-            }
-        }
+        //         winston.info("PubModulesManager initialized apps (voice).")
+        //     } catch(err) {
+        //         console.log("\n Unable to start voice 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);
-            this.sms.listener.listen(config);
+        // try {
+        //     this.sms = require('./sms');
+        //     winston.info("this.sms: " + this.sms);
+        //     this.sms.listener.listen(config);
 
-            this.smsRoute = this.sms.smsRoute;
+        //     this.smsRoute = this.sms.smsRoute;
 
-            winston.info("PubModulesManager initialized apps (sms).")
-        } 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);
-            }
-        }
+        //     winston.info("PubModulesManager initialized apps (sms).")
+        // } 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.mqttTest = require('./mqttTest');

package/routes/faq_kb.js

@@ -918,7 +918,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
 
           if (faq) {
             winston.info("new intent created")
-            faqBotEvent.emit('faq.create', savedFaq);
+            faqBotEvent.emit('faq.create', faq);
           }
         }
 

package/routes/kb.js

@@ -14,6 +14,7 @@ var mongoose = require('mongoose');
 const faq = require('../models/faq');
 const faq_kb = require('../models/faq_kb');
 let Integration = require('../models/integrations');
+var parsecsv = require("fast-csv");
 
 const { MODELS_MULTIPLIER } = require('../utils/aiUtils');
 
@@ -465,7 +466,7 @@ router.get('/namespace/:id/chatbots', async (req, res) => {
 
   let project_id = req.projectid;
   let namespace_id = req.params.id;
-
+  
   let chatbotsArray = [];
 
   let namespaces = await Namespace.find({ id_project: project_id }).catch((err) => {
@@ -491,6 +492,7 @@ router.get('/namespace/:id/chatbots', async (req, res) => {
   let chatbots = intents.map(i => i.id_faq_kb);
   let uniqueChatbots = [...new Set(chatbots)];
 
+  
   let chatbotPromises = uniqueChatbots.map(async (c_id) => {
     try {
       let chatbot = await faq_kb.findOne({ _id: c_id, trashed: false });
@@ -994,6 +996,117 @@ router.post('/multi', upload.single('uploadFile'), async (req, res) => {
 
 })
 
+router.post('/csv', upload.single('uploadFile'), async (req, res) => {
+
+  let project_id = req.projectid;
+
+  let csv = req.file.buffer.toString('utf8');
+  winston.debug("csv: ", csv);
+
+  let delimiter = req.body.delimiter || ";";
+  winston.debug("delimiter: ", delimiter);
+
+  let namespace_id = req.query.namespace;
+  if (!namespace_id) {
+    return res.status(400).send({ success: false, error: "queryParam 'namespace' is not defined" })
+  }
+
+  let namespaces = await Namespace.find({ id_project: project_id }).catch((err) => {
+    winston.error("find namespaces error: ", err)
+    res.status(500).send({ success: false, error: err })
+  })
+
+  if (!namespaces || namespaces.length == 0) {
+    let alert = "No namespace found for the selected project " + project_id + ". Cannot add content to a non-existent namespace."
+    winston.warn(alert);
+    res.status(403).send({ success: false, error: alert });
+  }
+
+  let namespaceIds = namespaces.map(namespace => namespace.id);
+
+  if (!namespaceIds.includes(namespace_id)) {
+    return res.status(403).send({ success: false, error: "Not allowed. The namespace does not belong to the current project." })
+  }
+
+  let quoteManager = req.app.get('quote_manager');
+  let limits = await quoteManager.getPlanLimits(req.project);
+  let kbs_limit = limits.kbs;
+  winston.verbose("Limit of kbs for current plan: " + kbs_limit);
+
+  let kbs_count = await KB.countDocuments({ id_project: project_id }).exec();
+  winston.verbose("Kbs count: " + kbs_count);
+
+  if (kbs_count >= kbs_limit) {
+    return res.status(403).send({ success: false, error: "Maximum number of resources reached for the current plan", plan_limit: kbs_limit })
+  }
+
+  let webhook = apiUrl + '/webhook/kb/status?token=' + KB_WEBHOOK_TOKEN;
+
+  let kbs = [];
+
+  parsecsv.parseString(csv, { headers: false, delimiter: delimiter })
+    .on("data", (data) => {
+
+      let question = data[0];
+      let answer = data[1];
+
+      console.log("data. ", data)
+      kbs.push({
+        id_project: project_id,
+        name: question,
+        source: question,
+        type: 'faq',
+        content: question + "\n" + answer,
+        namespace: namespace_id,
+        status: -1
+      })
+    })
+    .on("end", () => {
+      winston.debug("kbs after CSV parsing: ", kbs);
+
+      let total_count = kbs_count + kbs.length;
+      if (total_count >= kbs_limit) {
+        return res.status(403).send({ success: false, error: "Cannot exceed the number of resources in the current plan", plan_limit: kbs_limit })
+      }
+
+      if (kbs.length > 300) {
+        return res.status(403).send({ success: false, error: "Too many faqs. Can't index more than 300 urls at a time." })
+      }
+
+      let operations = kbs.map(doc => {
+        return {
+          updateOne: {
+            filter: { id_project: doc.id_project, type: 'faq', source: doc.source },
+            update: doc,
+            upsert: true,
+            returnOriginal: false
+          }
+        }
+      })
+
+      saveBulk(operations, kbs, project_id).then((result) => {
+        let resources = result.map(({ name, status, __v, createdAt, updatedAt, id_project,  ...keepAttrs }) => keepAttrs)
+        resources = resources.map(({ _id, ...rest}) => {
+          return { id: _id, webhooh: webhook, ...rest };
+        })
+        winston.verbose("resources to be sent to worker: ", resources);
+        if (!process.env.NODE_ENV) {
+          scheduleScrape(resources);
+        }
+        res.status(200).send(result);
+      }).catch((err) => {
+        winston.error("Unabled to saved kbs in bulk " + err);
+        res.status(500).send(err);
+      })
+
+    })
+    .on("error", (err) => {
+      winston.error("CSV parsing error: ", err);
+      res.status(400).send({ success: false, error: err });
+    })
+
+})
+
 router.post('/sitemap', async (req, res) => {
 
   let sitemap_url = req.body.sitemap;

package/routes/message.js

@@ -181,77 +181,82 @@ async (req, res)  => {
                   requester: project_user,
                   priority: req.body.priority,
                   followers: req.body.followers,
+                  proactive: true
                 };
   
                 return requestService.create(new_request).then(function (savedRequest) {
 
+
+                  if (!savedRequest) {
+                    return res.status(403).send({ success: false, message: "Requests quota exceeded"})
+                  }
                   winston.debug("returning savedRequest to", savedRequest.toJSON());
 
                   // createWithIdAndRequester(request_id, project_user_id, lead_id, id_project, first_text, departmentid, sourcePage, language, userAgent, status, 
                   //  createdBy, attributes, subject, preflight, channel, location) {
-                    
-                // return requestService.createWithIdAndRequester(req.params.request_id, req.projectuser._id, createdLead._id, req.projectid, 
-                //   req.body.text, req.body.departmentid, req.body.sourcePage, 
-                //   req.body.language, req.body.userAgent, null, req.user._id, req.body.attributes, req.body.subject, undefined, req.body.channel, req.body.location ).then(function (savedRequest) {
 
+                  // return requestService.createWithIdAndRequester(req.params.request_id, req.projectuser._id, createdLead._id, req.projectid, 
+                  //   req.body.text, req.body.departmentid, req.body.sourcePage, 
+                  //   req.body.language, req.body.userAgent, null, req.user._id, req.body.attributes, req.body.subject, undefined, req.body.channel, req.body.location ).then(function (savedRequest) {
 
-             
-                    
-                    // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type, channel) {
-                    return messageService.create(sender || req.user._id, fullname, req.params.request_id, req.body.text,
-                      req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, undefined, req.body.channel).then(function(savedMessage){                    
-                        
-                        // return requestService.incrementMessagesCountByRequestId(savedRequest.request_id, savedRequest.id_project).then(function(savedRequestWithIncrement) {
 
-                          let message = savedMessage.toJSON();
 
-                          winston.debug("returning message to", message);
-                          
-                          winston.debug("returning savedRequest2210 to", savedRequest.toJSON());
-
-
-                          savedRequest //bug
-                          // Request.findById(savedRequest.id)
-                            .populate('lead')
-                            .populate('department')
-                            .populate('participatingBots')
-                            .populate('participatingAgents') 
-                            // .populate('followers')  
-                            .populate({path:'requester',populate:{path:'id_user'}})
-                            // .exec(function (err, savedRequestPopulated){    
-                              .execPopulate(function (err, savedRequestPopulated){   //bug with  execPopulate request.attributes are invalid (NOT real data). but this bug is related to chat21 listener changes by reference. i think populate suffer from this problem bacause it it the same obect passed by reference 
-
-                            if (err) {
-                              return winston.error("Error gettting savedRequestPopulated for send Message", err);
-                            }       
-                            
-                            winston.debug("returning savedRequest221 to", savedRequest.toJSON());
+
+                  // create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language, channel_type, channel) {
+                  return messageService.create(sender || req.user._id, fullname, req.params.request_id, req.body.text,
+                    req.projectid, req.user._id, messageStatus, req.body.attributes, req.body.type, req.body.metadata, req.body.language, undefined, req.body.channel).then(function (savedMessage) {
+
+                      // return requestService.incrementMessagesCountByRequestId(savedRequest.request_id, savedRequest.id_project).then(function(savedRequestWithIncrement) {
+
+                      let message = savedMessage.toJSON();
+
+                      winston.debug("returning message to", message);
+
+                      winston.debug("returning savedRequest2210 to", savedRequest.toJSON());
 
 
-                            winston.debug("savedRequestPopulated", savedRequestPopulated.toJSON());
+                      savedRequest //bug
+                        // Request.findById(savedRequest.id)
+                        .populate('lead')
+                        .populate('department')
+                        .populate('participatingBots')
+                        .populate('participatingAgents')
+                        // .populate('followers')  
+                        .populate({ path: 'requester', populate: { path: 'id_user' } })
+                        // .exec(function (err, savedRequestPopulated){    
+                        .execPopulate(function (err, savedRequestPopulated) {   //bug with  execPopulate request.attributes are invalid (NOT real data). but this bug is related to chat21 listener changes by reference. i think populate suffer from this problem bacause it it the same obect passed by reference 
 
-                            winston.debug("returning savedRequest22 to", savedRequest.toJSON());
+                          if (err) {
+                            return winston.error("Error gettting savedRequestPopulated for send Message", err);
+                          }
 
+                          winston.debug("returning savedRequest221 to", savedRequest.toJSON());
 
-                            message.request = savedRequestPopulated;
-                            winston.debug("returning2 message to", message);
 
+                          winston.debug("savedRequestPopulated", savedRequestPopulated.toJSON());
 
-                            return res.json(message);
-                          });
+                          winston.debug("returning savedRequest22 to", savedRequest.toJSON());
+
+
+                          message.request = savedRequestPopulated;
+                          winston.debug("returning2 message to", message);
+
+
+                          return res.json(message);
                         });
-                    }).catch(function(err){    //pubblica questo
-                      winston.error('Error creating request: '+ JSON.stringify(err));
-                      winston.log({
-                        level: 'error',
-                        message: 'Error creating request: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
-                        label: req.projectid
-                      });
-                      // winston.error("Error creating message", err);
-                      return res.status(500).send({success: false, msg: 'Error creating request', err:err });
-                    });                                
-                      
+                    });
+                }).catch(function (err) {    //pubblica questo
+                  winston.error('Error creating request: ' + JSON.stringify(err));
+                  winston.log({
+                    level: 'error',
+                    message: 'Error creating request: ' + JSON.stringify(err) + " " + JSON.stringify(req.body),
+                    label: req.projectid
                   });
+                  // winston.error("Error creating message", err);
+                  return res.status(500).send({ success: false, msg: 'Error creating request', err: err });
+                });
+
+              });