@tiledesk/tiledesk-server 2.4.101 → 2.4.102

package/CHANGELOG.md

@@ -5,6 +5,11 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.102
+- Updated whatsapp-connector to 0.1.63
+- Updated messenger-connector to 0.1.17
+- Added quote management
+
 # 2.4.101
 - Added new route for knowledge base
 - Bug fix: conflicts with old knowledge base

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.101",
+  "version": "2.4.102",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -42,11 +42,11 @@
     "@tiledesk/tiledesk-dialogflow-connector": "^1.8.4",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
-    "@tiledesk/tiledesk-messenger-connector": "^0.1.15",
+    "@tiledesk/tiledesk-messenger-connector": "^0.1.17",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
     "@tiledesk/tiledesk-tybot-connector": "^0.2.50",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.61",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.63",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "@tiledesk/tiledesk-chatbot-templates": "^0.1.2",
     "amqplib": "^0.5.5",

package/routes/auth.js

@@ -276,7 +276,8 @@ router.post('/signinWithCustomToken', [
     if (req.user.role) {
       role = req.user.role;
     }
-    winston.debug("role: " + role );
+    winston.debug("role1: " + role );
+    winston.debug("id_project: " + id_project + " uuid_user " + req.user._id + " role " + role);
 
 
       Project_user.findOne({ id_project: id_project, uuid_user: req.user._id,  role: role}).              
@@ -285,15 +286,18 @@ router.post('/signinWithCustomToken', [
           winston.error(err);
           return res.json({ success: true, token: req.headers["authorization"], user: req.user });
         }
+        winston.debug("project_user: ", project_user );
+
+
         if (!project_user) {
 
           let createNewUser = false;
-          winston.debug('role: '+ role)
+          winston.debug('role2: '+ role)
 
           
           if (role === RoleConstants.OWNER || role === RoleConstants.ADMIN || role === RoleConstants.AGENT) {            
            createNewUser = true;
-
+           winston.debug('role owner admin agent');
            var newUser;
            try {
 
@@ -328,6 +332,8 @@ router.post('/signinWithCustomToken', [
               updatedBy: req.user._id
             });
 
+            winston.debug('newProject_user', newProject_user);
+
             // testtare qiestp cpm dpcker dev partemdp da ui
             if (createNewUser===true) {
               newProject_user.id_user = newUser._id;
@@ -375,7 +381,11 @@ router.post('/signinWithCustomToken', [
                 
               }
 
-              if (returnToken.indexOf("JWT")==0) {
+              winston.debug('returnToken '+returnToken);
+
+              winston.debug('returnToken.indexOf("JWT") '+returnToken.indexOf("JWT"));
+
+              if (returnToken.indexOf("JWT")<0) {
                 returnToken = "JWT " + returnToken;
               }
 
@@ -408,7 +418,7 @@ router.post('/signinWithCustomToken', [
               let returnToken = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt
 
 
-              if (returnToken.indexOf("JWT")==0) {
+              if (returnToken.indexOf("JWT")<0) {
                 returnToken = "JWT " + returnToken;
               }
               return res.json({ success: true, token: returnToken, user: userFromDB });
@@ -416,6 +426,8 @@ router.post('/signinWithCustomToken', [
               
 
             } else {
+              winston.debug('req.headers["authorization"]: '+req.headers["authorization"]);
+              
               return res.json({ success: true, token: req.headers["authorization"], user: userToReturn });
             }
 

package/routes/faq.js

@@ -467,7 +467,6 @@ router.put('/:faqid', function (req, res) {
 // DELETE REMOTE AND LOCAL FAQ
 router.delete('/:faqid', function (req, res) {
 
-  console.log("delete called")
   winston.debug('DELETE FAQ - FAQ ID ', req.params.faqid);
 
   let faqid = req.params.faqid;

package/routes/faq_kb.js

@@ -639,7 +639,7 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
 
   let globals = req.query.globals;
   winston.debug("export globals " + globals);
-  console.log("export globals? --> globals ", globals);
+
 
   let token = req.headers.authorization;
 
@@ -647,7 +647,7 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
 
   let chatbot = await cs.getBotById(id_faq_kb, public, api_url, chatbot_templates_api_url, token, current_project_id, globals);
   winston.debug("chatbot: ", chatbot)
-  console.log("/fork chatbot after getBotById: ", chatbot);
+
   if (!chatbot) {
     return res.status(500).send({ success: false, message: "Unable to get chatbot" });
   }
@@ -982,8 +982,6 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, r
 router.get('/exportjson/:id_faq_kb', (req, res) => {
 
   winston.debug("exporting bot...")
-  console.log("exportjson req.query.globals: ", req.query.globals);
-
 
   let id_faq_kb = req.params.id_faq_kb;
 
@@ -1000,12 +998,10 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
         const intents = faqs.map(({ _id, id_project, topic, status, id_faq_kb, createdBy, createdAt, updatedAt, __v, ...keepAttrs }) => keepAttrs)
 
         if (!req.query.globals) {
-          console.log("Delete globals from attributes!")
+          winston.verbose("Delete globals from attributes!")
           if (faq_kb.attributes) {
             delete faq_kb.attributes.globals;
           }
-        } else {
-          console.log("Keep globals")
         }
 
         let json = {
@@ -1033,7 +1029,6 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
           //   return res.status(200).send(json);
           // }
           let json_string = JSON.stringify(json);
-          console.log("json_string: ", json_string)
           res.set({ "Content-Disposition": "attachment; filename=\"bot.json\"" });
           return res.send(json_string);
         }

package/routes/kb.js

@@ -39,8 +39,6 @@ router.post('/', async (req, res) => {
 
     let project_id = req.projectid;
     let body = req.body;
-    console.log("create new kb project_id " + project_id);
-    console.log("create new kb body ", body);
 
     let new_kb = {
         id_project: project_id,

package/services/QuoteManager.js

@@ -4,22 +4,6 @@ const requestEvent = require('../event/requestEvent');
 const messageEvent = require('../event/messageEvent');
 const emailEvent = require('../event/emailEvent');
 
-// const PLANS_LIST = {
-//     FREE_TRIAL: { users: 2, requests: 3000, chatbots: 20, kbs: 3, kb_pages: 500, tokens: 250000 }, // same as PREMIUM
-//     SANDBOX: { users: 1, requests: 200, chatbots: 2, kbs: 1, kb_pages: 50, tokens: 10000 },
-//     BASIC: { users: 1, requests: 810, chatbots: 5, kbs: 2, kb_pages: 250, tokens: 50000 },
-//     PREMIUM: { users: 2, requests: 3000, chatbots: 20, kbs: 3, kb_pages: 500, tokens: 250000 },
-//     CUSTOM: { users: 100, conversations: 10000, chatbots: 100, kbs: 100, kb_pages: 1000, tokens: 100000 } // manage it --> get limit directly from project info
-// }
-
-// const PLANS_LIST = {
-//     FREE_TRIAL: { users: 2,     requests: 3000,     chatbots: 20,   kbs: 3,     kb_pages: 500,      tokens: 250000 }, // same as PREMIUM
-//     SANDBOX:    { users: 1,     requests: 200,      chatbots: 2,    kbs: 1,     kb_pages: 50,       tokens: 10000 },
-//     BASIC:      { users: 1,     requests: 800,      chatbots: 5,    kbs: 2,     kb_pages: 250,      tokens: 50000 },
-//     PREMIUM:    { users: 2,     requests: 3000,     chatbots: 20,   kbs: 3,     kb_pages: 500,      tokens: 250000 },
-//     CUSTOM:     { users: 2,     requests: 3000,     chatbots: 20,   kbs: 3,     kb_pages: 5000,     tokens: 1000000 }
-// }
-
 const PLANS_LIST = {
     FREE_TRIAL: { requests: 3000,   messages: 0,    tokens: 250000,     email: 200 }, // same as PREMIUM
     SANDBOX:    { requests: 200,    messages: 0,    tokens: 10000,      email: 200 },
@@ -99,6 +83,8 @@ class QuoteManager {
 
     async generateKey(object, type) {
 
+        winston.info("generateKey object ", object)
+        winston.info("generateKey type " + type)
         let subscriptionDate;
         if (this.project.profile.subStart) {
             subscriptionDate = this.project.profile.subStart;
@@ -106,6 +92,7 @@ class QuoteManager {
             subscriptionDate = this.project.createdAt;
         }
         let objectDate = object.createdAt;
+        winston.info("objectDate " + objectDate);
 
         // converts date in timestamps and transform from ms to s
         const objectDateTimestamp = ceil(objectDate.getTime() / 1000);
@@ -127,7 +114,7 @@ class QuoteManager {
 
         this.project = project;
         let key = await this.generateKey(object, type);
-        winston.verbose("[QuoteManager] getCurrentQuote key: " + key);
+        winston.info("[QuoteManager] getCurrentQuote key: " + key);
 
         let quote = await this.tdCache.get(key);
         return Number(quote);
@@ -142,18 +129,15 @@ class QuoteManager {
 
         let quotes = {}
         for (let type of typesList) {
-            console.log("*** get all quotes --> search for type: ", type);
+
             let key = await this.generateKey(obj, type);
-            console.log("*** get all quotes --> key generated: ", key);
             let quote = await this.tdCache.get(key);
-            console.log("*** get all quotes --> quote retrieved: ", quote);
 
             quotes[type] = {
                 quote: Number(quote)
             };
         }
         return quotes;
-
     }
 
     /**
@@ -163,15 +147,19 @@ class QuoteManager {
      */
     async checkQuote(project, object, type) {
 
+        winston.info("checkQuote project ", project);
+        winston.info("checkQuote object ", object);
+        winston.info("checkQuote type " + type);
         if (quotes_enabled === false) {
-            winston.debug("QUOTES DISABLED - checkQuote for type " + type);
+            winston.info("QUOTES DISABLED - checkQuote for type " + type);
             return true;
         }
 
         this.project = project;
         let limits = await this.getPlanLimits();
-        console.log("limits for current plan: ", limits)
+        winston.info("limits for current plan: ", limits)
         let quote = await this.getCurrentQuote(project, object, type);
+        winston.info("getCurrentQuote resp: ", quote)
 
         if (quote == null) {
             return true;
@@ -258,8 +246,7 @@ class QuoteManager {
                 let result = await this.incrementRequestsCount(payload.project, payload.request);
                 return result;
             } else {
-                console.log("QUOTES DISABLED - request.create.quote event")
-                winston.debug("QUOTES DISABLED - request.create.quote event")
+                winston.info("QUOTES DISABLED - request.create.quote event")
             }
         })
         // REQUESTS EVENTS - END
@@ -282,7 +269,7 @@ class QuoteManager {
                 let result = await this.incrementMessagesCount(payload.project, payload.message);
                 return result;
             } else {
-                winston.debug("QUOTES DISABLED - message.create.quote event")
+                winston.info("QUOTES DISABLED - message.create.quote event")
             }
         })
         // MESSAGES EVENTS - END
@@ -305,7 +292,7 @@ class QuoteManager {
                 let result = await this.incrementEmailCount(payload.project, payload.email);
                 return result;
             } else {
-                winston.debug("QUOTES DISABLED - email.send event")
+                winston.info("QUOTES DISABLED - email.send event")
             }
         })
         // EMAIL EVENTS - END

package/services/chatbotService.js

@@ -32,7 +32,6 @@ class ChatbotService {
   async getBotById(id_faq_kb, published, api_url, chatbot_templates_api_url, token, project_id, globals) {
 
     winston.debug("[CHATBOT SERVICE] getBotById");
-    console.log("getBotById globals: ", globals);
 
     // private bot
     if (published == "false") {

package/services/messageService.js

@@ -46,52 +46,13 @@ class MessageService {
 
     save(message) {
 
-        let total_1;
-        let total_e;
-        let total_1_end_e;
-        let total_2;
-
         var that = this;
         winston.debug('message.save called');
 
-        message.createdAt = new Date();
-
-        // let start1 = Date.now();
-        // let project;
-        // let payload;
-        // let q = Project.findOne({ _id: message.id_project, status: 100 });
-        // if (cacheEnabler.project) {
-        //     q.cache(cacheUtil.longTTL, "projects:id:" + message.id_project)  //project_cache
-        //     winston.debug('project cache enabled for /project detail');
-        // }
-        // q.exec(async function (err, p) {
-        //     if (err) {
-        //         winston.error('Error getting project ', err);
-        //     }
-        //     if (!p) {
-        //         winston.warn('Project not found ');
-        //     }
-        //     //TODO REMOVE settings from project
-        //     project = p;
-        //     payload = {
-        //         project: project,
-        //         message: message
-        //     }
-
-        //     let end1 = Date.now();
-        //     total_1 = end1 - start1;
-
-        //     let start_e = Date.now();
-        //     let result = await messageEvent.emit('message.create.quote.before', payload);
-        //     let end_e = Date.now();
-        //     total_e = end_e - start_e;
-        //     if (result === false) {
-        //         winston.info("Messages limits reached for project " + project._id)
-        //         // return false in the second phase
-        //     }
-        // });
-
-        // let start2 = Date.now();
+        if (!message.createdAt) {
+            message.createdAt = new Date();
+        }
+
         let sender = message.sender;
         let senderFullname = message.senderFullname;
         let recipient = message.recipient;
@@ -111,6 +72,9 @@ class MessageService {
 
         return new Promise(function (resolve, reject) {
 
+            //let q = Project.findOne({ _id: request.id_project, status: 100 });
+            // Continue quotes code here (see at requestService)
+
             if (!createdBy) {
                 createdBy = sender;
             }
@@ -196,11 +160,7 @@ class MessageService {
                             message: message
                         }
 
-                        let result = await messageEvent.emit('message.create.quote', payload);
-                        if (result === false) {
-                            winston.info("Messages limits reached for project " + p._id)
-                            // return false in the second phase
-                        }
+                        messageEvent.emit('message.create.quote', payload);
                     });
 
 
@@ -212,13 +172,6 @@ class MessageService {
                     //     messageEvent.emit('message.sending.simple', savedMessage);
                     // }
 
-                    // console.log("total 1: ", total_1);
-                    // console.log("total e: ", total_e);
-                    // total_1_end_e = total_1 + total_e;
-                    // console.log("total 1 + e: ", total_1_end_e);
-                    // console.log("total 2: ", total_2);
-
-
                     return resolve(savedMessage);
                 });
 

package/services/openaiService.js

@@ -11,7 +11,7 @@ class OpenaiService {
   // OPEN AI
   completions(data, gptkey) {
 
-    winston.debug("[OPENAI SERVICE] openai endpoint: ", openai_endpoint);
+    winston.debug("[OPENAI SERVICE] openai endpoint: " + openai_endpoint);
 
     return new Promise((resolve, reject) => {
 
@@ -36,7 +36,7 @@ class OpenaiService {
 
   // PUGLIA AI
   checkStatus(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
 
     return new Promise((resolve, reject) => {
 
@@ -50,7 +50,6 @@ class OpenaiService {
       }).then((resbody) => {
         resolve(resbody);
       }).catch((err) => {
-        console.log("checkStatus err: ", err)
         reject(err);
       })
 
@@ -58,7 +57,7 @@ class OpenaiService {
   }
 
   startScrape(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
 
     return new Promise((resolve, reject) => {
 
@@ -79,7 +78,7 @@ class OpenaiService {
   }
 
   ask(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint);
 
     return new Promise((resolve, reject) => {
 
@@ -93,7 +92,6 @@ class OpenaiService {
       }).then((resbody) => {
         resolve(resbody);
       }).catch((err) => {
-        console.log("err: ", err);
         reject(err);
       })
 
@@ -102,7 +100,7 @@ class OpenaiService {
 
   // PUGLIA AI V2
   singleScrape(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint_dev);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_dev);
 
     return new Promise((resolve, reject) => {
 
@@ -123,7 +121,7 @@ class OpenaiService {
   }
 
   scrapeStatus(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint_dev);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_dev);
 
     return new Promise((resolve, reject) => {
 
@@ -143,7 +141,7 @@ class OpenaiService {
   }
 
   askNamespace(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint_dev);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_dev);
 
     return new Promise((resolve, reject) => {
 
@@ -164,7 +162,7 @@ class OpenaiService {
   }
 
   deleteIndex(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint_dev);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_dev);
 
     return new Promise((resolve, reject) => {
 
@@ -184,7 +182,7 @@ class OpenaiService {
   }
 
   deleteNamespace(data) {
-    winston.debug("[OPENAI SERVICE] kb endpoint: ", kb_endpoint_dev);
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_dev);
 
     return new Promise((resolve, reject) => {
 

package/services/requestService.js

@@ -709,31 +709,7 @@ class RequestService {
           winston.verbose("Performance Request created in millis: " + endDate - startDate);
 
           requestEvent.emit('request.create.simple', savedRequest);
-
-          // let q = Project.findOne({ _id: request.id_project, status: 100 });
-          // if (cacheEnabler.project) {
-          //   q.cache(cacheUtil.longTTL, "projects:id:" + request.id_project)  //project_cache
-          //   winston.debug('project cache enabled for /project detail');
-          // }
-          // q.exec(async function (err, p) {
-          //   if (err) {
-          //     winston.error('Error getting project ', err);
-          //   }
-          //   if (!p) {
-          //     winston.warn('Project not found ');
-          //   }
-          //   //TODO REMOVE settings from project
-          //   let payload = {
-          //     project: p,
-          //     request: request
-          //   }
-
-          // });
           requestEvent.emit('request.create.quote', payload);;
-          // if (result === false) {
-          //   winston.info("Requests limits reached for project " + p._id)
-          //   // return false in the second phase
-          // }
 
           return resolve(savedRequest);