@tiledesk/tiledesk-tybot-connector 0.1.56 → 0.1.58

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.57
+- Added Filter on message.commands based on optional _tdJSONCondition field
+- TiledeskExpression: introduced "type" for operand2 (type: "const" and type: "var")
+- added addParameter(TiledeskChatbotConst.REQ_CHAT_URL, chat_url)
+- renamed all system attributes, "td" prefix removed
+- added class IntentsMachineFactory
+- added headersString in WebRequest
+- fixed await bot bug. Full text search and webhook affected
+
 ### 0.1.56
 - DirWebRequest added
 - SetAttribute added

package/TiledeskExpression.js

@@ -88,11 +88,29 @@ class TiledeskExpression {
     }
 
     // public
-    evaluateStaticExpression(expression) {
-        const result = new TiledeskExpression().evaluate(expression);
+    evaluateStaticExpression(expression, variables) {
+        const result = new TiledeskExpression().evaluateJavascriptExpression(expression, variables);
         return result;
     }
 
+    evaluateJavascriptExpression(expression, context) {
+        // console.log("evaluating:", expression)
+        console.log("context:", context)
+        let res;
+        try {
+            const vm = new VM({
+                timeout: 200,
+                allowAsync: false,
+                sandbox: context
+            });
+            res = vm.run(`let $data = this;${expression}`);
+        }
+        catch (err) {
+            console.error("TiledeskExpression.evaluate() error:", err.message, "evaluating expression: '" + expression + "'");
+        }
+        return res;
+    }
+
     // private
     // evaluate(expression, context) {
     //     let fn;
@@ -108,6 +126,7 @@ class TiledeskExpression {
     //     return res;
     // }
 
+    // DEPRECATED
     evaluate(expression, context) {
         // console.log("evaluating:", expression)
         // console.log("context:", context)
@@ -135,9 +154,16 @@ class TiledeskExpression {
         // console.log("operator:", operator);
         const applyPattern = operator.applyPattern;
         // console.log("applyPattern:", applyPattern);
-        const operand1_s = TiledeskExpression.stringValueOperand(condition.operand1, variables);
+        const operand1_s = TiledeskExpression.variableOperand(condition.operand1);
         // console.log("operand1_s:", operand1_s);
-        const operand2_s = TiledeskExpression.stringValueOperand(condition.operand2, variables);
+        let operand2_s;
+        if (condition.operand2 && condition.operand2.type && condition.operand2.type === "const") {
+            operand2_s = TiledeskExpression.stringValueOperand(condition.operand2.value, variables);
+        }
+        else if (condition.operand2 && condition.operand2.type && condition.operand2.type === "var") {
+            operand2_s = TiledeskExpression.variableOperand(condition.operand2.name);
+        }
+        
         // console.log("operand2_s:", operand2_s);
         const expression = 
             applyPattern
@@ -182,6 +208,10 @@ class TiledeskExpression {
     }
 
 
+    static variableOperand(operand) {
+        return "$data." + operand;
+    }
+
     static stringValueOperand(operand, variables) {
         // return operand;
         if (!operand) {

package/index.js

@@ -19,6 +19,7 @@ const { TiledeskIntentsMachine } = require('./models/TiledeskIntentsMachine.js')
 // const { MockActions } = require('./MockActions');
 const { MockBotsDataSource } = require('./models/MockBotsDataSource.js');
 const { TiledeskChatbotConst } = require('./models/TiledeskChatbotConst');
+const { IntentsMachineFactory } = require('./models/IntentsMachineFactory');
 
 //router.use(cors());
 router.use(bodyParser.json({limit: '50mb'}));
@@ -90,6 +91,7 @@ router.post('/ext/:botid', async (req, res) => {
   let botsDS;
   if (!staticBots) {
     botsDS = new MongodbBotsDataSource({projectId: projectId, botId: botId});
+    if (log) {console.log("botsDS created with Mongo");}
   }
   else {
     botsDS = new MockBotsDataSource(staticBots);
@@ -101,32 +103,41 @@ router.post('/ext/:botid', async (req, res) => {
   try {
     // bot = await botsDS.getBotById(botId);
     // bot = await botById(botId, projectId, tdcache, botsDS);
-    bot = botsDS.getBotByIdCache(botId, tdcache);
+    bot = await botsDS.getBotByIdCache(botId, tdcache);
   }
   catch(error) {
     console.error("Error getting botId:", botId);
     console.error("Error getting bot was:", error);
     return;
   }
+  if (log) {console.log("bot found:", bot);}
   
   let intentsMachine;
   if (!staticBots) {
-    if (log) {console.log("intentsMachine to MongoDB");}
-    intentsMachine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
-    if (bot.intentsEngine === "tiledesk-ai") {
-      if (log) {console.log("intentsMachine to tiledesk-ai");}
-      intentsMachine = new TiledeskIntentsMachine(
-        {
-          //projectId: projectId,
-          //language: bot.language,
-          botId: botId
-          //TILEBOT_AI_ENDPOINT: process.env.TILEBOT_AI_ENDPOINT
-        });
-    }
+    intentsMachine = IntentsMachineFactory.getMachine(bot, botId, projectId, log);
   }
   else {
     intentsMachine = {}
   }
+
+  // let intentsMachine;
+  // if (!staticBots) {
+  //   if (log) {console.log("intentsMachine to MongoDB");}
+  //   intentsMachine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
+  //   if (bot.intentsEngine === "tiledesk-ai") {
+  //     if (log) {console.log("intentsMachine to tiledesk-ai");}
+  //     intentsMachine = new TiledeskIntentsMachine(
+  //       {
+  //         //projectId: projectId,
+  //         //language: bot.language,
+  //         botId: botId
+  //         //TILEBOT_AI_ENDPOINT: process.env.TILEBOT_AI_ENDPOINT
+  //       });
+  //   }
+  // }
+  // else {
+  //   intentsMachine = {}
+  // }
   //const intentsMachine = new TiledeskIntentsMachine({API_ENDPOINT: "https://MockIntentsMachine.tiledesk.repl.co", log: true});
   const chatbot = new TiledeskChatbot({
     botsDataSource: botsDS,
@@ -141,8 +152,6 @@ router.post('/ext/:botid', async (req, res) => {
     projectId: projectId,
     log: log
   });
-  // console.log("log:", log)
-  // process.exit(1)
   await updateRequestVariables(chatbot, message, projectId, requestId);
 
   let reply = await chatbot.replyToMessage(message);
@@ -233,6 +242,8 @@ router.post('/ext/:botid', async (req, res) => {
 async function updateRequestVariables(chatbot, message, projectId, requestId) {
   // update request context
   const messageId = message._id;
+  const chat_url = `https://panel.tiledesk.com/v3/dashboard/#/project/${projectId}/wsrequest/${requestId}/messages`
+  await chatbot.addParameter(TiledeskChatbotConst.REQ_CHAT_URL, chat_url);
   await chatbot.addParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY, projectId);
   // TODO add projectName too
   await chatbot.addParameter(TiledeskChatbotConst.REQ_REQUEST_ID_KEY, requestId);
@@ -529,7 +540,6 @@ async function startApp(settings, completionCallback) {
     mongoose.connect(settings.MONGODB_URI, { "useNewUrlParser": true, "autoIndex": false }, async (err) => {
       if (err) { 
         console.error('(Tilebot) Failed to connect to MongoDB on ' + settings.MONGODB_URI + " ", err);
-        //process.exit(1); // add => exitOnFail: true
       }
       else {
         console.log("(Tilebot) mongodb connection ok.");

package/models/IntentsMachineFactory.js

@@ -0,0 +1,21 @@
+const { MongodbIntentsMachine } = require('./MongodbIntentsMachine.js');
+
+class IntentsMachineFactory {
+
+    static getMachine(bot, botId, projectId, log) {
+      let machine;
+      if (bot.intentsEngine === "tiledesk-ai") {
+        machine = new TiledeskIntentsMachine(
+          {
+            botId: botId
+          });
+      }
+      else {
+        if (log) {console.log("Setting MongodbIntentsMachine with bot:", JSON.stringify(bot));}
+        machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
+      }
+      return machine;
+    }
+  }
+  
+  module.exports = { IntentsMachineFactory }

package/models/MongodbIntentsMachine.js

@@ -26,6 +26,7 @@ class MongodbIntentsMachine {
       var sort = undefined;
       var search_obj = { "$search": text };
   
+      if (this.log) {console.log("chatbot lang:", this.language);}
       if (this.language) {
           search_obj["$language"] = this.language;
       }

package/models/TiledeskChatbot.js

@@ -449,6 +449,7 @@ class TiledeskChatbot {
       static_bot_answer.attributes.updateUserFullname = clientUpdateUserFullname;
     }
     // exec webhook
+    if (this.log) {console.log("exec webhook on bot:", JSON.stringify(this.bot));}
     const bot_answer = await this.execWebhook(static_bot_answer, message, this.bot, context, this.token);
     if (this.log) {console.log("bot_answer ready:", JSON.stringify(bot_answer));}
     return bot_answer;

package/models/TiledeskChatbotConst.js

@@ -1,19 +1,36 @@
 class TiledeskChatbotConst {
     
-    static REQ_DEPARTMENT_ID_KEY = "tdDepartmentId";
-    static REQ_PROJECT_ID_KEY = "tdProjectId";
-    static REQ_REQUEST_ID_KEY = "tdRequestId";
-    static REQ_CHATBOT_NAME_KEY = "tdChatbotName";
-    static REQ_LAST_USER_TEXT_KEY = "tdLastUserText";
-    static REQ_LAST_MESSAGE_ID_KEY = "tdLastMessageId";
-    static REQ_COUNTRY_KEY = "tdCountry";
-    static REQ_CITY_KEY = "tdCity";
-    static REQ_USER_SOURCE_PAGE_KEY = "tdUserSourcePage";
-    static REQ_USER_LANGUAGE_KEY = "tdUserLanguage";
-    static REQ_USER_AGENT_KEY = "tdUserAgent";
-    static REQ_DEPARTMENT_NAME_KEY = "tdDepartmentName";
-    static REQ_END_USER_ID_KEY = "tdEndUserId";
-    static REQ_END_USER_IP_ADDRESS_KEY = "tdEndUserIpAddress";
+    static REQ_DEPARTMENT_ID_KEY = "department_id";
+    static REQ_PROJECT_ID_KEY = "project_id";
+    static REQ_REQUEST_ID_KEY = "conversation_id";
+    static REQ_CHATBOT_NAME_KEY = "chatbot_name";
+    static REQ_LAST_USER_TEXT_KEY = "last_user_text";
+    static REQ_LAST_MESSAGE_ID_KEY = "last_message_id";
+    static REQ_COUNTRY_KEY = "user_country";
+    static REQ_CITY_KEY = "user_city";
+    static REQ_USER_SOURCE_PAGE_KEY = "user_source_page";
+    static REQ_USER_LANGUAGE_KEY = "user_language";
+    static REQ_USER_AGENT_KEY = "user_agent";
+    static REQ_DEPARTMENT_NAME_KEY = "department_name";
+    static REQ_END_USER_ID_KEY = "user_id";
+    static REQ_END_USER_IP_ADDRESS_KEY = "user_ip_address";
+    static REQ_CHAT_URL = "chat_url";
+
+    // static REQ_DEPARTMENT_ID_KEY = "tdDepartmentId";
+    // static REQ_PROJECT_ID_KEY = "projectId";
+    // static REQ_REQUEST_ID_KEY = "tdRequestId";
+    // static REQ_CHATBOT_NAME_KEY = "tdChatbotName";
+    // static REQ_LAST_USER_TEXT_KEY = "tdLastUserText";
+    // static REQ_LAST_MESSAGE_ID_KEY = "tdLastMessageId";
+    // static REQ_COUNTRY_KEY = "tdCountry";
+    // static REQ_CITY_KEY = "tdCity";
+    // static REQ_USER_SOURCE_PAGE_KEY = "tdUserSourcePage";
+    // static REQ_USER_LANGUAGE_KEY = "tdUserLanguage";
+    // static REQ_USER_AGENT_KEY = "tdUserAgent";
+    // static REQ_DEPARTMENT_NAME_KEY = "tdDepartmentName";
+    // static REQ_END_USER_ID_KEY = "tdEndUserId";
+    // static REQ_END_USER_IP_ADDRESS_KEY = "tdEndUserIpAddress";
+    // static REQ_CHAT_URL = "chat_url";
     
 }
 

package/models/TiledeskChatbotUtil.js

@@ -1,3 +1,5 @@
+const { TiledeskExpression } = require('../TiledeskExpression');
+
 class TiledeskChatbotUtil {
 
     static parseIntent(explicit_intent_name) {
@@ -44,24 +46,36 @@ class TiledeskChatbotUtil {
     //     }
     // }
 
-    static filterOnLanguage(commands, lang) {
-        if (!lang) {
+    static filterOnVariables(commands, variables) {
+        if (!variables) {
           return;
         }
         if (commands.length > 0) {
           for (let i = commands.length - 1; i >= 0; i--) {
-            // console.log("...commands[" + i + "]");
+            console.log("...commands[" + i + "]");
             if (commands[i].type === "message") { // is a message, not wait
                 // console.log("commands[i]:", commands[i].message.lang);
                 // console.log("commands[i]:", lang, (commands[i].message["lang"] === lang));
-                if (commands[i].message["lang"] && !(commands[i].message["lang"] === lang)) { // if there is a filter and the filter is false, remove
+                
+                // if (commands[i].message["lang"] && !(commands[i].message["lang"] === lang)) { // if there is a filter and the filter is false, remove
+                const jsonCondition = commands[i].message["_tdJSONCondition"];
+                console.log("jsonCondition:", jsonCondition);
+                if (jsonCondition) {
+                    const expression = TiledeskExpression.JSONGroupsToExpression(jsonCondition.groups);
+                    console.log("full json condition expression eval on command.message:", expression);
+                    const conditionResult = new TiledeskExpression().evaluateStaticExpression(expression, variables);
+                    console.log("conditionResult:", conditionResult);
+                    // FALSE
                     // console.log("commands[i]lang:", commands[i]);
-                    commands.splice(i, 1);
-                    if (commands[i-1]) {
-                        // console.log("commands[i-1]?:", commands[i-1]);
-                        if (commands[i-1].type === "wait") {
-                            commands.splice(i-1, 1);
-                            i--;
+                    if (conditionResult === false) {
+                        console.log("deleting command:", commands[i]);
+                        commands.splice(i, 1);
+                        if (commands[i-1]) {
+                            // console.log("commands[i-1]?:", commands[i-1]);
+                            if (commands[i-1].type === "wait") {
+                                commands.splice(i-1, 1);
+                                i--;
+                            }
                         }
                     }
                 }

package/package.json

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

package/test/condition_json_to_expression_test.js

@@ -7,29 +7,41 @@ describe('JSON to expression', function() {
   it('test condition operand lessThan (false)', async () => {
     const condition = {
       "type": "condition",
-      "operand1": "12",
+      "operand1": "age",
       "operator": TiledeskExpression.OPERATORS.lessThan.name,
-      "operand2": "10"
+      "operand2": {
+        type: "const",
+        value: "10"
+      }
+    }
+    const vars = {
+      age: 12
     }
-    
     const expression = TiledeskExpression.JSONConditionToExpression(condition);
-    assert(expression === "Number(\"" + condition.operand1 + "\") < Number(\"" + condition.operand2 + "\")");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === 'Number($data.age) < Number("10")');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     assert(result === false);
   });
 
   it('test condition operand lessThan (true)', async () => {
     const condition = {
       "type": "condition",
-      "operand1": "10",
+      "operand1": "age",
       "operator": TiledeskExpression.OPERATORS.lessThan.name,
-      "operand2": "12"
+      "operand2": {
+        type: "const",
+        value: "12"
+      }
     }
     
+    const vars = {
+      age: 10
+    }
     const expression = TiledeskExpression.JSONConditionToExpression(condition);
-    // console.log("expression:", expression);
-    assert(expression === "Number(\"" + condition.operand1 + "\") < Number(\"" + condition.operand2 + "\")");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === 'Number($data.age) < Number("12")');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -37,14 +49,20 @@ describe('JSON to expression', function() {
   it('test condition operand greaterThan (true)', async () => {
     const condition = {
       "type": "condition",
-      "operand1": "12",
+      "operand1": "age",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "10"
+      "operand2": {
+        type: "const",
+        value: "10"
+      }
+    }
+    const vars = {
+      age: 12
     }
-    
     const expression = TiledeskExpression.JSONConditionToExpression(condition);
-    assert(expression === "Number(\"" + condition.operand1 + "\") > Number(\"" + condition.operand2 + "\")");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === 'Number($data.age) > Number("10")');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -52,14 +70,20 @@ describe('JSON to expression', function() {
   it('test condition operand startsWith (true)', async () => {
     const condition = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.startsWith.name,
-      "operand2": "And"
+      "operand2": {
+        type: "const",
+        value: "And"
+      }
+    }
+    const vars = {
+      name: "Andrea"
     }
-    
     const expression = TiledeskExpression.JSONConditionToExpression(condition);
-    assert(expression === "String(\"" + condition.operand1 + "\").startsWith(String(\"" + condition.operand2 + "\"))");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === 'String($data.name).startsWith(String("And"))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -67,9 +91,12 @@ describe('JSON to expression', function() {
   it('test condition group in "and" (true)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "2",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "1"
+      "operand2": {
+        type: "const",
+        value: "1"
+      }
     }
 
     const part2 = {
@@ -79,20 +106,26 @@ describe('JSON to expression', function() {
 
     const part3 = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.startsWith.name,
-      "operand2": "And"
+      "operand2": {
+        type: "const",
+        value: "And"
+      }
     }
 
     const group = {
       type: "expression",
       conditions: [ part1, part2, part3 ]
     }
-    
+    const vars = {
+      height: 2,
+      name: "Andrea"
+    }
     const expression = TiledeskExpression.JSONGroupToExpression(group);
-    // console.log("expression:", expression);
-    assert(expression === "(" + "Number(\"2\") > Number(\"1\") && String(\"Andrea\").startsWith(String(\"And\"))" + ")");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) > Number("1") && String($data.name).startsWith(String("And")))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -100,9 +133,12 @@ describe('JSON to expression', function() {
   it('test condition group in "and" (false)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "1",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "2"
+      "operand2": {
+        type: "const",
+        value: "2"
+      }
     }
 
     const part2 = {
@@ -112,19 +148,25 @@ describe('JSON to expression', function() {
 
     const part3 = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.startsWith.name,
-      "operand2": "Ond"
+      "operand2": {
+        type: "const",
+        value: "Ond"
+      }
     }
 
     const group = {
       conditions: [ part1, part2, part3 ]
     }
-    
+    const vars = {
+      height: 1,
+      name: "Andrea"
+    }
     const expression = TiledeskExpression.JSONGroupToExpression(group);
-    // console.log("expression:", expression);
-    assert(expression === "(" + "Number(\"1\") > Number(\"2\") && String(\"Andrea\").startsWith(String(\"Ond\"))" + ")");
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) > Number("2") && String($data.name).startsWith(String("Ond")))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === false);
   });
@@ -132,9 +174,12 @@ describe('JSON to expression', function() {
   it('test multiple conditions group (true)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "2",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "1"
+      "operand2": {
+        type: "const",
+        value: "1"
+      }
     }
 
     const part2 = {
@@ -146,7 +191,10 @@ describe('JSON to expression', function() {
       "type": "condition",
       "operand1": "Andrea",
       "operator": TiledeskExpression.OPERATORS.startsWith.name,
-      "operand2": "And"
+      "operand2": {
+        type: "const",
+        value: "And"
+      }
     }
 
     const part4 = {
@@ -156,9 +204,12 @@ describe('JSON to expression', function() {
 
     const part5 = {
       "type": "condition",
-      "operand1": "3",
+      "operand1": "size",
       "operator": TiledeskExpression.OPERATORS.equalAsNumbers.name,
-      "operand2": "03"
+      "operand2": {
+        type: "const",
+        value: "03"
+      }
     }
 
     const part6 = {
@@ -168,19 +219,26 @@ describe('JSON to expression', function() {
 
     const part7 = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.equalAsStrings.name,
-      "operand2": "Andrea"
+      "operand2": {
+        type: "const",
+        value: "Andrea"
+      }
     }
 
     const group = {
       conditions: [ part1, part2, part3, part4, part5, part6, part7 ]
     }
-    
+    const vars = {
+      height: 2,
+      size: 3,
+      name: "Andrea"
+    }
     const expression = TiledeskExpression.JSONGroupToExpression(group);
-    // console.log("expression:", expression);
-    assert(expression === '(Number("2") > Number("1") && String("Andrea").startsWith(String("And")) || Number("3") === Number("03") && String("Andrea") === String("Andrea"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) > Number("1") && String($data.Andrea).startsWith(String("And")) || Number($data.size) === Number("03") && String($data.name) === String("Andrea"))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -188,9 +246,12 @@ describe('JSON to expression', function() {
   it('test multiple groups (true)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "2",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "1"
+      "operand2": {
+        type: "const",
+        value: "1"
+      }
     }
 
     const part2 = {
@@ -200,16 +261,22 @@ describe('JSON to expression', function() {
 
     const part3 = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.startsWith.name,
-      "operand2": "And"
+      "operand2": {
+        type: "const",
+        value: "And"
+      }
     }
 
     const part5 = {
       "type": "condition",
-      "operand1": "3",
+      "operand1": "size",
       "operator": TiledeskExpression.OPERATORS.equalAsNumbers.name,
-      "operand2": "03"
+      "operand2": {
+        type: "const",
+        value: "03"
+      }
     }
 
     const part6 = {
@@ -219,9 +286,12 @@ describe('JSON to expression', function() {
 
     const part7 = {
       "type": "condition",
-      "operand1": "Andrea",
+      "operand1": "name",
       "operator": TiledeskExpression.OPERATORS.equalAsStrings.name,
-      "operand2": "Andrea"
+      "operand2": {
+        type: "const",
+        value: "Andrea"
+      }
     }
 
     const group1 = {
@@ -240,11 +310,15 @@ describe('JSON to expression', function() {
     }
 
     const groups = [group1, group_operator, group2];
-    
+    const vars = {
+      height: 2,
+      size: 3,
+      name: "Andrea"
+    }
     const expression = TiledeskExpression.JSONGroupsToExpression(groups);
-    // console.log("full expression:", expression);
-    assert(expression === '(Number("2") > Number("1") && String("Andrea").startsWith(String("And"))) || (Number("3") === Number("03") && String("Andrea") === String("Andrea"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) > Number("1") && String($data.name).startsWith(String("And"))) || (Number($data.size) === Number("03") && String($data.name) === String("Andrea"))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -252,9 +326,12 @@ describe('JSON to expression', function() {
   it('test multiple groups with one condition and one group (true)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "2",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.greaterThan.name,
-      "operand2": "1"
+      "operand2": {
+        type: "const",
+        value: "1"
+      }
     }
 
     const group1 = {
@@ -263,11 +340,13 @@ describe('JSON to expression', function() {
     }
 
     const groups = [group1];
-    
+    const vars = {
+      height: 2
+    }
     const expression = TiledeskExpression.JSONGroupsToExpression(groups);
-    // console.log("full expression:", expression);
-    assert(expression === '(Number("2") > Number("1"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) > Number("1"))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
@@ -275,32 +354,38 @@ describe('JSON to expression', function() {
   it('test multiple groups with one condition and one group (false)', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "2",
+      "operand1": "height",
       "operator": TiledeskExpression.OPERATORS.lessThan.name,
-      "operand2": "1"
+      "operand2": {
+        type: "const",
+        value: "1"
+      }
     }
-
     const group1 = {
       type: "expression",
       conditions: [ part1 ]
     }
-
     const groups = [group1];
-    
+    const vars = {
+      height: 2
+    }
     const expression = TiledeskExpression.JSONGroupsToExpression(groups);
-    // console.log("full expression:", expression);
-    assert(expression === '(Number("2") < Number("1"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    console.log("expression:", expression);
+    assert(expression === '(Number($data.height) < Number("1"))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === false);
   });
 
-  it('test variables, all set', async () => {
+  it('test variables, a > b true', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "$a",
-      "operator": TiledeskExpression.OPERATORS.lessThan.name,
-      "operand2": "$b"
+      "operand1": "a",
+      "operator": TiledeskExpression.OPERATORS.greaterThan.name,
+      "operand2": {
+        type: "var",
+        name: "b"
+      }
     }
 
     const group1 = {
@@ -308,27 +393,30 @@ describe('JSON to expression', function() {
       conditions: [ part1 ]
     }
 
-    const variables = {
-      "a": "1",
-      "b": "2"
+    const vars = {
+      "a": "2.5",
+      "b": "2.4"
     }
 
     const groups = [group1];
     
-    const expression = TiledeskExpression.JSONGroupsToExpression(groups, variables);
-    // console.log("full expression:", expression);
-    assert(expression === '(Number("1") < Number("2"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
+    const expression = TiledeskExpression.JSONGroupsToExpression(groups);
+    console.log("full expression2:", expression);
+    assert(expression === '(Number($data.a) > Number($data.b))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
     // console.log("result:", result);
     assert(result === true);
   });
 
-  it('test variables, some not set', async () => {
+  it('test variables, a < b true', async () => {
     const part1 = {
       "type": "condition",
-      "operand1": "$a",
+      "operand1": "a",
       "operator": TiledeskExpression.OPERATORS.lessThan.name,
-      "operand2": "$b"
+      "operand2": {
+        type: "var",
+        name: "b"
+      }
     }
 
     const group1 = {
@@ -336,49 +424,52 @@ describe('JSON to expression', function() {
       conditions: [ part1 ]
     }
 
-    const variables = {
-      // "a": "1",
+    const vars = {
+      "a": "1",
       "b": "2"
     }
 
     const groups = [group1];
     
-    const expression = TiledeskExpression.JSONGroupsToExpression(groups, variables);
-    // console.log("full expression:", expression);
-    assert(expression === '(Number("$a") < Number("2"))');
-    const result = new TiledeskExpression().evaluateStaticExpression(expression);
-    console.log("result:", result);
-    assert(result === false);
+    const expression = TiledeskExpression.JSONGroupsToExpression(groups);
+    console.log("full expression:", expression);
+    assert(expression === '(Number($data.a) < Number($data.b))');
+    const result = new TiledeskExpression().evaluateStaticExpression(expression, vars);
+    // console.log("result:", result);
+    assert(result === true);
   });
 
-  // it('test one', async () => {
-  //   const expression = {
-  //     groups: [
-  //       {
-  //         type: "expression",
-  //         conditions: [
-  //           {
-  //             type: "condition",
-  //             "operand1": "12",
-  //             "operator": TiledeskExpression.OPERATORS.lessThan,
-  //             "operand2": "10"
-  //           },
-  //           {
-  //             type: "operator",
-  //             operator: "OR"
-  //           },
-  //           { type: "condition", ...}
-  //         ]
-  //       },
-  //       {
-  //         type: "operator",
-  //         operator: "AND"
-  //       },
-  //       { type: "expression", ...}
-  //     ]
-
-  //   };
-  // });
+ 
+  // Struct
+    // const expression = {
+    //   groups: [
+    //     {
+    //       type: "expression",
+    //       conditions: [
+    //         {
+    //           type: "condition",
+    //           "operand1": "age",
+    //           "operator": TiledeskExpression.OPERATORS.lessThan,
+    //           "operand2": {
+    //             type: "const", // type: "var"
+    //             value: "10" // name: "b"
+    //           }
+    //         },
+    //         {
+    //           type: "operator",
+    //           operator: "OR"
+    //         },
+    //         { type: "condition", ...}
+    //       ]
+    //     },
+    //     {
+    //       type: "operator",
+    //       operator: "AND"
+    //     },
+    //     { type: "expression", ...}
+    //   ]
+    // };
+
     
 });
 

package/test/conversation-actions-test.js

@@ -83,8 +83,8 @@ describe('Conversation for actions test', async () => {
         else {
           // console.log("params /start:", params);
           assert(params);
-          assert(params["tdLastMessageId"] === message_id);
-          assert(params["tdProjectId"] === PROJECT_ID);
+          assert(params["last_message_id"] === message_id);
+          assert(params["project_id"] === PROJECT_ID);
           listener.close(() => {
             done();
           });

package/test/conversation-form-test.js

@@ -33,7 +33,6 @@ const CHATBOT_TOKEN = process.env.CHATBOT_TOKEN;
 // }
 // bots_data.bots[BOT_ID] = bot;
 // console.log("bot:", bot);
-// process.exit(1);
 console.log("Testing conversation setup:");
 console.log("PROJECT_ID:", PROJECT_ID);
 console.log("REQUEST_ID:", REQUEST_ID);
@@ -105,8 +104,8 @@ describe('Conversation1 - Form filling', async () => {
         else {
           // console.log("params /start:", params);
           assert(params);
-          assert(params["tdLastMessageId"] === message_id);
-          assert(params["tdProjectId"] === PROJECT_ID);
+          assert(params["last_message_id"] === message_id);
+          assert(params["project_id"] === PROJECT_ID);
           listener.close(() => {
             done();
           });
@@ -231,8 +230,8 @@ describe('Conversation1 - Form filling', async () => {
           else {
             // console.log("params2:", params);
             assert(params);
-            assert(params["tdLastMessageId"] === message_id);
-            assert(params["tdProjectId"] === PROJECT_ID);
+            assert(params["last_message_id"] === message_id);
+          assert(params["project_id"] === PROJECT_ID);
             assert(params["your_fullname"] === reply_text);
             assert(params["_tdTypeOf:your_fullname"]);
             listener.close(() => {

package/test/filter_commands_test.js

@@ -342,7 +342,7 @@ describe('filter commands()', function() {
       }
     ];
 
-    TiledeskChatbotUtil.filterOnLanguage(commands, "en");
+    // TiledeskChatbotUtil.filterOnLanguage(commands, "en");
     // console.log("commands after", commands);
     // assert(commands.length == 6);
   });

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -72,12 +72,16 @@ class DirReply {
       }
 
       // EVALUATE EXPRESSION AND REMOVE BASED ON EVALUATION
-      const mylang = requestVariables["mylang"];
-      console.log("mylang:", mylang);
+      // const mylang = requestVariables["mylang"];
+      console.log("filterOnVariables:", JSON.stringify(requestVariables));
+      // if (message.attributes && message.attributes.commands) {
+      //   TiledeskChatbotUtil.filterOnLanguage(message.attributes.commands, mylang);
+      // }
       if (message.attributes && message.attributes.commands) {
-        TiledeskChatbotUtil.filterOnLanguage(message.attributes.commands, mylang);
+        console.log("filterOnVariables...on commands", message.attributes.commands);
+        TiledeskChatbotUtil.filterOnVariables(message.attributes.commands, requestVariables);
       }
-
+      
       // temporary send back of reserved attributes
       if (!message.attributes) {
         message.attributes = {}
@@ -103,33 +107,6 @@ class DirReply {
         callback();
     });
   }
-
-  // filterOnLanguage(commands, lang) {
-  //   if (!lang) {
-  //     return;
-  //   }
-  //   if (commands.length > 0) {
-  //     for (let i = commands.length - 1; i >= 0; i--) {
-  //       console.log("commands[i]:", commands[i]);
-  //       if (commands[i]) {
-  //           if (commands[i].type === "message") { // is a message, not wait
-  //               if (!commands[i]["lang"] === lang) { // filter is false, remove
-  //                   console.log("commands[i]lang:", commands[i]);
-  //                   commands.splice(i, 1);
-  //                   if (commands[i-1]) {
-  //                       console.log("commands[i-1]?:", commands[i-1]);
-  //                       if (commands[i-1].type === "wait") {
-  //                         commands.splice(i-1, 1);
-  //                       }
-  //                   }
-  //               }
-  //           }
-            
-  //       }
-  //   }
-      
-  //   }
-  // }
 }
 
 module.exports = { DirReply };

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -41,21 +41,36 @@ class DirWebRequest {
     }
     const filler = new Filler();
     const url = filler.fill(action.url, requestVariables);
-    if (action.headers) {
-      for (const [key, value] of Object.entries(action.headers)) {
-        action.headers[key] = filler.fill(value, requestVariables);
+
+    let headers = null;
+    if (action.headersString) {
+      let headersString = filler.fill(action.headersString, requestVariables);
+      try {
+        headers = JSON.parse(headersString);
+      }
+      catch(err) {
+        console.error("Error parsing webRequest headersString as JSON:", headersString);
       }
+      // for (const [key, value] of Object.entries(action.headers)) {
+      //   action.headers[key] = filler.fill(value, requestVariables);
+      // }
     }
-    let jsonBody = null;
+    let json = null;
     if (action.jsonBody) {
-      jsonBody = filler.fill(action.jsonBody, requestVariables);
+      let jsonBody = filler.fill(action.jsonBody, requestVariables);
+      try {
+        json = JSON.parse(jsonBody);
+      }
+      catch(err) {
+        console.error("Error parsing webRequest jsonBody:", jsonBody);
+      }
     }
     
     if (this.log) {console.log("webRequest URL", url);}
     const HTTPREQUEST = {
       url: url,
-      headers: action.headers,
-      json: jsonBody,
+      headers: headers,
+      json: json,
       method: action.method
     };
     this.myrequest(

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -31,7 +31,7 @@ class Directives {
   static IF_NOT_OPEN_HOURS = "ifnotopenhours"; // DEPRECATED
   static FUNCTION_VALUE = "functionvalue";
   static CONDITION = "condition";
-  static JSON_CONDITION = "jsonCondition";
+  static JSON_CONDITION = "jsoncondition";
   static ASSIGN = "assign";
   static SET_ATTRIBUTE = "setattribute";
   // static IF_AVAILABLE_AGENTS = "ifavailableagents"; // TODO