@tiledesk/tiledesk-server 2.10.19 → 2.10.21

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.10.21
+- Added catch blocks where necessary (improves error management)
+
+# 2.10.20
+- updated whatsapp-connector to 0.1.75
+
 # 2.10.19
 - updated whatsapp-connector to 0.1.74
 - updated whatsapp-worker to 0.1.10

package/channels/chat21/chat21WebHook.js

@@ -95,171 +95,174 @@ router.post('/', function (req, res) {
 
           if (!request) { //the request doen't exists create it
 
-                winston.debug("request not exists with request_id: " + message.recipient);
-                
-                var departmentid = "default";
+            winston.debug("request not exists with request_id: " + message.recipient);
 
+            var departmentid = "default";
 
-                var language = message.language;
-                winston.debug("chat21 language", language);
-            
-                var sourcePage;
-                var client;
-                var userEmail;
-                var userFullname;
-                var projectid;  // before request_id id_project unique - commented
-            
-                var requestStatus = undefined;
 
-                if (message.attributes) {
-            
-                  // before request_id id_project unique - commented
-                  projectid = message.attributes.projectId;
-                  winston.debug("chat21 projectid", projectid);
-            
-                  departmentid = message.attributes.departmentId;
-                  winston.debug("chat21 departmentid", departmentid);
-            
-                  sourcePage = message.attributes.sourcePage;
-                  winston.debug("chat21 sourcePage", sourcePage);
-                  
-                  client = message.attributes.client;
-                  winston.debug("chat21 client", client);
-              
-                
-            
-                  userEmail = message.attributes.userEmail;
-                  winston.debug("chat21 userEmail", userEmail);
-            
-                  userFullname = message.attributes.userFullname;
-                  winston.debug("chat21 userFullname", userFullname);
+            var language = message.language;
+            winston.debug("chat21 language", language);
 
-                  // TODO proactive status
-                  // if (message.attributes.subtype === "info") {                    
-                  //   requestStatus = 50;
-                  // }
-                }
-                
-                winston.debug("requestStatus "+ requestStatus);
-                
-                 // before request_id id_project unique - commented
-                if (!projectid) {
-                  winston.verbose("projectid is null. Not a support message");
-                  return res.status(400).send({success: false, msg: 'projectid is null. Not a support message'});
-                }
+            var sourcePage;
+            var client;
+            var userEmail;
+            var userFullname;
+            var projectid;  // before request_id id_project unique - commented
 
-                
-                if (!message.recipient.startsWith("support-group")) {
-                  winston.verbose("recipient not starts wiht support-group. Not a support message");
-                  return res.status(400).send({success: false, msg: "recipient not starts wiht support-group. Not a support message"});
-                }
-            
-              
-                if (!userFullname) {
-                  userFullname = message.sender_fullname;
-                }
+            var requestStatus = undefined;
 
-              
-               
+            if (message.attributes) {
 
-                var leadAttributes = message.attributes;
-                leadAttributes["senderAuthInfo"] = message.senderAuthInfo;
-              
-                  // winston.debug("userEmail is defined");
-                                    // createIfNotExistsWithLeadId(lead_id, fullname, email, id_project, createdBy)
-                  return leadService.createIfNotExistsWithLeadId(message.sender, userFullname, userEmail, projectid, null, leadAttributes)
-                  .then(function(createdLead) {
+              // before request_id id_project unique - commented
+              projectid = message.attributes.projectId;
+              winston.debug("chat21 projectid", projectid);
 
-                    var rAttributes = message.attributes;
-                    rAttributes["senderAuthInfo"] = message.senderAuthInfo;   
-                    winston.debug("rAttributes", rAttributes);
+              departmentid = message.attributes.departmentId;
+              winston.debug("chat21 departmentid", departmentid);
 
+              sourcePage = message.attributes.sourcePage;
+              winston.debug("chat21 sourcePage", sourcePage);
 
+              client = message.attributes.client;
+              winston.debug("chat21 client", client);
 
 
-                      // message.sender is the project_user id created with firebase custom auth
 
-                      var isObjectId = mongoose.Types.ObjectId.isValid(message.sender);
-                      winston.debug("isObjectId:"+ isObjectId);
+              userEmail = message.attributes.userEmail;
+              winston.debug("chat21 userEmail", userEmail);
 
-                       var queryProjectUser = {id_project:projectid, status: "active" };
+              userFullname = message.attributes.userFullname;
+              winston.debug("chat21 userFullname", userFullname);
 
-                      if (isObjectId) {
-                        queryProjectUser.id_user = message.sender;
-                      }else {
-                        queryProjectUser.uuid_user = message.sender;
-                      }
-                      winston.debug("queryProjectUser", queryProjectUser);
-                      
+              // TODO proactive status
+              // if (message.attributes.subtype === "info") {                    
+              //   requestStatus = 50;
+              // }
+            }
 
-                    return Project_user.findOne(queryProjectUser)
-                    // .cache(cacheUtil.defaultTTL, projectid+":project_users:request_id:"+requestid)
-                    .exec(function (err, project_user) {
+            winston.debug("requestStatus " + requestStatus);
 
-                      var project_user_id = null; 
+            // before request_id id_project unique - commented
+            if (!projectid) {
+              winston.verbose("projectid is null. Not a support message");
+              return res.status(400).send({ success: false, msg: 'projectid is null. Not a support message' });
+            }
 
-                      if (err) {
-                        winston.error("Error getting the project_user_id", err);
-                      }
 
-                      if (project_user) {
-                        winston.debug("project_user", project_user);
-                        project_user_id = project_user.id;
-                        winston.debug("project_user_id: " + project_user_id);
-                      }else {
-                        // error->utente bloccato oppure non autenticator request.requester sarà nulll...⁄
-                        return winston.error("project_user not found with query: ", queryProjectUser);                        
-                      }
+            if (!message.recipient.startsWith("support-group")) {
+              winston.verbose("recipient not starts wiht support-group. Not a support message");
+              return res.status(400).send({ success: false, msg: "recipient not starts wiht support-group. Not a support message" });
+            }
+
 
+            if (!userFullname) {
+              userFullname = message.sender_fullname;
+            }
 
-                      // var auto_close;
 
-                      // // qui projecy nn c'è devi leggerlo
-                      // // if (req.project.attributes.auto_close === false) {
-                      // //   auto_close = 10;
-                      // // }
 
-                      
-                      var new_request = {
-                        request_id: message.recipient, project_user_id:project_user_id, lead_id:createdLead._id, id_project:projectid, first_text:message.text,
-                        departmentid:departmentid, sourcePage:sourcePage, language:language, userAgent:client, status:requestStatus, createdBy: undefined,
-                        attributes:rAttributes, subject:undefined, preflight:false, channel:undefined, location:undefined,
-                        lead:createdLead, requester:project_user
-                        // , auto_close: auto_close
-                      };
-    
-                      winston.debug("new_request", new_request);
-                      
-                      return requestService.create(new_request).then(function (savedRequest) {
 
-                    
+            var leadAttributes = message.attributes;
+            leadAttributes["senderAuthInfo"] = message.senderAuthInfo;
+
+            // winston.debug("userEmail is defined");
+            // createIfNotExistsWithLeadId(lead_id, fullname, email, id_project, createdBy)
+            return leadService.createIfNotExistsWithLeadId(message.sender, userFullname, userEmail, projectid, null, leadAttributes)
+              .then(function (createdLead) {
+
+                var rAttributes = message.attributes;
+                rAttributes["senderAuthInfo"] = message.senderAuthInfo;
+                winston.debug("rAttributes", rAttributes);
+
+
+
+
+                // message.sender is the project_user id created with firebase custom auth
+
+                var isObjectId = mongoose.Types.ObjectId.isValid(message.sender);
+                winston.debug("isObjectId:" + isObjectId);
+
+                var queryProjectUser = { id_project: projectid, status: "active" };
+
+                if (isObjectId) {
+                  queryProjectUser.id_user = message.sender;
+                } else {
+                  queryProjectUser.uuid_user = message.sender;
+                }
+                winston.debug("queryProjectUser", queryProjectUser);
+
+
+                return Project_user.findOne(queryProjectUser)
+                  // .cache(cacheUtil.defaultTTL, projectid+":project_users:request_id:"+requestid)
+                  .exec(function (err, project_user) {
+
+                    var project_user_id = null;
+
+                    if (err) {
+                      winston.error("Error getting the project_user_id", err);
+                    }
+
+                    if (project_user) {
+                      winston.debug("project_user", project_user);
+                      project_user_id = project_user.id;
+                      winston.debug("project_user_id: " + project_user_id);
+                    } else {
+                      // error->utente bloccato oppure non autenticator request.requester sarà nulll...⁄
+                      return winston.error("project_user not found with query: ", queryProjectUser);
+                    }
+
+
+                    // var auto_close;
+
+                    // // qui projecy nn c'è devi leggerlo
+                    // // if (req.project.attributes.auto_close === false) {
+                    // //   auto_close = 10;
+                    // // }
+
+
+                    var new_request = {
+                      request_id: message.recipient, project_user_id: project_user_id, lead_id: createdLead._id, id_project: projectid, first_text: message.text,
+                      departmentid: departmentid, sourcePage: sourcePage, language: language, userAgent: client, status: requestStatus, createdBy: undefined,
+                      attributes: rAttributes, subject: undefined, preflight: false, channel: undefined, location: undefined,
+                      lead: createdLead, requester: project_user
+                      // , auto_close: auto_close
+                    };
+
+                    winston.debug("new_request", new_request);
+
+                    return requestService.create(new_request).then(function (savedRequest) {
+
+
                       //return requestService.createWithIdAndRequester(message.recipient, project_user_id, createdLead._id, projectid, message.text, 
                       // departmentid, sourcePage, language, client, requestStatus, null, rAttributes).then(function (savedRequest) {
-                 
-
-                        var messageId = undefined;
-                        if (message.attributes && message.attributes.tiledesk_message_id) {
-                          messageId = message.attributes.tiledesk_message_id;
-                        }
-
-                       // upsert(id, sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language)
-                        return messageService.upsert(messageId, message.sender, message.sender_fullname, message.recipient, message.text,
-                          projectid, null, MessageConstants.CHAT_MESSAGE_STATUS.RECEIVED, message.attributes, message.type, message.metadata, language).then(function(savedMessage){
-                            return res.json(savedRequest);                                  
-                            // return requestService.incrementMessagesCountByRequestId(savedRequest.request_id, savedRequest.id_project).then(function(savedRequestWithIncrement) {
-                              // return res.json(savedRequestWithIncrement);
-                            // });
-                          
-                        
-                      }).catch(function (err) {
-                        winston.error( 'Error creating the request object.', err);
-                        return res.status(500).send({success: false, msg: 'Error creating the request object.', err:err});
-                      });
+
+
+                      var messageId = undefined;
+                      if (message.attributes && message.attributes.tiledesk_message_id) {
+                        messageId = message.attributes.tiledesk_message_id;
+                      }
+
+                      // upsert(id, sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language)
+                      return messageService.upsert(messageId, message.sender, message.sender_fullname, message.recipient, message.text,
+                        projectid, null, MessageConstants.CHAT_MESSAGE_STATUS.RECEIVED, message.attributes, message.type, message.metadata, language).then(function (savedMessage) {
+                          return res.json(savedRequest);
+                          // return requestService.incrementMessagesCountByRequestId(savedRequest.request_id, savedRequest.id_project).then(function(savedRequestWithIncrement) {
+                          // return res.json(savedRequestWithIncrement);
+                          // });
+
+
+                        }).catch(function (err) {
+                          winston.error('Error creating the request object.', err);
+                          return res.status(500).send({ success: false, msg: 'Error creating the request object.', err: err });
+                        });
+                    }).catch((err) => {
+                      winston.error('(Chat21Webhook) Error creating the request object ', err);
+                      return res.status(500).send({ success: false, msg: 'Error creating the request object.', err: err });
+                    });
                   });
-                });
-                  
+
               });
-              
+
 
 
           } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.10.19",
+  "version": "2.10.21",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -49,7 +49,7 @@
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.11",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.130",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.74",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.75",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.10",
     "@tiledesk/tiledesk-sms-connector": "^0.1.10",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.49",

package/pubmodules/messageActions/messageActionsInterceptor.js

@@ -111,6 +111,8 @@ class MessageActionsInterceptor {
                                 //     {"updateconversation" : false, messagelabel: {key: "TOUCHING_OPERATOR"}}
                                 // );
 
+                        }).catch((err) => {
+                            winston.error("(MessageActionsInterceptor) route request error ", err)
                         });
                 //    });
                 }   else {

package/pubmodules/rules/conciergeBot.js

@@ -135,7 +135,9 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                             
                             // botprefix
                             // removeParticipantByRequestId(request_id, id_project, member) 
-                            requestService.removeParticipantByRequestId(request.request_id, request.id_project,"bot_"+botId );
+                            requestService.removeParticipantByRequestId(request.request_id, request.id_project,"bot_"+botId ).catch((err) => {
+                                winston.error("(ConciergeBot) removeParticipantByRequestId error", err)
+                            });
                         }      
                     }
                     

package/pubmodules/trigger/rulesTrigger.js

@@ -877,7 +877,9 @@ class RulesTrigger {
             winston.debug('runAction action id_project: ' + id_project);
 
             //     removeParticipantByRequestId(request_id, id_project, member) {
-            requestService.removeParticipantByRequestId(request_id, id_project, member);                      
+            requestService.removeParticipantByRequestId(request_id, id_project, member).catch((err) => {
+              winston.error("(RulesTrigger) removeParticipantByRequestId error", err)
+            });                      
   
           } catch(e) {
             winston.error("Error runAction", e);

package/routes/files.js

@@ -31,8 +31,7 @@ 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")
+  winston.verbose("files/users")
   return res.status(201).json({
     message: 'File uploded successfully',
     filename: req.file.filename

package/routes/request.js

@@ -187,6 +187,9 @@ router.post('/',
           return res.json(savedRequest);
           // });
           // });
+        }).catch((err) => {
+          winston.error("(Request) create request error ", err)
+          return res.status(500).send({ success: false, message: "Unable to create request", err: err })
         });
 
 
@@ -424,6 +427,9 @@ router.delete('/:requestid/participants/:participantid', function (req, res) {
     winston.verbose("participant removed", updatedRequest);
 
     return res.json(updatedRequest);
+  }).catch((err) => {
+    winston.error("(Request) removeParticipantByRequestId error", err)
+    return res.status(400).send({ success: false, error: "Unable to removed the participant " + req.params.participantid +  " from the request " + req.params.requestid})
   });