@tiledesk/tiledesk-tybot-connector 0.3.5-rc4 → 0.4.0

package/CHANGELOG.md

@@ -5,18 +5,11 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
-# 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.4.0
+- added: DirWebResposne
+- added: management of webhook
+- changed: refactoring of DIrWebRequestv2
+- bug-fixed: erro while parsing webrequestv2 body
 
 # v0.3.4
 -bug-fixed: slit is undefined in TiledeskChatbotUtils
@@ -27,18 +20,6 @@ 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/TdCache copy.js

@@ -0,0 +1,242 @@
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.3.5-rc4",
+  "version": "0.4.0",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,6 @@
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
     "@tiledesk/tiledesk-client": "^0.10.13",
-    "@tiledesk/tiledesk-multi-worker": "^0.2.1-rc2",
     "accept-language-parser": "^1.5.0",
     "axios": "^1.7.7",
     "body-parser": "^1.19.0",

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -55,8 +55,8 @@ const { DirAddTags } = require('./directives/DirAddTags');
 const { DirSendWhatsapp } = require('./directives/DirSendWhatsapp');
 const { DirReplaceBotV3 } = require('./directives/DirReplaceBotV3');
 const { DirAiTask, DirAiPrompt } = require('./directives/DirAiPrompt');
-const { DirConnectBlock } = require('./directives/DirConnectBlock');
 const { DirWebResponse } = require('./directives/DirWebResponse');
+const { DirConnectBlock } = require('./directives/DirConnectBlock');
 
 class DirectivesChatbotPlug {
 
@@ -774,19 +774,6 @@ 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);

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -71,12 +71,11 @@ class DirIntent {
         "recipient": requestId,
         "text": intent_command,
         "id_project": projectId,
-        "request": this.supportRequest,
-        // "request": {
-        //   "request_id": requestId,
-        //   "id_project": projectId
-        //   // "bot_id": botId
-        // }
+        "request": {
+          "request_id": requestId,
+          "id_project": projectId
+          // "bot_id": botId
+        }
       },
       "token": this.token
     }

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -3,7 +3,6 @@ const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
 let axios = require('axios');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const { Logger } = require('../../Logger');
 
 class DirReply {
 
@@ -17,8 +16,6 @@ class DirReply {
     this.token = context.token;
     this.tdcache = context.tdcache;
     this.log = context.log;
-    this.supportRequest = this.context.supportRequest;
-    this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest.draft });
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
@@ -41,14 +38,10 @@ class DirReply {
     }
     else {
       console.error("Incorrect directive (no action provided):", directive);
-      this.logger.error("Incorrect directive (no action provided):", directive);
       callback();
       return;
     }
-    this.logger.info("Executing Action Reply ", directive.action)
-
     this.go(action, () => {
-      this.logger.info("Action Reply terminated")
       callback();
     });
   }
@@ -71,16 +64,13 @@ class DirReply {
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
-
       if (message.metadata) {
         if (this.log) {console.log("filling message 'metadata':", JSON.stringify(message.metadata));}
         if (message.metadata.src) {
           message.metadata.src = filler.fill(message.metadata.src, requestAttributes);
-          this.logger.debug("Filled metadata.src with ", message.metadata.src);
         }
         if (message.metadata.name) {
           message.metadata.name = filler.fill(message.metadata.name, requestAttributes);
-          this.logger.debug("Filled metadata.name with ", message.metadata.name);
         }
       }
       if (this.log) {console.log("filling commands'. Message:", JSON.stringify(message));}
@@ -94,7 +84,6 @@ class DirReply {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              this.logger.debug("Filled message.text with ", command.message.text)
               TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               if (this.log) {console.log("command filled:", command.message.text);}
             }
@@ -144,14 +133,12 @@ class DirReply {
           }
           catch(err) {
             console.error("An error occurred while JSON.parse(). Parsed value:" + value + " in allParametersStatic(). Error:", err);
-            this.logger.error("An error occurred while JSON.parse(). Parsed value:" + value + " in allParametersStatic(). Error:", err);
           }
         }
       }
     }
     // send!
     let cleanMessage = message;
-    this.logger.info("Sending reply with text ", cleanMessage.text);
     // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
     // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
     //   console.log("invalid message", cleanMessage);
@@ -169,10 +156,8 @@ class DirReply {
       (err) => {
         if (err) {
           console.error("Error sending reply:", err);
-          this.logger.error("Error sending reply ", err.response.data);
         }
         if (this.log) {console.log("Reply message sent:", JSON.stringify(cleanMessage));}
-        this.logger.info("Reply message sent!", cleanMessage.text);
         const delay = TiledeskChatbotUtil.totalMessageWait(cleanMessage);
         // console.log("got total delay:", delay)
         if (delay > 0 && delay <= 30000) { // prevent long delays

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,8 +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 WEB_RESPONSE = "webresponse";
 
   // 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

package/Logger.js

@@ -1,86 +0,0 @@
-let { Publisher } = require("@tiledesk/tiledesk-multi-worker");
-
-const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
-let publisher = new Publisher(AMQP_MANAGER_URL, {
-    debug: false,
-    queueName: "logs_queue",
-    exchange: "tiledesk-multi",
-    topic: "logs",
-})
-
-class Logger {
-
-    constructor(config) {
-
-        if (!config) {
-            throw new Error('config is mandatory');
-        }
-
-        if (!config.request_id) {
-            console.error('config.request_id is mandatory');
-            //throw new Error('config.request_id is mandatory');
-        }
-
-        this.request_id = config.request_id;
-        this.dev = false;
-        if (config.dev && config.dev === true) {
-            this.dev = true;
-        }
-
-        if (!AMQP_MANAGER_URL) {
-            console.error('AMQP_MANAGER_URL is undefined. Logger not available...');
-            return;
-            //throw new Error("Error starting logger: AMQP_MANAGER_URL is undefined.")
-        }
-
-    }
-
-    error(...args) {
-        let log = this.formatLog(args);
-        return this.base('error', log);
-    }
-
-    warn(...args) {
-        let log = this.formatLog(args);
-        return this.base('warn', log);
-    }
-
-    info(...args) {
-        let log = this.formatLog(args);
-        return this.base('info', log);
-    }
-
-    debug(...args) {
-        let log = this.formatLog(args);
-        return this.base('debug', log);
-    }
-
-    base(level, text) {
-        if (!this.request_id || !publisher) {
-            console.log("Return because request or publisher is undefined", this.request_id, publisher);
-            return;
-        }
-
-        let data = {
-            request_id: this.request_id,
-            text: text,
-            level: level,
-            timestamp: new Date(),
-            dev: this.dev
-        }
-
-        publisher.publish(data, (err, ok) => {
-            if (err) console.warn("publish log fail: ", err);
-            return;
-        })
-    }
-
-    formatLog(args) {
-        return args
-            .map(arg => (typeof arg === "object" ? JSON.stringify(arg, null, 2) : arg ))
-            .join(" ")
-    }
-
-}
-
-module.exports = { Logger }