@tiledesk/tiledesk-tybot-connector 0.1.53 → 0.1.55

package/CHANGELOG.md

@@ -5,6 +5,12 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.55
+- fixed bug on DirCondition $data. replace with regex
+
+### 0.1.54
+- bug fixing
+
 ### 0.1.53
 - removed projectId from query MongodbBotsDataSource.getByExactMatch()
 - removed projectId from query MongodbIntentsMachine.decode()

package/models/IntentForm.js

@@ -19,7 +19,7 @@ class IntentForm {
       return null;
     }
     if (this.log) {
-      console.log("this.requestParameters:", this.requestParameters);
+      console.log("this.requestParameters:", JSON.stringify(this.requestParameters));
       console.log("this.requestParameters[" + paramKey + "]:", this.requestParameters[paramKey]);
     }
     return this.requestParameters[paramKey];
@@ -103,7 +103,7 @@ class IntentForm {
       // set the first field under the "await the response-value" state (=0)
       await this.setValue(this.CURRENT_FIELD_INDEX_KEY, current_field);
       // now look for an already set value for this field in request parameters
-      if (this.log) {console.log("params", this.requestParameters);}
+      if (this.log) {console.log("IntentForm parameters", JSON.stringify(this.requestParameters));}
       if (this.log) {console.log("checking field:", this.form.fields[current_field].name);}
       const is_current_value = this.getParam(this.form.fields[current_field].name);
       if (is_current_value) {
@@ -187,7 +187,7 @@ class IntentForm {
         if (this.log) {console.log("Processing next field:", current_field)}
         await this.setValue(this.CURRENT_FIELD_INDEX_KEY, current_field);
 
-        if (this.log) {console.log("params", this.requestParameters);}
+        // if (this.log) {console.log("params", this.requestParameters);}
         if (this.log) {console.log("checking field:", this.form.fields[current_field].name);}
         
         const is_current_value = this.getParam(this.form.fields[current_field].name);

package/models/TiledeskChatbot.js

@@ -98,7 +98,7 @@ class TiledeskChatbot {
           });
           // it only gets the locked_intent
           const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
-          if (this.log) {console.log("locked intent. got faqs", faq)}
+          if (this.log) {console.log("locked intent. got faqs", JSON.stringify(faq))}
           let reply;
           if (faq) {
             reply = await this.execIntent(faq, message, lead);//, bot);
@@ -340,7 +340,7 @@ class TiledeskChatbot {
         if (this.log) {
           console.log("FORM end.", );
           console.log("unlocking intent for request:", this.requestId);
-          console.log("populate data on lead:", lead);
+          console.log("populate data on lead:", JSON.stringify(lead));
         }
         this.unlockIntent(this.requestId);
         if (lead) {
@@ -350,7 +350,7 @@ class TiledeskChatbot {
           if (this.log) {console.log("No lead. Skipping populatePrechatFormAndLead()");}
         }
         const all_parameters = await this.allParameters();
-        if (this.log) {console.log("We have all_parameters:", all_parameters)};
+        // if (this.log) {console.log("We have all_parameters:", all_parameters)};
         if (all_parameters && all_parameters["userFullname"]) {
           clientUpdateUserFullname = all_parameters["userFullname"];
         }
@@ -576,7 +576,7 @@ class TiledeskChatbot {
   async execIntentForm(userInputReply, form) {
     if (this.log) {console.log("executing intent form...")}
     let all_parameters = await this.allParameters();
-    if (this.log) {console.log("allParameters for IntentForm:", all_parameters)}
+    // if (this.log) {console.log("allParameters for IntentForm:", all_parameters)}
     let intentForm = new IntentForm(
       {
         form: form,

package/package.json

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

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -229,9 +229,17 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.IF_OPEN_HOURS) {
-      new DirIfOpenHours(context).execute(directive, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
+      new DirIfOpenHours(context).execute(directive, async (stop) => {
+        if (stop) {
+          if (context.log) { console.log("Stopping Actions on:", directive);}
+          this.theend();
+        }
+        else {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+        }
+        // let next_dir = await this.nextDirective(this.directives);
+        // this.process(next_dir);
       });
     }
     else if (directive_name === Directives.IF_ONLINE_AGENTS) {
@@ -274,7 +282,7 @@ class DirectivesChatbotPlug {
       // DEPRECATED
       const whenOpenDir = new DirWhenOpen(
         {
-          tdclient: tdclient, // matches open hours
+          tdclient: this.context.tdclient, // matches open hours
           log: false
         });
       whenOpenDir.execute(directive, directives, curr_directive_index, async () => {
@@ -286,7 +294,7 @@ class DirectivesChatbotPlug {
       // DEPRECATED
       const whenOpenDir = new DirWhenOpen(
         {
-          tdclient: tdclient,
+          tdclient: this.context.tdclient,
           checkOpen: false, // matches closed hours
           log: false
         });
@@ -299,7 +307,7 @@ class DirectivesChatbotPlug {
       // DEPRECATED
       const ifNoAgentsDir = new DirIfAvailableAgents(
         {
-          tdclient: tdclient,
+          tdclient: this.context.tdclient,
           checkAgents: true, // check available agents > 0
           log: false
         });
@@ -312,7 +320,7 @@ class DirectivesChatbotPlug {
       // DEPRECATED
       const ifNoAgentsDir = new DirIfAvailableAgents(
         {
-          tdclient: tdclient,
+          tdclient: this.context.tdclient,
           checkAgents: false, // check no available agents 
           log: false
         });
@@ -402,7 +410,7 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.SEND_EMAIL) {
-      // console.log("...DirSendEmail");
+      console.log("...DirSendEmail");
       new DirSendEmail(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
         this.process(next_dir);

package/tiledeskChatbotPlugs/MarkbotChatbotPlug.js

@@ -61,7 +61,7 @@ class MarkbotChatbotPlug {
           // if already present, do not modify metadata
           message.metadata = parsed_reply.message.metadata;
         }
-        if (this.log) {console.log("parsed_reply.message.attributes", parsed_reply.message.attributes);}
+        if (this.log) {console.log("parsed_reply.message.attributes", JSON.stringify(parsed_reply.message.attributes));}
         //this.mergeCurrentMessageButtons(message, parsed_reply);
         if (parsed_reply.message.attributes) {
           for(const [key, value] of Object.entries(parsed_reply.message.attributes)) {

package/tiledeskChatbotPlugs/directives/DirAssign.js

@@ -75,7 +75,8 @@ class DirAssign {
       // console.log("assign variable name (after filling):", variableName);
       
       if (this.log) {console.log("(DirAssign) Variables:", JSON.stringify(variables));}
-      const value = await new TiledeskExpression().evaluateExpression(expression, variables);
+      // const value = await new TiledeskExpression().evaluateExpression(expression, variables);
+      const value = new TiledeskExpression().evaluateExpression(expression, variables);
       if (this.log) {console.log("(DirAssign) executed expression:", expression, "value:", value);}
       await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, variableName, value);
       if (this.log) {

package/tiledeskChatbotPlugs/directives/DirCondition.js

@@ -65,7 +65,6 @@ class DirCondition {
     this.go(action, (stop) => {
       callback(stop);
     });
-    
   }
 
   async go(action, callback) {
@@ -133,7 +132,7 @@ class DirCondition {
       if (trueIntentDirective) {
         this.intentDir.execute(trueIntentDirective, () => {
           console.log("result === true. stopOnConditionMet?", stopOnConditionMet);
-          callback(true);
+          callback(stopOnConditionMet);
         });
       }
       else {
@@ -157,13 +156,14 @@ class DirCondition {
     }
   }
 
-  async evaluateCondition(_condition, variables) {
-    let condition = _condition.replace("$", "$data.");
+  async evaluateCondition(expression, variables) {
+    // let condition = _condition.replace("$", "$data.");
     if (this.log) {
-      console.log("Evaluating expression:", condition);
+      console.log("Evaluating expression:", expression);
       console.log("With variables:", variables);
     }
-    const result = new TiledeskExpression().evaluate(condition, variables)
+    // const result = new TiledeskExpression().evaluate(condition, variables)
+    const result = await new TiledeskExpression().evaluateExpression(expression, variables);
     if (this.log) {
       console.log("Expression result:", result);
     }

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

@@ -53,22 +53,35 @@ class DirIfOpenHours {
         return;
       }
       action = {
-        body: {
-          trueIntent: params.trueIntent,
-          falseIntent: params.falseIntent
-        }
+        trueIntent: params.trueIntent,
+        falseIntent: params.falseIntent
       }
     }
     else {
       callback();
       return;
     }
-    this.go(action, () => {
-      callback();
+    this.go(action, (stop) => {
+      callback(stop);
     });
   }
 
   go(action, callback) {
+    let trueIntent = action.trueIntent;
+    let falseIntent = action.falseIntent;
+    const stopOnConditionMet = action.stopOnConditionMet;
+    if (trueIntent && trueIntent.trim() === "") {
+      trueIntent = null;
+    }
+    if (falseIntent && falseIntent.trim() === "") {
+      falseIntent = null;
+    }
+    if (this.log) {console.log("condition action:", action);}
+    if (!trueIntent && !falseIntent) {
+      if (this.log) {console.log("Invalid condition, no intents specified");}
+      callback();
+      return;
+    }
     this.tdclient.openNow((err, result) => {
       if (this.log) {console.log("openNow():", result);}
       if (err) {
@@ -76,11 +89,11 @@ class DirIfOpenHours {
         callback();
       }
       else if (result && result.isopen) {
-        if (action.body.trueIntent) {
-          let intentDirective = DirIntent.intentDirectiveFor(action.body.trueIntent);
+        if (trueIntent) {
+          let intentDirective = DirIntent.intentDirectiveFor(trueIntent);
           if (this.log) {console.log("agents (openHours) => trueIntent");}
           this.intentDir.execute(intentDirective, () => {
-            callback();
+            callback(stopOnConditionMet);
           });
         }
         else {
@@ -88,11 +101,11 @@ class DirIfOpenHours {
           return;
         }
       }
-      else if (action.body.falseIntent) {
-        let intentDirective = DirIntent.intentDirectiveFor(action.body.falseIntent);
-        if (this.log) {console.log("!agents (openHours) => falseIntent", action.body.falseIntent);}
+      else if (falseIntent) {
+        let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
+        if (this.log) {console.log("!agents (openHours) => falseIntent", falseIntent);}
         this.intentDir.execute(intentDirective, () => {
-          callback();
+          callback(stopOnConditionMet);
         });
       }
       else {
@@ -101,17 +114,6 @@ class DirIfOpenHours {
     });
   }
 
-  // intentDirectiveFor(intent) {
-  //   let intentDirective = {
-  //     action: {
-  //       body: {
-  //         intentName: intent
-  //       }
-  //     }
-  //   }
-  //   return intentDirective;
-  // }
-
   parseParams(directive_parameter) {
     let trueIntent = null;
     let falseIntent = null;

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -24,10 +24,10 @@ class DirLockIntent {
     else if (directive.parameter && directive.parameter.trim() !== "") {
       const params = this.parseParams(directive.parameter);
       action = {
-        body: {
-          intentName: params.intentName // directive.parameter.trim()
+        // body: {
+        intentName: params.intentName // directive.parameter.trim()
           // variableName: params.variableName
-        }
+        // }
       }
     }
     else {
@@ -49,10 +49,11 @@ class DirLockIntent {
   }
 
   async go(action, callback) {
-    let intent_name = action.body.intentName;
+    // let intent_name = action.body.intentName;
+    let intent_name = action.intentName;
     // let variable_name = action.body.variableName;
     await DirLockIntent.lockIntent(this.tdcache, this.context.requestId, intent_name); //, variable_name);
-    if (this.log) {console.log("Locked intent:", action.body.intentName);}
+    if (this.log) {console.log("Locked intent:", action.intentName);}
     if (callback) {
       callback();
     }

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -88,7 +88,7 @@ class DirMessage {
   go(action, callback) {
     // const message = action.body.message;
     const message = action;
-    if (this.log) {console.log("Message to extEndpoint:", message)};
+    if (this.log) {console.log("Message to extEndpoint:", JSON.stringify(message))};
     let extEndpoint = `${this.API_ENDPOINT}/modules/tilebot`;
     if (this.TILEBOT_ENDPOINT) {
       extEndpoint = `${this.TILEBOT_ENDPOINT}`;

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -91,7 +91,7 @@ class DirReply {
       }
     }
     // send!
-    if (this.log) {console.log("Message to extEndpoint:", message)};
+    if (this.log) {console.log("Reply:", JSON.stringify(message))};
     this.context.tdclient.sendSupportMessage(
       this.requestId,
       message,
@@ -99,7 +99,7 @@ class DirReply {
         if (err) {
           console.error("Error sending reply:", err.message);
         }
-        if (this.log) {console.log("Message sent.");}
+        if (this.log) {console.log("Reply message sent.");}
         callback();
     });
   }

package/tiledeskChatbotPlugs/directives/DirSendEmail.js

@@ -40,7 +40,6 @@ class DirSendEmail {
   execute(directive, callback) {
     let action;
     if (directive.action) {
-      console.log("got intent action:", JSON.stringify(directive.action));
       action = directive.action;
     }
     else if (directive.parameter && directive.parameter.trim() !== "") {
@@ -52,7 +51,7 @@ class DirSendEmail {
       }
     }
     else {
-      console.error("Incorrect directive:", directive);
+      console.error("Incorrect directive:", JSON.stringify(directive));
       callback();
       return;
     }
@@ -63,6 +62,7 @@ class DirSendEmail {
 
   async go(action, completion) {
       // let params = action.body;
+      if (this.log) {console.log("email action:", JSON.stringify(action));}
       if (action.subject && action.text && action.to) {
         try {
           let requestVariables = null;
@@ -73,11 +73,17 @@ class DirSendEmail {
             );
           }
           const filler = new Filler();
+          const filled_subject = filler.fill(action.subject, requestVariables);
+          const filled_text = filler.fill(action.text, requestVariables);
+          const filled_to = filler.fill(action.to, requestVariables);
           const message_echo = await this.tdclient.sendEmail({
-            subject: filler.fill(action.subject, requestVariables),
-            text: filler.fill(action.text, requestVariables),
-            to: filler.fill(action.to, requestVariables)
+            subject: filled_subject,
+            text: filled_text,
+            to: filled_to
           });
+          if (this.log) {console.log("email sent. filled_subject:", filled_subject);}
+          if (this.log) {console.log("email sent. filled_text:", filled_text);}
+          if (this.log) {console.log("email sent. filled_to:", filled_to);}
           if (completion) {
             completion(null, message_echo);
           }