@tiledesk/tiledesk-tybot-connector 0.2.29 → 0.2.31

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# v0.2.31
+- Removed patch: Added support for removing empty text from replies: TiledeskChatbotUtil.removeEmptyReplyCommands()
+
+### v0.2.30
+- Updated WhatsappByAttribute action
+- Fixed bug: WhatsappByAttribute action pointed to whatsapp pre
+
 ### v0.2.29
 - Added Make action 
 

package/TiledeskExpression.js

@@ -234,8 +234,8 @@ class TiledeskExpression {
     }
 
     evaluateJavascriptExpression(expression, context) {
-        console.log("(evaluateJavascriptExpression) evaluating:", expression)
-        console.log("context:", context)
+        // console.log("(evaluateJavascriptExpression) evaluating:", expression)
+        // console.log("context:", context)
         let res = null;
         try {
             const vm = new VM({

package/index.js

@@ -37,7 +37,6 @@ router.post('/ext/:botid', async (req, res) => {
     console.log("Removed req.body.payload.request.snapshot field");
   }
   if (log) {console.log("REQUEST BODY:", JSON.stringify(req.body));}
-  res.status(200).send({"success":true});
   
   const botId = req.params.botid;
   if (log) {console.log(" :", botId);}
@@ -53,6 +52,14 @@ router.post('/ext/:botid', async (req, res) => {
   if (message.request.id_project === null || message.request.id_project === undefined) {
     message.request.id_project = projectId;
   }
+
+  // let request_check = checkRequest(message.request.request_id, message.id_project);
+  // if (request_check === true) {
+  //   res.status(200).send({ "successs": true });
+  // } else {
+  //   return res.status(400).send({ "success": false, "message": "Invalid request_id"})
+  // }
+  res.status(200).send({"success":true});
   
   const request_botId_key = "tilebot:botId_requests:" + requestId;
   await tdcache.set(
@@ -541,4 +548,23 @@ async function connectRedis() {
   return;
 }
 
+async function checkRequest(request_id, id_project) {
+  // TO DO CHECK
+
+  // if (request_id startsWith "support-request-{$project_id}")
+  //    if (project_id is equal to the id_project)
+  //        return true;
+  //    else 
+  //        return (false, motivation)
+  // else if (request_id startsWith "automation-request-{$project_id}")
+  //    if (project_id is equal to the id_project)
+  //        return true;
+  //    else 
+  //        return (false, motivation)
+  // else
+  //    return (false, motivation);
+  
+  // WARNING! Move this function in models/TiledeskChatbotUtil.js
+}
+
 module.exports = { router: router, startApp: startApp};

package/models/TiledeskChatbot.js

@@ -80,7 +80,7 @@ class TiledeskChatbot {
             if (this.log) {console.log("RESETTING LOCKED INTENT. Intent was explicitly invoked with an action:", message.attributes.action);}
             await this.unlockIntent(this.requestId);
             await this.unlockAction(this.requestId);
-            console.log("RESET LOCKED INTENT.");
+            // console.log("RESET LOCKED INTENT.");
             if (this.log) {console.log("RESET LOCKED INTENT. Intent was explicitly  invoked with an action:", message.attributes.action);}
           }
         } catch(error) {
@@ -296,7 +296,7 @@ class TiledeskChatbot {
         }
         if (this.log) {console.log("NLP intents found:", intents);}
         if (intents && intents.length > 0) {
-          console.log("Matching intents found.");
+          // console.log("Matching intents found.");
           // let faq = await this.botsDataSource.getByIntentDisplayName(this.botId, intents[0].intent_display_name);
           let faq = await this.botsDataSource.getByIntentDisplayNameCache(this.botId, intents[0].intent_display_name, this.tdcache);
           let reply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.29",
+  "version": "0.2.31",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -74,14 +74,12 @@ class DirMake {
     }
     let url;
     try {
-    console.log('CIAOkkkk',bodyParameters)
     let make_base_url = process.env.MAKE_ENDPOINT;
     if (make_base_url) {
       url = make_base_url + "/make/";
     } else {
       url = action.url;
     }
-    console.log('Make url: ', url);
     const filler = new Filler();
 
     

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -97,11 +97,13 @@ class DirReply {
       }
     }
     // send!
-    const cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
-    if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
-      console.log("invalid message", cleanMessage);
-      callback(); // cancel reply operation
-    }
+    let cleanMessage = message;
+    // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
+    // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
+    //   console.log("invalid message", cleanMessage);
+    //   callback(); // cancel reply operation
+    //   return;
+    // }
     // console.log("valid message!", cleanMessage);
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     if (this.log) {console.log("Reply:", JSON.stringify(cleanMessage))};
@@ -128,86 +130,8 @@ class DirReply {
         }
     });
 
-    // this.sendSupportMessage(
-    //   this.requestId,
-    //   message,
-    //   (err) => {
-    //     if (err) {
-    //       console.error("Error sending reply:", err);
-    //     }
-    //     // if (this.log) {console.log("Reply message sent.");}
-    //     console.log("Reply message sent.", JSON.stringify(message));
-    //     callback();
-    //   }
-    // );
   }
 
-  // sendSupportMessage(requestId, message, callback) {
-  //   const url = `${this.context.tdclient.APIURL}/${this.projectId}/requests/${requestId}/messages`
-  //   const HTTPREQUEST = {
-  //     url: url,
-  //     headers: {
-  //       'Content-Type' : 'application/json',
-  //       'Authorization': "JWT " + this.token
-  //     },
-  //     json: message,
-  //     method: 'POST'
-  //   };
-  //   this.myrequest(
-  //     HTTPREQUEST,
-  //     function(err, resbody) {
-  //       if (err) {
-  //         if (callback) {
-  //           callback(err);
-  //         }
-  //       }
-  //       else {
-  //         if (callback) {
-  //           callback(null, resbody);
-  //         }
-  //       }
-  //     }, this.log
-  //   );
-  // }
-
-  // myrequest(options, callback, log) {
-  //   console.log("API URL:", options.url);
-  //   console.log("** Options:", JSON.stringify(options));
-  //   console.log("** Sending reply json:", JSON.stringify(options.json));
-  //   axios(
-  //   {
-  //     url: options.url,
-  //     method: options.method,
-  //     data: options.json,
-  //     params: options.params,
-  //     headers: options.headers
-  //   })
-  //   .then((res) => {
-  //     console.log("Reply: Response for url:", options.url);
-  //     console.log("Reply: Response headers:\n", JSON.stringify(res.headers));
-  //     console.log("Reply: Status:", res.status);
-  //     console.log("Reply: Data:", JSON.stringify(res.data));
-  //     if (res && res.status == 200 && res.data) {
-  //       console.log("Status 200 OK");
-  //       if (callback) {
-  //         callback(null, res.data);
-  //       }
-  //     }
-  //     else {
-  //       console.error("Status ! 200");
-  //       if (callback) {
-  //         callback({ message: "Response status not 200" }, null);
-  //       }
-  //     }
-  //   })
-  //   .catch((error) => {
-  //     console.error("Reply error:", error);
-  //     if (callback) {
-  //       callback(error, null);
-  //     }
-  //   });
-  // } 
-
 }
 
 module.exports = { DirReply };

package/tiledeskChatbotPlugs/directives/DirSetAttributeV2.js

@@ -96,12 +96,12 @@ class DirSetAttributeV2 {
     }
 
     async go(action, callback) {
-        console.log("(DirSetAttribute) action before filling:", JSON.stringify(action));
+        if (this.log) {console.log("(DirSetAttribute) action before filling:", JSON.stringify(action));}
         if (action && action.operation && action.operation.operands) {
-            console.log("filling in setattribute...");
+            if (this.log) {console.log("filling in setattribute...");}
             await this.fillValues(action.operation.operands);
         }
-        console.log("filled in setattribute:", action.operation);
+        if (this.log) {console.log("filled in setattribute:", action.operation);}
         // let res = validate(action, schema);
         // if (res.errors) {
         //     console.log("(DirSetAttribute) failed validation action:", JSON.stringify(action));
@@ -126,18 +126,34 @@ class DirSetAttributeV2 {
         //     console.log("filling in setattribute...");
         //     await this.fillValues(action.operation.operands);
         // }
-        console.log("dirsetattribute, action.operation.operands:", action.operation.operands);
+        // console.log("dirsetattribute, action.operation.operands:", action.operation.operands);
         const expression = TiledeskExpression.JSONOperationToExpression(action.operation.operators, action.operation.operands);
         const attributes = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-        console.log("dirsetattribute, attributes:", attributes);
+        // console.log("dirsetattribute, attributes:", attributes);
         attributes.TiledeskMath = TiledeskMath;
         attributes.TiledeskString = TiledeskString;
         const result = new TiledeskExpression().evaluateJavascriptExpression(expression, attributes);
-        console.log("filling in setattribute, result:", result);
-        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.destination, result);
+        // console.log("filling in setattribute, result:", result);
+        // THE GOAL OF ATTRIBUTE-FILLING THE "DESTINATION" FIELD IS TO SUPPORT DYNAMIC ATTRIBUTES
+        // (ATTRS WHOSE NAME IS UNKNOWN AD DESIGN-TIME)
+        // STILL UNSUPPORTED IN UI
+        let destination = await this.fillDestination(action.destination);
+        await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, destination, result);
         callback();
     }
 
+    async fillDestination(destination) {
+        if (this.tdcache) {
+            // console.log("tdcache in setattribute...", this.tdcache);
+            const requestAttributes = 
+                await TiledeskChatbot.allParametersStatic(this.tdcache, this.context.requestId);
+            // console.log("requestAttributes in setattribute...", requestAttributes);
+            const filler = new Filler();
+            destination = filler.fill(destination, requestAttributes);
+            // console.log("setattribute, final destination:", destination);
+        }
+        return destination
+    }
     async fillValues(operands) {
         // operation: {
         //     operators: ["addAsNumber", "subtractAsNumber", "divideAsNumber", "multiplyAsNumber"],
@@ -173,11 +189,11 @@ class DirSetAttributeV2 {
                 // console.log("requestAttributes in setattribute...", requestAttributes);
                 const filler = new Filler();
                 operands.forEach(operand => {
-                    if (!operand.isVariable) {
-                        console.log("setattribute, liquid operand:", operand);
+                    // if (!operand.isVariable) {
+                        // console.log("setattribute, liquid operand:", operand);
                         operand.value = filler.fill(operand.value, requestAttributes);
-                        console.log("setattribute, final operand:", operand);
-                    }
+                        // console.log("setattribute, final operand:", operand);
+                    // }
                 });
             }
         }

package/tiledeskChatbotPlugs/directives/DirWhatsappByAttribute.js

@@ -30,65 +30,126 @@ class DirWhatsappByAttribute {
   }
 
   async go(action, callback) {
+
     if (this.log) {
       console.log("whatsapp by attributes action: ", JSON.stringify(action))
     }
 
-    if (process.env.API_URL) {
-      whatsapp_api_url = "https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/api";
-      // whatsapp_api_url = process.env.API_URL + "/modules/whatsapp";
-      console.log("(Tilebot) DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
+    /////////// 
+
+    const whatsapp_api_url_pre = process.env.WHATSAPP_ENDPOINT;
+    const server_base_url = process.env.API_URL || process.env.API_ENDPOINT;
+
+    if (whatsapp_api_url_pre) {
+      whatsapp_api_url = whatsapp_api_url_pre;
     } else {
-      console.error("(Tilebot) ERROR Missing whatsapp_api_url. Unable to use action WhatsApp By Attributes");
+      whatsapp_api_url = server_base_url + "/modules/whatsapp/api"
+    }
+    console.log("DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
+
+    if (!action.attributeName) {
+      console.error("DirWhatsappByAttribute attributeName is mandatory")
       callback();
       return;
     }
+    if (this.log) { console.log("DirWhatsappByAttribute attributeName: ", action.attributeName )};
 
-    if (action.attributeName) {
-      if (this.log) { console.log("whatsapp attributeName:", action.attributeName); }
-      let attribute_value = null;
-      if (this.context.tdcache) {
+    const attribute_value = await TiledeskChatbot.getParameterStatic(this.context.tdcache, this.context.requestId, action.attributeName)
+    if (this.log) { console.log("attribute_value:", JSON.stringify(attribute_value)); }
 
-        const attribute_value = await TiledeskChatbot.getParameterStatic(this.context.tdcache, this.context.requestId, action.attributeName)
-        if (this.log) { console.log("attribute_value:", JSON.stringify(attribute_value)); }
+    if (attribute_value == null) {
+      console.error("DirWhatsappByAttribute attribute_value is undefined");
+      callback();
+      return;
+    }
 
-        if (attribute_value == null) {
-          console.error("(Tilebot) attribute_value is undefined");
-          callback();
-          return;
-        }
+    attribute_value.transaction_id = this.context.requestId;
 
-        const URL = whatsapp_api_url + '/tiledesk/broadcast';
-        const HTTPREQUEST = {
-          url: URL,
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          json: attribute_value,
-          method: 'POST'
-        };
-        let promise = new Promise((resolve, reject) => {
-          DirWhatsappByAttribute.myrequest(
-            HTTPREQUEST,
-            function (err, resbody) {
-              if (err) {
-                if (callback) {
-                  callback(err);
-                }
-                reject(err);
-              }
-              else {
-                if (callback) {
-                  callback(null, resbody);
-                }
-                console.log("(tybot) broadcast sent: ", resbody);
-                resolve(resbody);
-              }
-            }, true);
-        })
-        return promise;
-      }
+    const HTTPREQUEST = {
+      url: whatsapp_api_url + "/tiledesk/broadcast",
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      json: attribute_value,
+      method: 'POST'
     }
+
+    return new Promise((resolve, reject) => {
+      DirWhatsappByAttribute.myrequest(
+        HTTPREQUEST,
+        function (err, resbody) {
+          if (err) {
+            if (callback) {
+              callback(err);
+            }
+            reject(err);
+          }
+          else {
+            if (callback) {
+              callback(null, resbody);
+            }
+            console.log("(tybot) broadcast sent: ", resbody);
+            resolve(resbody);
+          }
+        }, true);
+    })
+
+
+    // if (process.env.API_URL) {
+    //   whatsapp_api_url = "https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/api";
+    //   // whatsapp_api_url = process.env.API_URL + "/modules/whatsapp";
+    //   console.log("(Tilebot) DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
+    // } else {
+    //   console.error("(Tilebot) ERROR Missing whatsapp_api_url. Unable to use action WhatsApp By Attributes");
+    //   callback();
+    //   return;
+    // }
+    // if (action.attributeName) {
+    //   if (this.log) { console.log("whatsapp attributeName:", action.attributeName); }
+    //   let attribute_value = null;
+    //   if (this.context.tdcache) {
+
+    //     const attribute_value = await TiledeskChatbot.getParameterStatic(this.context.tdcache, this.context.requestId, action.attributeName)
+    //     if (this.log) { console.log("attribute_value:", JSON.stringify(attribute_value)); }
+
+    //     if (attribute_value == null) {
+    //       console.error("(Tilebot) attribute_value is undefined");
+    //       callback();
+    //       return;
+    //     }
+
+    //     const URL = whatsapp_api_url + '/tiledesk/broadcast';
+    //     const HTTPREQUEST = {
+    //       url: URL,
+    //       headers: {
+    //         'Content-Type': 'application/json',
+            
+    //       },
+    //       json: attribute_value,
+    //       method: 'POST'
+    //     };
+    //     let promise = new Promise((resolve, reject) => {
+    //       DirWhatsappByAttribute.myrequest(
+    //         HTTPREQUEST,
+    //         function (err, resbody) {
+    //           if (err) {
+    //             if (callback) {
+    //               callback(err);
+    //             }
+    //             reject(err);
+    //           }
+    //           else {
+    //             if (callback) {
+    //               callback(null, resbody);
+    //             }
+    //             console.log("(tybot) broadcast sent: ", resbody);
+    //             resolve(resbody);
+    //           }
+    //         }, true);
+    //     })
+    //     return promise;
+    //   }
+    // }
   }
 
   // HTTP REQUEST