@tiledesk/tiledesk-tybot-connector 0.1.28 → 0.1.30

package/.env

@@ -1,8 +1,7 @@
 API_ENDPOINT=http://localhost:10002
 mongoUrl=mongodb://tiledesk-user1:YB62b7gQNGg3G9OW@tiledesk-prod-shard-00-00-vmvst.mongodb.net:27017,tiledesk-prod-shard-00-01-vmvst.mongodb.net:27017,tiledesk-prod-shard-00-02-vmvst.mongodb.net:27017/tiledesk-pre?ssl=true&replicaSet=tiledesk-prod-shard-0&authSource=admin&retryWrites=true
-REDIS_HOST=redis-17533.c135.eu-central-1-1.ec2.cloud.redislabs.com
-REDIS_PASSWORD=ZSKKrWfnR6o5Gkt17ZgPkKGu1DcrUTge
-REDIS_PORT=17533
+REDIS_HOST=localhost
+REDIS_PORT=6379
 TYBOT_ENDPOINT=http://localhost:10001
 CHATBOT_TOKEN=JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3ZWJob29rX2VuYWJsZWQiOmZhbHNlLCJ0eXBlIjoiZXh0ZXJuYWwiLCJsYW5ndWFnZSI6ImVuIiwicHVibGljIjpmYWxzZSwiX2lkIjoiNjM4Yzc5MDQxZGI0NDkwMDM1MTEwMjYwIiwibmFtZSI6IlRoZSBGb3JtIHYyIC0gZXh0IiwidXJsIjoiaHR0cHM6Ly90aWxlYm90LWRldi5oZXJva3VhcHAuY29tL2V4dC82MzhjNzhkNzFkYjQ0OTAwMzUxMTAxYzIiLCJpZF9wcm9qZWN0IjoiNjM4Yzc4YTYxZGI0NDkwMDM1MTBmZjkxIiwidHJhc2hlZCI6ZmFsc2UsImNyZWF0ZWRCeSI6IjVlMDlkMTZkNGQzNjExMDAxNzUwNmQ3ZiIsImNyZWF0ZWRBdCI6IjIwMjItMTItMDRUMTA6NDA6MDQuMjA3WiIsInVwZGF0ZWRBdCI6IjIwMjItMTItMDVUMDc6MjE6MDIuOTIxWiIsIl9fdiI6MCwiZGVzY3JpcHRpb24iOiJPbiBIZXJva3UiLCJpYXQiOjE2NzA2NzE4ODksImF1ZCI6Imh0dHBzOi8vdGlsZWRlc2suY29tL2JvdHMvNjM4Yzc5MDQxZGI0NDkwMDM1MTEwMjYwIiwiaXNzIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJzdWIiOiJib3QiLCJqdGkiOiJmNDVlZGIwYS0zNzVhLTQ0NjMtYjFhZi1jM2ZiZDg4YmE3ZGQifQ.FbW3csHl1sQgSyRz5Jg0qaTvvpXWXgWHlJ1JWoVbv3s
 CHATBOT_ENDPOINT=http://localhost:10001

package/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Tiledesk tybotRoute
 
-**npm @tiledesk/tiledesk-tybot-connector@0.1.23**
+**npm @tiledesk/tiledesk-tybot-connector**
 
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.30 - online
+- Fixed wrong bot_answer["_raw_message"]
+
+### 0.1.29 - online
+- Added process.exit(1) in tybot-route.startApp when no Redis connection is available to facilitate Cluster start
+- Debug console.log() removed.
+
 ### 0.1.28 - online
 - Added a 'serious' integration test for chatbot
 - Removed reference to requestId and depId from processInlineDirectives()

package/TdCache.js

@@ -19,7 +19,6 @@ class TdCache {
                     password: this.redis_password
                 });
             this.client.on('error', err => {
-                console.log('Redis connection error', err);
                 reject(err);
                 if (callback) {
                     callback(err);

package/index.js

@@ -189,6 +189,8 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   if (log) {console.log("request...", request);}
   let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, TILEDESK_API_ENDPOINT: APIURL, TILEBOT_ENDPOINT:process.env.TYBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
   // PIPELINE-EXT
+  if (log) {console.log("answer to process:", JSON.stringify(answer));}
+  const original_answer_text = answer.text;
   const bot_answer = await ExtUtil.execPipelineExt(request, answer, directivesPlug, tdcache, log);
   // console.log("bot_answer", bot_answer)
   //const bot_answer = answer;
@@ -215,7 +217,9 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   //      triggeredByMessageId: '6392e5e8408e0000437aa383'
   //    }
   if (bot_answer) {
-    bot_answer["_raw_message"] = answer.text;
+    if (log) {console.log("adding to bot_answer original_answer_text:", JSON.stringify(original_answer_text));}
+    bot_answer["_raw_message"] = original_answer_text;
+    if (log) {console.log("bot_answer", JSON.stringify(bot_answer));}
     tdclient.sendSupportMessage(requestId, bot_answer, (err, response) => {
       if (err) {
         console.error("Error sending message", err);
@@ -291,13 +295,15 @@ function startApp(settings, completionCallback) {
       console.log("(Tilebot) mongodb connection ok.");
       if (tdcache) {
         try {
+          console.log("(Tilebot) Connecting Redis...");
           await tdcache.connect();
         }
         catch (error) {
           tdcache = null;
-          console.error("(Tilebot) tdcache (Redis) connection error:", error);
+          console.error("(Tilebot) Redis connection error:", error);
+          process.exit(1);
         }
-        console.log("(Tilebot) tdcache (Redis) connected.");
+        console.log("(Tilebot) Redis connected.");
       }
       console.info("Tilebot started.");
       if (completionCallback) {

package/models/TiledeskChatbot.js

@@ -258,9 +258,9 @@ class TiledeskChatbot {
       await this.lockIntent(this.requestId, intent_name);
       const user_reply = message.text;
       let form_reply = await this.execIntentForm(user_reply, intent_form);
-      console.log("got form reply", form_reply)
+      // console.log("got form reply", form_reply)
       if (!form_reply.canceled && form_reply.message) {
-        console.log("Form replying for next field...");
+        // console.log("Form replying for next field...");
         if (this.log) {console.log("Sending form reply...", form_reply.message)}
         // reply with this message (ex. please enter your fullname)
         if (!form_reply.message.attributes) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
-    "test": "mocha",
+    "test": "mocha  --exit",
     "start": "node index.js"
   },
   "keywords": [],

package/test/conversation1-test.js

@@ -8,8 +8,12 @@ app.use("/", tybotRoute);
 require('dotenv').config();
 const bodyParser = require('body-parser');
 
-const REQUEST_ID = "support-group-" + process.env.TEST_PROJECT_ID + "-" + Date.now();
-console.log("REQUEST_ID:", REQUEST_ID);
+const PROJECT_ID = process.env.TEST_PROJECT_ID;
+const REQUEST_ID = "support-group-" + PROJECT_ID + "-" + Date.now();
+const BOT_ID = process.env.TEST_BOT_ID;
+const CHATBOT_TOKEN = process.env.CHATBOT_TOKEN;
+
+// console.log("REQUEST_ID:", REQUEST_ID);
 let app_listener;
 
 before( () => {
@@ -82,7 +86,7 @@ describe('Conversation1', async() => {
         // console.log('endpointServer started', listener.address());
       });
       
-      const botId = process.env.TEST_BOT_ID;
+      // const botId = process.env.TEST_BOT_ID;
       // console.log("botId:", botId);
       let request = {
         "payload": {
@@ -92,15 +96,15 @@ describe('Conversation1', async() => {
           "sender": "A-SENDER",
           "recipient": REQUEST_ID,
           "text": "/start",
-          "id_project": process.env.TEST_PROJECT_ID,
+          "id_project": PROJECT_ID,
           "metadata": "",
           "request": {
             "request_id": REQUEST_ID
           }
         },
-        "token": process.env.CHATBOT_TOKEN
+        "token": CHATBOT_TOKEN
       }
-      sendMessageToBot(request, botId, process.env.CHATBOT_TOKEN, () => {
+      sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
         // console.log("Message sent.");
       });
     });
@@ -128,10 +132,10 @@ describe('Conversation1', async() => {
       
       listener = endpointServer.listen(10002, '0.0.0.0', function () {
         // console.log('endpointServer started', listener.address());
-        const botId = process.env.TEST_BOT_ID;
-        const PROJECT_ID = process.env.TEST_PROJECT_ID;
-        console.log("botId:", botId);
-        console.log("REQUEST_ID:", REQUEST_ID);
+        // const botId = process.env.TEST_BOT_ID;
+        // const PROJECT_ID = process.env.TEST_PROJECT_ID;
+        // console.log("botId:", botId);
+        // console.log("REQUEST_ID:", REQUEST_ID);
         let request = {
           "payload": {
             "_id": "ID",
@@ -147,9 +151,78 @@ describe('Conversation1', async() => {
               "id_project": PROJECT_ID
             }
           },
-          "token": process.env.CHATBOT_TOKEN
+          "token": CHATBOT_TOKEN
+        }
+        sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
+          // console.log("Message sent.");
+        });
+      });
+    });
+
+    it('/good_form', (done) => {
+      console.log("/good_form...");
+      let listener;
+      let endpointServer = express();
+      endpointServer.use(bodyParser.json());
+      endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
+        // console.log("req.body:", JSON.stringify(req.body));
+        res.send({success: true});
+        const message = req.body;
+
+        if (message.text === "Your name?") {
+          const reply_text = "Andrea";
+          let request = {
+            "payload": {
+              "_id": "ID",
+              "senderFullname": "guest#367e",
+              "type": "text",
+              "sender": "A-SENDER",
+              "recipient": REQUEST_ID,
+              "text": reply_text,
+              "id_project": PROJECT_ID,
+              "request": {
+                "request_id": REQUEST_ID,
+                "id_project": PROJECT_ID
+              }
+            },
+            "token": CHATBOT_TOKEN
+          }
+          sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
+            // console.log("Message sent.", request);
+          });
+        }
+        else if (message.text === "It's a good form Andrea") {
+          listener.close( () => {
+            done();
+          });
+        }
+        else {
+          console.error("Unexpected message.");
+          assert.ok(false);
+        }
+        
+      });
+      
+      listener = endpointServer.listen(10002, '0.0.0.0', function () {
+        // console.log('endpointServer started', listener.address());
+        // console.log("REQUEST_ID:", REQUEST_ID);
+        let request = {
+          "payload": {
+            "_id": "ID",
+            "senderFullname": "guest#367e",
+            "type": "text",
+            "sender": "A-SENDER",
+            "recipient": REQUEST_ID,
+            "text": "/good_form",
+            "id_project": PROJECT_ID,
+            "request": {
+              "request_id": REQUEST_ID,
+              "id_project": PROJECT_ID
+            }
+          },
+          "token": CHATBOT_TOKEN
         }
-        sendMessageToBot(request, botId, process.env.CHATBOT_TOKEN, () => {
+        sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
           // console.log("Message sent.");
         });
       });

package/tiledeskChatbotPlugs/MarkbotChatbotPlug.js

@@ -32,7 +32,7 @@ class MarkbotChatbotPlug {
     // console.log("message.text:", incoming_message_text);
     // console.log("message commands:", commands)
     if (incoming_message_text === "" && !commands) {
-      console.log("message with no content. Ignoring");
+      // console.log("message with no content. Ignoring");
       pipeline.message = null;
       pipeline.nextplug();
       return;

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -9,7 +9,7 @@ class DirLockIntent {
   }
 
   async execute(directive, requestId, callback) {
-    console.log("Locking intent");
+    // console.log("Locking intent");
     if (directive.parameter) {
       let intent_name = directive.parameter.trim();
       await this.lockIntent(requestId, intent_name);
@@ -22,7 +22,7 @@ class DirLockIntent {
 
   async lockIntent(requestId, intent_name) {
     await this.tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
-    console.log("locked.", intent_name);
+    // console.log("locked.", intent_name);
   }
   
 }