@tiledesk/tiledesk-tybot-connector 0.1.82 → 0.1.85

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.85
+- "Match (regex) operator" fix
+- Text in multiple message commands is now merged in main "message.text" property based on filtered commands
+
+### 0.1.84
+- removed debug logs
+
+### 0.1.83
+- added "attributes.intentName" in chatbot replies, showing the last block involved in generating the reply
+
 ### 0.1.82
 - added /echobot endpoint (only used for performance test)
 - @tiledesk/tiledesk-client update => 0.10.2

package/ExtApi.js

@@ -27,7 +27,7 @@ class ExtApi {
   }
 
   /**
-   * A stub to send message to the "ext" endpoint, hosted by tilebot on:
+   * A stub to send messages to the "ext" endpoint, hosted by tilebot on:
    * /${TILEBOT_ROUTE}/ext/${projectId}/requests/${requestId}/messages
    *
    * @param {Object} message. The message to send

package/TiledeskExpression.js

@@ -143,7 +143,7 @@ class TiledeskExpression {
         },
         "matches": {
             name: "matches",
-            applyPattern: "#1.matches(/#2/)"
+            applyPattern: "#1.match(String(#2)) ? true : false"
         },
         // Francesco
         "addAsNumber": {

package/index.js

@@ -1,28 +1,18 @@
 const express = require('express');
 const router = express.Router();
 const bodyParser = require('body-parser');
-//var cors = require('cors');
-//let path = require("path");
-//let fs = require('fs');
-// const { TiledeskChatbotClient } = require('@tiledesk/tiledesk-chatbot-client');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-//const { TiledeskClientTest } = require('./TiledeskClientTest');
-//const jwt = require('jsonwebtoken');
-//const { v4: uuidv4 } = require('uuid');
 const { ExtApi } = require('./ExtApi.js');
 const { ExtUtil } = require('./ExtUtil.js');
 const { TdCache } = require('./TdCache.js');
-//const { IntentForm } = require('./IntentForm.js');
 const { TiledeskChatbot } = require('./models/TiledeskChatbot.js');
 const { MongodbBotsDataSource } = require('./models/MongodbBotsDataSource.js');
 const { MongodbIntentsMachine } = require('./models/MongodbIntentsMachine.js');
 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'}));
 router.use(bodyParser.urlencoded({ extended: true , limit: '50mb'}));
 
@@ -32,20 +22,9 @@ let tdcache = null;
 // DEV
 // const { MessagePipeline } = require('./tiledeskChatbotPlugs/MessagePipeline');
 const { DirectivesChatbotPlug } = require('./tiledeskChatbotPlugs/DirectivesChatbotPlug');
-// const { SplitsChatbotPlug } = require('./tiledeskChatbotPlugs/SplitsChatbotPlug');
-// const { MarkbotChatbotPlug } = require('./tiledeskChatbotPlugs/MarkbotChatbotPlug');
-// const { WebhookChatbotPlug } = require('./tiledeskChatbotPlugs/WebhookChatbotPlug');
-
-// PROD
-// const { MessagePipeline } =  require('@tiledesk/tiledesk-chatbot-plugs/MessagePipeline');
-// const { DirectivesChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/DirectivesChatbotPlug');
-// const { SplitsChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/SplitsChatbotPlug');
-// const { MarkbotChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/MarkbotChatbotPlug');
-// const { WebhookChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/WebhookChatbotPlug');
 
 // THE IMPORT
 let mongoose = require('mongoose');
-// const { DirSendEmail } = require('./tiledeskChatbotPlugs/directives/DirSendEmail.js');
 const { Directives } = require('./tiledeskChatbotPlugs/directives/Directives.js');
 let APIURL = null;
 let staticBots;
@@ -169,13 +148,14 @@ router.post('/ext/:botid', async (req, res) => {
     }
   }
   
-  // console.log("reply.actions:", reply.actions);
+  // console.log("reply is:", reply);
   if (reply.actions && reply.actions.length > 0) { // structured actions (coming from chatbot designer)
     if (log) {console.log("the actions:", JSON.stringify(reply.actions));}
     let directives = actionsToDirectives(reply.actions);
     if (log) {console.log("the directives:", JSON.stringify(directives));}
     let directivesPlug = new DirectivesChatbotPlug(
       {
+        reply: reply,
         directives: directives,
         supportRequest: message.request,
         TILEDESK_API_ENDPOINT: APIURL,
@@ -208,10 +188,9 @@ router.post('/ext/:botid', async (req, res) => {
       ENDPOINT: extEndpoint,
       log: false
     });
-    
     apiext.sendSupportMessageExt(reply, projectId, requestId, token, () => {
       if (log) {
-        // console.log("SupportMessageExt() reply sent:", JSON.stringify(reply));
+        //console.log("SupportMessageExt() reply sent:", JSON.stringify(reply));
       }
     });
   }
@@ -269,7 +248,7 @@ async function updateRequestVariables(chatbot, message, projectId, requestId) {
   if (message.request && message.request.location && message.request.location.city) {
     await chatbot.addParameter(TiledeskChatbotConst.REQ_CITY_KEY, message.request.location.city);
   }
-  // console.log("message.request.language", message.request["language"])
+  // console.log("message.request.language", message.request["language"]);
   if (message.request) {
     await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_SOURCE_PAGE_KEY, message.request.sourcePage);
     await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_LANGUAGE_KEY, message.request["language"]);
@@ -296,7 +275,7 @@ async function updateRequestVariables(chatbot, message, projectId, requestId) {
     }
     message.attributes.payload = message.request.attributes.payload
     if (chatbot.log) {console.log("FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
-    if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
+    // if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > FORCED SET message.attributes.payload:", JSON.stringify(message.attributes.payload))}
   }
 
   if (message.attributes) {
@@ -309,7 +288,7 @@ async function updateRequestVariables(chatbot, message, projectId, requestId) {
         for (const [key, value] of Object.entries(message.attributes.payload)) {
           // const value = all_parameters[key];
           const value_type = typeof value;
-          if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > importing payload parameter:", key, "value:", value, "type:", value_type);}
+          //if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > importing payload parameter:", key, "value:", value, "type:", value_type);}
           await chatbot.addParameter(key, String(value));
         }
       }

package/models/TiledeskChatbot.js

@@ -103,6 +103,12 @@ class TiledeskChatbot {
           let reply;
           if (faq) {
             reply = await this.execIntent(faq, message, lead);//, bot);
+            // if (!reply.attributes) {
+            //   reply.attributes = {}
+            // }
+            // // used by the Clients to get some info about the intent that generated this reply
+            // reply.attributes.intent_display_name = faq.intent_display_name;
+            // reply.attributes.intent_id = faq.intent_id;
           }
           else {
             reply = {
@@ -209,8 +215,15 @@ class TiledeskChatbot {
       if (faqs && faqs.length > 0 && faqs[0].answer) {
         if (this.log) {console.log("EXACT MATCH OR ACTION FAQ:", faqs[0]);}
         let reply;
+        const faq = faqs[0];
         try {
-          reply = await this.execIntent(faqs[0], message, lead);//, bot);
+          reply = await this.execIntent(faq, message, lead);//, bot);
+          // if (!reply.attributes) {
+          //   reply.attributes = {}
+          // }
+          // // used by the Clients to get some info about the intent that generated this reply
+          // reply.attributes.intent_display_name = faq.intent_display_name;
+          // reply.attributes.intent_id = faq.intent_id;
         }
         catch(error) {
           console.error("error during exact match execIntent():", error);
@@ -236,6 +249,12 @@ class TiledeskChatbot {
           let reply;
           try {
             reply = await this.execIntent(faq, message, lead);//, bot);
+            // if (!reply.attributes) {
+            //   reply.attributes = {}
+            // }
+            // // used by the Clients to get some info about the intent that generated this reply
+            // reply.attributes.intent_display_name = faq.intent_display_name;
+            // reply.attributes.intent_id = faq.intent_id;
           }
           catch(error) {
             console.error("error during NLP decoding:", error);
@@ -258,6 +277,12 @@ class TiledeskChatbot {
             let reply;
             try {
               reply = await this.execIntent(fallbackIntent, message, lead);//, bot);
+              // if (!reply.attributes) {
+              //   reply.attributes = {}
+              // }
+              // // used by the Clients to get some info about the intent that generated this reply
+              // reply.attributes.intent_display_name = fallbackIntent.intent_display_name;
+              // reply.attributes.intent_id = fallbackIntent.intent_id;
             }
             catch(error) {
               console.error("error during defaultFallback:", error);
@@ -380,6 +405,9 @@ class TiledeskChatbot {
         form_reply.message.attributes.fillParams = true;
         form_reply.message.attributes.splits = true;
         form_reply.message.attributes.directives = true;
+        // // used by the Clients to get some info about the intent that generated this reply
+        // form_reply.message.attributes.intent_display_name = faq.intent_display_name;
+        // form_reply.message.attributes.intent_id = faq.intent_id;
         return form_reply.message
       }
     }
@@ -438,6 +466,7 @@ class TiledeskChatbot {
       bot: this.bot
     }
     static_bot_answer.attributes.intent_info = intent_info;
+    // console.log("static_bot_answer.attributes.intent_info",)
     // static_bot_answer.attributes.directives = true;
     // static_bot_answer.attributes.splits = true;
     // static_bot_answer.attributes.markbot = true;

package/models/TiledeskChatbotUtil.js

@@ -146,44 +146,61 @@ class TiledeskChatbotUtil {
     //     }
     // }
 
-    static filterOnVariables(commands, variables) {
+    //static filterOnVariables(commands, variables) {
+    static filterOnVariables(message, variables) {
         if (!variables) {
           return;
         }
-        if (commands.length > 0) {
-          for (let i = commands.length - 1; i >= 0; 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
-                const jsonCondition = commands[i].message["_tdJSONCondition"];
-                // console.log("jsonCondition:", jsonCondition);
-                if (jsonCondition) {
-                    // const expression = TiledeskExpression.JSONGroupsToExpression(jsonCondition.groups);
-                    const expression = TiledeskExpression.JSONGroupToExpression(jsonCondition);
-                    // 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]);
-                    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--;
+        if (message.attributes.commands.length > 0) {
+            let commands = message.attributes.commands;
+            message.text = "";
+            for (let i = commands.length - 1; i >= 0; i--) {
+                // console.log("...commands[" + i + "]");
+                if (commands[i].type === "message") { // is a message, not wait
+                    // console.log("commands[i]:", commands[i].message.text);
+                    // 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
+                    const jsonCondition = commands[i].message["_tdJSONCondition"];
+                    // console.log("jsonCondition:", jsonCondition);
+                    if (jsonCondition) {
+                        // const expression = TiledeskExpression.JSONGroupsToExpression(jsonCondition.groups);
+                        const expression = TiledeskExpression.JSONGroupToExpression(jsonCondition);
+                        // 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]);
+                        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--;
+                                }
+                            }
+                        }
+                        else {
+                            // console.log("comands[i]:", commands[i], commands[i].message, commands[i].message.text)
+                            if (commands[i] && commands[i].message && commands[i].message.text) {
+                                // console.log("curr text:", message.text)
+                                if (message.text === "") {
+                                    message.text = commands[i].message.text;    
+                                }
+                                else {
+                                    message.text = commands[i].message.text + "\n\n" + message.text;
+                                }
+                                // console.log("new text:", message.text)
+                            }
+                            else {
+                                // console.log("commands@", commands[i])
                             }
                         }
                     }
                 }
             }
-                
-            
-        }
           // for (let i = 0; i < commands.length; i++) {
           //   if (commands[i].type === 'message' && commands[i].message && commands[i].message.text) {
           //     if (this.log) {console.log("[" + commands[i].message.lang + "]commands[i].message.text:", commands[i].message.text);}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.82",
+  "version": "0.1.85",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "jsonschema": "^1.4.1",
     "jsonwebtoken": "^8.5.1",
     "minimist-string": "^1.0.2",
-    "mocha": "^10.2.0",
     "mongoose": "^6.3.5",
     "nanoid": "^3.1.25",
     "redis": "^3.1.2",
     "uuid": "^3.3.3",
-    "vm2": "^3.9.13"
+    "vm2": "^3.9.13",
+    "mocha": "^10.2.0"
   }
 }

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -26,6 +26,7 @@ const { DirJSONCondition } = require('./directives/DirJSONCondition');
 const { DirAssign } = require('./directives/DirAssign');
 const { DirSetAttribute } = require('./directives/DirSetAttribute');
 const { DirWebRequest } = require('./directives/DirWebRequest');
+const { DirCode } = require('./directives/DirCode');
 
 const { TiledeskChatbot } = require('../models/TiledeskChatbot');
 const { DirIfOnlineAgents } = require('./directives/DirIfOnlineAgents');
@@ -49,6 +50,7 @@ class DirectivesChatbotPlug {
     this.HELP_CENTER_API_ENDPOINT = config.HELP_CENTER_API_ENDPOINT;
     this.tdcache = config.cache;
     this.directives = config.directives;
+    this.reply = config.reply;
     // console.log("We have the support request:", JSON.stringify(this.supportRequest))
   }
 
@@ -88,7 +90,6 @@ class DirectivesChatbotPlug {
   }
 
   async processDirectives(theend) {
-    // console.log("Directives to process:", JSON.stringify(this.directives));
     this.theend = theend;
     const directives = this.directives;
     if (!directives || directives.length === 0) {
@@ -106,7 +107,7 @@ class DirectivesChatbotPlug {
     // const requestId = supportRequest.request_id
     let depId;
     if (supportRequest.department && supportRequest.department._id) {
-      if (this.log) {console.log("setting depId:", supportRequest.department._id);}      
+      if (this.log) {console.log("setting depId:", supportRequest.department._id);}
       depId = supportRequest.department._id;
       if (this.log) {console.log("depId is:", depId);}
     }
@@ -124,6 +125,7 @@ class DirectivesChatbotPlug {
       projectId: projectId,
       token: token,
       supportRequest: supportRequest,
+      reply: this.reply,
       requestId: supportRequest.request_id,
       TILEDESK_APIURL: API_URL,
       TILEBOT_ENDPOINT: TILEBOT_ENDPOINT,
@@ -189,6 +191,7 @@ class DirectivesChatbotPlug {
   async process(directive) {
     // console.log(".process(directive):", JSON.stringify(directive));
     let context = this.context;
+    // console.log(".this.context.reply", JSON.stringify(this.context.reply));
     if (directive) {
       if (context.log) {
         console.log("..process(directive):", JSON.stringify(directive));
@@ -199,7 +202,6 @@ class DirectivesChatbotPlug {
     if (directive && directive.name) {
       directive_name = directive.name.toLowerCase();
     }
-    
     if (directive == null || (directive !== null && directive["name"] === undefined)) {
       if (context.log) { console.log("stop process(). directive is (null?):", directive);}
       this.theend();
@@ -379,7 +381,7 @@ class DirectivesChatbotPlug {
     //   });
     // }
     else if (directive_name === Directives.AGENT) {
-      console.log("...DirMoveToAgent");
+      // console.log("...DirMoveToAgent");
       new DirMoveToAgent(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
         this.process(next_dir);
@@ -472,6 +474,13 @@ class DirectivesChatbotPlug {
         this.process(next_dir);
       });
     }
+    else if (directive_name === Directives.CODE) {
+      console.log("...DirCode", directive);
+      new DirCode(context).execute(directive, async () => {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+      });
+    }
     else if (directive_name === Directives.DELETE) {
       // console.log("got delete dir...")
       new DirDeleteVariable(context).execute(directive, async () => {

package/tiledeskChatbotPlugs/TiledeskRequestVariables.js

@@ -0,0 +1,65 @@
+const { TiledeskChatbot } = require('../models/TiledeskChatbot');
+
+class TiledeskRequestVariables {
+    
+    constructor(requestId, tdcache, vars) {
+        this.requestId = requestId;
+        this.tdcache = tdcache;
+        this.vars = vars;
+        this.ops = {
+            set: {
+            },
+            del: {
+            }
+        }
+    }
+
+    async set(name, value, callback) {
+        const parameter_key = TiledeskChatbot.requestCacheKey(this.requestId) + ":parameters";
+        await this.tdcache.hset(parameter_key, name, value);
+        if (callback) {
+            callback();
+        }
+    }
+
+    async get(name, callback) {
+        const parameter_key = TiledeskChatbot.requestCacheKey(this.requestId) + ":parameters";
+        const value = await this.tdcache.hget(parameter_key, name);
+        if (callback) {
+            callback(value);
+        }
+        else {
+            return value;
+        }
+    }
+
+    async delete(name) {
+        const parameter_key = TiledeskChatbot.requestCacheKey(this.requestId) + ":parameters";
+        return await this.tdcache.hdel(parameter_key, name);
+    }
+
+    async all(callback) {
+        const parameter_key = TiledeskChatbot.requestCacheKey(this.requestId) + ":parameters";
+        const values = await this.tdcache.hgetall(parameter_key);
+        if (callback) {
+            callback(values);
+        }
+        else {
+            return values;
+        }
+    }
+
+    setVar(key, value) {
+        this.ops.set[key] = value;
+    }
+
+    delVar(key) {
+        this.ops.del[key] = true;
+    }
+
+    allVars() {
+        return this.vars;
+    }
+}
+
+module.exports = { TiledeskRequestVariables };

package/tiledeskChatbotPlugs/directives/DirCode.js

@@ -0,0 +1,91 @@
+const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskExpression } = require('../../TiledeskExpression');
+const { TiledeskRequestVariables } = require('../TiledeskRequestVariables');
+
+class DirCode {
+
+  constructor(context) {
+    if (!context) {
+      throw new Error('context object is mandatory.');
+    }
+    this.context = context;
+    this.log = context.log;
+  }
+
+  execute(directive, callback) {
+    let action;
+    if (directive.action) {
+      action = directive.action
+    }
+    else {
+      callback();
+      return;
+    }
+    this.go(action, (stop) => {
+      callback(stop);
+    });
+    
+  }
+
+  async go(action, callback) {
+    console.log("action.source:", action.source)
+    const source_code = action.source;
+    if (!source_code || source_code.trim() === "") {
+      if (this.log) {console.log("Invalid source_code");}
+      callback();
+      return;
+    }
+    let script_context = {
+      console: console
+    }
+    let variables = null;
+    if (this.context.tdcache) {
+      variables = 
+      await TiledeskChatbot.allParametersStatic(
+        this.context.tdcache, this.context.requestId
+      );
+      if (this.log) {console.log("Variables:", JSON.stringify(variables))}
+    }
+    else {
+      console.error("(DirCode) No this.context.tdcache");
+      callback();
+      return;
+    }
+    console.log("before variables:", variables);
+    for (const [key, value] of Object.entries(variables)) {
+      script_context[key] = value;
+    }
+    let variablesManager = new TiledeskRequestVariables(this.context.requestId, this.context.tdcache, variables)
+    script_context.tiledeskVars = variablesManager;
+    //console.log("script_context:", script_context);
+    const tdExpression = new TiledeskExpression();
+    //console.log("tdExpression:", tdExpression.evaluateJavascriptExpression);
+    try {
+      const result = new TiledeskExpression().evaluateJavascriptExpression(source_code, script_context);
+      console.log("result:", result);
+      // console.log("script_context.tiledeskVars:", script_context.tiledeskVars);
+      for (const [key, value] of Object.entries(script_context.tiledeskVars.ops.set)) {
+        // await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, key, value);
+        await variablesManager.set(key, value);
+      }
+      // if (this.log) {
+        let newvars_set = await variablesManager.all();
+        // console.log("newvars_set:", newvars_set);
+      // }
+      for (const [key, value] of Object.entries(script_context.tiledeskVars.ops.del)) {
+        // await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, key, value);
+        await variablesManager.delete(key);
+      }
+      const newvars_del = await variablesManager.all();
+      console.log("newvars_del:", newvars_del);
+    }
+    catch(err) {
+      console.error("An error occurred:", err);
+    }
+    callback();
+    return;
+  }
+
+}
+
+module.exports = { DirCode };

package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js

@@ -100,7 +100,7 @@ class DirMoveToAgent {
               console.error("Error moving to agent:", err);
             }
             else {
-              console.log("Successfully moved to agent");
+              // console.log("Successfully moved to agent");
             }
             callback();
           });

package/tiledeskChatbotPlugs/directives/DirOfflineHours.js

@@ -54,7 +54,6 @@ class DirOfflineHours {
   reply(pipeline, directive, offline_reply, callback) {
     let message = pipeline.message;
     console.log("message in pipeline:", JSON.stringify(message));
-    //const original_text = message.attributes.intent_info.question_payload.text
     this.tdclient.openNow((err, result) => {
       console.log("whenofflinehours result...", result);
       if (err) {

package/tiledeskChatbotPlugs/directives/DirRandomReply.js

@@ -73,12 +73,6 @@ class DirRandomReply {
         }
       }
 
-      // EVALUATE EXPRESSION AND REMOVE BASED ON EVALUATION
-    //   if (message.attributes && message.attributes.commands) {
-    //     if (this.log) {console.log("filterOnVariables...on commands", JSON.stringify(message.attributes.commands));}
-    //     TiledeskChatbotUtil.filterOnVariables(message.attributes.commands, requestVariables);
-    //   }
-      
       // temporary send back of reserved attributes
       if (!message.attributes) {
         message.attributes = {}

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -17,11 +17,9 @@ class DirReply {
   }
 
   execute(directive, callback) {
-    // console.log("Reply directive:", JSON.stringify(directive));
     let action;
     if (directive.action) {
       action = directive.action;
-      // console.log("got action:", JSON.stringify(action));
       if (!action.attributes) {
         action.attributes = {}
       }
@@ -40,21 +38,21 @@ class DirReply {
   async go(action, callback) {
     const message = action;
     // fill
-    let requestVariables = null;
+    let requestAttributes = null;
     if (this.tdcache) {
-      requestVariables = 
+      requestAttributes = 
       await TiledeskChatbot.allParametersStatic(
         this.tdcache, this.requestId
       );
       if (this.log) {
-        for (const [key, value] of Object.entries(requestVariables)) {
+        for (const [key, value] of Object.entries(requestAttributes)) {
           const value_type = typeof value;
           if (this.log) {console.log("(DirReply) request parameter:", key, "value:", value, "type:", value_type)}
         }
       }
       const filler = new Filler();
       // fill text attribute
-      message.text = filler.fill(message.text, requestVariables);
+      message.text = filler.fill(message.text, requestAttributes);
       if (this.log) {console.log("filling commands'. Message:", JSON.stringify(message));}
       if (message.attributes && message.attributes.commands) {
         if (this.log) {console.log("filling commands'. commands found.");}
@@ -65,8 +63,8 @@ class DirReply {
           for (let i = 0; i < commands.length; i++) {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
-              command.message.text = filler.fill(command.message.text, requestVariables);
-              TiledeskChatbotUtil.fillCommandAttachments(command, requestVariables, this.log);
+              command.message.text = filler.fill(command.message.text, requestAttributes);
+              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               if (this.log) {console.log("command filled:", command.message.text);}
             }
           }
@@ -74,26 +72,25 @@ class DirReply {
       }
 
       // EVALUATE EXPRESSION AND REMOVE BASED ON EVALUATION
-      // 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) {
         if (this.log) {console.log("filterOnVariables...on commands", JSON.stringify(message.attributes.commands));}
-        TiledeskChatbotUtil.filterOnVariables(message.attributes.commands, requestVariables);
+        // TiledeskChatbotUtil.filterOnVariables(message.attributes.commands, requestAttributes);
+        TiledeskChatbotUtil.filterOnVariables(message, requestAttributes);
       }
-      
       // temporary send back of reserved attributes
       if (!message.attributes) {
         message.attributes = {}
       }
       // Reserved names: userEmail, userFullname
-      if (requestVariables['userEmail']) {
-          message.attributes.updateUserEmail = requestVariables['userEmail'];
+      if (requestAttributes['userEmail']) {
+          message.attributes.updateUserEmail = requestAttributes['userEmail'];
       }
-      if (requestVariables['userFullname']) {
-        message.attributes.updateUserFullname = requestVariables['userFullname'];
+      if (requestAttributes['userFullname']) {
+        message.attributes.updateUserFullname = requestAttributes['userFullname'];
+      }
+      // intent_info
+      if (this.context.reply && this.context.reply.attributes && this.context.reply.attributes.intent_info) {
+        message.attributes.intentName = this.context.reply.attributes.intent_info.intent_name;
       }
     }
     // send!

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -1,23 +1,13 @@
 class Directives {
   static AGENT = 'agent';
-  static WHEN_ONLINE_MOVE_TO_AGENT = "whenonlinemovetoagent"; // DEPRECATED?
   static CLOSE = 'close';
   static DEPARTMENT = 'department';
-  static JSONMESSAGE = 'jsonmessage'; // DEPRECATED?
   static MESSAGE = 'message';
   static HMESSAGE = 'hmessage';
   static INTENT = 'intent';
   static REMOVE_CURRENT_BOT = "removecurrentbot";
   static REPLACE_BOT = "replacebot";
-  static WHEN_NO_AVAILABLE_AGENTS = "whennoavailableagents"; // DEPRECATED
-  static WHEN_OFFLINE_HOURS = "whenofflinehours"; // DEPRECATED // adds a message on top of the original message when offline hours opts: --replace
-  //static WHEN_OFFLINE_HOURS_REPLACE_MESSAGE = "whenofflinehoursreplacemessage"; // REMOVE
-  static DISABLE_INPUT_TEXT = "disableinputtext"; // DEPRECATED
-  static WHEN_OPEN = "whenopen"; // DEPRECATED
-  static WHEN_CLOSED = "whenclosed"; // DEPRECATED
-  static IF_NO_AGENTS = "ifnoagents"; // DEPRECATED
-  static IF_AGENTS = "ifagents"; // DEPRECATED
-
+  static ASSIGN = "assign"; // DEPRECATED
   static ASK_HELP_CENTER = "askhelpcenter";
   static WAIT = "wait";
   static LOCK_INTENT = "lockintent";
@@ -28,16 +18,25 @@ class Directives {
   static DELETE = "delete";
   static IF_OPEN_HOURS = "ifopenhours";
   static IF_ONLINE_AGENTS = "ifonlineagents";
-  static IF_NOT_OPEN_HOURS = "ifnotopenhours"; // DEPRECATED
   static FUNCTION_VALUE = "functionvalue";
-  static CONDITION = "condition"; // DEPRECATED
   static JSON_CONDITION = "jsoncondition";
-  static ASSIGN = "assign"; // DEPRECATED
   static SET_ATTRIBUTE = "setattribute";
-  // static IF_AVAILABLE_AGENTS = "ifavailableagents"; // TODO
-  // static IF_NO_AVAILABLE_AGENTS = "ifnotavailableagents"; // TODO
   static REPLY = 'reply';
   static RANDOM_REPLY = 'randomreply';
+  static CODE = 'code';
+
+  // static WHEN_ONLINE_MOVE_TO_AGENT = "whenonlinemovetoagent"; // DEPRECATED?
+  // static WHEN_OFFLINE_HOURS = "whenofflinehours"; // DEPRECATED // adds a message on top of the original message when offline hours opts: --replace
+  //static WHEN_OFFLINE_HOURS_REPLACE_MESSAGE = "whenofflinehoursreplacemessage"; // REMOVE
+  // static DISABLE_INPUT_TEXT = "disableinputtext"; // DEPRECATED
+  // static WHEN_OPEN = "whenopen"; // DEPRECATED
+  // static WHEN_CLOSED = "whenclosed"; // DEPRECATED
+  // static IF_NO_AGENTS = "ifnoagents"; // DEPRECATED
+  // static IF_AGENTS = "ifagents"; // DEPRECATED
+  // static WHEN_NO_AVAILABLE_AGENTS = "whennoavailableagents"; // DEPRECATED
+  // static JSONMESSAGE = 'jsonmessage'; // DEPRECATED?
+  // static IF_NOT_OPEN_HOURS = "ifnotopenhours"; // DEPRECATED
+  // static CONDITION = "condition"; // DEPRECATED
 
   static actionToDirective(action) {
     // console.log("actionToDirective:", action);