@tiledesk/tiledesk-tybot-connector 2.0.19 → 2.0.21-rc1

package/CHANGELOG.md

@@ -5,8 +5,6 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
-# 2.0.9
-
 # 2.0.9-rc1
 - removed: speech-to-text management
 
@@ -20,6 +18,8 @@ available on:
 
 # v0.5.0
 - added: AI_ENDPOINT env var
+
+# v0.5.0-rc1
 - added: ability to get 'none' as bodytype in webresponse
 
 # v0.4.2
@@ -34,6 +34,19 @@ available on:
 - changed: refactoring of DIrWebRequestv2
 - bug-fixed: erro while parsing webrequestv2 body
 
+# v0.3.5-rc4
+- added: webhook action (same as intent one)
+
+# v0.3.5-rc3
+- bug-fixed: jsonBody parse error in web-request-v2
+
+# v0.3.5-rc2
+- bug-fixed: cannot set status of undefined reading res.status in DirAssistant
+
+# v0.3.5-rc1
+- changed: refactoring web-request-v2
+- bug-fixed: jsonBody parse error in web-request-v2
+
 # v0.3.4
 -bug-fixed: slit is undefined in TiledeskChatbotUtils
 
@@ -43,6 +56,18 @@ available on:
 # v0.3.2
 - bug-fixed: minor improvement
 
+# v0.2.153-rc9
+- changed: updated tiledesk-multi-worker to 0.2.1-rc2   
+
+# v0.2.153-rc8
+- added: fixToken function in TiledeskService utils class
+
+# v0.2.153-rc4
+- log added
+
+# v0.2.153-rc3
+- added: specchToText function to transcript audio file
+
 # v0.2.153-rc1
 - changed: context for gpt-40 and gpt-40-mini
 

package/Logger.js

@@ -12,6 +12,8 @@ let publisher = new Publisher(AMQP_MANAGER_URL, {
     exchange: "amq.topic"
 })
 
+console.log("LOGGER publisher: ", publisher);
+
 class Logger {
 
     constructor(config) {
@@ -92,6 +94,7 @@ class Logger {
         }
         
         let topic = LOGS_BASE_ROUTING_KEY + `.${this.request_id}`;
+        console.log("LOGGER publishing on topic ", topic)
         publisher.publish(data, topic);
         return;
     }

package/TdCache.js

@@ -149,9 +149,23 @@ class TdCache {
       })
     }
 
-    async unsubscribe(topic, listener) {
-      await this.subscriberClient.unsubscribe(topic, listener);
+    async unsubscribe(topic) {
+      if (!this.subscriberClient) {
+        winston.warn("Redis subscriberClient not initialized, cannot unsubscribe.");
+        return;
+      }
+    
+      try {
+        const result = await this.subscriberClient.unsubscribe(topic);
+        winston.debug(`Unsubscribed from topic "${topic}". Current subscription count: ${result}`);
+      } catch (err) {
+        winston.error(`Error unsubscribing from topic "${topic}":`, err);
+      }
     }
+    
+    // async unsubscribe(topic, listener) {
+    //   await this.subscriberClient.unsubscribe(topic, listener);
+    // }
 
     // subscribe(key, callback) {
     //   this.redis_sub.subscribe(key, (message) => {

package/engine/mock/MockBotsDataSource.js

@@ -24,8 +24,7 @@ class MockBotsDataSource {
       }catch(err){
         reject(err);
       }
-      
-    }) 
+    })
   }
   
   async getBotByIdCache(botId, tdcache) {

package/index.js

@@ -13,6 +13,8 @@ const { TiledeskChatbotConst } = require('./engine/TiledeskChatbotConst.js');
 const { IntentsMachineFactory } = require('./engine/IntentsMachineFactory.js');
 const { v4: uuidv4 } = require('uuid');
 let axios = require('axios');
+const { customAlphabet } = require('nanoid');
+const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz0123456789', 10);
 // let parser = require('accept-language-parser');
 
 router.use(bodyParser.json({limit: '50mb'}));
@@ -98,6 +100,9 @@ router.post('/ext/:botid', async (req, res) => {
     Promise.reject(err);
     return;
   });
+
+  winston.debug("(tybotRoute) Bot found: ", bot)
+  
   
   let intentsMachine;
   let backupMachine;
@@ -393,6 +398,8 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
   const token = body.token;
   delete body.async;
   delete body.token;
+
+  let draft = req.body.draft || false;
   
   // invoke block
   // unique ID for each execution
@@ -402,7 +409,6 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
   } else {
     const execution_id = uuidv4().replace(/-/g, '');
     request_id = "automation-request-" + project_id + "-" + execution_id;
-    
   }
   const command = "/#" + block_id;
   let message = {
@@ -411,7 +417,8 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
       text: command,
       id_project: project_id,
       request: {
-        request_id: request_id
+        request_id: request_id,
+        draft: draft
       },
       attributes: {
         payload: body
@@ -432,13 +439,14 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
   } else {
     
     winston.verbose("Sync webhook. Subscribe and await for reply...")
+    let uniqueid = nanoid();
     const topic = `/webhooks/${request_id}`;
     
     try {
 
       const listener = async (message, topic) => {
         winston.debug("Web response is: " + JSON.stringify(message) + " for topic " + topic);
-        await tdcache.unsubscribe(topic, listener);
+        await tdcache.unsubscribe(topic);
 
         let json = JSON.parse(message);
         let status = json.status ? json.status : 200;

package/package.json

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

package/services/KbService.js

@@ -0,0 +1,105 @@
+const httpUtils = require('../utils/HttpUtils');
+const winston = require('../utils/winston');
+const API_ENDPOINT = process.env.API_ENDPOINT;
+
+class KbService {
+
+  constructor() { }
+
+  async getNamespace(id_project, token, name, id) {
+    return new Promise((resolve) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kb/namespace/all",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("Kb HttpRequest", http_request);
+      
+      httpUtils.request(
+        http_request, async (err, namespaces) => {
+          if (err) {
+            winston.error("Error getting namespaces:", err);
+            reject(err);
+          } else {
+            winston.debug("Get namespaces response:", namespaces);
+            if (!Array.isArray(namespaces)) {
+              reject(new Error('Invalid response format'));
+              return;
+            }
+            
+            let namespace;
+            if (name) {
+              namespace = namespaces.find(n => n.name === name);
+            } else {
+              namespace = namespaces.find(n => n.id === id);
+            }
+            resolve(namespace || null);
+          }
+        }
+      )
+    })
+  }
+
+  async getKeyFromKbSettings(id_project, token) {
+
+    return new Promise((resolve, reject) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kbsettings",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("Kb HttpRequest", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Error getting kb settings:", err);
+            reject(err);
+          } else {
+            if (!resbody || !resbody.gptkey) {
+              resolve(null);
+            } else {
+              resolve(resbody.gptkey);
+            }
+          }
+        }
+      )
+    })
+  }
+
+  async addUnansweredQuestion(id_project, namespace, question, token) {
+    
+    const json = { namespace, question };
+    
+    return new Promise((resolve, reject) => {
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/kb/unanswered/",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "POST",
+        json: json
+      }
+      winston.debug("Kb HttpRequest", http_request);
+
+      httpUtils.request(http_request, (err, response) => {
+        if (err) {
+          winston.error("Error adding unanswered question:", err);
+          reject(err);
+        } else {
+          resolve(response);
+        }
+      });
+    });
+  }
+}
+
+const kbService = new KbService();
+module.exports = kbService;

package/services/QuotasService.js

@@ -0,0 +1,69 @@
+const httpUtils = require('../utils/HttpUtils');
+const winston = require('../utils/winston');
+const API_ENDPOINT = process.env.API_ENDPOINT;
+
+class QuotasService {
+
+  constructor() { }
+
+  async checkQuoteAvailability(id_project, token) {
+    return new Promise((resolve) => {
+
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/quotes/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        method: "GET"
+      }
+      winston.debug("QuotasService HttpRequest", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Check quote availability err: ", err);
+            resolve(true)
+          } else {
+            if (resbody.isAvailable === true) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          }
+        }
+      )
+    })
+  }
+
+  async updateQuote(id_project, token, tokens_usage) {
+    return new Promise((resolve, reject) => {
+
+      const http_request = {
+        url: API_ENDPOINT + "/" + id_project + "/quotes/incr/tokens",
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'JWT ' + token
+        },
+        json: tokens_usage,
+        method: "POST"
+      }
+      winston.debug("DirAskGPTV2 update quote HttpRequest ", http_request);
+
+      httpUtils.request(
+        http_request, async (err, resbody) => {
+          if (err) {
+            winston.error("Increment tokens quote err: ", err);
+            reject(false)
+          } else {
+            resolve(true);
+          }
+        }
+      )
+    })
+  }
+
+}
+
+const quotasService = new QuotasService();
+module.exports = quotasService;

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -54,13 +54,13 @@ const { DirMoveToUnassigned } = require('./directives/DirMoveToUnassigned');
 const { DirAddTags } = require('./directives/DirAddTags');
 const { DirSendWhatsapp } = require('./directives/DirSendWhatsapp');
 const { DirReplaceBotV3 } = require('./directives/DirReplaceBotV3');
-const { DirAiTask, DirAiPrompt } = require('./directives/DirAiPrompt');
+const { DirAiPrompt } = require('./directives/DirAiPrompt');
 const { DirWebResponse } = require('./directives/DirWebResponse');
 const { DirConnectBlock } = require('./directives/DirConnectBlock');
+const { DirAddKbContent } = require('./directives/DirAddKbContent');
+const { DirFlowLog } = require('./directives/DirFlowLog');
 
 const winston = require('../utils/winston');
-const { DirFlowLog } = require('./directives/DirFlowLog');
-const { DirAddKbContent } = require('./directives/DirAddKbContent');
 
 class DirectivesChatbotPlug {
 
@@ -219,14 +219,13 @@ class DirectivesChatbotPlug {
       directive_name = directive.name.toLowerCase();
     }
     if (directive && directive.action) {
-        const action_id = directive.action["_tdActionId"];
-        const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
-        if ( locked_action_id && (locked_action_id !== action_id) ) {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-          return;
-        }
-      
+      const action_id = directive.action["_tdActionId"];
+      const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
+      if ( locked_action_id && (locked_action_id !== action_id) ) {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+        return;
+      }      
     }
     if (directive == null || (directive !== null && directive["name"] === undefined)) {
       winston.debug("(DirectivesChatbotPlug) stop process(). directive is (null?): ", directive);
@@ -704,6 +703,19 @@ class DirectivesChatbotPlug {
         }
       });
     }
+    else if (directive_name === Directives.WEBHOOK) {
+      // console.log(".....DirIntent")
+      new DirIntent(context).execute(directive, async (stop) => {
+        if (stop) {
+          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
+          this.theend();
+        }
+        else {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+        }
+      });
+    }
     else if (directive_name === Directives.WEB_RESPONSE) {
       new DirWebResponse(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
@@ -716,6 +728,12 @@ class DirectivesChatbotPlug {
         this.process(next_dir);
       })
     }
+    else if (directive_name === Directives.ADD_KB_CONTENT) {
+      new DirAddKbContent(context).execute(directive, async () => {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+      });
+    }
     else {
       let next_dir = await this.nextDirective(this.directives);
       this.process(next_dir);

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -11,6 +11,8 @@ const winston = require('../../utils/winston');
 const httpUtils = require("../../utils/HttpUtils");
 const integrationService = require("../../services/IntegrationService");
 const { Logger } = require("../../Logger");
+const kbService = require("../../services/KBService");
+const quotasService = require("../../services/QuotasService");
 
 class DirAskGPTV2 {
 
@@ -172,7 +174,7 @@ class DirAskGPTV2 {
     if (!key) {
       this.logger.native("[Ask Knowledge Base] OpenAI key not found in Integration. Using shared OpenAI key");
       winston.verbose("DirAskGPTV2 - Key not found in Integrations. Searching in kb settings...");
-      key = await this.getKeyFromKbSettings();
+      key = await kbService.getKeyFromKbSettings(this.projectId, this.token);
     }
 
     if (!key) {
@@ -196,7 +198,7 @@ class DirAskGPTV2 {
     }
 
     if (publicKey === true && !chunks_only) {
-      let keep_going = await this.checkQuoteAvailability();
+      let keep_going = await quotasService.checkQuoteAvailability(this.projectId, this.token);
       if (keep_going === false) {
         this.logger.warn("[Ask Knowledge Base] Tokens quota exceeded. Skip the action")
         winston.verbose("DirAskGPTV2 - Quota exceeded for tokens. Skip the action")
@@ -340,7 +342,9 @@ class DirAskGPTV2 {
                 tokens: resbody.prompt_token_size,
                 model: json.model
               }
-              this.updateQuote(tokens_usage);
+              quotasService.updateQuote(this.projectId, this.token, tokens_usage).catch((err) => {
+                winston.error("Error updating quota: ", err);
+              })
             }
   
             if (trueIntent) {
@@ -353,6 +357,10 @@ class DirAskGPTV2 {
           }
         } else {
           await this.#assignAttributes(action, answer, source);
+          kbService.addUnansweredQuestion(this.projectId, json.namespace, json.question, this.token).catch((err) => {
+            winston.error("DirAskGPTV2 - Error adding unanswered question: ", err);
+            this.logger.warn("[Ask Knowledge Base] Unable to add unanswered question", json.question, "to namespacae", json.namespace);
+          })
           if (falseIntent) {
             await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
             callback(true);
@@ -423,93 +431,6 @@ class DirAskGPTV2 {
     }
   }
 
-  async getKeyFromKbSettings() {
-    return new Promise((resolve) => {
-
-      const KB_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("DirAskGPTV2 KB HttpRequest", KB_HTTPREQUEST);
-
-      httpUtils.request(
-        KB_HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Get kb settings error ", err?.response?.data);
-            resolve(null);
-          } else {
-            if (!resbody.gptkey) {
-              resolve(null);
-            } else {
-              resolve(resbody.gptkey);
-            }
-          }
-        }
-      )
-    })
-  }
-
-  async checkQuoteAvailability() {
-    return new Promise((resolve) => {
-
-      const HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/tokens",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("DirAskGPTV2 check quote availability HttpRequest", HTTPREQUEST);
-
-      httpUtils.request(
-        HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Check quote availability err: ", err);
-            resolve(true)
-          } else {
-            if (resbody.isAvailable === true) {
-              resolve(true)
-            } else {
-              resolve(false)
-            }
-          }
-        }
-      )
-    })
-  }
-
-  async updateQuote(tokens_usage) {
-    return new Promise((resolve, reject) => {
-
-      const HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        json: tokens_usage,
-        method: "POST"
-      }
-      winston.debug("DirAskGPTV2 update quote HttpRequest ", HTTPREQUEST);
-
-      httpUtils.request(
-        HTTPREQUEST, async (err, resbody) => {
-          if (err) {
-            winston.error("DirAskGPTV2 Increment tokens quote err: ", err);
-            reject(false)
-          } else {
-            resolve(true);
-          }
-        }
-      )
-    })
-  }
-
   /**
    * Transforms the transcirpt array in a dictionary like '0': { "question": "xxx", "answer":"xxx"}
    * merging consecutive messages with the same role in a single question or answer.

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -19,6 +19,8 @@ class DirReply {
     this.tdcache = context.tdcache;
     this.log = context.log;
     this.API_ENDPOINT = context.API_ENDPOINT;
+
+    console.log("context.supportRequest: ", context.supportRequest);
     
     this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest?.draft, intent_id: this.context.reply?.attributes?.intent_info?.intent_id });
     this.tdClient = new TiledeskClient({ projectId: this.context.projectId, token: this.context.token, APIURL: this.API_ENDPOINT, APIKEY: "___", log: this.log });

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -118,7 +118,7 @@ class DirWebRequestV2 {
         this.logger.native("[Web Request] resbody: ", resbody);
         
         if (err) {
-          this.logger.error("WebRequest error: ", err);
+          this.logger.error("[Web Request] error: ", err);
           winston.log("webRequest error: ", err);
           if (callback) {
             if (falseIntent) {

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,6 +58,7 @@ class Directives {
   static MOVE_TO_UNASSIGNED = "move_to_unassigned";
   static CONNECT_BLOCK = "connect_block";
   static ADD_TAGS = 'add_tags'
+  static WEBHOOK = 'webhook';
   static WEB_RESPONSE = "web_response";
   static FLOW_LOG = "flow_log";
   static ADD_KB_CONTENT = "add_kb_content";

package/utils/TiledeskChatbotUtil.js

@@ -333,27 +333,6 @@ class TiledeskChatbotUtil {
                                         }
                                     });
                                 }
-
-                                // "buttons": [
-                                //                 {
-                                //                     "type": "action",
-                                //                     "value": "Button1", // obbligatorio sempre
-                                //                     "action": "#bb347206-d639-4926-94c9-e94930623dce", // mandatory
-                                //                     "show_echo": true, // lo inserisco sempre
-                                //                     "alias": "button1 alias"
-                                //                 },
-                                //                 {
-                                //                     "type": "text",
-                                //                     "value": "Button2 text", // obbligatorio sempre
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 },
-                                //                 {
-                                //                     "type": "url",
-                                //                     "value": "Button3 link", // obbligatorio sempre
-                                //                     "link": "http://", // obbligatorio
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 }
-                                //             ]
                             }
                             catch(error) {
                                 winston.warn("Invalid json_buttons:", error)
@@ -604,8 +583,10 @@ class TiledeskChatbotUtil {
                 }
                 let currentLeadName = await chatbot.getParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY);
                 winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail);
+                console.log("currentLeadName: ", currentLeadName)
                 if (message.request.lead.fullname && !currentLeadName) {
                     // worth saving
+                    console.log("inside if")
                     winston.debug("(TiledeskChatbotUtil) worth saving email");
                     try {
                         await chatbot.addParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY, message.request.lead.fullname);

package/TdCache copy.js

@@ -1,242 +0,0 @@
-const redis = require('redis');
-
-class TdCache {
-
-    constructor(config) {
-        this.redis_host = config.host;
-        this.redis_port = config.port;
-        this.redis_password = config.password;
-        this.client = null;
-    }
-
-    async connect(callback) {
-        // client = redis.createClient();
-        return new Promise( async (resolve, reject) => {
-            this.client = redis.createClient(
-                {
-                    host: this.redis_host,
-                    port: this.redis_port,
-                    password: this.redis_password
-                });
-            this.client.on('error', err => {
-                reject(err);
-                if (callback) {
-                    callback(err);
-                }
-            });
-            // this.client.on('connect', function() {
-            //     console.log('Redis Connected!');
-            // });
-            this.client.on('ready',function() {
-              console.log("connected")
-                resolve();
-                if (callback) {
-                    callback();
-                }
-                //console.log("Redis is ready.");
-            });
-        });
-    }
-
-    async set(key, value, options) {
-      //console.log("setting key value", key, value)
-      if (!options) {
-        options = {EX: 86400}
-      }
-      return new Promise( async (resolve, reject) => {
-        if (options && options.EX) {
-          //console.log("expires:", options.EX)
-          try {
-            await this.client.set(
-              key,
-              value,
-              'EX', options.EX);
-          }
-          catch(error) {
-            reject(error)
-          }
-        }
-        else {
-          try {
-            //console.log("setting here...key", key, value)
-            await this.client.set(
-              key,
-              value);
-          }
-          catch(error) {
-            console.error("Error", error);
-            reject(error)
-          }
-        }
-        if (options && options.callback) {
-            options.callback();
-        }
-        //console.log("resolving...", key);
-        return resolve();
-      });
-    }
-
-    async incr(key) {
-      // console.log("incr key:", key)
-      return new Promise( async (resolve, reject) => {
-          try {
-            // console.log("incr here...key", key)
-            await this.client.incr(key);
-          }
-          catch(error) {
-            console.error("Error on incr:", error);
-            reject(error)
-          }
-        return resolve();
-      });
-    }
-
-    async hset(dict_key, key, value, options) {
-      //console.log("hsetting dict_key key value", dict_key, key, value)
-      return new Promise( async (resolve, reject) => {
-        if (options && options.EX) {
-          //console.log("expires:", options.EX)
-          try {
-            await this.client.hset(
-              dict_key,
-              key,
-              value,
-              'EX', options.EX);
-          }
-          catch(error) {
-            reject(error)
-          }
-        }
-        else {
-          try {
-            //console.log("setting here...key", key, value)
-            await this.client.hset(
-              dict_key,
-              key,
-              value);
-          }
-          catch(error) {
-            console.error("Error", error);
-            reject(error)
-          }
-        }
-        if (options && options.callback) {
-            options.callback();
-        }
-        return resolve();
-      });
-    }
-
-    async hdel(dict_key, key, options) {
-      //console.log("hsetting dict_key key value", dict_key, key, value)
-      return new Promise( async (resolve, reject) => {
-        if (options && options.EX) {
-          //console.log("expires:", options.EX)
-          try {
-            await this.client.hdel(
-              dict_key,
-              key,
-              'EX', options.EX);
-          }
-          catch(error) {
-            reject(error)
-          }
-        }
-        else {
-          try {
-            //console.log("setting here...key", key, value)
-            await this.client.hdel(
-              dict_key,
-              key);
-          }
-          catch(error) {
-            console.error("Error", error);
-            reject(error);
-          }
-        }
-        if (options && options.callback) {
-            options.callback();
-        }
-        return resolve();
-      });
-    }
-    
-    async setJSON(key, value, options) {
-      const _string = JSON.stringify(value);
-      return await this.set(key, _string, options);
-    }
-    
-    async get(key, callback) {
-      //console.log("getting key", key)
-      return new Promise( async (resolve, reject) => {
-        this.client.get(key, (err, value) => {
-          if (err) {
-            reject(err);
-          }
-          else {
-            if (callback) {
-              callback(value);
-          }
-          return resolve(value);
-          }
-        });
-      });
-    }
-
-    async hgetall(dict_key, callback) {
-      //console.log("hgetting dics", dict_key);
-      return new Promise( async (resolve, reject) => {
-        this.client.hgetall(dict_key, (err, value) => {
-          if (err) {
-            reject(err);
-            if (callback) {
-              callback(err, null);
-            }
-          }
-          else {
-            if (callback) {
-              callback(null, value);
-            }
-            resolve(value);
-          }
-        });
-      });
-    }
-
-    async hget(dict_key, key, callback) {
-      //console.log("hgetting dics", dict_key);
-      return new Promise( async (resolve, reject) => {
-        this.client.hget(dict_key, key, (err, value) => {
-          if (err) {
-            reject(err);
-            if (callback) {
-              callback(err, null);
-            }
-          }
-          else {
-            if (callback) {
-              callback(null, value);
-            }
-            resolve(value);
-          }
-        });
-      });
-    }
-    
-    async getJSON(key, callback) {
-      const value = await this.get(key);
-      return JSON.parse(value);
-    }
-    
-    async del(key, callback) {
-      return new Promise( async (resolve, reject) => {
-        await this.client.del(key);
-        if (callback) {
-            callback();
-        }
-        return resolve();
-      })
-    }
-}
-
-module.exports = { TdCache };

package/tiledeskChatbotPlugs/directives/DirWebRequestV2_old.js

@@ -1,418 +0,0 @@
-let axios = require('axios');
-let https = require("https");
-const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
-const { DirIntent } = require('./DirIntent');
-
-class DirWebRequestV2 {
-  constructor(context) {
-    if (!context) {
-      throw new Error('context object is mandatory.');
-    }
-    this.context = context;
-    this.tdcache = context.tdcache;
-    this.requestId = context.requestId;
-    this.chatbot = context.chatbot;
-    this.log = context.log;
-    
-    this.intentDir = new DirIntent(context);
-  }
-
-  execute(directive, callback) {
-    let action;
-    if (directive.action) {
-      action = directive.action;
-    }
-    else {
-      console.error("Incorrect directive:", JSON.stringify(directive));
-      callback();
-      return;
-    }
-    this.go(action, (stop) => {
-      if (this.log) {console.log("(webrequestv2, stop?", stop); }
-      callback(stop);
-    });
-  }
-
-  async go(action, callback) {
-    if (this.log) {console.log("webRequest action:", JSON.stringify(action));}
-
-    // Condition branches
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
-    const trueIntentAttributes = action.trueIntentAttributes;
-    const falseIntentAttributes = action.falseIntentAttributes;
-    let stopOnConditionMet = action.stopOnConditionMet;
-    if (trueIntent && trueIntent.trim() === "") {
-      trueIntent = null;
-    }
-    if (falseIntent && falseIntent.trim() === "") {
-      falseIntent = null;
-    }
-
-    let requestAttributes = null;
-    if (this.tdcache) {
-      requestAttributes = 
-      await TiledeskChatbot.allParametersStatic(
-        this.tdcache, this.requestId
-      );
-    }
-    const filler = new Filler();
-    const url = filler.fill(action.url, requestAttributes);
-
-    let headers = {};
-    if (action.headersString) {
-      let headersDict = action.headersString
-      for (const [key, value] of Object.entries(headersDict)) {
-        if (this.log) {console.log("header:", key, "value:", value)}
-        let filled_value = filler.fill(value, requestAttributes);
-        headers[key] = filled_value;
-      }
-    }
-
-    let json = null;
-    try {
-      if (action.jsonBody && action.bodyType == "json") {
-        if (this.log) {console.log("action.body is:", action.jsonBody);}
-        let jsonBody = filler.fill(action.jsonBody, requestAttributes);
-        try {
-          json = JSON.parse(jsonBody);
-          if (this.log) {console.log("json is:", json);}
-        }
-        catch(err) {
-          console.error("Error parsing webRequest jsonBody:", jsonBody);
-          if (callback) {
-            if (falseIntent) {
-              await this.chatbot.addParameter("flowError", "Error parsing jsonBody");
-              this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-                console.log('herrrrr 11111' )
-                callback(true); // stop the flow
-                return;
-              });
-            }
-            else {
-              console.log('herrrrr 2222' )
-              callback(false); // continue the flow
-              return;
-            }
-          }
-        }
-      }
-      else if (action.formData && action.bodyType == "form-data") {
-        let formData = filler.fill(action.formData, requestAttributes);
-        if (this.log) {console.log("action.body is form-data:", formData);}
-        // // fill
-        if (formData && formData.length > 0) {
-          for (let i = 0; i < formData.length; i++) {
-            let field = formData[i];
-            if (field.value) {
-              field.value = filler.fill(field.value, requestAttributes);
-              if (this.log) {console.log("field filled:", field.value);}
-            }
-          }
-        }
-        json = {};
-        for (let i = 0; i < formData.length; i++) {
-          let field = formData[i];
-          if (field.enabled && field.value && field.type === "URL") {
-            if (this.log) {console.log("Getting file:", field.value);}
-            let response = await axios.get(field.value,
-              {
-                responseType: 'stream'
-              }
-            );
-            let stream = response.data;
-            // if (this.log) {console.log("Stream data:", stream);}
-            json[field.name] = stream;
-            // process.exit(0);
-          }
-          else if (field.enabled && field.value && field.type === "Text") {
-            json[field.name] = field.value;
-          }
-        }
-        if (this.log) {console.log("final json:", json);}
-      }
-      else {
-        if (this.log) {console.log("no action upload parts");}
-      }
-
-    }
-    catch(error) {
-      console.error("Error", error);
-      if (callback) {
-        if (falseIntent) {
-          await this.chatbot.addParameter("flowError", "Error: " + error);
-          this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-            callback(true); // stop the flow
-            return;
-          });
-        }
-        else {
-          callback(false); // continue the flow
-          return;
-        }
-      }
-    }
-    
-    
-
-    let timeout = this.#webrequest_timeout(action, 20000, 1, 300000);
-    
-    if (this.log) {console.log("webRequest URL", url);}
-    
-    const HTTPREQUEST = {
-      url: url,
-      headers: headers,
-      json: json,
-      method: action.method,
-      timeout: timeout
-    };
-
-    if (this.log) {console.log("webRequest HTTPREQUEST", HTTPREQUEST);}
-    this.#myrequest(
-      HTTPREQUEST, async (err, res) => {
-        if (this.log && err) {
-          console.log("webRequest error:", err);
-        }
-        if (this.log) {console.log("got res:", res);}
-        let resbody = res.data;
-        let status = res.status;
-        let error = res.error;
-        await this.#assignAttributes(action, resbody, status, error)
-        if (this.log) {console.log("webRequest resbody:", resbody);}
-        if (err) {
-          if (this.log) {console.error("webRequest error:", err);}
-          if (callback) {
-            if (falseIntent) {
-              this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-                callback(true); // stop the flow
-              });
-            }
-            else {
-              callback(false); // continue the flow
-            }
-          }
-        }
-        else if(res.status >= 200 && res.status <= 299) {
-          if (trueIntent) {
-            await this.#executeCondition(true, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-              callback(true); // stop the flow
-            });
-          }
-          else {
-            callback(false); // continue the flow
-          }
-        }
-        else {
-          if (falseIntent) {
-            this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, () => {
-              callback(true); // stop the flow
-            });
-          }
-          else {
-            callback(false); // continue the flow
-          }
-        }
-      }
-    );
-  }
-
-  async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
-    let trueIntentDirective = null;
-    if (trueIntent) {
-      trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
-    }
-    let falseIntentDirective = null;
-    if (falseIntent) {
-      falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
-    }
-    if (result === true) {
-      if (trueIntentDirective) {
-        this.intentDir.execute(trueIntentDirective, () => {
-          callback();
-        });
-      }
-      else {
-        if (this.log) {console.log("No trueIntentDirective specified");}
-        callback();
-      }
-    }
-    else {
-      if (falseIntentDirective) {
-        this.intentDir.execute(falseIntentDirective, () => {
-          callback();
-        });
-      }
-      else {
-        if (this.log) {console.log("No falseIntentDirective specified");}
-        callback();
-      }
-    }
-  }
-
-  async #assignAttributes(action, resbody, status, error) {
-    if (this.log) {
-      console.log("assignAttributes resbody:", resbody)
-      console.log("assignAttributes error:", error)
-      console.log("assignAttributes status:", status)
-      console.log("assignAttributes action:", action)
-    }
-    if (this.context.tdcache) {
-      if (action.assignResultTo && resbody) {
-        if (this.log) {console.log("assign assignResultTo:", resbody);}
-        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignResultTo, resbody);
-      }
-      if (action.assignErrorTo && error) {
-        if (this.log) {console.log("assign assignResultTo:", error);}
-        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignErrorTo, error);
-      }
-      if (action.assignStatusTo && status) {
-        if (this.log) {console.log("assign assignStatusTo:", status);}
-        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignStatusTo, status);
-      }
-      // Debug log
-      if (this.log) {
-        const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-        for (const [key, value] of Object.entries(all_parameters)) {
-          if (this.log) {console.log("(webRequest) request parameter:", key, "value:", value, "type:", typeof value)}
-        }
-      }
-    }
-  }
-
-  #myrequest(options, callback) {
-    try {
-      if (this.log) {
-        console.log("API URL:", options.url);
-        //console.log("** Options:", JSON.stringify(options));
-        // Stringify "options". FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
-        let cache = [];
-        let str_Options = JSON.stringify(options, function(key, value) { // try to use a separate function
-          if (typeof value === 'object' && value != null) {
-            if (cache.indexOf(value) !== -1) {
-              return;
-            }
-            cache.push(value);
-          }
-          return value;
-        });
-        console.log("** Options:", str_Options);
-      }
-      let axios_options = {
-        url: options.url,
-        method: options.method,
-        params: options.params,
-        headers: options.headers,
-        timeout: options.timeout,
-        maxContentLength: 10000000, // max 10mb response size
-        maxBodyLength: 10000000 // max 10mb request body size
-      }
-    
-      if (options.json !== null) {
-        axios_options.data = options.json
-      }
-      // if (this.log) {
-      //   console.log("axios_options:", JSON.stringify(axios_options));
-      // }
-      if (options.url.startsWith("https:")) {
-        const httpsAgent = new https.Agent({
-          rejectUnauthorized: false,
-        });
-        axios_options.httpsAgent = httpsAgent;
-      }
-    
-      axios(axios_options)
-      .then((res) => {
-        if (this.log) {
-          console.log("Success Response:", res);
-          console.log("Response for url:", options.url);
-          console.log("Response headers:\n", JSON.stringify(res.headers));
-        }
-        if (callback) {
-          callback(null, res);
-        }
-      })
-      .catch( (err) => {
-        if (this.log) {
-          if (err.response) {
-            console.log("Error Response data:", err.response.data);
-          }
-          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
-          let cache = [];
-          let error_log = JSON.stringify(err, function(key, value) { // try to use a separate function
-            if (typeof value === 'object' && value != null) {
-              if (cache.indexOf(value) !== -1) {
-                return;
-              }
-              cache.push(value);
-            }
-            return value;
-          });
-          console.error("An error occurred: ", error_log);
-          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
-          // console.error("An error occurred:", JSON.stringify(err));
-        }
-        if (callback) {
-          let status = 1000;
-          let cache = [];
-          let str_error = JSON.stringify(err, function(key, value) { // try to use a separate function
-            if (typeof value === 'object' && value != null) {
-              if (cache.indexOf(value) !== -1) {
-                return;
-              }
-              cache.push(value);
-            }
-            return value;
-          });
-          let error = JSON.parse(str_error) // "status" disappears without this trick
-          let errorMessage = JSON.stringify(error);
-          if (error.status) {
-            status = error.status;
-          }
-          if (error.message) {
-            errorMessage = error.message;
-          }
-          let data = null;
-          if (err.response) {
-            data =  err.response.data;
-          }
-          callback(
-            null, {
-              status: status,
-              data: data,
-              error: errorMessage
-            }
-          );
-        }
-      });
-    }
-    catch(error) {
-      console.error("Error:", error);
-    }
-  }
-
-  #webrequest_timeout(action, default_timeout, min, max) {
-    let timeout = default_timeout;
-    if (!action.settings) {
-      return timeout;
-    }
-    // console.log("default timeout:", timeout);
-    // console.log("action.settings:", action.settings);
-    // console.log("action.settings.timeout:", action.settings.timeout);
-    // console.log("typeof action.settings.timeout:", typeof action.settings.timeout);
-    // console.log("action.settings.timeout > min", action.settings.timeout > min)
-    // console.log("action.settings.timeout < max", action.settings.timeout < max)  
-    
-    if (action.settings.timeout) {
-      if ((typeof action.settings.timeout === "number") && action.settings.timeout > min && action.settings.timeout < max) {
-        timeout = Math.round(action.settings.timeout)
-        // console.log("new timeout:", timeout);
-      }
-    }
-    // console.log("returning timeout:", timeout);
-    return timeout
-  }
-
-}
-
-module.exports = { DirWebRequestV2 };