@tiledesk/tiledesk-tybot-connector 0.2.30 → 0.2.32

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+# v0.2.32
+- Added attributes filling to message.metadata.src
+- Added attributes filling to message.metadata.name
+
+# 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

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/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.30",
+  "version": "0.2.32",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -9,6 +9,7 @@ require('dotenv').config();
 class DirMake {
 
   constructor(context) {
+    console.log('context object LOG: ', context.log)
     if (!context) {
       throw new Error('context object is mandatory');
     }
@@ -37,6 +38,9 @@ class DirMake {
 
   async go(action, callback) {
     if (this.log) { console.log("DirMake action:", JSON.stringify(action)); }
+    let trueIntent = action.trueIntent;
+    let falseIntent = action.falseIntent;
+    //console.log('DirMake trueIntent',trueIntent)
     if (!this.tdcache) {
       console.error("Error: DirMake tdcache is mandatory");
       callback();
@@ -55,7 +59,7 @@ class DirMake {
         if (this.log) { console.log("DirMake request parameter:", key, "value:", value, "type:", typeof value) }
       }
     }
-
+    
     let webhook_url = action.url;
     let bodyParameters = action.bodyParameters;
     if (this.log) {
@@ -69,39 +73,38 @@ class DirMake {
     }
     if (!webhook_url || webhook_url === '') {
       console.error("DirMake ERROR - webhook_url is undefined or null or empty string");
-      callback();
+      let status = 422;   
+      let error = 'Missing make webhook url';
+      await this.#assignAttributes(action, status, error);
+      this.#executeCondition(false, trueIntent, null, falseIntent, null, () => {
+        callback(); // stop the flow
+      });
       return;
     }
     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();
-
-    
+      if (make_base_url) {
+        url = make_base_url + "/make/";
+      } else {
+        url = action.url;
+      }
+      const filler = new Filler();
       for (const [key, value] of Object.entries(bodyParameters)) {
-        if (this.log) {console.log("bodyParam:", key, "value:", value)}
+        //if (this.log) {console.log("bodyParam:", key, "value:", value)}
         let filled_value = filler.fill(value, requestVariables);
         bodyParameters[key] = filled_value;
       }
+      if (this.log) {console.log('DirMake bodyParameters filler: ',bodyParameters)}
     
-      console.log('CIAO',bodyParameters)
-    
-
 
     
     // Condition branches
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
-    console.log('trueIntent',trueIntent)
+    //let trueIntent = action.trueIntent;
+    //let falseIntent = action.falseIntent;
+    //console.log('DirMake trueIntent',trueIntent)
  
-    if (this.log) { console.log("DirMake MakeEndpoint URL: ", make_base_url); }
+    if (this.log) { console.log("DirMake MakeEndpoint URL: ", url); }
     const MAKE_HTTPREQUEST = {
       url: url,
       headers: {
@@ -133,8 +136,8 @@ class DirMake {
           await this.#executeCondition(true, trueIntent, null, falseIntent, null, () => {
             callback(); // stop the flow
           });
-          console.log('myrequest/status: ',status)
-          callback();
+          if (this.log) {console.log('myrequest/status: ',status)}
+          //callback();
         }
       }
     );

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -54,6 +54,15 @@ class DirReply {
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
+      if (message.metadata) {
+        if (this.log) {console.log("filling message 'metadata':", JSON.stringify(message.metadata));}
+        if (message.metadata.src) {
+          message.metadata.src = filler.fill(message.metadata.src, requestAttributes);
+        }
+        if (message.metadata.name) {
+          message.metadata.name = filler.fill(message.metadata.name, requestAttributes);
+        }
+      }
       if (this.log) {console.log("filling commands'. Message:", JSON.stringify(message));}
       if (message.attributes && message.attributes.commands) {
         if (this.log) {console.log("filling commands'. commands found.");}
@@ -97,11 +106,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 +139,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,14 +126,17 @@ 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);
+        // 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();
@@ -147,7 +150,7 @@ class DirSetAttributeV2 {
             // console.log("requestAttributes in setattribute...", requestAttributes);
             const filler = new Filler();
             destination = filler.fill(destination, requestAttributes);
-            console.log("setattribute, final destination:", destination);
+            // console.log("setattribute, final destination:", destination);
         }
         return destination
     }
@@ -186,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);
+                    // }
                 });
             }
         }