@tiledesk/tiledesk-server 2.9.16 → 2.9.17

package/CHANGELOG.md

@@ -5,6 +5,9 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.9.17
+- Added: /requests/count endpoint
+
 # 2.9.16
 - Update: change automatically the content status on re-index
 

package/app.js

@@ -422,7 +422,13 @@ if (process.env.ROUTELOGGER_ENABLED==="true") {
   winston.info("RouterLogger disabled ");
 }
 
-app.get('/', function (req, res) {  
+app.get('/', function (req, res) {
+  
+  console.log("(/api) req ", req.headers)
+  console.log("(/api) x-forwarded-for: ", req.headers['x-forwarded-for'], "remote port: ", req.socket.remotePort);
+  console.log("(/api) X-Real-IP ", req.headers['X-Real-IP'])
+  console.log("(/api) remoteAddress: ",  req.socket.remoteAddress)
+
   res.send('Hello from Tiledesk server. It\'s UP. See the documentation here http://developer.tiledesk.com');
 });
   

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.9.16",
+  "version": "2.9.17",
   "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.95",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.96-rc1",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.72",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.8",
     "@tiledesk/tiledesk-sms-connector": "^0.1.7",

package/routes/project.js

@@ -906,7 +906,7 @@ router.get('/:projectid/users/availables', async  (req, res) => {
         });
       });
     } catch (err) {
-      wisnton.error("(Users Availables) check operating hours error: ", err);
+      winston.error("(Users Availables) check operating hours error: ", err);
       return res.status(500).send({ success: false, msg: err });
     }
   }

package/routes/request.js

@@ -1463,6 +1463,52 @@ router.get('/csv', function (req, res, next) {
 
 });
 
+router.get('/count', async (req, res) => {
+  
+  let id_project = req.projectid;
+  let merge_assigned = req.query.merge_assigned;
+
+  let unassigned_count = 0;
+  let human_assigned_count = 0;
+  let bot_assigned_count = 0;
+
+  unassigned_count = await Request.countDocuments({ id_project: id_project, status: 100, preflight: false }).catch((err) => {
+    winston.error("Error getting unassigned requests count: ", err);
+    res.status(400).send({ success: false, error: err });
+  })
+  winston.info("Unassigned count: ", unassigned_count);
+
+  human_assigned_count = await Request.countDocuments({ id_project: id_project, status: 200, preflight: false, hasBot: false }).catch((err) => {
+    winston.error("Error getting human unassigned requests count: ", err);
+    res.status(400).send({ success: false, error: err });
+  })
+  winston.info("Unassigned count: ", unassigned_count);
+
+  bot_assigned_count = await Request.countDocuments({ id_project: id_project, status: 200, preflight: false, hasBot: true }).catch((err) => {
+    winston.error("Error getting bot assigned requests count: ", err);
+    res.status(400).send({ success: false, error: err });
+  })
+  winston.info("Unassigned count: ", bot_assigned_count);
+
+
+  if (merge_assigned) {
+    let data = {
+      unassigned: unassigned_count,
+      assigned: human_assigned_count + bot_assigned_count
+    }
+    return res.status(200).send(data);
+    
+  } else {
+    let data = {
+      unassigned: unassigned_count,
+      assigned: human_assigned_count,
+      bot_assigned: bot_assigned_count
+    }
+    return res.status(200).send(data);
+  }
+
+})
+
 router.get('/:requestid', function (req, res) {
 
   var requestid = req.params.requestid;
@@ -1517,5 +1563,4 @@ router.get('/:requestid/chatbot/parameters', async (req, res) => {
 
 })
 
-
 module.exports = router;

package/websocket/webSocketServer.js

@@ -196,6 +196,28 @@ class WebSocketServer {
         var projectId = urlSub[1];
         winston.debug('projectId: ' + projectId);
 
+        if (projectId === "65203e12f8c0cf002cf4110b"
+            || projectId === "62c3f10152dc7400352bab0d"
+            || projectId === "66acec0cf7ebf80013d67974"
+            || projectId === "6613ff078890fc0013ad3c3a"
+            || projectId === "6565047fdd64fd001323f37c"
+            || projectId === "656054000410fa00132e5dcc") {
+
+              console.log('(WebSocket) WSS onSubscribeCallback - ProjectID ' + projectId);
+              console.log("(WebSocket) req ", req.headers)
+              console.log("(WebSocket) x-forwarded-for: ", req.headers['x-forwarded-for'], "remote port: ", req.socket.remotePort);
+              console.log("(/api) X-Real-IP ", req.headers['X-Real-IP'])
+              console.log("(WebSocket) remoteAddress: ",  req.socket.remoteAddress)
+
+
+              try {
+                console.log("req: ", JSON.stringify(req))
+              } catch(err) {
+                console.log("Unable to stringify request")
+                console.log("req: ", req)
+              }
+
+            }
 
         let q = Project.findOne({ _id: projectId, status: 100 })