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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "2.0.7",
+  "version": "2.0.8-rc1",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
     "@tiledesk/tiledesk-client": "^0.10.13",
-    "@tiledesk/tiledesk-multi-worker": "^0.2.1-rc2",
+    "@tiledesk/tiledesk-multi-worker": "^0.3.1-rc10",
     "accept-language-parser": "^1.5.0",
     "app-root-path": "^3.1.0",
     "axios": "^1.7.7",
@@ -29,6 +29,7 @@
     "liquidjs": "^10.8.4",
     "minimist-string": "^1.0.2",
     "mongoose": "^6.3.5",
+    "mqtt": "^5.10.4",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.1.25",
     "redis": "^4.7.0",

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -222,14 +222,13 @@ class DirectivesChatbotPlug {
       directive_name = directive.name.toLowerCase();
     }
     if (directive && directive.action) {
-        const action_id = directive.action["_tdActionId"];
-        const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
-        if ( locked_action_id && (locked_action_id !== action_id) ) {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-          return;
-        }
-      
+      const action_id = directive.action["_tdActionId"];
+      const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
+      if ( locked_action_id && (locked_action_id !== action_id) ) {
+        let next_dir = await this.nextDirective(this.directives);
+        this.process(next_dir);
+        return;
+      }      
     }
     if (directive == null || (directive !== null && directive["name"] === undefined)) {
       winston.debug("(DirectivesChatbotPlug) stop process(). directive is (null?): ", directive);
@@ -701,6 +700,19 @@ class DirectivesChatbotPlug {
         }
       });
     }
+    else if (directive_name === Directives.WEBHOOK) {
+      // console.log(".....DirIntent")
+      new DirIntent(context).execute(directive, async (stop) => {
+        if (stop) {
+          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
+          this.theend();
+        }
+        else {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+        }
+      });
+    }
     else if (directive_name === Directives.WEB_RESPONSE) {
       new DirWebResponse(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -62,10 +62,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/DirReply.js

@@ -18,6 +18,7 @@ class DirReply {
     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;
@@ -44,10 +45,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 +69,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,6 +91,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);
+              this.logger.debug("Filled message.text with ", command.message.text)
               TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               winston.debug("DirReply command filled: " + command.message.text);
             }
@@ -143,15 +146,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 +156,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/DirWebResponse.js

@@ -96,42 +96,4 @@ class DirWebResponse {
 
 }
 
-
-
-/**
- * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
- * /${TILEBOT_ROUTE}/ext/${botId}
- *
- * @param {Object} webResponse. The webhook response to send back
- * @param {Object} projectId. The projectId
- * @param {string} botId. Tiledesk botId
- * @param {string} token. User token
- */
-// function sendResponse(webResponse, projectId, botId, callback) {
-//   const url = `${WEBHOOK_URL}/${projectId}/${botId}`;
-//   const HTTPREQUEST = {
-//     url: url,
-//     headers: {
-//       'Content-Type': 'application/json'
-//     },
-//     json: webResponse,
-//     method: 'POST'
-//   };
-//   myrequest(
-//     HTTPREQUEST,
-//     function (err, resbody) {
-//       if (err) {
-//         if (callback) {
-//           callback(err);
-//         }
-//       }
-//       else {
-//         if (callback) {
-//           callback(null, resbody);
-//         }
-//       }
-//     }, false
-//   );
-// }
-
 module.exports = { DirWebResponse };

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,6 +58,7 @@ class Directives {
   static MOVE_TO_UNASSIGNED = "move_to_unassigned";
   static CONNECT_BLOCK = "connect_block";
   static ADD_TAGS = 'add_tags'
+  static WEBHOOK = 'webhook';
   static WEB_RESPONSE = "web_response";
 
   // static WHEN_ONLINE_MOVE_TO_AGENT = "whenonlinemovetoagent"; // DEPRECATED?

package/utils/TiledeskChatbotUtil.js

@@ -319,55 +319,31 @@ class TiledeskChatbotUtil {
                                     json_buttons.forEach(button => {
                                         if (button.value && button.type === "action" && button.action) {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "text") {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "url" && button.link) {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else {
-                                            console.log("Invalid button. Skipping:", JSON.stringify(button) );
+                                            winston.verbose("Invalid button. Skipping:", button);
                                         }
                                     });
                                 }
-
-                                // "buttons": [
-                                //                 {
-                                //                     "type": "action",
-                                //                     "value": "Button1", // obbligatorio sempre
-                                //                     "action": "#bb347206-d639-4926-94c9-e94930623dce", // mandatory
-                                //                     "show_echo": true, // lo inserisco sempre
-                                //                     "alias": "button1 alias"
-                                //                 },
-                                //                 {
-                                //                     "type": "text",
-                                //                     "value": "Button2 text", // obbligatorio sempre
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 },
-                                //                 {
-                                //                     "type": "url",
-                                //                     "value": "Button3 link", // obbligatorio sempre
-                                //                     "link": "http://", // obbligatorio
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 }
-                                //             ]
                             }
                             catch(error) {
-                                console.error("Invalid json_buttons:", error)
+                                winston.warn("Invalid json_buttons:", error)
                             }
                             if (final_buttons && final_buttons.length > 0) {
                                 command.message.attributes.attachment.buttons = final_buttons;
                                 delete command.message.attributes.attachment.json_buttons;
                             }
                             else {
-                                console.log("Invalid json_buttons. Skipping")
+                                winston.verbose("Invalid json_buttons. Skipping...")
                             }
                         }
                     }

package/TdCache copy.js

@@ -1,242 +0,0 @@
-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 };