@tiledesk/tiledesk-tybot-connector 0.1.43 → 0.1.45

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.45
+- DirLockIntent added varibleName parameter
+
+### 0.1.44
+- Variables to webhook
+
 ### 0.1.43
 - added context variable chatbot.addParameter("_tdRequestId", requestId);
 - completed TiledeskIntentsMachine.js

package/TiledeskExpression.js

@@ -38,7 +38,7 @@ class TiledeskExpression {
         // console.log("Original expression:", _expression);
         let expression = String(_expression).replace(/\$/g, "$data.");
         // console.log("Evaluating expression:", expression);
-        // console.log("With variables:", variables);
+        // console.log("With variables:", JSON.stringify(variables));
         const result = new TiledeskExpression().evaluate(expression, variables);
         // console.log("Expression result:", result);
         return result;
@@ -46,9 +46,16 @@ class TiledeskExpression {
 
     // private
     evaluate(expression, context) {
-        let fn = Function(`let $data = this;return (${expression})`);
+        let fn;
+        let res
+        try {
+            fn = Function(`let $data = this;return (${expression})`);
+            res = fn.bind(context)()
+        }
+        catch (err) {
+            console.error("Error:", err.message, "evaluating expression: '" + expression + "'");
+        }
         // let fn = Function(`let $data = this;console.log('data', $data);return (${conditionExpression})`);
-        let res = fn.bind(context)()
         return res;
     }
 

package/index.js

@@ -46,7 +46,7 @@ const { DirSendEmail } = require('./tiledeskChatbotPlugs/directives/DirSendEmail
 const { Directives } = require('./tiledeskChatbotPlugs/directives/Directives.js');
 //let Faq = require('./models/faq');
 //let Faq_kb = require('./models/faq_kb');
-let connection;
+// let connection;
 let APIURL = null;
 let staticBots;
 
@@ -156,15 +156,17 @@ router.post('/ext/:botid', async (req, res) => {
   if (message.request && message.request.location && message.request.location.city) {
     await chatbot.addParameter("_tdCity", message.request.location.city);
   }
-  
+  if (message.text) {
+    await chatbot.addParameter("_tdUserText", message.text);
+  }
   if (requestSourcePage) {
-    await chatbot.addParameter("requestSourcePage", sourcePage);
+    await chatbot.addParameter("_tdRequestSourcePage", sourcePage);
   }
   if (requestLanguage) {
-    await chatbot.addParameter("requestLanguage", language);
+    await chatbot.addParameter("_tdRequestLanguage", language);
   }
   if (requestUserAgent) {
-    await chatbot.addParameter("requestUserAgent", userAgent);
+    await chatbot.addParameter("_tdRequestUserAgent", userAgent);
   }
   let reply = await chatbot.replyToMessage(message);
   if (!reply) {
@@ -280,7 +282,7 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   if (log) {console.log("request_key:", request_key);}
   if (tdcache) {
     request = await tdcache.getJSON(request_key)
-    if (log) {console.log("Request from cache:", request);}
+    if (log) {console.log("Request from cache:", JSON.stringify(request));}
     if (!request) {
       if (log) {console.log("!Request from cache", requestId);}
       try {
@@ -310,10 +312,7 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
       id_project: projectId
     }
   }
-  else {
-    if (log) {console.log("request::", request);}
-  }
-  if (log) {console.log("request....", request);}
+  // if (log) {console.log("request....", JSON.stringify(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));}
@@ -452,7 +451,8 @@ async function startApp(settings, completionCallback) {
 
   if (!staticBots) {
     console.log("(Tilebot) Connecting to mongodb...");
-    connection = mongoose.connect(settings.MONGODB_URI, { "useNewUrlParser": true, "autoIndex": false }, async (err) => {
+    // connection = 
+    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

package/models/TiledeskChatbot.js

@@ -7,6 +7,8 @@ const { WebhookChatbotPlug } = require('../tiledeskChatbotPlugs/WebhookChatbotPl
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { IntentForm } = require('./IntentForm.js');
 const { TiledeskChatbotUtil } = require('./TiledeskChatbotUtil.js');
+const { DirLockIntent } = require('../tiledeskChatbotPlugs/directives/DirLockIntent');
+const { DirUnlockIntent } = require('../tiledeskChatbotPlugs/directives/DirUnlockIntent');
 
 class TiledeskChatbot {
 
@@ -59,32 +61,40 @@ class TiledeskChatbot {
         console.log("replyToMessage() > lead found:", JSON.stringify(lead));
       }
       
-      // Checking locked intent
-      const locked_intent = await this.currentLockedIntent(this.requestId);
-      if (this.log) {console.log("got locked intent", locked_intent)}
-      if (locked_intent) {
-        const tdclient = new TiledeskClient({
-          projectId: this.projectId,
-          token: this.token,
-          APIURL: this.APIURL,
-          APIKEY: this.APIKEY,
-          log: false
-        });
-        // it only gets the locked_intent
-        const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
-        if (this.log) {console.log("locked intent. got faqs", faq)}
-        let reply;
-        if (faq) {
-          reply = await this.execIntent(faq, message, lead);//, bot);
-        }
-        else {
-          reply = {
-            "text": "An error occurred while getting locked intent:'" + locked_intent
+      // Checking locked intent (for non-internal intents)
+      // internal intents always "skip" the locked intent
+      // if (message.text.startsWith("/") && message.sender != "_tdinternal") {
+        const locked_intent = await this.currentLockedIntent(this.requestId);
+        if (this.log) {console.log("got locked intent", locked_intent)}
+        if (locked_intent) {
+          const tdclient = new TiledeskClient({
+            projectId: this.projectId,
+            token: this.token,
+            APIURL: this.APIURL,
+            APIKEY: this.APIKEY,
+            log: false
+          });
+          // it only gets the locked_intent
+          const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
+          if (this.log) {console.log("locked intent. got faqs", faq)}
+          let reply;
+          if (faq) {
+            reply = await this.execIntent(faq, message, lead);//, bot);
+          }
+          else {
+            reply = {
+              "text": "An error occurred while getting locked intent:'" + locked_intent
+            }
           }
+          resolve(reply);
+          return;
         }
-        resolve(reply);
-        return;
-      }
+      // }
+      // else if (message.text.startsWith("/")) {
+      //   if (this.log) {
+      //     console.log("Internal intent". message.text, "skips locked intent check");
+      //   }
+      // }
 
       let explicit_intent_name = null;
       // Explicit intent invocation
@@ -225,7 +235,7 @@ class TiledeskChatbot {
   async execIntent(faq, message, lead) {//, bot) {
     let answerObj = faq; // faqs[0];
     const botId = this.botId;
-    let sender = 'bot_' + botId;
+    // let sender = 'bot_' + botId;
     //var answerObj;
     //answerObj.score = 100; // exact search has max score
     if (this.log) {
@@ -253,30 +263,30 @@ class TiledeskChatbot {
     
     let intent_name = answerObj.intent_display_name
     // THE FORM
-    if (intent_name === "test_form_intent") {
-      answerObj.form = {
-        "cancelCommands": ['reset', 'cancel'],
-        "cancelReply": "Ok canceled!",
-        "fields": [
-          {
-            "name": "userFullname",
-            "type": "text",
-            "label": "What is your name?\n* Andrea\n* Marco\n* Mirco\n* Luca Leo"
-          },{
-            "name": "companyName",
-            "type": "text",
-            "label": "Thank you ${userFullname}! What is your Company name?\n* Tiledesk\n* Frontiere21"
-          },
-          {
-            "name": "userEmail",
-            "type": "text",
-            "regex": "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/",
-            "label": "Hi ${userFullname} from ${companyName}\n\nJust one last question\n\nYour email 🙂\n* andrea@libero.it\n* andrea@tiledesk.com",
-            "errorLabel": "${userFullname} this email address is invalid\n\nCan you insert a correct email address?"
-          }
-        ]
-      };
-    }
+    // if (intent_name === "test_form_intent") {
+    //   answerObj.form = {
+    //     "cancelCommands": ['reset', 'cancel'],
+    //     "cancelReply": "Ok canceled!",
+    //     "fields": [
+    //       {
+    //         "name": "userFullname",
+    //         "type": "text",
+    //         "label": "What is your name?\n* Andrea\n* Marco\n* Mirco\n* Luca Leo"
+    //       },{
+    //         "name": "companyName",
+    //         "type": "text",
+    //         "label": "Thank you ${userFullname}! What is your Company name?\n* Tiledesk\n* Frontiere21"
+    //       },
+    //       {
+    //         "name": "userEmail",
+    //         "type": "text",
+    //         "regex": "/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$/",
+    //         "label": "Hi ${userFullname} from ${companyName}\n\nJust one last question\n\nYour email 🙂\n* andrea@libero.it\n* andrea@tiledesk.com",
+    //         "errorLabel": "${userFullname} this email address is invalid\n\nCan you insert a correct email address?"
+    //       }
+    //     ]
+    //   };
+    // }
     let intent_form = answerObj.form;
     if (this.log) {
       console.log("IntentForm.isValidForm(intent_form)", IntentForm.isValidForm(intent_form));
@@ -398,7 +408,6 @@ class TiledeskChatbot {
       if (this.log) {console.log("We must clientUpdateUserFullname with:", clientUpdateUserFullname)};
       static_bot_answer.attributes.updateUserFullname = clientUpdateUserFullname;
     }
-    // console.log("...static_bot_answer ready:", JSON.stringify(static_bot_answer));
     // exec webhook
     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));}
@@ -406,7 +415,8 @@ class TiledeskChatbot {
   }
 
   async lockIntent(requestId, intent_name) {
-    await this.tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
+    // await this.tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
+    await DirLockIntent.lockIntent(this.tdcache, requestId, intent_name);
   }
   
   async currentLockedIntent(requestId) {
@@ -419,7 +429,8 @@ class TiledeskChatbot {
   }
   
   async unlockIntent(requestId) {
-    await this.tdcache.del("tilebot:requests:"  + requestId + ":locked");
+    await DirUnlockIntent.unlockIntent(this.tdcache, requestId);
+    // await this.tdcache.del("tilebot:requests:"  + requestId + ":locked");
   }
 
   async addParameter(parameter_name, parameter_value) {
@@ -458,10 +469,16 @@ class TiledeskChatbot {
     return request_key;
   }
   
-  async execWebhook(static_bot_answer, message, bot, context) {
+  async execWebhook(static_bot_answer, userMessage, bot, context) {
+    if (this.log) {console.log("static_bot_answer.attributes.webhook:", static_bot_answer.attributes.webhook);}
+    if (static_bot_answer.attributes && static_bot_answer.attributes.webhook && static_bot_answer.attributes.webhook === true) {
+      const variables = await this.allParameters();
+      context.variables = variables;
+      if (this.log) {console.log("adding variables to webhook context:", context.variables);}
+    }
     const messagePipeline = new MessagePipeline(static_bot_answer, context);
     const webhookurl = bot.webhook_url;
-    messagePipeline.addPlug(new WebhookChatbotPlug(message.request, webhookurl, this.token));
+    messagePipeline.addPlug(new WebhookChatbotPlug(userMessage.request, webhookurl, this.token, this.log));
     //messagePipeline.addPlug(directivesPlug);
     //messagePipeline.addPlug(new SplitsChatbotPlug(log));
     //messagePipeline.addPlug(new MarkbotChatbotPlug(log));

package/models/TiledeskChatbotUtil.js

@@ -17,7 +17,7 @@ class TiledeskChatbotUtil {
         }
         if (parts.length > 1) {
             let json_string = explicit_intent_name.substring(parts[0].length);
-            // console.log("json_string (params)", json_string);
+            console.log("json_string (params)", json_string);
             try {
                 intent.parameters = JSON.parse(json_string);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@tiledesk/helpcenter-query-client": "^0.1.8",
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
-    "@tiledesk/tiledesk-chatbot-util": "^0.8.38",
+    "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
     "@tiledesk/tiledesk-client": "^0.9.5",
     "axios": "^0.27.2",
     "body-parser": "^1.19.0",

package/test/conversation-form-test.js

@@ -144,12 +144,12 @@ describe('Conversation1 - Form filling', async () => {
   });
 
   it('/disable_input', (done) => {
-    // console.log("/disable_input...");
+    console.log("/disable_input...");
     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));
+      console.log("req.body....:", JSON.stringify(req.body));
       res.send({ success: true });
       const message = req.body;
 
@@ -194,14 +194,14 @@ describe('Conversation1 - Form filling', async () => {
   });
 
   it('/good_form', (done) => {
-    // console.log("/good_form...");
+    console.log("/good_form...");
     const message_id = uuidv4();
     const reply_text = "Andrea";
     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));
+      console.log("req.body22222:", JSON.stringify(req.body));
       res.send({ success: true });
       const message = req.body;
 
@@ -223,7 +223,7 @@ describe('Conversation1 - Form filling', async () => {
           "token": CHATBOT_TOKEN
         }
         sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-          // console.log("Message sent.", request);
+          console.log("Message sent.", request);
         });
       }
       else if (message.text === "It's a good form Andrea") {
@@ -233,13 +233,15 @@ describe('Conversation1 - Form filling', async () => {
             assert.ok(false);
           }
           else {
-            // console.log("params:", params);
+            console.log("params2:", params);
             assert(params);
             assert(params["_tdLastMessageId"] === message_id);
             assert(params["_tdProjectId"] === PROJECT_ID);
             assert(params["your_fullname"] === reply_text);
             assert(params["_tdTypeOf:your_fullname"]);
+            console.log("ok2")
             listener.close(() => {
+              console.log("done2");
               done();
             });
           }
@@ -247,7 +249,7 @@ describe('Conversation1 - Form filling', async () => {
 
       }
       else {
-        console.error("Unexpected message.");
+        console.error("Unexpected message2.");
         assert.ok(false);
       }
 
@@ -279,16 +281,16 @@ describe('Conversation1 - Form filling', async () => {
   });
 
   it('(intent-to-intent) /move_to => /target_intent', (done) => {
-    // console.log("(intent-to-intent) /move_to => /target_intent");
+    console.log("(intent-to-intent) /move_to => /target_intent");
     let listener;
     let endpointServer = express();
     endpointServer.use(bodyParser.json());
     endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
       res.send({ success: true });
       const message = req.body;
-      // console.log("received message:", JSON.stringify(message));
+      console.log("received message33:", JSON.stringify(message));
       if (message.text === "The target!") {
-        // console.log("Got it. End.");
+        console.log("Got it. End.");
         listener.close(() => {
           done();
         });
@@ -316,13 +318,13 @@ describe('Conversation1 - Form filling', async () => {
       }
       // console.log("sending message:", request);
       sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-        // console.log("Message sent.");
+        console.log("Message sent33.");
       });
     });
   });
 
   it('/all_filled (none) => /form_to_unfill => (fill) => /all_filled (all) /form_to_unfill (bypass because filled) => /delete_fullname => all_filled (no fullname) => /form_to_unfill (verify it asks only for fullname) => all_filled (all, again)', (done) => {
-    // console.log("/all_filled (none) =>...");
+    console.log("/all_filled (none) =>...");
     let request0_uuid = uuidv4();
     let request1_uuid = uuidv4();
     let request2_uuid = uuidv4();
@@ -339,9 +341,12 @@ describe('Conversation1 - Form filling', async () => {
     endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
       res.send({ success: true });
       const message = req.body;
-      // console.log("received message:", JSON.stringify(message));
+      console.log("received message__3:", JSON.stringify(message));
+      console.log("message.triggeredByMessageId:", message.triggeredByMessageId);
+      console.log("message.text:", message.text);
+      
       if (message.text === "You filled\nfullname: ${fullname}\nyouremail: ${youremail}" && message.triggeredByMessageId === request0_uuid) {
-        // console.log("got #0 'You filled...' sending #1");
+        console.log("got #0 'You filled...' sending #1");
         let request = {
           "payload": {
             "_id": request1_uuid,
@@ -363,7 +368,7 @@ describe('Conversation1 - Form filling', async () => {
         });
       }
       else if (message.text === "Your name?" && message.triggeredByMessageId === request1_uuid) {
-        // console.log("got #1 sending #2");
+        console.log("got #1 sending #2");
         let request = {
           "payload": {
             "_id": request2_uuid,
@@ -381,14 +386,14 @@ describe('Conversation1 - Form filling', async () => {
           "token": CHATBOT_TOKEN
         }
         sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-          // console.log("Message sent.", request);
+          console.log("Message sent4.", request);
         });
         // listener.close( () => {
         //   done();
         // });
       }
       else if (message.text === "Your email?" && message.triggeredByMessageId === request2_uuid) {
-        // console.log("got #2 sending #3");
+        console.log("got #2 sending #3");
         let request = {
           "payload": {
             "_id": request3_uuid,
@@ -406,14 +411,14 @@ describe('Conversation1 - Form filling', async () => {
           "token": CHATBOT_TOKEN
         }
         sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-          // console.log("Message sent.", request);
+          console.log("Message sent5.", request);
         });
         // listener.close( () => {
         //   done();
         // });
       }
       else if (message.text === "Thanks Andrea\nYour email test@test.it" && message.triggeredByMessageId === request3_uuid) {
-        // console.log("got #3 sending #4");
+        console.log("got #3 sending #4");
         let request = {
           "payload": {
             "_id": request4_uuid,
@@ -431,14 +436,14 @@ describe('Conversation1 - Form filling', async () => {
           "token": CHATBOT_TOKEN
         }
         sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-          // console.log("got #3 sending #4. Message sent.", request);
+          console.log("got #3 sending #4. Message sent.", request);
         });
         // listener.close( () => {
         //   done();
         // });
       }
       else if (message.text === "You filled\nfullname: Andrea\nyouremail: test@test.it" && message.triggeredByMessageId === request4_uuid) {
-        // console.log("got #4 sending #5");
+        console.log("got #4 sending #5");
         let request = {
           "payload": {
             "_id": request5_uuid,
@@ -556,11 +561,11 @@ describe('Conversation1 - Form filling', async () => {
           "token": CHATBOT_TOKEN
         }
         sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-          // console.log("got #8 sending #9. Message sent.", request);
+          console.log("got #8 sending #9. Message sent.", request);
         });
       }
       else if (message.text === "You filled\nfullname: ${fullname}\nyouremail: ${youremail}") {
-        // console.log("got #9. End.");
+        console.log("got #9. End.");
         listener.close(() => {
           done();
         });
@@ -736,6 +741,62 @@ describe('Conversation1 - Form filling', async () => {
     });
   });
 
+  it('/assign_params{...} with multi-line JSON', (done) => {
+    // console.log("/assign_params...");
+    let listener;
+    let endpointServer = express();
+    endpointServer.use(bodyParser.json());
+    endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
+      res.send({ success: true });
+      const message = req.body;
+      if (message.text) {
+        assert(message.text === "myvar: places");
+        getChatbotParameters(REQUEST_ID, (err, params) => {
+          if (err) {
+            assert.ok(false);
+          }
+          else {
+            // console.log("params /assign_params:", params);
+            assert(params);
+            assert(params["var1"] === "value1");
+            assert(params["var2"] === "value2");
+            listener.close(() => {
+              done();
+            });
+          }
+        });
+      }
+      else {
+        console.error("Unexpected message.");
+        assert.ok(false);
+      }
+    });
+    listener = endpointServer.listen(10002, '0.0.0.0', function () {
+      let request = {
+        "payload": {
+          "_id": uuidv4(),
+          "senderFullname": "guest#367e",
+          "type": "text",
+          "sender": "A-SENDER",
+          "recipient": REQUEST_ID,
+          "text": `/assign_params{
+              "var1": "value1",
+              "var2": "value2"
+          }`,
+          "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);
+      });
+    });
+  });
+
   it('/if_you_live_IT (_tdCondition) TRUE', (done) => {
     // console.log("/if_you_live_IT (TRUE)...");
     let listener;

package/test/expression_evaluator_test.js

@@ -0,0 +1,161 @@
+var assert = require('assert');
+const { TiledeskExpression } = require('../TiledeskExpression');
+
+describe('Evaluate basic conditions', function() {
+  
+    it('quick conditions 1 - true', async () => {
+        const condition = "$userFullname === 'Andrea'"
+        console.log("Evaluating condition:", condition);
+        let context = {userFullname: 'Andrea'};
+        console.log("With context:", context);
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        console.log("conditionResult:", result);
+        assert(result === true);
+    });
+
+    it('quick conditions 2 - empty context', async () => {
+        const condition = "$userFullname === 'Andrea'"
+        console.log("Evaluating condition:", condition);
+        context = {};
+        console.log("With context:", context);
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        console.log("conditionResult:", result);
+        assert(result === false);
+    });
+
+    it('quick conditions 3 - false', async () => {
+        const condition = "$userFullname === 'Andrea'"
+        console.log("Evaluating condition:", condition);
+        context = {userFullname: 'Andreus'};
+        console.log("With context:", context);
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        console.log("conditionResult:", result);
+        assert(result === false);
+    });
+
+    it('condition 2 - numbers and string comparison - true', async () => {
+        const condition = "$score >= $minimumScore && $topic === $testTopic";
+        console.log("Evaluating condition:", condition);
+        context = {
+            score: 10,
+            minimumScore: 5,
+            topic: "Angular",
+            testTopic: "Angular"
+        };
+        console.log("With context:", context);
+        const result = new TiledeskExpression().evaluateExpression(condition, context)
+        console.log("conditionResult2:", result);
+        assert(result === true);
+    });
+
+    it('condition 3 - startsWith -> false', async () => {
+        const condition = "$site.url.startsWith($url_match)";
+        console.log("Evaluating condition:", condition);
+        context = {
+            site: {
+                url: "https://tiledesk.com/pricing"
+            },
+            url_match: "pricing"
+        };
+        const result = new TiledeskExpression().evaluateExpression(condition, context)
+        console.log("conditionResult3:", result);
+        assert(result === false);
+    });
+
+    it('condition 4 - startsWith -> true', async () => {
+        const condition = "$site.url.startsWith($url_match)";
+        console.log("Evaluating condition:", condition);
+        context = {
+            site: {
+                url: "https://tiledesk.com/pricing"
+            },
+            url_match: "https:"
+        };
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        console.log("conditionResult4:", result);
+        assert(result === true);
+    });
+
+    it('condition 5 - compare string with a constant', async () => {
+        const condition = "$_tdCountry === 'IT'";
+        // console.log("Evaluating condition:", condition);
+        context = {
+            "_tdCountry": "IT"
+        };
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        // console.log("conditionResult:", result);
+        assert(result === true);
+    });
+
+    it('condition 6 - invalid expression', async () => {
+        const condition = "don't try this";
+        // console.log("Evaluating condition:", condition);
+        context = {
+            "whatever": "IT"
+        };
+        const result = new TiledeskExpression().evaluateExpression(condition, context);
+        assert(result === undefined);
+    });
+
+    it('assignment 1', async () => {
+        const expression = "$protocol + $site.url";
+        console.log("Evaluating assign expression:", expression);
+        context = {
+            protocol: "https://",
+            site: {
+                url: "tiledesk.com/pricing"
+            }
+        };
+        const result = new TiledeskExpression().evaluateExpression(expression, context);
+        console.log("expression value:", result);
+        assert(result === 'https://tiledesk.com/pricing');
+    });
+
+    it('assignment 2', async () => {
+        const expression = "$age + $added";
+        console.log("Evaluating assign expression:", expression);
+        context = {
+            age: 32,
+            added: 10
+        };
+        const result = new TiledeskExpression().evaluateExpression(expression, context);
+        console.log("expression value:", result);
+        assert(result === 42);
+    });
+
+    it('assignment 3 - Number() on numbers', async () => {
+        const expression = "Number($age) + Number($added)";
+        console.log("Evaluating assign expression:", expression);
+        context = {
+            age: 33,
+            added: 10
+        };
+        const result = new TiledeskExpression().evaluateExpression(expression, context);
+        console.log("expression value:", result);
+        assert(result === 43);
+    });
+
+    it('assignment 4 - Number() on strings', async () => {
+        const expression = "Number($age) + Number($added)";
+        console.log("Evaluating assign expression:", expression);
+        context = {
+            age: "34",
+            added: "10"
+        };
+        const result = new TiledeskExpression().evaluateExpression(expression, context);
+        console.log("expression value:", result);
+        assert(result === 44);
+    });
+
+    it('assignment 5 - Constant int, no context', async () => {
+        const expression = 45;
+        console.log("Evaluating assign expression:", expression);
+        const result = new TiledeskExpression().evaluateExpression(expression, context);
+        console.log("expression value:", result);
+        assert(result === 45);
+    });
+    
+});
+
+
+

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -118,7 +118,7 @@ class DirectivesChatbotPlug {
       TILEBOT_ENDPOINT:TILEBOT_ENDPOINT,
       departmentId: depId,
       tdcache: tdcache,
-      log: false
+      log: true
     }
     
     let curr_directive_index = -1;
@@ -270,7 +270,7 @@ class DirectivesChatbotPlug {
         });
       }
       else if (directive_name === Directives.ASSIGN) {
-        // console.log("...DirAssign");
+        console.log("...DirAssign", context.log);
         const assign_dir = new DirAssign(context);
         assign_dir.execute(directive, () => {
           process(nextDirective());
@@ -404,17 +404,17 @@ class DirectivesChatbotPlug {
         });
       }
       else if (directive_name === Directives.WAIT) {
-        new DirWait().execute(directive, () => {
+        new DirWait(context).execute(directive, () => {
           process(nextDirective());
         });
       }
       else if (directive_name === Directives.LOCK_INTENT) {
-        new DirLockIntent(tdcache).execute(directive, requestId, () => {
+        new DirLockIntent(context).execute(directive, () => {
           process(nextDirective());
         });
       }
       else if (directive_name === Directives.UNLOCK_INTENT) {
-        new DirUnlockIntent(tdcache).execute(requestId, () => {
+        new DirUnlockIntent(context).execute( () => {
           process(nextDirective());
         });
       }

package/tiledeskChatbotPlugs/MessagePipeline.js

@@ -6,9 +6,9 @@ class MessagePipeline {
    * 
    */
 
-  constructor(message, context) {
+  constructor(answer, context) {
     this.context = context;
-    this.message = message;
+    this.message = answer;
     this.plugs = [];
     this.counter = -1;
   }

package/tiledeskChatbotPlugs/WebhookChatbotPlug.js

@@ -16,12 +16,13 @@ class WebhookChatbotPlug {
   }
 
   exec(pipeline) {
-    let message = pipeline.message;
+    let answer = pipeline.message;
     let context = pipeline.context;
-    if (this.log) {console.log("WEBHOOK?", message.attributes.webhook);}
-    if (message.attributes && message.attributes.webhook && message.attributes.webhook === true) {
+    if (this.log) {console.log("WEBHOOK?", answer.attributes.webhook);}
+    if (answer.attributes && answer.attributes.webhook && answer.attributes.webhook === true) {
       if (this.log) {console.log("EXECUTING WEBHOOK URL!", this.webhookurl);}
-      this.execWebhook(message, context, this.webhookurl, (err, message_from_webhook) => {
+      if (this.log) {console.log("EXECUTING WEBHOOK ON CONTEXT:", context);}
+      this.execWebhook(answer, context, this.webhookurl, (err, message_from_webhook) => {
         if (this.log) {console.log("message", message_from_webhook);}
         if (err) {
           console.error("Error calling webhook:", this.webhookurl)

package/tiledeskChatbotPlugs/directives/DirAssign.js

@@ -33,27 +33,30 @@ class DirAssign {
     else if (directive.parameter) {
       let params;
       params = this.parseParams(directive.parameter);
-      // console.log("params:", params);
+      console.log("DirAssign params:", params);
       action = {
         body: {
           expression: params.expression,
           assignTo: params.assignTo
         }
       }
+      console.log("DirAssign action:", action);
     }
     else {
       callback();
       return;
     }
+    console.log("go DirAssign with action:", action);
     this.go(action, () => {
       callback();
     });
   }
 
   async go(action, callback) {
+    console.log("DirAssign action processing:", action)
     const expression = action.body.expression;
     const assignTo = action.body.assignTo;
-    if (!assignTo || !expression) {
+    if (assignTo === null || expression === null) {
       if (this.log) {console.log("Invalid expression or assignTo parameters");}
       callback();
       return;
@@ -71,9 +74,9 @@ class DirAssign {
       variableName = filler.fill(assignTo, variables);
       // console.log("assign variable name (after filling):", variableName);
       
-      if (this.log) {console.log("(DirAssign) Variables:", variables);}
+      if (this.log) {console.log("(DirAssign) Variables:", JSON.stringify(variables));}
       const value = await new TiledeskExpression().evaluateExpression(expression, variables);
-      if (this.log) {console.log("(DirAssign) executed expression:", expression, "result:", result);}
+      if (this.log) {console.log("(DirAssign) executed expression:", expression, "value:", value);}
       await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, variableName, value);
       if (this.log) {console.log("(DirAssign) Assigned:", value, "to", variableName);}
       callback();
@@ -94,13 +97,17 @@ class DirAssign {
   // }
 
   parseParams(directive_parameter) {
+    console.log("Parsing directive_parameter:", directive_parameter);
     let expression = null;
     let assignTo = null;
     const params = ms(directive_parameter);
-    if (params.expression) {
+    console.log("params dirassign:", params)
+    if (params.expression !== null) {
+      console.log("go expression:", params.expression)
       expression = params.expression
+      console.log("got it expression:", expression)
     }
-    if (params.assignTo) {
+    if (params.assignTo !== null) {
       assignTo = params.assignTo;
     }
     return {

package/tiledeskChatbotPlugs/directives/DirCondition.js

@@ -106,7 +106,7 @@ class DirCondition {
       await TiledeskChatbot.allParametersStatic(
         this.context.tdcache, this.context.requestId
       );
-      if (this.log) {console.log("Variables:", variables)}
+      if (this.log) {console.log("Variables:", JSON.stringify(variables))}
     }
     else {
       console.error("(DirCondition) No this.context.tdcache");

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -2,6 +2,7 @@
 let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
+const ms = require('minimist-string');
 
 class DirIntent {
 

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -1,30 +1,88 @@
+const ms = require('minimist-string');
 
 class DirLockIntent {
 
-  constructor(tdcache) {
-    if (!tdcache) {
+  constructor(context) {
+    if (!context) {
+      throw new Error('config (TiledeskClient) object is mandatory.');
+    }
+    this.context = context;
+    if (!context.tdcache) {
       throw new Error('tdcache (TdCache) object is mandatory.');
     }
-    this.tdcache = tdcache;
+    this.tdcache = this.context.tdcache;
+    this.log = context.log;
   }
 
-  async execute(directive, requestId, callback) {
-    // console.log("Locking intent");
-    if (directive.parameter) {
-      let intent_name = directive.parameter.trim();
-      await this.lockIntent(requestId, intent_name);
-      callback();
+  async execute(directive, callback) {
+    if (this.log) {console.log("Locking intent:", JSON.stringify(directive));}
+    let action;
+    if (directive.action) {
+      // console.log("got intent action:", JSON.stringify(directive.action));
+      action = directive.action;
+    }
+    else if (directive.parameter && directive.parameter.trim() !== "") {
+      const params = this.parseParams(directive.parameter);
+      action = {
+        body: {
+          intentName: params.intentName // directive.parameter.trim()
+          // variableName: params.variableName
+        }
+      }
     }
     else {
+      console.error("Incorrect directive:", directive);
       callback();
+      return;
     }
+    // if (directive.parameter) {
+    //   let intent_name = directive.parameter.trim();
+    //   await this.lockIntent(requestId, intent_name);
+    //   callback();
+    // }
+    // else {
+    //   callback();
+    // }
+    this.go(action, () => {
+      callback();
+    });
   }
 
-  async lockIntent(requestId, intent_name) {
-    await this.tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
-    // console.log("locked.", intent_name);
+  async go(action, callback) {
+    let intent_name = action.body.intentName;
+    // let variable_name = action.body.variableName;
+    await DirLockIntent.lockIntent(this.tdcache, this.context.requestId, intent_name); //, variable_name);
+    if (this.log) {console.log("Locked intent:", action.body.intentName);}
+    if (callback) {
+      callback();
+    }
+  }
+
+  static async lockIntent(tdcache, requestId, intent_name) { //}, variable_name) {
+    await tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
+    // if (variable_name) {
+    //   console.log("locking intent with variable:", variable_name);
+    //   await this.tdcache.set("tilebot:requests:"  + requestId + ":lockedValue", variable_name);
+    // }
+    // console.log("locked. Intent name:", intent_name, "intent variable:", variable_name);
   }
   
+  parseParams(directive_parameter) {
+    let intentName = null;
+    let variableName = null;
+    const params = ms(directive_parameter);
+    if (params.intentName) {
+      intentName = params.intentName
+    }
+    if (params.variableName) {
+      variableName = params.variableName.replace(/[$]/g, ""); // $ sign not permitted. Silently removing if present
+    }
+    return {
+      intentName: intentName,
+      variableName: variableName
+    }
+  }
+
 }
 
 module.exports = { DirLockIntent };

package/tiledeskChatbotPlugs/directives/DirUnlockIntent.js

@@ -1,21 +1,41 @@
 
 class DirUnlockIntent {
 
-  constructor(tdcache) {
-    if (!tdcache) {
+  constructor(context) {
+    if (!context) {
+      throw new Error('config (TiledeskClient) object is mandatory.');
+    }
+    this.context = context;
+    if (!context.tdcache) {
       throw new Error('tdcache (TdCache) object is mandatory.');
     }
-    this.tdcache = tdcache;
+    this.tdcache = context.tdcache;
+    this.log = context.log;
   }
 
-  async execute(requestId, callback) {
-    console.log("Unocking intent");
-    await this.unlockIntent(requestId);
-    callback();
+  async execute(directive, requestId, callback) {
+    if (this.log) {console.log("Unlocking current intent");}
+    this.go(action, () => {
+      callback();
+    });
   }
 
-  async unlockIntent(requestId) {
-    await this.tdcache.del("tilebot:requests:"  + requestId + ":locked");
+  async go(action, callback) {
+    await DirUnlockIntent.unlockIntent(this.context.requestId);
+    if (callback) {
+      callback();
+    }
+  }
+
+  // async execute(requestId, callback) {
+  //   console.log("Unocking intent");
+  //   await this.unlockIntent(requestId);
+  //   callback();
+  // }
+
+  static async unlockIntent(tdcache, requestId) {
+    await tdcache.del("tilebot:requests:"  + requestId + ":locked");
+    // await this.tdcache.del("tilebot:requests:"  + requestId + ":locked");
     console.log("unlocked.")
   }
   

package/test/condition_evaluator_test.js

@@ -1,151 +0,0 @@
-var assert = require('assert');
-const { TiledeskExpression } = require('../TiledeskExpression');
-
-describe('Evaluate basic conditions', function() {
-  
-    // it('quick conditions 1 - true', async () => {
-    //     const condition = "$userFullname === 'Andrea'"
-    //     console.log("Evaluating condition:", condition);
-    //     let context = {userFullname: 'Andrea'};
-    //     console.log("With context:", context);
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context);
-    //     console.log("conditionResult:", result);
-    //     assert(result === true);
-    // });
-
-    // it('quick conditions 2 - empty context', async () => {
-    //     const condition = "$userFullname === 'Andrea'"
-    //     console.log("Evaluating condition:", condition);
-    //     context = {};
-    //     console.log("With context:", context);
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context);
-    //     console.log("conditionResult:", result);
-    //     assert(result === false);
-    // });
-
-    // it('quick conditions 3 - false', async () => {
-    //     const condition = "$userFullname === 'Andrea'"
-    //     console.log("Evaluating condition:", condition);
-    //     context = {userFullname: 'Andreus'};
-    //     console.log("With context:", context);
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context);
-    //     console.log("conditionResult:", result);
-    //     assert(result === false);
-    // });
-
-    // it('condition 2 - numbers and string comparison - true', async () => {
-    //     const condition = "$score >= $minimumScore && $topic === $testTopic";
-    //     console.log("Evaluating condition:", condition);
-    //     context = {
-    //         score: 10,
-    //         minimumScore: 5,
-    //         topic: "Angular",
-    //         testTopic: "Angular"
-    //     };
-    //     console.log("With context:", context);
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context)
-    //     console.log("conditionResult2:", result);
-    //     assert(result === true);
-    // });
-
-    // it('condition 3 - startsWith -> false', async () => {
-    //     const condition = "$site.url.startsWith($url_match)";
-    //     console.log("Evaluating condition:", condition);
-    //     context = {
-    //         site: {
-    //             url: "https://tiledesk.com/pricing"
-    //         },
-    //         url_match: "pricing"
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context)
-    //     console.log("conditionResult3:", result);
-    //     assert(result === false);
-    // });
-
-    // it('condition 4 - startsWith -> true', async () => {
-    //     const condition = "$site.url.startsWith($url_match)";
-    //     console.log("Evaluating condition:", condition);
-    //     context = {
-    //         site: {
-    //             url: "https://tiledesk.com/pricing"
-    //         },
-    //         url_match: "https:"
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(condition, context);
-    //     console.log("conditionResult4:", result);
-    //     assert(result === true);
-    // });
-
-    it('condition 5 - compare string with a constant', async () => {
-        const condition = "$_tdCountry === 'IT'";
-        // console.log("Evaluating condition:", condition);
-        context = {
-            "_tdCountry": "IT"
-        };
-        const result = new TiledeskExpression().evaluateExpression(condition, context);
-        // console.log("conditionResult:", result);
-        assert(result === true);
-    });
-
-    // it('assignment 1', async () => {
-    //     const expression = "$protocol + $site.url";
-    //     console.log("Evaluating assign expression:", expression);
-    //     context = {
-    //         protocol: "https://",
-    //         site: {
-    //             url: "tiledesk.com/pricing"
-    //         }
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(expression, context);
-    //     console.log("expression value:", result);
-    //     assert(result === 'https://tiledesk.com/pricing');
-    // });
-
-    // it('assignment 2', async () => {
-    //     const expression = "$age + $added";
-    //     console.log("Evaluating assign expression:", expression);
-    //     context = {
-    //         age: 32,
-    //         added: 10
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(expression, context);
-    //     console.log("expression value:", result);
-    //     assert(result === 42);
-    // });
-
-    // it('assignment 3 - Number() on numbers', async () => {
-    //     const expression = "Number($age) + Number($added)";
-    //     console.log("Evaluating assign expression:", expression);
-    //     context = {
-    //         age: 33,
-    //         added: 10
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(expression, context);
-    //     console.log("expression value:", result);
-    //     assert(result === 43);
-    // });
-
-    // it('assignment 4 - Number() on strings', async () => {
-    //     const expression = "Number($age) + Number($added)";
-    //     console.log("Evaluating assign expression:", expression);
-    //     context = {
-    //         age: "34",
-    //         added: "10"
-    //     };
-    //     const result = new TiledeskExpression().evaluateExpression(expression, context);
-    //     console.log("expression value:", result);
-    //     assert(result === 44);
-    // });
-
-    // it('assignment 5 - Constant int, no context', async () => {
-    //     const expression = 45;
-    //     console.log("Evaluating assign expression:", expression);
-    //     const result = new TiledeskExpression().evaluateExpression(expression, context);
-    //     console.log("expression value:", result);
-    //     assert(result === 45);
-    // });
-    
-});
-
-
-