@tiledesk/tiledesk-tybot-connector 2.0.8-rc1 → 2.0.8

package/CHANGELOG.md

@@ -5,17 +5,16 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# 2.0.8
+
+# 2.0.8-rc2
+- added: check on preloaded_request_id in /block
+
 # 2.0.8-rc1
 - removed: TILEBOT_LOG var 
 
-# 0.5.1-rc1
-- added json_buttons 
-- added winston log with code refactoring
-
 # v0.5.0
 - added: AI_ENDPOINT env var
-
-# v0.5.0-rc1
 - added: ability to get 'none' as bodytype in webresponse
 
 # v0.4.2
@@ -30,19 +29,6 @@ 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
 
@@ -52,18 +38,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/Logger.js

@@ -2,18 +2,13 @@ let { Publisher } = require("@tiledesk/tiledesk-multi-worker");
 
 const FLOW_LOGS_ENABLED = process.env.FLOW_LOGS_ENABLED;
 const AMQP_MANAGER_URL = process.env.AMQP_MANAGER_URL;
-const LOGS_BASE_ROUTING_KEY = process.env.LOGS_BASE_ROUTING_KEY || "apps.tilechat.logs";
-
-const levels = { error: 0, warn: 1, info: 2, debug: 3 };
-
 let publisher = new Publisher(AMQP_MANAGER_URL, {
     debug: false,
     queueName: "logs_queue",
-    exchange: "amq.topic"
+    exchange: "tiledesk-multi",
+    topic: "logs",
 })
 
-console.log("LOGGER publisher: ", publisher);
-
 class Logger {
 
     constructor(config) {
@@ -38,15 +33,10 @@ class Logger {
         }
 
         this.request_id = config.request_id;
-        console.log("LOGGER for request ", this.request_id);
-
         this.dev = false;
-        console.log("LOGGER is dev conversation ? ", config.dev);
-        // if (config.dev && config.dev === true) {
-        //     this.dev = true;
-        // } else {
-        //     this._disableDebugMethods()
-        // }
+        if (config.dev && config.dev === true) {
+            this.dev = true;
+        }
 
         // if (!AMQP_MANAGER_URL) {
         //     console.error('AMQP_MANAGER_URL is undefined. Logger not available...');
@@ -78,29 +68,27 @@ class Logger {
 
     base(level, text) {
         if (!this.request_id || !publisher) {
-            console.log("Return because request or publisher is undefined", 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,
-            id_project: this.request_id.split("-")[2],
             text: text,
             level: level,
-            nlevel: levels[level],
             timestamp: new Date(),
             dev: this.dev
         }
 
-        let topic = LOGS_BASE_ROUTING_KEY + `.${this.request_id}`;
-        console.log("LOGGER publishing on topic ", topic)
-        publisher.publish(data, topic);
-        return;
+        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))
+            .map(arg => (typeof arg === "object" ? JSON.stringify(arg, null, 2) : arg ))
             .join(" ")
     }
 
@@ -108,14 +96,9 @@ class Logger {
     _disableMethods() {
         const methods = ['error', 'warn', 'info', 'debug'];
         methods.forEach(method => {
-            this[method] = () => { };
+          this[method] = () => {};
         });
-    }
-
-    _disableDebugMethods() {
-        const method = 'debug';
-        this[method] = () => { };
-    }
+      }
 
 }
 

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/engine/mock/MockBotsDataSource.js

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

package/index.js

@@ -112,9 +112,6 @@ router.post('/ext/:botid', async (req, res) => {
     Promise.reject(err);
     return;
   });
-
-  winston.debug("(tybotRoute) Bot found: ", bot)
-  
   
   let intentsMachine;
   let backupMachine;