@tiledesk/tiledesk-tybot-connector 2.0.9 → 2.0.10-rc2

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");
@@ -16,7 +15,6 @@ class DirIfOpenHours {
     this.context = context;
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.intentDir = new DirIntent(context);
-    this.log = context.log;
   }
 
   execute(directive, callback) {

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 {
 
@@ -11,15 +12,13 @@ class DirIfOpenHours {
 
     this.context = context;
     this.intentDir = new DirIntent(context);
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 
@@ -32,9 +31,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;
       }
@@ -66,14 +62,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();
@@ -81,7 +77,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);
           });
@@ -93,7 +89,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) {
@@ -62,10 +61,12 @@ class DirIntent {
         "recipient": requestId,
         "text": intent_command,
         "id_project": projectId,
-        "request": {
-          "request_id": requestId,
-          "id_project": projectId
-        }
+        "request": this.supportRequest,
+        // "request": {
+        //   "request_id": requestId,
+        //   "id_project": projectId
+        //   // "bot_id": botId
+        // }
       },
       "token": this.token
     }

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -13,7 +13,6 @@ class DirJSONCondition {
     this.chatbot = context.chatbot;
     this.chatbot = context.chatbot;
     this.intentDir = new DirIntent(context);
-    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

@@ -16,7 +16,6 @@ class DirMake {
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
     this.intentDir = new DirIntent(context);
-    this.log = context.log;
   }
 
   execute(directive, callback) {
@@ -199,21 +198,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,15 +16,13 @@ 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
+      APIKEY: "___"
     });
   }
 

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');
@@ -14,15 +13,13 @@ class DirMoveToAgent {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
     
   }

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');
@@ -13,7 +12,6 @@ class DirMoveToUnassigned {
     }
     this.context = context;
     this.requestId = context.requestId;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
@@ -21,7 +19,6 @@ class DirMoveToUnassigned {
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
       APIKEY: "___",
-      log: this.log
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirQapla.js

@@ -21,7 +21,6 @@ class DirQapla {
     this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirRandomReply.js

@@ -15,15 +15,13 @@ class DirRandomReply {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirRemoveCurrentBot.js

@@ -16,8 +16,7 @@ class DirRemoveCurrentBot {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirReplaceBot.js

@@ -11,15 +11,13 @@ class DirReplaceBot {
     }
     this.context = context;
     this.requestId = context.requestId;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirReplaceBotV2.js

@@ -15,15 +15,13 @@ class DirReplaceBotV2 {
     }
     this.context = context;
     this.requestId = context.requestId;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirReplaceBotV3.js

@@ -15,15 +15,13 @@ class DirReplaceBotV3 {
     }
     this.context = context;
     this.requestId = context.requestId;
-    this.log = context.log;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -17,7 +17,7 @@ class DirReply {
     this.requestId = context.requestId;
     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;
@@ -25,8 +25,7 @@ class DirReply {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 
@@ -44,10 +43,10 @@ class DirReply {
       callback();
       return;
     }
-    this.logger.info("1 Execute action reply for " + directive.action.text)
+    this.logger.info("Executing Action Reply ", directive.action)
 
     this.go(action, () => {
-      this.logger.info("6 End of action reply " + directive.action.text + " -> callback")
+      this.logger.info("Action Reply terminated")
       callback();
     });
   }
@@ -68,15 +67,16 @@ class DirReply {
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
-      this.logger.info("2 Sending reply " + message.text);
 
       if (message.metadata) {
         winston.debug("DirReply filling message 'metadata':", 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);
         }
       }
       winston.debug("DirReply filling commands'. Message:", message);
@@ -89,7 +89,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) {
@@ -143,15 +143,6 @@ class DirReply {
     }
 
     let cleanMessage = message;
-    this.logger.info("3 Sending reply (text) " + cleanMessage.text);
-    this.logger.info("4 Sending reply with clean message " + JSON.stringify(cleanMessage));
-    // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
-    // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
-    //   console.log("invalid message", cleanMessage);
-    //   callback(); // cancel reply operation
-    //   return;
-    // }
-    
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     winston.debug("DirReply reply with clean message: ", cleanMessage);
 
@@ -162,10 +153,8 @@ class DirReply {
       (err) => {
         if (err) {
           winston.error("DirReply Error sending reply: ", err);
-          this.logger.error("Error sending reply: " + err);
         }
         winston.verbose("DirReply reply message sent")
-        this.logger.info("5 Reply message sent");
         const delay = TiledeskChatbotUtil.totalMessageWait(cleanMessage);
         if (delay > 0 && delay <= 30000) { // prevent long delays
           setTimeout(() => {

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -20,7 +20,6 @@ class DirReplyV2 {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
-    this.log = context.log;
     this.intentDir = new DirIntent(context);
     this.chatbot = context.chatbot;
     this.reply = context.reply;
@@ -31,8 +30,7 @@ class DirReplyV2 {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 
@@ -61,11 +59,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;
@@ -74,11 +71,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);
 
@@ -197,7 +192,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/DirSendEmail.js

@@ -15,15 +15,13 @@ class DirSendEmail {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;    
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirSendWhatsapp.js

@@ -19,7 +19,6 @@ class DirSendWhatsapp {
     this.requestId = this.context.requestId;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

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

@@ -79,7 +79,6 @@ class DirSetAttributeV2 {
         }
         this.context = context;
         this.tdcache = context.tdcache;
-        this.log = context.log;
     }
 
     execute(directive, callback) {
@@ -199,9 +198,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;
@@ -17,8 +16,7 @@ class DirSetConversationTags {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

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

@@ -12,7 +12,6 @@ class DirWait {
     this.chatbot = context.chatbot;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;
   }
 
   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) {