@tiledesk/tiledesk-server 2.9.26 → 2.9.28

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.28
+- Updated number_assigned_request count logic (removed incr/decr)
+
+# 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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.26",
+  "version": "2.9.28",
   "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.105",
+    "@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/pubmodules/routing-queue/listenerQueued.js

@@ -2,6 +2,7 @@ const authEvent = require('../../event/authEvent');
 const requestEvent = require('../../event/requestEvent');
 var Project = require('../../models/project');
 var Project_user = require('../../models/project_user');
+var Request = require('../../models/request')
 var winston = require('../../config/winston');
 
 var ProjectUserUtil = require("../../utils/project_userUtil");
@@ -34,44 +35,88 @@ class Listener {
         this.enabled = false;
     }
     winston.debug("Listener this.enabled: "+ this.enabled);
-}
+  }
 
  
-      // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+  // db.getCollection('project_users').find({"number_assigned_requests" : {"$lt":0}}).count()
+
+  // New version of updateProjectUser() method.
+  // This will not increment or decrement the number_assigned_requests field but search the exact number of assigned conversation to the project user
+  updateProjectUser(id_user, id_project, operation) {
+    winston.debug("Route queue updateProjectUser start operation: " + operation + "id_user " + id_user + " id_project " + id_project);
+    
+    return Request.countDocuments({ id_project: id_project, participantsAgents: id_user, status: { $lt: 1000 } }, (err, requestsCount) => {
+      console.log("requestsCount for id_user: ", id_user, "and project: ", id_project, "-->", requestsCount);
+      if (err) {
+        return winston.error(err);
+      }
+
+      return Project_user
+        .findOneAndUpdate({ id_user: id_user, id_project: id_project }, { number_assigned_requests: requestsCount }, { new: true, upsert: false }, function (err, updatedPU) {
+          if (err) {
+            return winston.error(err);
+          }
+          // winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+          // winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+          winston.debug("Route queue number_assigned_requests updated to " + requestsCount + "for project user " + updatedPU.id);
+  
+          updatedPU.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, updatedProject_userPopulated) {
+  
+            var pu = updatedProject_userPopulated.toJSON();
+  
+            return Project.findById(id_project).exec(function (err, project) {
+              pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);
+              winston.debug("Route queue pu.isBusy: " + pu.isBusy);
+  
+              authEvent.emit('project_user.update', { updatedProject_userPopulated: pu, req: undefined, skipArchive: true }); //if queued with jobs -> websocket notification on project_user.update doesn't work??? forse si in quanto viene convertito in .pub.queue e poi rifunziiona
+  
+  
+              // project_user.update triggers activityArchiver(tested), cache invalidation(tested), subscriptionNotifierQueued and websocket(tested works from queue i trigger ws)
+              if (requestEvent.queueEnabled) {  //force to .queue to be catched into the queue (activity archiver, subscriptionNotifierQueued )
+                authEvent.emit('project_user.update.queue', { updatedProject_userPopulated: pu, req: undefined, skipArchive: true });
+              }
+  
+            })
+  
+          });
+  
+        });
+    })
 
+  }
 
-    updateProjectUser(id_user, id_project, operation) {
-      winston.debug("Route queue updateProjectUser start operation: " +operation+ "id_user "+ id_user + " id_project " + id_project );
-      return Project_user       
-                    .findOneAndUpdate({id_user: id_user, id_project: id_project}, {$inc : {'number_assigned_requests' : operation}}, {new: true, upsert:false}, function(err, updatedPU) {
-                    if (err) {
-                     return winston.error(err);
-                    }
-                    winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
-                     winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+  _updateProjectUser(id_user, id_project, operation) {
+    winston.debug("Route queue updateProjectUser start operation: " + operation + "id_user " + id_user + " id_project " + id_project);
+    return Project_user
+      .findOneAndUpdate({ id_user: id_user, id_project: id_project }, { $inc: { 'number_assigned_requests': operation } }, { new: true, upsert: false }, function (err, updatedPU) {
+        if (err) {
+          return winston.error(err);
+        }
+        winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
+        winston.debug("Route queue number_assigned_requests +1 :" + updatedPU.id);
 
-                    updatedPU.populate({path:'id_user', select:{'firstname':1, 'lastname':1}},function (err, updatedProject_userPopulated){    
+        updatedPU.populate({ path: 'id_user', select: { 'firstname': 1, 'lastname': 1 } }, function (err, updatedProject_userPopulated) {
 
-                      var pu = updatedProject_userPopulated.toJSON();
+          var pu = updatedProject_userPopulated.toJSON();
 
-                      return Project.findById(id_project).exec(function(err, project) {
-                        pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);                  
-                        winston.debug("Route queue pu.isBusy: "+ pu.isBusy);
-                                               
-                        authEvent.emit('project_user.update', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true}); //if queued with jobs -> websocket notification on project_user.update doesn't work??? forse si in quanto viene convertito in .pub.queue e poi rifunziiona
+          return Project.findById(id_project).exec(function (err, project) {
+            pu.isBusy = ProjectUserUtil.isBusy(updatedProject_userPopulated, project.settings && project.settings.max_agent_assigned_chat);
+            winston.debug("Route queue pu.isBusy: " + pu.isBusy);
 
+            authEvent.emit('project_user.update', { updatedProject_userPopulated: pu, req: undefined, skipArchive: true }); //if queued with jobs -> websocket notification on project_user.update doesn't work??? forse si in quanto viene convertito in .pub.queue e poi rifunziiona
 
-                        // project_user.update triggers activityArchiver(tested), cache invalidation(tested), subscriptionNotifierQueued and websocket(tested works from queue i trigger ws)
-                        if (requestEvent.queueEnabled) {  //force to .queue to be catched into the queue (activity archiver, subscriptionNotifierQueued )
-                          authEvent.emit('project_user.update.queue', {updatedProject_userPopulated:pu, req: undefined, skipArchive: true});
-                        }
 
-                      })
-                      
-                    });
+            // project_user.update triggers activityArchiver(tested), cache invalidation(tested), subscriptionNotifierQueued and websocket(tested works from queue i trigger ws)
+            if (requestEvent.queueEnabled) {  //force to .queue to be catched into the queue (activity archiver, subscriptionNotifierQueued )
+              authEvent.emit('project_user.update.queue', { updatedProject_userPopulated: pu, req: undefined, skipArchive: true });
+            }
 
-                });
-    }
+          })
+
+        });
+
+      });
+  }
 
     updateParticipatingProjectUsers(request, operation) {
         winston.debug("Route queue request.participatingAgents", request.participatingAgents);

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

@@ -466,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) => {
@@ -492,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 });

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 });
+                });
+
+              });