@tiledesk/tiledesk-tybot-connector 0.2.135 → 0.2.137-rc1

package/CHANGELOG.md

@@ -17,6 +17,12 @@ available on:
 - Added flowError on JSONCondition when result = null
 - Added fix on Filler -->
 
+# v0.2.137-rc1
+- Updated: hidden message is enabled only in dev mode for dratf requests
+
+# v0.2.136
+- TdCache rollback
+
 # v0.2.135
 - Updated to redis 4.7.0 + Tdcache.js
 - Disabled close_directive_test.js - DirClose directive - too old, not passing

package/TdCache.js

@@ -7,7 +7,6 @@ class TdCache {
         this.redis_port = config.port;
         this.redis_password = config.password;
         this.client = null;
-        this.redis_sub = null;
     }
 
     async connect(callback) {
@@ -25,22 +24,17 @@ class TdCache {
                     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.");
             });
-            await this.client.connect();
-            this.redis_sub = redis.createClient(
-              {
-                  host: this.redis_host,
-                  port: this.redis_port,
-                  password: this.redis_password
-              });
-              // console.log("redis is:", this.redis_sub)
-            await this.redis_sub.connect();
         });
     }
 
@@ -49,59 +43,202 @@ class TdCache {
       if (!options) {
         options = {EX: 86400}
       }
-      await this.client.set(
-        key,
-        value,
-        options);
+      return new Promise( async (resolve, reject) => {
+        if (options && options.EX) {
+          //console.log("expires:", options.EX)
+          try {
+            this.client.set(
+              key,
+              value,
+              'EX', options.EX,
+              (err) => {
+                if (err) {
+                  reject(err);
+                }
+                else {
+                  return resolve();
+                }
+              }
+            );
+          }
+          catch(error) {
+            reject(error)
+          }
+        }
+        else {
+          try {
+            //console.log("setting here...key", key, value)
+            await this.client.set(
+              key,
+              value,
+              (err) => {
+                if (err) {
+                  reject(err);
+                }
+                else {
+                  return resolve();
+                }
+              }
+            );
+          }
+          catch(error) {
+            console.error("TdCache Error:", error);
+            reject(error)
+          }
+        }
+        // if (options && options.callback) {
+        //     options.callback();
+        // }
+        //console.log("resolving...", key);
+        // return resolve();
+      });
     }
 
     async incr(key) {
-      await this.client.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) {
-      if (!value) {
-        return;
-      }
-      if (!options) {
-        options = {EX: 86400}
-      }
-      await this.client.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) {
-      await this.client.HDEL(dict_key, key);
+    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) {
-      if (!value) {
-        return;
-      }
-      if (!options) {
-        options = {EX: 86400}
-      }
       const _string = JSON.stringify(value);
       return await this.set(key, _string, options);
     }
     
-    async get(key) {
-      const value = await this.client.GET(key);
-      return value;
+    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) {
-      const all = await this.client.HGETALL(dict_key);
-      return all;
+    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) {
-      // console.log("hgetting dics", dict_key);
-      const value = await this.client.HGET(dict_key, key);
-      return 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) {
@@ -109,19 +246,16 @@ class TdCache {
       return JSON.parse(value);
     }
     
-    async del(key) {
-        await this.client.del(key);
-    }
-    
-    async publish(key, value) {
-      await this.redis_sub.publish(key, value);
+    async del(key, callback) {
+      return new Promise( async (resolve, reject) => {
+        this.client.del(key, () => {
+          if (callback) {
+            callback();
+          }
+          return resolve();
+        });
+      })
     }
-
-    // subscribe(key, callback) {
-    //   this.redis_sub.subscribe(key, (message) => {
-    //     callback(message);
-    //   });
-    // }
 }
 
 module.exports = { TdCache };

package/models/TiledeskChatbotUtil.js

@@ -1,6 +1,7 @@
 const { TiledeskExpression } = require('../TiledeskExpression');
 const { Filler } = require('../tiledeskChatbotPlugs/Filler');
 const { TiledeskChatbotConst } = require('./TiledeskChatbotConst');
+const { TiledeskChatbot } = require('./TiledeskChatbot.js');
 let parser = require('accept-language-parser');
 const { Directives } = require('../tiledeskChatbotPlugs/directives/Directives.js');
 require('dotenv').config();
@@ -516,13 +517,10 @@ class TiledeskChatbotUtil {
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
             }
-            /**
-             * RefactoringCheck: can this be deleted?
-             */
-            // if (process.env.TILEDESK_API) {
-            //     await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
-            //     await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
-            // }
+            if (process.env.TILEDESK_API) {
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
+                await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
+            }
             
             if (process.env.API_URL) {
                 await chatbot.addParameter(TiledeskChatbotConst.API_BASE_URL, process.env.API_URL);
@@ -701,14 +699,7 @@ class TiledeskChatbotUtil {
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY, message.attributes.departmentId);
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_DEPARTMENT_NAME_KEY, message.attributes.departmentName);
             }
-            if (message && message.request && message.request.attributes && message.request.attributes.payload) {
-                if (!message.attributes) {
-                    message.attributes = {}
-                }
-                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 (message.attributes) {
                 if (chatbot.log) {console.log("Ok message.attributes", JSON.stringify(message.attributes));}
                 // if (projectId === "641864da99c1fb00131ba495") {console.log("641864da99c1fb00131ba495 > Ok message.attributes", JSON.stringify(message.attributes));}
@@ -743,6 +734,17 @@ class TiledeskChatbotUtil {
                     await chatbot.addParameter("ani", message.attributes.ani);
                 }
             }
+
+            /** DEPRECATED */
+            if (message && message.request && message.request.attributes && message.request.attributes.payload) {
+                if (!message.attributes) {
+                    message.attributes = {}
+                }
+                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))}
+            }
+            
             
             const _bot = chatbot.bot; // aka FaqKB
             if (chatbot.log) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.135",
+  "version": "0.2.137-rc1",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,7 @@
     "mongoose": "^6.3.5",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.1.25",
-    "redis": "^4.7.0",
+    "redis": "^3.1.2",
     "uuid": "^3.3.3",
     "vm2": "^3.9.13"
   },

package/tiledeskChatbotPlugs/directives/DirAddTags.js

@@ -6,7 +6,6 @@ const { DirIntent } = require("./DirIntent");
 const { TiledeskChatbotConst } = require("../../models/TiledeskChatbotConst");
 const { TiledeskChatbotUtil } = require("../../models/TiledeskChatbotUtil");
 const req = require("express/lib/request");
-const { rejects } = require("assert");
 const { update } = require("../../models/faq");
 const { TiledeskClient } = require("@tiledesk/tiledesk-client");
 require('dotenv').config();
@@ -274,7 +273,7 @@ class DirAddTags {
   }
 
   async addNewTag(tag){
-    return new Promise((resolve, rejects)=> {
+    return new Promise((resolve, reject)=> {
       const HTTPREQUEST = {
         url: this.API_ENDPOINT + "/" + this.context.projectId + "/tags",
         headers: {

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -507,7 +507,7 @@ class DirAskGPTV2 {
   }
 
   async updateQuote(tokens_usage) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
 
       const HTTPREQUEST = {
         url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
@@ -524,7 +524,7 @@ class DirAskGPTV2 {
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             console.error("(httprequest) DirAskGPT Increment tokens quote err: ", err);
-            rejects(false)
+            reject(false)
           } else {
             // console.log("(httprequest) DirAskGPT Increment token quote resbody: ", resbody);
             resolve(true);

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -458,7 +458,7 @@ class DirGptTask {
   }
 
   async updateQuote(tokens_usage) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
 
       const HTTPREQUEST = {
         url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
@@ -475,7 +475,7 @@ class DirGptTask {
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             console.error("(httprequest) DirGptTask Increment tokens quote err: ", err);
-            rejects(false)
+            reject(false)
           } else {
             if (this.log) { console.log("(httprequest) DirGptTask Increment token quote resbody: ", resbody); }
             resolve(true);

package/tiledeskChatbotPlugs/directives/DirIfOnlineAgentsV2.js

@@ -1,5 +1,4 @@
 // const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const { rejects } = require('assert');
 const { DirIntent } = require('./DirIntent');
 const axios = require("axios").default;
 let https = require("https");

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -25,6 +25,7 @@ class DirMessage {
     this.requestId = context.requestId;
     this.token = context.token;
     this.log = this.context.log;
+    this.supportRequest = this.context.supportRequest
   }
 
   execute(directive, callback) {
@@ -94,12 +95,18 @@ class DirMessage {
     const message = action;
     if (this.log) {console.log("Message to extEndpoint:", JSON.stringify(message))};
 
-    if (this.projectId === "656054000410fa00132e5dcc") {
+    if(this.supportRequest && this.supportRequest.draft){
       if (!message.text.startsWith('/')) {
         callback();
         return;
       }
     }
+    // if (this.projectId === "656054000410fa00132e5dcc") {
+    //   if (!message.text.startsWith('/')) {
+    //     callback();
+    //     return;
+    //   }
+    // }
 
     let extEndpoint = `${this.API_ENDPOINT}/modules/tilebot`;
     if (this.TILEBOT_ENDPOINT) {