@tiledesk/tiledesk-tybot-connector 2.0.12-rc4 → 2.0.12-rc6

package/tiledeskChatbotPlugs/directives/DirGptTask_OLD.js

@@ -3,6 +3,7 @@ const { TiledeskChatbot } = require("../../engine/TiledeskChatbot");
 const { Filler } = require("../Filler");
 let https = require("https");
 const { DirIntent } = require("./DirIntent");
+const winston = require('../../utils/winston');
 const httpUtils = require("../../utils/HttpUtils");
 require('dotenv').config();
 
@@ -22,13 +23,13 @@ class DirGptTask {
   }
 
   execute(directive, callback) {
-    if (this.log) { console.log("GptTask directive: ", directive); }
+     winston.verbose("Execute GptTask directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive: ", JSON.stringify(directive));
+      winston.warn("DirGptTask Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -38,9 +39,9 @@ class DirGptTask {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("DirGptTask action:", JSON.stringify(action)); }
+    winston.debug("(DirGptTask) Action: ", action);
     if (!this.tdcache) {
-      console.error("Error: DirGptTask tdcache is mandatory");
+      winston.error("(DirGptTask) Error: tdcache is mandatory");
       callback();
       return;
     }
@@ -50,18 +51,16 @@ class DirGptTask {
     let trueIntentAttributes = action.trueIntentAttributes;
     let falseIntentAttributes = action.falseIntentAttributes;
 
-    if (this.log) {
-      console.log("DirGptTask trueIntent", trueIntent)
-      console.log("DirGptTask falseIntent", falseIntent)
-      console.log("DirGptTask trueIntentAttributes", trueIntentAttributes)
-      console.log("DirGptTask falseIntentAttributes", falseIntentAttributes)
-    }
+    winston.debug("(DirGptTask) trueIntent " + trueIntent)
+        winston.debug("(DirGptTask) falseIntent " + falseIntent)
+        winston.debug("(DirGptTask) trueIntentAttributes " + trueIntentAttributes)
+        winston.debug("(DirGptTask) falseIntentAttributes " + falseIntentAttributes)
 
     // default value
     let answer = "No answer.";
 
     if (!action.question || action.question === '') {
-      console.error("Error: DirGptTask question attribute is mandatory. Executing condition false...")
+      winston.debug("(DirGptTask) Error: question attribute is mandatory. Executing condition false...")
       if (falseIntent) {
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
         callback(true);
@@ -83,13 +82,11 @@ class DirGptTask {
     let max_tokens = action.max_tokens;
     let temperature = action.temperature;
 
-    if (this.log) {
-      console.log("DirGptTask max_tokens: ", max_tokens);
-      console.log("DirGptTask temperature: ", temperature);
-    }
+    winston.debug("(DirGptTask) max_tokens: " + max_tokens);
+    winston.debug("(DirGptTask) temperature: " + temperature);
 
     const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
-    if (this.log) { console.log("DirGptTask openai_url ", openai_url); }
+    winston.debug("(DirGptTask) openai_url ", openai_url);
 
     const INTEGRATIONS_HTTPREQUEST = {
       url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
@@ -99,7 +96,7 @@ class DirGptTask {
       },
       method: "GET"
     }
-    if (this.log) { console.log("DirGptTask INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
+    winston.debug("(DirGptTask) INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST);
     
     httpUtils.request(
       INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
@@ -111,7 +108,7 @@ class DirGptTask {
             // return;
           }
         } else if (callback) {
-          if (this.log) { console.log("DirGptTask get integration resbody: ", integration); }
+          winston.debug("(DirGptTask) get integration resbody: ", integration);
 
           let key;
           if (integration &&
@@ -122,8 +119,7 @@ class DirGptTask {
           // key not present in integrations - for retro compatibility search in kbsettings
           if (!key) {
 
-            // if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings...")}
-            if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings..."); }
+            winston.debug("(DirGptTask) Key not found in Integrations. Searching in kb settings...");
 
             const KB_HTTPREQUEST = {
               url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
@@ -133,16 +129,15 @@ class DirGptTask {
               },
               method: "GET"
             }
-            if (this.log) { console.log("DirGptTask KB_HTTPREQUEST", KB_HTTPREQUEST); }
+            winston.debug("(DirGptTask) KB_HTTPREQUEST", KB_HTTPREQUEST);
 
             httpUtils.request(
               KB_HTTPREQUEST, async (err, resbody) => {
                 if (err) {
                   if (callback) {
                     console.error("(httprequest) DirGptTask Get KnowledgeBase err:", err.message);
-                    if (this.log) {
-                      console.error("(httprequest) DirGptTask Get KnowledgeBase full err", err);
-                    }
+                    console.error("(httprequest) DirGptTask Get KnowledgeBase full err", err);
+
                     await this.#assignAttributes(action, answer);
                     if (falseIntent) {
                       await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -153,7 +148,7 @@ class DirGptTask {
                     return;
                   }
                 } else if (callback) {
-                  if (this.log) { console.log("DirGptTask Get KnowledgeBase settings resbody:", resbody); }
+                  winston.debug("(DirGptTask) Get KnowledgeBase settings resbody:", resbody);
 
                   if (!resbody.gptkey) {
                     await this.#assignAttributes(action, answer);
@@ -167,7 +162,7 @@ class DirGptTask {
 
                   } else {
 
-                    if (this.log) { console.log("DirGptTask - Key found in KbSettings") };
+                    winston.debug("(DirGptTask) Key found in KbSettings");
 
                     key = resbody.gptkey;
 
@@ -189,7 +184,7 @@ class DirGptTask {
                       message.content = action.context;
                       json.messages.unshift(message);
                     }
-                    if (this.log) { console.log("DirGptTask json: ", json) }
+                    winston.debug("(DirGptTask) json: ", json);
 
                     const HTTPREQUEST = {
                       url: openai_url,
@@ -200,14 +195,12 @@ class DirGptTask {
                       json: json,
                       method: 'POST'
                     }
-                    if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
+                    winston.debug("(DirGptTask) HTTPREQUEST: ", HTTPREQUEST);
                     httpUtils.request(
                       HTTPREQUEST, async (err, resbody) => {
                         if (err) {
-                          if (this.log) {
-                            console.error("(httprequest) DirGptTask openai err:", err);
-                            console.error("(httprequest) DirGptTask openai err:", err.response.data);
-                          }
+                          console.error("(httprequest) DirGptTask openai err:", err);
+                          console.error("(httprequest) DirGptTask openai err:", err.response.data);
                           await this.#assignAttributes(action, answer);
                           if (falseIntent) {
                             await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -217,7 +210,7 @@ class DirGptTask {
                           callback();
                           return;
                         } else {
-                          if (this.log) { console.log("DirGptTask resbody: ", JSON.stringify(resbody)); }
+                          winston.debug("(DirGptTask) resbody: ", JSON.stringify(resbody));
                           answer = resbody.choices[0].message.content;
                           let answer_json = await this.convertToJson(answer);
                           await this.#assignAttributes(action, answer_json);
@@ -237,7 +230,7 @@ class DirGptTask {
             )
           } else {
 
-            if (this.log) { console.log("DirGptTask - Key found in Integrations") };
+            winston.debug("(DirGptTask) Key found in Integrations");
 
             let json = {
               "model": action.model,
@@ -257,7 +250,7 @@ class DirGptTask {
               message.content = action.context;
               json.messages.unshift(message);
             }
-            if (this.log) { console.log("DirGptTask json: ", json) }
+            winston.debug("(DirGptTask) json: ", json);
 
             const HTTPREQUEST = {
               url: openai_url,
@@ -268,14 +261,12 @@ class DirGptTask {
               json: json,
               method: 'POST'
             }
-            if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
+            winston.debug("(DirGptTask) HTTPREQUEST: ", HTTPREQUEST);
             httpUtils.request(
               HTTPREQUEST, async (err, resbody) => {
                 if (err) {
-                  if (this.log) {
-                    console.error("(httprequest) DirGptTask openai err:", err);
-                    console.error("(httprequest) DirGptTask openai err:", err.response.data);
-                  }
+                  console.error("(httprequest) DirGptTask openai err:", err);
+                  console.error("(httprequest) DirGptTask openai err:", err.response.data);
                   await this.#assignAttributes(action, answer);
                   if (falseIntent) {
                     await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -285,7 +276,7 @@ class DirGptTask {
                   callback();
                   return;
                 } else {
-                  if (this.log) { console.log("DirGptTask resbody: ", JSON.stringify(resbody)); }
+                  winston.debug("(DirGptTask) resbody: ", JSON.stringify(resbody));
                   answer = resbody.choices[0].message.content;
                   // check if answer is a json
                   let answer_json = await this.convertToJson(answer);
@@ -339,7 +330,7 @@ class DirGptTask {
         })
       }
       else {
-        if (this.log) { console.log("No trueIntentDirective specified"); }
+        winston.debug("(DirGptTask) No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -354,7 +345,7 @@ class DirGptTask {
         });
       }
       else {
-        if (this.log) { console.log("No falseIntentDirective specified"); }
+        winston.debug("(DirGptTask) No falseIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -363,10 +354,8 @@ class DirGptTask {
   }
 
   async #assignAttributes(action, answer) {
-    if (this.log) {
-      console.log("assignAttributes action:", action)
-      console.log("assignAttributes answer:", answer)
-    }
+    winston.debug("(DirGptTask) assignAttributes action:", action)
+    winston.debug("(DirGptTask) assignAttributes answer:", answer)
     if (this.context.tdcache) {
       if (action.assignReplyTo && answer) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignReplyTo, answer);
@@ -374,13 +363,6 @@ class DirGptTask {
       // if (action.assignSourceTo && source) {
       //   await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignSourceTo, source);
       // }
-      // 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("(gpttask) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
     }
   }
   

package/tiledeskChatbotPlugs/directives/DirIfOnlineAgents.js

@@ -1,4 +1,3 @@
-// const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { DirIntent } = require('./DirIntent');
 const ms = require('minimist-string');

package/tiledeskChatbotPlugs/directives/DirIfOnlineAgentsV2.js

@@ -1,4 +1,3 @@
-// const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { DirIntent } = require('./DirIntent');
 const axios = require("axios").default;
 let https = require("https");
@@ -208,7 +207,7 @@ class DirIfOnlineAgentsV2 {
             }
             resolve(resbody);
           }
-        }, this.log);
+        });
     });
     
   }

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

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

package/tiledeskChatbotPlugs/directives/DirIfOpenHours_OLD.js

@@ -1,6 +1,7 @@
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { DirIntent } = require('./DirIntent');
 const ms = require('minimist-string');
+const winston = require('../../utils/winston');
 
 class DirIfOpenHours {
 
@@ -26,9 +27,6 @@ class DirIfOpenHours {
       let params;
       params = this.parseParams(directive.parameter);
       if (!params.trueIntent && !params.falseIntent) {
-        if (this.log) {
-          console.log("missing both params.trueIntent & params.falseIntent");
-        }
         callback();
         return;
       }
@@ -60,14 +58,14 @@ class DirIfOpenHours {
     if (falseIntent && falseIntent.trim() === "") {
       falseIntent = null;
     }
-    if (this.log) {console.log("condition action:", action);}
+    winston.verbose("(DirIfOpenHours) Action:", action);
     if (!trueIntent && !falseIntent) {
-      if (this.log) {console.log("Invalid condition, no intents specified");}
-      callback();
+      winston.error("(DirIfOpenHours) Error: missing both action.trueIntent & action.falseIntent");
+            callback();
       return;
     }
     this.tdClient.openNow((err, result) => {
-      if (this.log) {console.log("openNow():", result);}
+      winston.error("(DirIfOpenHours) openNow():", result)
       if (err) {
         console.error("*** DirIfOpenHours Error:", err);
         callback();
@@ -75,7 +73,7 @@ class DirIfOpenHours {
       else if (result && result.isopen) {
         if (trueIntent) {
           let intentDirective = DirIntent.intentDirectiveFor(trueIntent);
-          if (this.log) {console.log("DirIfOpenHours (openHours) => trueIntent");}
+          winston.debug("(DirIfOpenHours) (openHours) => trueIntent ");
           this.intentDir.execute(intentDirective, () => {
             callback(stopOnConditionMet);
           });
@@ -87,7 +85,7 @@ class DirIfOpenHours {
       }
       else if (falseIntent) {
         let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
-        if (this.log) {console.log("DirIfOpenHours (openHours) => falseIntent", falseIntent);}
+        winston.debug("(DirIfOpenHours) (openHours) => falseIntent ");
         this.intentDir.execute(intentDirective, () => {
           callback(stopOnConditionMet);
         });

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -16,7 +16,6 @@ class DirIntent {
     this.TILEBOT_ENDPOINT = context.TILEBOT_ENDPOINT;
     this.supportRequest = context.supportRequest;
     this.token = context.token;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -12,7 +12,6 @@ class DirLockIntent {
       throw new Error('tdcache (TdCache) object is mandatory.');
     }
     this.tdcache = this.context.tdcache;
-    this.log = context.log;
   }
 
   async execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -204,21 +204,7 @@ class DirMake {
 
       })
       .catch((err) => {
-        if (this.log) {
-          // 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;
-          });
-          winston.error("(DirMake) An error occurred: ", error_log);
-          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END;
-        }
+        // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END;
         if (callback) {
           let status = 1000;
           let cache = [];

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -16,7 +16,6 @@ class DirMessage {
     this.requestId = context.requestId;
     this.tdcache = this.context.tdcache;
     this.token = context.token;
-    this.log = this.context.log;
     this.supportRequest = this.context.supportRequest
 
     this.tdClient = new TiledeskClient({ projectId: this.context.projectId, token: this.context.token, APIURL: this.API_ENDPOINT, APIKEY: "___", log: this.log });

package/tiledeskChatbotPlugs/directives/DirMessageToBot.js

@@ -15,7 +15,6 @@ class DirMessageToBot {
     this.TILEBOT_ENDPOINT = context.TILEBOT_ENDPOINT;
     this.supportRequest = context.supportRequest;
     this.token = context.token;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js

@@ -1,4 +1,3 @@
-// const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { Directives } = require('./Directives');
 const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');

package/tiledeskChatbotPlugs/directives/DirMoveToUnassigned.js

@@ -1,4 +1,3 @@
-// const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { Directives } = require('./Directives');
 const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -84,7 +84,7 @@ class DirReply {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
+              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes);
               winston.debug("DirReply command filled: " + command.message.text);
             }
             if (command.type === 'settings' && command.settings) {

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -21,6 +21,7 @@ class DirReplyV2 {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
+    this.intentDir = new DirIntent(context);
     this.chatbot = context.chatbot;
     this.reply = context.reply;
     this.originalMessage = context.message;
@@ -59,11 +60,10 @@ class DirReplyV2 {
     const message = action;
 
     let current; // debug only
-    if (this.log) {
-      if (message.attributes.commands[1].message.text) {
-        current = message.attributes.commands[1].message.text
-      }
+    if (message.attributes.commands[1].message.text) {
+      current = message.attributes.commands[1].message.text
     }
+    
     let must_stop = false;
     // fill
     let requestAttributes = null;
@@ -72,11 +72,9 @@ class DirReplyV2 {
       await TiledeskChatbot.allParametersStatic(
         this.tdcache, this.requestId
       );
-      if (this.log) {
-        for (const [key, value] of Object.entries(requestAttributes)) {
-          const value_type = typeof value;
-        }
-      }
+      // for (const [key, value] of Object.entries(requestAttributes)) {
+      //   const value_type = typeof value;
+      // }
 
       TiledeskChatbotUtil.replaceJSONButtons(message, requestAttributes);
 
@@ -195,7 +193,7 @@ class DirReplyV2 {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
+              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes);
             }
           }
         }

package/tiledeskChatbotPlugs/directives/DirSetAttribute.js

@@ -77,7 +77,6 @@ class DirSetAttribute {
             throw new Error('context object is mandatory.');
         }
         this.context = context;
-        this.log = context.log;
     }
 
     execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirSetAttributeV2.js

@@ -205,9 +205,7 @@ class DirSetAttributeV2 {
         httpUtils.request(
             HTTPREQUEST, async (err, resbody) => {
                 if (err) {
-                    if (this.log) {
-                        winston.error("(DirSetAttributeV2) persistOnTiledesk() error: ", err);
-                    }
+                    winston.error("(DirSetAttributeV2) persistOnTiledesk() error: ", err);
                 } else {
                     winston.debug("(DirSetAttributeV2) Attributes saved: ", resbody);
                 }

package/tiledeskChatbotPlugs/directives/DirSetConversationTags.js

@@ -9,7 +9,6 @@ class DirSetConversationTags {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
-    this.log = context.log;
     this.requestId = context.requestId;
     this.API_ENDPOINT = context.API_ENDPOINT;
     

package/tiledeskChatbotPlugs/directives/DirUnlockIntent.js

@@ -11,7 +11,6 @@ class DirUnlockIntent {
       throw new Error('tdcache (TdCache) object is mandatory.');
     }
     this.tdcache = context.tdcache;
-    this.log = context.log;
   }
 
   async execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -13,7 +13,6 @@ class DirWebRequest {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -317,21 +317,7 @@ class DirWebRequestV2 {
           }
         })
         .catch((err) => {
-          if (this.log) {
-            // 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;
-            });
-            winston.error("(DirWebRequestv2) An error occurred: ", error_log);
-            // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
-          }
+          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
           if (callback) {
             let status = 1000;
             let cache = [];

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -60,6 +60,7 @@ class Directives {
   static ADD_TAGS = 'add_tags'
   static WEB_RESPONSE = "web_response";
   static FLOW_LOG = "flow_log";
+  static ADD_KB_CONTENT = "add_kb_content";
 
   // 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