@tiledesk/tiledesk-tybot-connector 2.0.8-rc2 → 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/ExtApi.js

@@ -10,6 +10,12 @@ class ExtApi {
       throw new Error("options.TILEBOT_ENDPOINT is mandatory");
       //this.extEndpoint = `${options.TILEBOT_ENDPOINT}/;
     }
+    if (options.log) {
+      this.log = options.log;
+    }
+    else {
+      this.log = false;
+    }
     this.TILEBOT_ENDPOINT = options.TILEBOT_ENDPOINT;
   }
 
@@ -57,7 +63,8 @@ class ExtApi {
             callback(null, resbody);
           }
         }
-      });
+      }, this.log
+    );
   }
 
 }

package/ExtUtil.js

@@ -8,19 +8,20 @@ const { FillParamsChatbotPlug } = require('./tiledeskChatbotPlugs/FillParamsChat
 
 // 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');*/
 
 class ExtUtil {
 
-  static async execPipelineExt(request, static_bot_answer, directivesPlug, tdcache) {
+  static async execPipelineExt(request, static_bot_answer, directivesPlug, tdcache, log) {
     const messagePipeline = new MessagePipeline(static_bot_answer, null);
     messagePipeline.addPlug(directivesPlug);
-    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache)); // in original message
-    messagePipeline.addPlug(new SplitsChatbotPlug());
-    messagePipeline.addPlug(new MarkbotChatbotPlug());
-    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache)); // in splits
+    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache, log)); // in original message
+    messagePipeline.addPlug(new SplitsChatbotPlug(log));
+    messagePipeline.addPlug(new MarkbotChatbotPlug(log));
+    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache, log)); // in splits
     const bot_answer = await messagePipeline.exec();
     return bot_answer;
   }

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/IntentForm.js

@@ -11,6 +11,7 @@ class IntentForm {
     this.form = options.form;
     this.CURRENT_FIELD_INDEX_KEY = "tilebot:requests:" + this.requestId + ":currentFieldIndex"
     this.CURRENT_FORM_KEY = "tilebot:requests:" + this.requestId + ":currentForm"
+    this.log = options.log;
     this.requestParameters = options.requestParameters;
   }
 

package/engine/IntentsMachineFactory.js

@@ -4,7 +4,7 @@ const winston = require('../utils/winston.js')
 
 class IntentsMachineFactory {
 
-    static getMachine(bot, botId, projectId) {
+    static getMachine(bot, botId, projectId, log) {
       let machine;
       if (bot && bot.intentsEngine === "tiledesk-ai") {
         winston.verbose("(IntentsMachineFactory) bot.intentsEngine is tiledesk-ai");
@@ -15,7 +15,7 @@ class IntentsMachineFactory {
       }
       else if (bot) {
         winston.verbose("(IntentsMachineFactory) Setting MongodbIntentsMachine with bot:", JSON.stringify(bot));
-        machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language});
+        machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
       }
       else {
         winston.error("bot is null for: " + botId + " on projectId: " + projectId);
@@ -23,10 +23,10 @@ class IntentsMachineFactory {
       return machine;
     }
 
-    static getBackupMachine(bot, botId, projectId) {
+    static getBackupMachine(bot, botId, projectId, log) {
       let machine;
       winston.verbose("(IntentsMachineFactory) Setting MongodbIntentsMachine as Backup Intents Machine on bot:", JSON.stringify(bot));
-      machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language});
+      machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
       return machine;
     }
   }

package/engine/MongodbBotsDataSource.js

@@ -9,6 +9,7 @@ class MongodbBotsDataSource {
       throw new Error("config.projectId is mandatory");
     }
     this.projectId = config.projectId;
+    this.log = config.log;
   }
   
   async getBotById(botId) {

package/engine/MongodbIntentsMachine.js

@@ -10,6 +10,7 @@ class MongodbIntentsMachine {
     }
     this.projectId = config.projectId;
     this.language = config.language;
+    this.log = config.log;
   }
 
   /**

package/engine/TiledeskChatbot.js

@@ -1,5 +1,6 @@
 // let Faq = require('./faq');
 // let Faq_kb = require('./faq_kb');
+// const { DirectivesChatbotPlug } = require('../tiledeskChatbotPlugs/DirectivesChatbotPlug');
 const { MessagePipeline } = require('../tiledeskChatbotPlugs/MessagePipeline');
 const { WebhookChatbotPlug } = require('../tiledeskChatbotPlugs/WebhookChatbotPlug');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
@@ -40,6 +41,7 @@ class TiledeskChatbot {
     this.projectId = config.projectId;
     this.MAX_STEPS = config.MAX_STEPS;
     this.MAX_EXECUTION_TIME = config.MAX_EXECUTION_TIME;
+    this.log = config.log;
   }
 
   async replyToMessage(message, callback) {
@@ -70,13 +72,13 @@ class TiledeskChatbot {
           winston.verbose("(TiledeskChatbot) Resetting current step by request message: " + message.text);
           await TiledeskChatbot.resetStep(this.tdcache, this.requestId);
           await TiledeskChatbot.resetStarted(this.tdcache, this.requestId);
-
-          if (this.tdcache) {
-            let currentStep = 
-            await TiledeskChatbot.currentStep(this.tdcache, this.requestId);
-            winston.verbose("(TiledeskChatbot) After reset currentStep:" + currentStep);
+          if (this.log) {
+            if (this.tdcache) {
+              let currentStep = 
+              await TiledeskChatbot.currentStep(this.tdcache, this.requestId);
+              winston.verbose("(TiledeskChatbot) After reset currentStep:" + currentStep);
+            }
           }
-          
         }
       } catch(error) {
         winston.error("(TiledeskChatbot) Error resetting locked intent: ", error);
@@ -91,7 +93,8 @@ class TiledeskChatbot {
         //   projectId: this.projectId,
         //   token: this.token,
         //   APIURL: this.APIURL,
-        //   APIKEY: this.APIKEY
+        //   APIKEY: this.APIKEY,
+        //   log: false
         // });
         // it only gets the locked_intent
         // const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
@@ -503,7 +506,7 @@ class TiledeskChatbot {
       TiledeskChatbot.requestCacheKey(requestId) + ":parameters", paramName);
   }
 
-  static async checkStep(_tdcache, requestId, max_steps, max_execution_time) {
+  static async checkStep(_tdcache, requestId, max_steps, max_execution_time, log) {
     winston.verbose("(TiledeskChatbot) Checking on MAX_STEPS: " + max_steps);
     // let go_on = true; // continue
     const parameter_key = TiledeskChatbot.requestCacheKey(requestId) + ":step";
@@ -576,7 +579,7 @@ class TiledeskChatbot {
     }
     const messagePipeline = new MessagePipeline(static_bot_answer, context);
     const webhookurl = bot.webhook_url;
-    messagePipeline.addPlug(new WebhookChatbotPlug(userMessage.request, webhookurl, this.token));
+    messagePipeline.addPlug(new WebhookChatbotPlug(userMessage.request, webhookurl, this.token, this.log));
     const bot_answer = await messagePipeline.exec();
     return bot_answer;
   }
@@ -589,7 +592,8 @@ class TiledeskChatbot {
         form: form,
         requestId: this.requestId,
         chatbot: this,
-        requestParameters: all_parameters
+        requestParameters: all_parameters,
+        log: this.log
       });
     let message = await intentForm.getMessage(userInputReply);
     return message;
@@ -606,7 +610,8 @@ class TiledeskChatbot {
       projectId: this.projectId,
       token: this.token,
       APIURL: this.APIURL,
-      APIKEY: this.APIKEY
+      APIKEY: this.APIKEY,
+      log: this.log
     });
     // const parameters_key = "tilebot:requests:" + requestId + ":parameters";
     const all_parameters = await this.allParameters();//this.tdcache.hgetall(parameters_key);

package/engine/TiledeskIntentsMachine.js

@@ -12,6 +12,7 @@ class TiledeskIntentsMachine {
     else {
       this.API_ENDPOINT = config.API_ENDPOINT;
     }
+    this.log = config.log;
   }
 
   /**
@@ -92,7 +93,7 @@ class TiledeskIntentsMachine {
     return tiledesk_intents;
   }
 
-  myrequest(options, callback) {
+  myrequest(options, callback, log) {
     axios(
       {
         url: options.url,

package/engine/mock/MockBotsDataSource.js

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