@tiledesk/tiledesk-server 2.2.16 → 2.2.20

package/CHANGELOG.md

@@ -1,8 +1,14 @@
+# 2.2.19
+- disabled waiting time in widgets endpoint unused
 
+# 2.2.18
+- Router logger module enable with ROUTELOGGER_ENABLED=true
 
 
+# 2.2.17 -> PROD
+- Removed default fallback limit on parse reply
 
-# 2.2.16
+# 2.2.16 
 - Email templates endpoint
 - Created request.updated event for request event and deprecated request.update.comment
 - Added Handlebars template processor for the message transformer module only if message.attributes.templateProcessor=true
@@ -11,7 +17,7 @@
 - Added /intents alias for /faq endpoint
 - The request_id field of the request model has now a unique index
 
-# 2.2.15 -> PROD
+# 2.2.15
 - Added catch messageService.send for bot
 - Added external searcher for bot( ex. Rasa proxy) 
 - Faq language fix taken from bot language for create single and import from csv

package/app.js

@@ -107,7 +107,7 @@ var email = require('./routes/email');
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
 var schemaMigrationService = require('./services/schemaMigrationService');
-
+var RouterLogger = require('./models/routerLogger');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -222,7 +222,42 @@ app.options('*', cors());
 // const customRedisRateLimiter = require("./rateLimiter").customRedisRateLimiter;
 // app.use(customRedisRateLimiter);
 
+if (process.env.ROUTELOGGER_ENABLED==="true") {
+  winston.info("RouterLogger enabled ");
+  app.use(function (req, res, next) {
+    // winston.error("log ", req);
+
+      try {
+        var projectid = req.projectid;
+        winston.debug("RouterLogger projectIdSetter projectid:" + projectid);
+
+      var fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
+      winston.debug("fullUrl:"+ fullUrl);
+      winston.debug("req.get('origin'):" + req.get('origin'));
+
+      var routerLogger = new RouterLogger({
+        origin: req.get('origin'),
+        fullurl: fullUrl,    
+        url: req.originalUrl.split("?").shift(),    
+        id_project: projectid,      
+      });
+
+      routerLogger.save(function (err, savedRouterLogger) {        
+        if (err) {
+          winston.error('Error saving RouterLogger ', err)
+        }
+        winston.debug("RouterLogger saved "+ savedRouterLogger);
+        next();
+      });
+      }catch(e) {
+        winston.error('Error saving RouterLogger ', e)
+        next();
+      }
+  });
 
+} else {
+  winston.info("RouterLogger disabled ");
+}
 
 app.get('/', function (req, res) {  
   res.send('Hello from Tiledesk server. It\'s UP. See the documentation here http://developer.tiledesk.com');
@@ -276,6 +311,9 @@ var projectSetter = function (req, res, next) {
 }
 
 
+
+
+
 // app.use('/admin', admin);
 
 //oauth2
@@ -284,6 +322,7 @@ var projectSetter = function (req, res, next) {
 // app.post('/oauth/token', oauth2.token);
 
 
+
 app.use('/auth', auth);
 app.use('/testauth', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtest);
 
@@ -407,6 +446,7 @@ app.use(function (err, req, res, next) {
   res.render('error');
 });*/
 
+
 // error handler
 app.use((err, req, res, next) => {
   winston.error("General error", err);

package/config/labels/widget.json

@@ -63,8 +63,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT":"you",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB":"you have been added ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"joined",
-        "INFO_SUPPORT_USER_ADDED_VERB":"to chat",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"the chat",
+        "INFO_SUPPORT_USER_ADDED_VERB":"joined",
         "INFO_SUPPORT_CHAT_REOPENED":"Chat reopened",
         "INFO_SUPPORT_CHAT_CLOSED":"Chat closed",
 
@@ -141,8 +141,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT":"tu",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB":"sei stato aggiunto ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"si è unito",
-        "INFO_SUPPORT_USER_ADDED_VERB":"alla chat",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"alla chat",
+        "INFO_SUPPORT_USER_ADDED_VERB":"si è unito",
         "INFO_SUPPORT_CHAT_REOPENED":"Chat riaperta",
         "INFO_SUPPORT_CHAT_CLOSED":"Chat chiusa",
 
@@ -217,8 +217,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT":"toi",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB":"tu as été ajouté ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"rejoint",
-        "INFO_SUPPORT_USER_ADDED_VERB":"discuter",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"discuter",
+        "INFO_SUPPORT_USER_ADDED_VERB":"rejoint",
         "INFO_SUPPORT_CHAT_REOPENED":"Chat rouvert",
         "INFO_SUPPORT_CHAT_CLOSED":"Chat fermé",
 
@@ -293,8 +293,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT":"usted",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB":"usted ha sido agregado ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"unido",
-        "INFO_SUPPORT_USER_ADDED_VERB":"para charlar",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT":"para charlar",
+        "INFO_SUPPORT_USER_ADDED_VERB":"unido",
         "INFO_SUPPORT_CHAT_REOPENED":"Chat reabierto",
         "INFO_SUPPORT_CHAT_CLOSED":"Chat cerrado",
 
@@ -370,8 +370,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT": "Sie",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB": "Sie wurden hinzugefügt ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT": "beigetreten",
-        "INFO_SUPPORT_USER_ADDED_VERB": "zum Chatten",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT": "zum Chatten",
+        "INFO_SUPPORT_USER_ADDED_VERB": "beigetreten",
         "INFO_SUPPORT_CHAT_REOPENED": "Chat wieder geöffnet",
         "INFO_SUPPORT_CHAT_CLOSED": "Chat geschlossen",
 
@@ -446,8 +446,8 @@
 
         "INFO_SUPPORT_USER_ADDED_SUBJECT": "você",
         "INFO_SUPPORT_USER_ADDED_YOU_VERB": "você foi adicionado ",
-        "INFO_SUPPORT_USER_ADDED_COMPLEMENT": "aderiu",
-        "INFO_SUPPORT_USER_ADDED_VERB": "para conversar",
+        "INFO_SUPPORT_USER_ADDED_COMPLEMENT": "para conversar",
+        "INFO_SUPPORT_USER_ADDED_VERB": "aderiu",
         "INFO_SUPPORT_CHAT_REOPENED": "Chat reaberto",
         "INFO_SUPPORT_CHAT_CLOSED": "Bate-papo fechado",
 

package/models/routerLogger.js

@@ -0,0 +1,57 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var config = require('../config/database');
+
+
+var winston = require('../config/winston');
+
+var dbUrl = process.env.MONGODB_LOGS_URI || config.databaselogs || process.env.MONGODB_URI;
+winston.info('VisitorCounterSchema dbUrl: '+dbUrl);
+
+// mongoose.set('useFindAndModify', false); //??
+// mongoose.set('useCreateIndex', true);
+// mongoose.set('useUnifiedTopology', true); 
+
+var conn      = mongoose.createConnection(dbUrl, { "autoIndex": true });	
+// var conn      = mongoose.connect(dbUrl, { "useNewUrlParser": true, "autoIndex": true });
+
+// db.getCollection('reqlogs').aggregate([ {$group:{_id:{id_project:"$id_project"},  "count":{$sum:1}}},{$sort:{"count":-1}}])
+// db.getCollection('projects').find({"_id":ObjectId("5afeaf94404bff0014098f54")})
+
+var RouterLoggerSchema = new Schema({
+  url: {
+    type: String,
+    index: true 
+  },
+  fullurl: {
+    type: String,
+    index: true 
+  },
+
+  // ip: {
+  //   type: String,
+  //   index: true 
+  // },
+  // host: {
+  //   type: String,
+  //   index: true 
+  // },
+  origin: {
+    type: String,
+    index: true 
+  },
+  id_project: {
+    type: String,
+    index: true
+    //required: true
+  }
+}, {
+    timestamps: true
+  }
+);
+
+var routerLogger = conn.model('router_logger', RouterLoggerSchema);
+
+
+
+module.exports = routerLogger;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.16",
+  "version": "2.2.20",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/events/eventRoute.js

@@ -41,8 +41,8 @@ router.post('/', [
     eventService.emit(req.body.name, req.body.attributes, req.projectid, pu, req.user.id, undefined, req.user).then(function(event) {
     res.json(event);
   }).catch(function(err) {
-    winston.error('Error saving the event '+ JSON.stringify(savedEvent), err)
-    return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(savedEvent)});
+    winston.error('Error saving the event '+ JSON.stringify(event), err)
+    return res.status(500).send({success: false, msg: 'Error saving the event '+ JSON.stringify(event)});
   });
 
   // var newEvent = new Event({

package/routes/public-analytics.js

@@ -11,27 +11,29 @@ var winston = require('../config/winston');
     //winston.debug(req.params);
     //winston.debug("req.projectid",  req.projectid);    
    
-    AnalyticResult.aggregate([
-        //last 4
-        { $match: {"id_project":req.projectid, "createdAt" : { $gte : new Date((new Date().getTime() - (4 * 60 * 60 * 1000))) }} },
-        { "$group": { 
-          "_id": "$id_project", 
-         "waiting_time_avg":{"$avg": "$waiting_time"}
-        }
-      },
+    res.json([]);
+
+    // AnalyticResult.aggregate([
+    //     //last 4
+    //     { $match: {"id_project":req.projectid, "createdAt" : { $gte : new Date((new Date().getTime() - (4 * 60 * 60 * 1000))) }} },
+    //     { "$group": { 
+    //       "_id": "$id_project", 
+    //      "waiting_time_avg":{"$avg": "$waiting_time"}
+    //     }
+    //   },
       
-    ])
-      // .cache(cacheUtil.longTTL, req.projectid+":analytics:query:waiting:avg:4hours")        
-      .exec(function(err, result) {
-
-          if (err) {
-            winston.debug(err);
-            return res.status(500).send({success: false, msg: 'Error getting analytics.'});
-          }
-          //winston.debug(result);
-
-          res.json(result);
-    });
+    // ])
+    //   // .cache(cacheUtil.longTTL, req.projectid+":analytics:query:waiting:avg:4hours")        
+    //   .exec(function(err, result) {
+
+    //       if (err) {
+    //         winston.debug(err);
+    //         return res.status(500).send({success: false, msg: 'Error getting analytics.'});
+    //       }
+    //       //winston.debug(result);
+
+    //       res.json(result);
+    // });
 
   });
 

package/routes/widget.js

@@ -123,7 +123,7 @@ router.get('/', function(req, res, next) {
       ,
         getDepartments(req)
       ,
-        waiting()
+        // waiting()unused used 620e87f02e7fda00350ea5a5/publicanalytics/waiting/current
       , 
         getIp()
      

package/services/faqBotSupport.js

@@ -368,7 +368,8 @@ class FaqBotSupport {
                                 // found = true;
                                 // return resolve(bot_answer);
 
-                                if (message.channel.name == "chat21") {    //why this contition on chat21 channel? bacause only chat21 support parsed replies?
+                                // problem with 
+                                // if (message.channel.name == "chat21") {    //why this contition on chat21 channel? bacause only chat21 support parsed replies?
                                     winston.debug("faqBotSupport message.channel.name is chat21",message);
                                     that.getParsedMessage(bot_answer.text,message, bot, faqs[0]).then(function(bot_answerres) {
                                     
@@ -377,10 +378,10 @@ class FaqBotSupport {
                                         return resolve(bot_answerres);
                                     });
 
-                                } else {
-                                    winston.debug("faqBotSupport message.channel.name is not chat21 returning default",message);
-                                    return resolve(bot_answer);
-                                }
+                                // } else {
+                                //     winston.debug("faqBotSupport message.channel.name is not chat21 returning default",message);
+                                //     return resolve(bot_answer);
+                                // }
                                 
                            } else {
                                 var message_key = "DEFAULT_NOTFOUND_NOBOT_SENTENCE_REPLY_MESSAGE";