@tiledesk/tiledesk-server 2.10.66 → 2.10.68

package/services/faqService.js

@@ -4,12 +4,13 @@ var winston = require('../config/winston');
 const botEvent = require('../event/botEvent');
 const ActionsConstants = require('../models/actionsConstants');
 const uuidv4 = require('uuid/v4');
+const chatbotTypes = require("../models/chatbotTypes");
 
 
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine, attributes) {
+  create(name, url, projectid, user_id, type, subtype, description, webhook_url, webhook_enabled, language, template, mainCategory, intentsEngine, attributes) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -22,6 +23,7 @@ class FaqService {
         webhook_url: webhook_url,
         webhook_enabled: webhook_enabled,
         type: type,
+        subtype: subtype,
         language: language,
         public: false,
         certified: false,
@@ -47,6 +49,25 @@ class FaqService {
 
         if (type === "internal" || type === "tilebot") {
 
+          if (!subtype) {
+            if (!template) {
+              template = "empty";
+            }
+          } else {
+
+            if (subtype === chatbotTypes.CHATBOT) {
+              if (!template) {
+                template = "empty";
+              }
+            } else if (subtype === chatbotTypes.WEBHOOK) {
+              template = "blank_webhook"
+            } else if (subtype === chatbotTypes.COPILOT) {
+              template = "blank_copilot"
+            } else {
+              template = "empty";  
+            }
+          }
+
           if (!template) {
             template = "empty";
           }
@@ -89,7 +110,6 @@ class FaqService {
           { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },
           { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },
           { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },
-
           // { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
           { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action', 'intent_display_name': 'action1', 'topic': 'sample' },
           { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/', 'intent_display_name': 'yes_action', 'topic': 'sample' },
@@ -108,76 +128,78 @@ class FaqService {
         //   { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },            
         //   { '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', 'topic': 'internal' }, //TODO se metto spazio n * nn va              
         // ]
-        faqsArray = [{
-          "webhook_enabled": false,
-          "enabled": true,
-          "actions": [{
-            "_tdActionType": "reply",
-            "text": "I didn't understand. Can you rephrase your question?",
+        faqsArray = [
+          {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "reply",
+              "text": "I didn't understand. Can you rephrase your question?",
+              "attributes": {
+                "commands": [{
+                  "type": "wait",
+                  "time": 500
+                }, {
+                  "type": "message",
+                  "message": {
+                    "type": "text",
+                    "text": "I didn't understand. Can you rephrase your question?"
+                  }
+                }]
+              }
+            }],
+            "intent_display_name": "defaultFallback",
             "attributes": {
-              "commands": [{
-                "type": "wait",
-                "time": 500
-              },{
-                "type": "message",
-                "message": {
-                  "type": "text",
-                  "text": "I didn't understand. Can you rephrase your question?"
-                }
-              }]
+              "position": {
+                "x": 714,
+                "y": 528
+              }
             }
-          }],
-          "intent_display_name": "defaultFallback",
-          "attributes": {
-            "position": {
-              "x": 714,
-              "y": 528
-            }
-          }
-        }, {
-          "webhook_enabled": false,
-          "enabled": true,
-          "actions": [{
-            "_tdActionType": "intent",
-            "intentName": "#" + custom_intent_id
-          }],
-          "question": "\\start",
-          "intent_display_name": "start",
-          "attributes": {
-            "position": {
-              "x": 172,
-              "y": 384
+          }, {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "intent",
+              "intentName": "#" + custom_intent_id
+            }],
+            "question": "\\start",
+            "intent_display_name": "start",
+            "attributes": {
+              "position": {
+                "x": 172,
+                "y": 384
+              }
             }
-          }
-        }, {
-          "webhook_enabled": false,
-          "enabled": true,
-          "actions": [{
-            "_tdActionType": "reply",
+          }, {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "reply",
+              "attributes": {
+                "disableInputMessage": false,
+                "commands": [{
+                  "type": "wait",
+                  "time": 500
+                }, {
+                  "type": "message",
+                  "message": {
+                    "type": "text",
+                    "text": "Hi, how can I help you?"
+                  }
+                }]
+              },
+              "text": "Hi, how can I help you?\r\n"
+            }],
+            "intent_display_name": "welcome",
+            "intent_id": custom_intent_id,
             "attributes": {
-              "disableInputMessage": false,
-              "commands": [{
-                "type": "wait",
-                "time": 500
-              }, {
-                "type": "message",
-                "message": {
-                  "type": "text",
-                  "text": "Hi, how can I help you?"
-                }
-              }]
-            },
-            "text": "Hi, how can I help you?\r\n"
-          }],
-          "intent_display_name": "welcome",
-          "intent_id": custom_intent_id,
-          "attributes": {
-            "position": {
-              "x": 714,
-              "y": 113
+              "position": {
+                "x": 714,
+                "y": 113
+              }
             }
           }
-        }]
+        ]
 
       }
 
@@ -196,7 +218,89 @@ class FaqService {
         faqsArray = [];
       }
 
+      if (template === "blank_webhook") {
+        let custom_intent_id = uuidv4();
+
+        faqsArray = [
+          {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "intent",
+              "intentName": "#" + custom_intent_id
+            }],
+            "question": "",
+            "intent_display_name": "webhook",
+            "attributes": {
+              "position": {
+                "x": 172,
+                "y": 384
+              }
+            }
+          },
+          {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "web_response",
+              "status": 200,
+              "bodyType": "json",
+              "payload": '{"success": true , "message": "Your webhook is online!"}'
+            }],
+            "intent_display_name": "response",
+            "intent_id": custom_intent_id,
+            "attributes": {
+              "position": {
+                "x": 714,
+                "y": 113
+              }
+            }
+          }
+        ]
+      }
+
+      if (template === "blank_copilot") {
+        let custom_intent_id = uuidv4();
+
+        faqsArray = [
+          {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "intent",
+              "intentName": "#" + custom_intent_id
+            }],
+            "question": "",
+            "intent_display_name": "webhook",
+            "attributes": {
+              "position": {
+                "x": 172,
+                "y": 384
+              }
+            }
+          },
+          {
+            "webhook_enabled": false,
+            "enabled": true,
+            "actions": [{
+              "_tdActionType": "web_response",
+              "status": 200,
+              "bodyType": "json",
+              "payload": '{"title": "Official Copilot", "text": "This is a suggestion!"}'
+            }],
+            "intent_display_name": "response",
+            "intent_id": custom_intent_id,
+            "attributes": {
+              "position": {
+                "x": 714,
+                "y": 113
+              }
+            }
+          }
+        ]
+      }
 
+    
       faqsArray.forEach(faq => {
 
         var newFaq = new Faq({

package/services/webhookService.js

@@ -0,0 +1,71 @@
+const faq_kb = require("../models/faq_kb");
+const httpUtil = require("../utils/httpUtil");
+const uuidv4 = require('uuid/v4');
+var jwt = require('jsonwebtoken');
+var winston = require('../config/winston');
+
+const port = process.env.PORT || '3000';
+let TILEBOT_ENDPOINT = "http://localhost:" + port + "/modules/tilebot/";;
+if (process.env.TILEBOT_ENDPOINT) {
+    TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT + "/"
+}
+winston.debug("TILEBOT_ENDPOINT: " + TILEBOT_ENDPOINT);
+
+class WebhookService {
+
+    async run(webhook, payload) {
+
+        return new Promise(async (resolve, reject) => {
+
+            winston.verbose("(WebhookService) Run webhook " + webhook.webhook_id);
+            let chatbot = await faq_kb.findById(webhook.chatbot_id).select("+secret").catch((err) => {
+                winston.error("Error finding chatbot ", err);
+                reject(err);
+            })
+
+            if (!chatbot) {
+                winston.verbose("Chatbot not found with id " + webhook.chatbot_id);
+                reject("Chatbot not found with id " + webhook.chatbot_id);
+            }
+
+            let token = await this.generateChatbotToken(chatbot);
+
+            let url = TILEBOT_ENDPOINT + 'block/' + webhook.id_project + "/" + webhook.chatbot_id + "/" + webhook.block_id;
+            winston.info("Webhook chatbot URL: ", url);
+
+            payload.async = webhook.async;
+            payload.token = token;
+
+            if (process.env.NODE_ENV === 'test') {
+                resolve(true);
+            }
+
+            await httpUtil.post(url, payload).then((response) => {
+                resolve(response.data);
+            }).catch((err) => {
+                winston.error("Error calling webhook on post: ", err);
+                reject(err);
+            })
+
+        })
+    }
+
+    async generateChatbotToken(chatbot) {
+        let signOptions = {
+          issuer: 'https://tiledesk.com',
+          subject: 'bot',
+          audience: 'https://tiledesk.com/bots/' + chatbot._id,
+          jwtid: uuidv4()
+        };
+      
+        let botPayload = chatbot.toObject();
+        let botSecret = botPayload.secret;
+      
+        var bot_token = jwt.sign(botPayload, botSecret, signOptions);
+        return bot_token;
+      }
+}
+
+let webhookService = new WebhookService();
+
+module.exports = webhookService;

package/test/faqService.js

@@ -22,7 +22,7 @@ let log = false;
 
 describe('FaqService()', function () {
 
-  it('create-and-search', (done) => {
+  it('createee-and-search', (done) => {
 
     var email = "test-subscription-" + Date.now() + "@email.com";
     var pwd = "pwd";
@@ -40,10 +40,12 @@ describe('FaqService()', function () {
             createdBy: savedUser._id,
             updatedBy: savedUser._id
           });
+          
 
           newFaq.save(function (err, savedFaq) {
             winston.debug("err", err);
             winston.debug("resolve", savedFaq);
+
             expect(savedBot.name).to.equal("testbot");
             expect(savedBot.secret).to.not.equal(null);
             expect(savedFaq.question).to.equal("question");
@@ -51,15 +53,15 @@ describe('FaqService()', function () {
             expect(savedFaq.intent_display_name).to.not.equal(undefined);
             expect(savedFaq.webhook_enabled).to.equal(false);
 
-            var query = { "id_project": savedProject._id };
+            var query = { "id_faq_kb": savedBot._id };
 
             // aggiunta qui 
             query.$text = { "$search": "question" };
 
             return Faq.find(query, { score: { $meta: "textScore" } })
               .sort({ score: { $meta: "textScore" } }) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
-              .lean().
-              exec(function (err, faqs) {
+              .lean()
+              .exec(function (err, faqs) {
                 if (log) { console.log("faqs", faqs); }
                 // expect(faqs.length).to.equal(1);
                 expect(faqs[0]._id.toString()).to.equal(savedFaq._id.toString());
@@ -106,7 +108,7 @@ describe('FaqService()', function () {
             expect(savedFaq.intent_display_name).to.equal("question1");
             expect(savedFaq.webhook_enabled).to.equal(false);
 
-            var query = { "id_project": savedProject._id };
+            var query = { "id_faq_kb": savedBot._id };
 
             // aggiunta qui 
             query.$text = { "$search": "question" };
@@ -115,6 +117,7 @@ describe('FaqService()', function () {
               .sort({ score: { $meta: "textScore" } }) //https://docs.mongodb.com/manual/reference/operator/query/text/#sort-by-text-search-score
               .lean().
               exec(function (err, faqs) {
+                if (err) { console.error("err: ", err )}
                 if (log) { console.log("faqs", faqs); }
                 // expect(faqs.length).to.equal(1);
                 expect(faqs[0]._id.toString()).to.equal(savedFaq._id.toString());