@tiledesk/tiledesk-server 2.3.91 → 2.3.93

package/CHANGELOG.md

@@ -5,8 +5,26 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.3.93 -> PROD v3
+- subscriptionNotifier secret fix
 
-# 2.3.87 -> PROD v3
+# 2.3.92
+- Apps module fix for public secret key
+
+# 2.3.91
+- subscription webhook fix for global webhook secret creation for token
+- added jsonRequest field to subscriptionLog to save request body payload
+
+# 2.3.90
+- Dependency updated tiledesk-tybot-connector 0.1.59
+
+# 2.3.89 
+- added as_attachment query parameter to images endpoint to download the images
+
+# 2.3.88
+- added score, publishedBy and publishedAt to bot model 
+
+# 2.3.87
 - Geo Service fix with queue enabled
 
 # 2.3.86 

package/package.json

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

package/pubmodules/apps/listener.js

@@ -1,6 +1,19 @@
 const apps = require("@tiledesk/tiledesk-apps");
 var winston = require('../../config/winston');
 
+var config = require('../../config/database'); // get db config file
+
+let configSecretOrPubicKay = process.env.GLOBAL_SECRET || config.secret;   
+
+var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
+// console.log("pKey",pKey);
+
+if (pKey) {
+  configSecretOrPubicKay = pKey.replace(/\\n/g, '\n');
+}
+
+// console.log("configSecretOrPubicKay",configSecretOrPubicKay);
+
 class Listener {
 
     listen(config) {
@@ -12,7 +25,7 @@ class Listener {
         }
 
         apps.startApp({
-            ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || 'nodeauthsecret',
+            ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay,
             MONGODB_URI: process.env.APPS_MONGODB_URI || config.databaseUri,
             KALEYRA_ENABLED: process.env.KALEYRA_ENABLED || config.kaleyra_enabled
         }, () => {

package/routes/faq_kb.js

@@ -525,7 +525,7 @@ router.post('/fork/:id_faq_kb', async (req, res) => {
 })
 
 
-router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) => {
+router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), async (req, res) => {
 
   let id_faq_kb = req.params.id_faq_kb;
   winston.info('import on id_faq_kb: ', id_faq_kb);
@@ -545,7 +545,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
 
     winston.info("intents only")
 
-    json.intents.forEach((intent) => {
+    await json.intents.forEach((intent) => {
 
       let new_faq = {
         id_faq_kb: id_faq_kb,
@@ -573,7 +573,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
               winston.info("updated existing intent")
               faqBotEvent.emit('faq.update', savingResult.value);
             } else {
-              winston.info("new intent crated")
+              winston.info("new intent created")
               faqBotEvent.emit('faq.create', savingResult.value);
             }
           }
@@ -588,7 +588,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
               winston.error("Duplicate intent_display_name.");
               winston.info("Skip duplicated intent_display_name");
             } else {
-              winston.info("new intent crated")
+              winston.info("new intent created")
               faqBotEvent.emit('faq.create', savedFaq);
             }
           }
@@ -596,17 +596,17 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
       }
 
     })
-
+    faqBotEvent.emit('faq_train.importedall', id_faq_kb);
     return res.status(200).send({ success: true, msg: "Intents imported successfully" })
 
   } else {
 
     if (req.query.create && req.query.create == 'true') {
-      faqService.create(json.name, undefined, req.projectid, req.user.id, "tilebot", json.description, json.webhook_url, json.webhook_enabled, json.language, undefined, undefined, undefined, json.attributes).then((savedFaq_kb) => {
+      faqService.create(json.name, undefined, req.projectid, req.user.id, "tilebot", json.description, json.webhook_url, json.webhook_enabled, json.language, undefined, undefined, undefined, json.attributes).then( async (savedFaq_kb) => {
         winston.debug("saved (and imported) faq kb: ", savedFaq_kb);
         botEvent.emit('faqbot.create', savedFaq_kb);
 
-        json.intents.forEach((intent) => {
+        await json.intents.forEach((intent) => {
   
           let new_faq = {
             id_faq_kb: savedFaq_kb._id,
@@ -635,7 +635,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
                   winston.info("updated existing intent")
                   faqBotEvent.emit('faq.update', savingResult.value);
                 } else {
-                  winston.info("new intent crated")
+                  winston.info("new intent created")
                   faqBotEvent.emit('faq.create', savingResult.value);
                 }
 
@@ -652,7 +652,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
                   winston.error("Duplicate intent_display_name.");
                   winston.info("Skip duplicated intent_display_name");
                 } else {
-                  winston.info("new intent crated")
+                  winston.info("new intent created")
                   faqBotEvent.emit('faq.create', savedFaq);
                 }
               }
@@ -660,6 +660,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
           }
 
         })
+        faqBotEvent.emit('faq_train.importedall', savedFaq_kb._id);
         return res.status(200).send(savedFaq_kb);
 
       }).catch((err) => {
@@ -699,15 +700,18 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
         if (json.attributes) {
           faq_kb.attributes = json.attributes;
         }
+        // if (json.intentsEngine) {
+        //   faq_kb.intentsEngine = json.intentsEngine;
+        // }
   
-        Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, (err, updatedFaq_kb) => {
+        Faq_kb.findByIdAndUpdate(id_faq_kb, faq_kb, { new: true }, async (err, updatedFaq_kb) => {
           if (err) {
             return res.status(500).send({ success: false, msg: "Error updating bot." });
           }
   
           botEvent.emit('faqbot.update', updatedFaq_kb);
   
-          json.intents.forEach((intent) => {
+          await json.intents.forEach((intent) => {
   
             let new_faq = {
               id_faq_kb: updatedFaq_kb._id,
@@ -736,7 +740,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
                     winston.info("updated existing intent")
                     faqBotEvent.emit('faq.update', savingResult.value);
                   } else {
-                    winston.info("new intent crated")
+                    winston.info("new intent created")
                     faqBotEvent.emit('faq.create', savingResult.value);
                   }
   
@@ -753,7 +757,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
                     winston.error("Duplicate intent_display_name.");
                     winston.info("Skip duplicated intent_display_name");
                   } else {
-                    winston.info("new intent crated")
+                    winston.info("new intent created")
                     faqBotEvent.emit('faq.create', savedFaq);
                   }
                 }
@@ -761,7 +765,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
             }
   
           })
-  
+          faqBotEvent.emit('faq_train.importedall', id_faq_kb);
           return res.send(updatedFaq_kb);
   
         })
@@ -796,7 +800,7 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
           webhook_url: faq_kb.webhook_url,
           language: faq_kb.language,
           name: faq_kb.name,
-          description: faq_kb.description,
+          type: faq_kb.type,
           attributes: faq_kb.attributes,
           intents: intents
         }

package/services/chatbotService.js

@@ -75,7 +75,7 @@ class ChatbotService {
 
   async createBot(api_url, token, chatbot, project_id) {
 
-    winston.info("[CHATBOT SERVICE] createBot");
+    winston.info("(CHATBOT SERVICE) createBot");
 
     return await axios({
       url: api_url + '/' + project_id + '/faq_kb/',

package/services/subscriptionNotifier.js

@@ -69,6 +69,7 @@ class SubscriptionNotifier {
           
         // winston.debug("s",s);
           var secret = s.secret;
+          var xHookSecret = secret;
 
           let sJson = s.toObject();
           delete sJson.secret;
@@ -91,17 +92,17 @@ class SubscriptionNotifier {
             if (alg) {
               signOptions.algorithm = alg;
             }
-            var tokensecret = process.env.GLOBAL_SECRET || config.secret;   
+            secret = process.env.GLOBAL_SECRET || config.secret;   
             var pKey = process.env.GLOBAL_SECRET_OR_PRIVATE_KEY;
             // console.log("pKey",pKey);
 
             if (pKey) {
-              tokensecret = pKey.replace(/\\n/g, '\n');
+              secret = pKey.replace(/\\n/g, '\n');
             }
 
           }
     
-          var token = jwt.sign(sJson, tokensecret, signOptions); //priv_jwt pp_jwt
+          var token = jwt.sign(sJson, secret, signOptions); //priv_jwt pp_jwt
           json["token"] = token;
 
           winston.debug("Calling subscription " + s.event + " TO " + s.target + " with secret " +secret+ " with json " , json);
@@ -111,7 +112,7 @@ class SubscriptionNotifier {
             url: s.target,
             headers: {
              'Content-Type' : 'application/json',        
-              'x-hook-secret': secret,
+              'x-hook-secret': xHookSecret,
               'User-Agent': 'tiledesk-webhooks',
               'Origin': webhook_origin
             },

package/services/trainingService.js

@@ -10,19 +10,27 @@ let chatbot_training_api_url = "http://34.65.210.38/model/train"
 class TrainingService {
 
 
+    train(eventName, id_faq_kb) {
 
-    train(eventName, faq) {
+        Faq_kb.findById(id_faq_kb, (err, faq_kb) => {
 
-        Faq_kb.findById(faq.id_faq_kb, (err, faq_kb) => {
-            winston.debug("faq_kb: ", faq_kb)
+            if (err) {
+                winston.error("train error: ", err)
+                return null;
+            }
+
+            if (!faq_kb) {
+                winston.error("faq_kb is undefined");
+                return null;
+            }
 
             if (faq_kb.intentsEngine !== 'tiledesk-ai') {
                 winston.info("intentsEngine: off")
                 return null;
             }
 
-            winston.info("intentsEngine: on")
-            Faq.find({ id_faq_kb: faq.id_faq_kb }, (err, faqs) => {
+            winston.debug("intentsEngine: on")
+            Faq.find({ id_faq_kb: id_faq_kb }, (err, faqs) => {
 
                 if (err) {
                     winston.error("[Training] find all error: ", err);
@@ -31,7 +39,7 @@ class TrainingService {
                     let json = {
                         "configuration": {
                             "language": faq_kb.language,
-                            "pipeline": [""]
+                            "pipeline":["lstm"]
                         },
                         "model": faq_kb._id,
                         "nlu": []
@@ -76,23 +84,27 @@ class TrainingService {
     start() {
         winston.info('TrainingService start');
 
-        faqBotEvent.on('faq.create', (faq) => {
+        faqBotEvent.on('faq_train.importedall', (id_faq_kb) => {
+            setImmediate(() => {
+                trainingService.train('faq.importedall', id_faq_kb);
+            })
+        })
+
+        faqBotEvent.on('faq_train.create', (id_faq_kb) => {
             setImmediate(() => {
-                trainingService.train('faq.create', faq);
+                trainingService.train('faq_train.create', id_faq_kb);
             })
         })
 
-        faqBotEvent.on('faq.update', (faq) => {
-            winston.debug("--> event faq: ", faq);
+        faqBotEvent.on('faq_train.update', (id_faq_kb) => {
             setImmediate(() => {
-                trainingService.train('faq.update', faq);
+                trainingService.train('faq_train.update', id_faq_kb);
             })
         })
 
-        faqBotEvent.on('faq.delete', (faq) => {
-            console.log("--> event faq: ", faq);
+        faqBotEvent.on('faq_train.delete', (id_faq_kb) => {
             setImmediate(() => {
-                trainingService.train('faq.delete', faq);
+                trainingService.train('faq_train.delete', id_faq_kb);
             })
         })
 

package/test/chatbot-mock.js

@@ -1,10 +1,10 @@
 const existing_chatbot_mock = {
     _id: "63234fd6c69f188814749e1b",
     webhook_enabled: false,
-    type: "identity",
+    type: "tilebot",
     secret: "a3577185-a8bf-4547-a000-6ba81ccb0460",
     language: "en",
-    description: "An identity bot",
+    description: "A Tiledesk bot",
     id_project: "63234fd6c69f188814749e15",
     trashed: false,
     createdBy: "system",
@@ -104,7 +104,7 @@ const existing_chatbot_mock = {
 
 const empty_chatbot_mock = {
     webhook_enabled: false,
-    type: 'internal',
+    type: 'tilebot',
     secret: '0896478d-8eb3-4240-a6eb-cf2ea27b1a8e',
     language: 'en',
     public: false,

package/test/example-json.txt

@@ -1 +1 @@
-{"webhook_enabled":false,"language":"en","name":"examplebot","intents":[{"webhook_enabled":false,"enabled":true,"question":"\\start","answer":"Hi","intent_display_name":"start","language":"en"},{"webhook_enabled":false,"enabled":true,"question":"question1","answer":"question1","intent_display_name":"question1","language":"en"},{"webhook_enabled":false,"enabled":true,"question":"defaultFallback","answer":"I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent","intent_display_name":"defaultFallback","language":"en"}]}
+{"webhook_enabled":false,"language":"en","name":"examplebot","intentsEngine":"tiledesk-ai","intents":[{"webhook_enabled":false,"enabled":true,"question":"\\start","answer":"Hi","intent_display_name":"start","language":"en"},{"webhook_enabled":false,"enabled":true,"question":"question1","answer":"question1","intent_display_name":"question1","language":"en"},{"webhook_enabled":false,"enabled":true,"question":"defaultFallback","answer":"I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent","intent_display_name":"defaultFallback","language":"en"}]}

package/test/faqkbRoute.js

@@ -30,6 +30,7 @@ describe('FaqKBRoute', () => {
     describe('/create', () => {
 
 
+
         it('create', (done) => {
 
 
@@ -53,7 +54,15 @@ describe('FaqKBRoute', () => {
                             expect(res.body.name).to.equal("testbot");
                             expect(res.body.language).to.equal("fr");
 
-                            done();
+                            chai.request(server)
+                                .get('/' + savedProject._id + '/faq_kb/' + res.body._id)
+                                .auth(email, pwd)
+                                .end((err, res) => {
+                                    console.log("res.body", res.body);
+                                    res.should.have.status(200);
+
+                                    done();
+                                });
                         });