@tiledesk/tiledesk-tybot-connector 0.1.44 → 0.1.46

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.46
+- weird npm import fix
+
+### 0.1.45
+- DirLockIntent added varibleName parameter
+
 ### 0.1.44
 - Variables to webhook
 

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) {
@@ -449,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) {
@@ -459,11 +470,11 @@ class TiledeskChatbot {
   }
   
   async execWebhook(static_bot_answer, userMessage, bot, context) {
-    console.log("static_bot_answer.attributes.webhook:", static_bot_answer.attributes.webhook)
+    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) {
-      console.log("adding variables to context...")
       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;

package/package.json

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

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();
         });

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -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/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/DirMessage.js

@@ -1,4 +1,3 @@
-const { commands } = require('npm');
 const { ExtApi } = require('../../ExtApi.js');
 const { Directives } = require('./Directives.js');
 
@@ -29,20 +28,20 @@ class DirMessage {
         action.body.message.attributes.markbot = false;
         action.body.message.attributes.fillParams = true; // fillParams can fill commands[].message.text
         // temp patch for a fix in the future
-        if (!action.body.message.text || action.body.message.text.trim() === "") {
-          // because server doesn't allow empty text
-          // because we anyway need a text/type for conversation summary
-          // we get info from first commands' message or set a default value
-          if (action.body.message && action.body.message.attributes && action.body.message.attributes.commands) {
-            const message_info = DirMessage.firstMessageInfoFromCommands(commands);
-            action.body.message.text = message_info.text;
-            action.body.message.type = message_info.type;
-          }
-          else {
-            action.body.message.text = "New message";
-            action.body.message.type = "text";
-          }
-        }
+        // if (!action.body.message.text || action.body.message.text.trim() === "") {
+        //   // because server doesn't allow empty text
+        //   // because we anyway need a text/type for conversation summary
+        //   // we get info from first commands' message or set a default value
+        //   if (action.body.message && action.body.message.attributes && action.body.message.attributes.commands) {
+        //     const message_info = DirMessage.firstMessageInfoFromCommands(commands);
+        //     action.body.message.text = message_info.text;
+        //     action.body.message.type = message_info.type;
+        //   }
+        //   else {
+        //     action.body.message.text = "New message";
+        //     action.body.message.type = "text";
+        //   }
+        // }
         // console.log("final message action:", JSON.stringify(action));
       }
     }

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.")
   }