@tiledesk/tiledesk-tybot-connector 0.2.143 → 0.2.145

package/CHANGELOG.md

@@ -17,6 +17,12 @@ available on:
 - Added flowError on JSONCondition when result = null
 - Added fix on Filler -->
 
+# v0.2.145
+- added: TILEBOT_ENDPOINT env variable to startApp method
+
+# v0.2.144
+- Removed userFlowAttributes from message.attributes (fix message too long issue)
+
 # v0.2.143
 - Changed: env var TILEBOT_ENDPOINT replaced with TILEBOT_ENDPOINT
 
@@ -24,7 +30,7 @@ available on:
 - Bug-fix: action.isInfo added in DirMessage fo fix test
 
 # v0.2.141
-- Bug-fix: message.attributes.payload not not visible on first message
+- Bug-fix: message.attributes.payload not visible on first message
 
 # v0.2.140
 - Bug-fix: block hidden message for non-dev conversation

package/ExtApi.js

@@ -4,9 +4,9 @@ let https = require("https");
 class ExtApi {
 
   constructor(options) {
-    if (!options.ENDPOINT) {
-      throw new Error("options.ENDPOINT is mandatory");
-      //this.extEndpoint = `${options.TYBOT_ENDPOINT}/;
+    if (!options.TILEBOT_ENDPOINT) {
+      throw new Error("options.TILEBOT_ENDPOINT is mandatory");
+      //this.extEndpoint = `${options.TILEBOT_ENDPOINT}/;
     }
     if (options.log) {
       this.log = options.log;
@@ -14,7 +14,7 @@ class ExtApi {
     else {
       this.log = false;
     }
-    this.ENDPOINT = options.ENDPOINT;
+    this.TILEBOT_ENDPOINT = options.TILEBOT_ENDPOINT;
   }
 
   fixToken(token) {
@@ -37,7 +37,7 @@ class ExtApi {
    */
   sendSupportMessageExt(message, projectId, requestId, token, callback) {
     const jwt_token = this.fixToken(token);
-    const url = `${this.ENDPOINT}/ext/${projectId}/requests/${requestId}/messages`;
+    const url = `${this.TILEBOT_ENDPOINT}/ext/${projectId}/requests/${requestId}/messages`;
     if (this.log) {console.log("sendSupportMessageExt URL", url);}
     const HTTPREQUEST = {
       url: url,

package/index.js

@@ -33,6 +33,7 @@ let mongoose = require('mongoose');
 // const { Directives } = require('./tiledeskChatbotPlugs/directives/Directives.js');
 const { TiledeskChatbotUtil } = require('./models/TiledeskChatbotUtil.js'); //require('@tiledesk/tiledesk-chatbot-util');
 let API_ENDPOINT = null;
+let TILEBOT_ENDPOINT = null;
 let staticBots;
 
 router.post('/ext/:botid', async (req, res) => {
@@ -211,7 +212,7 @@ router.post('/ext/:botid', async (req, res) => {
           chatbot: chatbot,
           supportRequest: message.request,
           API_ENDPOINT: API_ENDPOINT,
-          TILEBOT_ENDPOINT:process.env.TILEBOT_ENDPOINT,
+          TILEBOT_ENDPOINT:TILEBOT_ENDPOINT,
           token: token,
           log: log,
           // HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT,
@@ -236,12 +237,9 @@ router.post('/ext/:botid', async (req, res) => {
     reply.attributes.splits = true;
     reply.attributes.markbot = true;
     reply.attributes.fillParams = true;
-    let extEndpoint = `${API_ENDPOINT}/modules/tilebot/`;
-    if (process.env.TILEBOT_ENDPOINT) {
-      extEndpoint = `${process.env.TILEBOT_ENDPOINT}`;
-    }
+    
     const apiext = new ExtApi({
-      ENDPOINT: extEndpoint,
+      TILEBOT_ENDPOINT: TILEBOT_ENDPOINT,
       log: false
     });
     apiext.sendSupportMessageExt(reply, projectId, requestId, token, () => {
@@ -314,9 +312,9 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   if (log) {
     console.log("/ext request....", JSON.stringify(request));
     console.log("/ext API_ENDPOINT....", API_ENDPOINT);
-    console.log("/ext process.env.TILEBOT_ENDPOINT....", process.env.TILEBOT_ENDPOINT);
+    console.log("/ext process.env.TILEBOT_ENDPOINT....", TILEBOT_ENDPOINT);
   }
-  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, API_ENDPOINT: API_ENDPOINT, TILEBOT_ENDPOINT:process.env.TILEBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
+  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, API_ENDPOINT: API_ENDPOINT, TILEBOT_ENDPOINT: TILEBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
   // let directivesPlug = null;
   // PIPELINE-EXT
   // if (log) {console.log("answer to process:", JSON.stringify(answer));}
@@ -601,7 +599,7 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
     "token": "NO-TOKEN"
   }
   if (this.log) {console.log("sendMessageToBot()...", JSON.stringify(request));}
-  sendMessageToBot(process.env.TILEBOT_ENDPOINT, request, bot_id, async () => {
+  sendMessageToBot(TILEBOT_ENDPOINT, request, bot_id, async () => {
     res.status(200).send({"success":true});
     return;
   });
@@ -627,6 +625,15 @@ async function startApp(settings, completionCallback) {
     console.log("(Tilebot) settings.API_ENDPOINT:", API_ENDPOINT);
   }
 
+  if (!settings.TILEBOT_ENDPOINT) {
+    TILEBOT_ENDPOINT = `${API_ENDPOINT}/modules/tilebot`
+  }
+  else {
+    TILEBOT_ENDPOINT = settings.TILEBOT_ENDPOINT
+  }
+  console.log("(Tilebot) settings.TILEBOT_ENDPOINT:", TILEBOT_ENDPOINT);
+
+
   if (settings.REDIS_HOST && settings.REDIS_PORT) {
     tdcache = new TdCache({
       host: settings.REDIS_HOST,
@@ -746,9 +753,6 @@ async function checkRequest(request_id, id_project) {
  */
 function sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
   // const jwt_token = this.fixToken(token);
-  if (!TILEBOT_ENDPOINT) {
-    TILEBOT_ENDPOINT = `${API_ENDPOINT}/modules/tilebot`
-  }
   const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
   console.log("sendMessageToBot URL", url);
   const HTTPREQUEST = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.143",
+  "version": "0.2.145",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -210,7 +210,6 @@ class DirectivesChatbotPlug {
       action: {
         "_tdThenStop": true,
         text: message,
-        isInfo: true,
         attributes: {
           runtimeError: {
             message: message

package/tiledeskChatbotPlugs/directives/DirConnectBlock.js

@@ -1,4 +1,3 @@
-//const { ExtApi } = require('../../ExtApi.js');
 let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
@@ -63,14 +62,8 @@ class DirConnectBlock {
       "token": this.token
     }
     if (this.log) {console.log("move to intent message:", intent_command_request);}
-    let TILEBOT_ENDPOINT;
-    if (this.TILEBOT_ENDPOINT) {
-      TILEBOT_ENDPOINT = this.TILEBOT_ENDPOINT;
-    }
-    else {
-      TILEBOT_ENDPOINT = `${this.API_ENDPOINT}/modules/tilebot`
-    }
-    this.sendMessageToBot(TILEBOT_ENDPOINT, intent_command_request, botId, () => {
+
+    this.sendMessageToBot(this.TILEBOT_ENDPOINT, intent_command_request, botId, () => {
       callback();
     });
   }
@@ -114,9 +107,9 @@ class DirConnectBlock {
    * @param {string} botId. Tiledesk botId
    * @param {string} token. User token
    */
-  sendMessageToBot(CHATBOT_ENDPOINT, message, botId, callback) {
+  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
     // const jwt_token = this.fixToken(token);
-    const url = `${CHATBOT_ENDPOINT}/ext/${botId}`;
+    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
     // console.log("sendMessageToBot URL", url);
     const HTTPREQUEST = {
       url: url,

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -1,4 +1,3 @@
-//const { ExtApi } = require('../../ExtApi.js');
 let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
@@ -81,14 +80,9 @@ class DirIntent {
       "token": this.token
     }
     if (this.log) {console.log("move to intent message:", intent_command_request);}
-    let TILEBOT_ENDPOINT;
-    if (this.TILEBOT_ENDPOINT) {
-      TILEBOT_ENDPOINT = this.TILEBOT_ENDPOINT;
-    }
-    else {
-      TILEBOT_ENDPOINT = `${this.API_ENDPOINT}/modules/tilebot`
-    }
-    this.sendMessageToBot(TILEBOT_ENDPOINT, intent_command_request, botId, () => {
+
+
+    this.sendMessageToBot(this.TILEBOT_ENDPOINT, intent_command_request, botId, () => {
       // console.log("sendMessageToBot() req_body sent:", intent_command_request);
       callback(true);
     });
@@ -138,9 +132,9 @@ class DirIntent {
    * @param {string} botId. Tiledesk botId
    * @param {string} token. User token
    */
-  sendMessageToBot(CHATBOT_ENDPOINT, message, botId, callback) {
+  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
     // const jwt_token = this.fixToken(token);
-    const url = `${CHATBOT_ENDPOINT}/ext/${botId}`;
+    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
     // console.log("sendMessageToBot URL", url);
     const HTTPREQUEST = {
       url: url,

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -3,17 +3,6 @@ const { Directives } = require('./Directives.js');
 
 class DirMessage {
 
-  // constructor(settings) {
-  //   if (!settings.API_ENDPOINT) {
-  //     throw new Error("settings.API_ENDPOINT is mandatory!");
-  //   }
-  //   this.API_ENDPOINT = settings.API_ENDPOINT;
-  //   this.TILEBOT_ENDPOINT = settings.TILEBOT_ENDPOINT;
-  //   this.projectId = settings.projectId;
-  //   this.requestId = settings.requestId;
-  //   this.token = settings.token;
-  // }
-
   constructor(context) {
     if (!context) {
       throw new Error('context object is mandatory.');
@@ -110,12 +99,8 @@ class DirMessage {
     //   }
     // }
 
-    let extEndpoint = `${this.API_ENDPOINT}/modules/tilebot`;
-    if (this.TILEBOT_ENDPOINT) {
-      extEndpoint = `${this.TILEBOT_ENDPOINT}`;
-    }
     const apiext = new ExtApi({
-      ENDPOINT: extEndpoint,
+      TILEBOT_ENDPOINT: this.TILEBOT_ENDPOINT,
       log: false
     });
     if (message.text) {

package/tiledeskChatbotPlugs/directives/DirMessageToBot.js

@@ -45,14 +45,8 @@ class DirMessageToBot {
       "token": this.token
     }
     if (this.log) {console.log("sending message:", JSON.stringify(outgoing_message));}
-    let TILEBOT_ENDPOINT;
-    if (this.TILEBOT_ENDPOINT) {
-      TILEBOT_ENDPOINT = this.TILEBOT_ENDPOINT;
-    }
-    else {
-      TILEBOT_ENDPOINT = `${this.API_ENDPOINT}/modules/tilebot`
-    }
-    this.sendMessageToBot(TILEBOT_ENDPOINT, outgoing_message, botId, () => {
+    
+    this.sendMessageToBot(this.TILEBOT_ENDPOINT, outgoing_message, botId, () => {
       // console.log("(DirMessageToBot) sendMessageToBot() req_body sent");
       callback(true);
     });
@@ -66,9 +60,9 @@ class DirMessageToBot {
    * @param {string} botId. Tiledesk botId
    * @param {string} token. User token
    */
-  sendMessageToBot(CHATBOT_ENDPOINT, message, botId, callback) {
+  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
     // const jwt_token = this.fixToken(token);
-    const url = `${CHATBOT_ENDPOINT}/ext/${botId}`;
+    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
     // console.log("sendMessageToBot URL", url);
     const HTTPREQUEST = {
       url: url,

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -121,10 +121,12 @@ class DirReply {
         message.attributes.intentName = this.context.reply.attributes.intent_info.intent_name;
       }
       // userFlowAttributes
-      let userFlowAttributes = TiledeskChatbotUtil.userFlowAttributes(requestAttributes);
-      if (this.log) { console.log("userFlowAttributes:", userFlowAttributes); }
-      if (userFlowAttributes) {
-        message.attributes["flowAttributes"] = userFlowAttributes;
+      if (this.projectId === "656054000410fa00132e5dcc") {
+        let userFlowAttributes = TiledeskChatbotUtil.userFlowAttributes(requestAttributes);
+        if (this.log) { console.log("userFlowAttributes:", userFlowAttributes); }
+        if (userFlowAttributes) {
+          message.attributes["flowAttributes"] = userFlowAttributes;
+        }
       }
     }
     // send!

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -255,11 +255,14 @@ class DirReplyV2 {
         message.attributes.intentName = this.context.reply.attributes.intent_info.intent_name;
       }
       // userFlowAttributes
-      let userFlowAttributes = TiledeskChatbotUtil.userFlowAttributes(requestAttributes);
-      if (this.log) { console.log("userFlowAttributes:", userFlowAttributes); }
-      if (userFlowAttributes) {
-        message.attributes["flowAttributes"] = userFlowAttributes;
+      if (this.projectId === "656054000410fa00132e5dcc") { 
+        let userFlowAttributes = TiledeskChatbotUtil.userFlowAttributes(requestAttributes);
+        if (this.log) { console.log("userFlowAttributes:", userFlowAttributes); }
+        if (userFlowAttributes) {
+          message.attributes["flowAttributes"] = userFlowAttributes;
+        }
       }
+      
     }
     // send!
     let cleanMessage = message;