@tiledesk/tiledesk-tybot-connector 0.1.62 → 0.1.63

package/CHANGELOG.md

@@ -5,6 +5,20 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.63
+- Added stopOnConditionMet to DirIfOnlineAgents
+- Removed deprecated Directive Directives.WHEN_OFFLINE_HOURS
+- Removed deprecated Directive Directives.DISABLE_INPUT_TEXT
+- Removed deprecated Directive Directives.WHEN_OPEN
+- Removed deprecated Directive Directives.WHEN_CLOSED
+- Removed deprecated Directive Directives.IF_AGENTS
+- Removed deprecated Directive Directives.IF_NO_AGENTS
+- Added support for intent parameters in DirJSONCondition DirIfOnlineAgents DirIfOpeningHours
+- Added JSONCondition with intent parameters test
+
+### 0.1.63 - online
+- Added support for depId-from-supportRequest in DirMoveToAgent. This fixes no-handoff in test-it-out and from Dialogflow connector
+
 ### 0.1.62
 - Added TiledeskChatbotUtil.fillCommandAttachments() replacing vars in commands.button.link
 

package/index.js

@@ -390,7 +390,11 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
       id_project: projectId
     }
   }
-  // if (log) {console.log("request....", JSON.stringify(request));}
+  if (log) {
+    console.log("/ext request....", JSON.stringify(request));
+    console.log("/ext APIURL....", APIURL);
+    console.log("/ext process.env.TYBOT_ENDPOINT....", process.env.TYBOT_ENDPOINT);
+  }
   let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, TILEDESK_API_ENDPOINT: APIURL, TILEBOT_ENDPOINT:process.env.TYBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
   // PIPELINE-EXT
   // if (log) {console.log("answer to process:", JSON.stringify(answer));}

package/models/MockBotsDataSource.js

@@ -64,7 +64,16 @@ class MockBotsDataSource {
       faq = await this.getByIntentDisplayName(botId, key);
       // console.log("faq found in datasource..:", JSON.stringify(faq));
     }
-    return faq;
+    // clones the faq to avoid modifying original object
+    // console.log("faq is:", faq)
+    let json_faq;
+    if (faq !== null && faq !== undefined) {
+      let string_faq = JSON.stringify(faq)
+      // console.log("string faq is:", string_faq)
+      json_faq = JSON.parse(string_faq);
+      // console.log("json faq is:", json_faq)
+    }
+    return json_faq;
   }
 
   /**

package/models/TiledeskChatbot.js

@@ -580,7 +580,7 @@ class TiledeskChatbot {
     if (static_bot_answer.attributes && static_bot_answer.attributes.webhook && static_bot_answer.attributes.webhook === true) {
       const variables = await this.allParameters();
       context.variables = variables;
-      if (this.log) {console.log("adding variables to webhook context:", context.variables);}
+      if (this.log) {console.log("adding variables to webhook context:", JSON.stringify(context.variables));}
     }
     const messagePipeline = new MessagePipeline(static_bot_answer, context);
     const webhookurl = bot.webhook_url;
@@ -625,7 +625,7 @@ class TiledeskChatbot {
     });
     // const parameters_key = "tilebot:requests:" + requestId + ":parameters";
     const all_parameters = await this.allParameters();//this.tdcache.hgetall(parameters_key);
-    if (this.log) {console.log("(populatePrechatFormAndLead) parameters_key:", all_parameters);}
+    if (this.log) {console.log("(populatePrechatFormAndLead) parameters_key:", JSON.stringify(all_parameters));}
     if (all_parameters) {
       if (this.log) {console.log("(populatePrechatFormAndLead) userEmail:", all_parameters['userEmail']);}
       if (this.log) {console.log("(populatePrechatFormAndLead) userFullname:", all_parameters['userFullname']);}

package/models/TiledeskChatbotUtil.js

@@ -207,6 +207,9 @@ class TiledeskChatbotUtil {
                 }
             });
         }
+        else if (log) {
+            console.log("No attachments to fill in command")
+        }
     }
 
 }

package/package.json

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

package/test/conversation-form-test.js

@@ -138,55 +138,55 @@ describe('Conversation1 - Form filling', async () => {
     });
   });
 
-  it('/disable_input', (done) => {
-    // console.log("/disable_input...");
-    let listener;
-    let endpointServer = express();
-    endpointServer.use(bodyParser.json());
-    endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
-      // console.log("req.body....:", JSON.stringify(req.body));
-      res.send({ success: true });
-      const message = req.body;
+  // it('/disable_input', (done) => {
+  //   // console.log("/disable_input...");
+  //   let listener;
+  //   let endpointServer = express();
+  //   endpointServer.use(bodyParser.json());
+  //   endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
+  //     // console.log("req.body....:", JSON.stringify(req.body));
+  //     res.send({ success: true });
+  //     const message = req.body;
 
-      assert(message["text"] !== "");
-      assert(message["attributes"] !== "");
-      assert(message["attributes"]["disableInputMessage"] === true);
+  //     assert(message["text"] !== "");
+  //     assert(message["attributes"] !== "");
+  //     assert(message["attributes"]["disableInputMessage"] === true);
 
-      listener.close(() => {
-        // console.log('closed.');
-        done();
-      });
+  //     listener.close(() => {
+  //       // console.log('closed.');
+  //       done();
+  //     });
 
-    });
+  //   });
 
-    listener = endpointServer.listen(10002, '0.0.0.0', function () {
-      // console.log('endpointServer started', listener.address());
-      // const botId = process.env.TEST_BOT_ID;
-      // const PROJECT_ID = process.env.TEST_PROJECT_ID;
-      // console.log("botId:", botId);
-      // console.log("REQUEST_ID:", REQUEST_ID);
-      let request = {
-        "payload": {
-          "_id": uuidv4(),
-          "senderFullname": "guest#367e",
-          "type": "text",
-          "sender": "A-SENDER",
-          "recipient": REQUEST_ID,
-          "text": "/disable_input",
-          "id_project": PROJECT_ID,
-          "metadata": "",
-          "request": {
-            "request_id": REQUEST_ID,
-            "id_project": PROJECT_ID
-          }
-        },
-        "token": CHATBOT_TOKEN
-      }
-      sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
-        // console.log("Message sent.");
-      });
-    });
-  });
+  //   listener = endpointServer.listen(10002, '0.0.0.0', function () {
+  //     // console.log('endpointServer started', listener.address());
+  //     // const botId = process.env.TEST_BOT_ID;
+  //     // const PROJECT_ID = process.env.TEST_PROJECT_ID;
+  //     // console.log("botId:", botId);
+  //     // console.log("REQUEST_ID:", REQUEST_ID);
+  //     let request = {
+  //       "payload": {
+  //         "_id": uuidv4(),
+  //         "senderFullname": "guest#367e",
+  //         "type": "text",
+  //         "sender": "A-SENDER",
+  //         "recipient": REQUEST_ID,
+  //         "text": "/disable_input",
+  //         "id_project": PROJECT_ID,
+  //         "metadata": "",
+  //         "request": {
+  //           "request_id": REQUEST_ID,
+  //           "id_project": PROJECT_ID
+  //         }
+  //       },
+  //       "token": CHATBOT_TOKEN
+  //     }
+  //     sendMessageToBot(request, BOT_ID, CHATBOT_TOKEN, () => {
+  //       // console.log("Message sent.");
+  //     });
+  //   });
+  // });
 
   it('/good_form', (done) => {
     // console.log("/good_form...");

package/test/json_condition-actions_bot.js

@@ -213,8 +213,7 @@ const bot = {
 		"actions": [{
 			"_tdActionTitle": null,
 			"_tdActionType": "jsoncondition",
-			"jsonCondition": {
-				"groups": [{
+			"groups": [{
 					"type": "expression",
 					"conditions": [{
 						"type": "condition",
@@ -226,15 +225,13 @@ const bot = {
 							"name": ""
 						}
 					}]
-				}]
-			},
+			}],
 			"stopOnConditionMet": true,
 			"trueIntent": "#d19b1b7a-7146-481d-a7d5-6b9cce8fcb50"
 		}, {
 			"_tdActionTitle": null,
 			"_tdActionType": "jsoncondition",
-			"jsonCondition": {
-				"groups": [{
+			"groups": [{
 					"type": "expression",
 					"conditions": [{
 						"type": "condition",
@@ -246,15 +243,13 @@ const bot = {
 							"name": ""
 						}
 					}]
-				}]
-			},
+			}],
 			"stopOnConditionMet": true,
 			"trueIntent": "#16240c0b-9618-40cd-87e7-6319e5c3e392"
 		}, {
 			"_tdActionTitle": null,
 			"_tdActionType": "jsoncondition",
-			"jsonCondition": {
-				"groups": [{
+			"groups": [{
 					"type": "expression",
 					"conditions": [{
 						"type": "condition",
@@ -278,8 +273,8 @@ const bot = {
 							"name": ""
 						}
 					}]
-				}]
-			},
+			}],
+			
 			"stopOnConditionMet": false,
 			"trueIntent": "#98dd1994-83ef-4863-8179-07c48d2194b9"
 		}],

package/test/json_condition-conversation_test.js

@@ -59,7 +59,7 @@ describe('Conversation for JSONCondition test', async () => {
     let endpointServer = express();
     endpointServer.use(bodyParser.json());
     endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
-      // console.log("...req.body:", JSON.stringify(req.body));
+      console.log("...req.body:", JSON.stringify(req.body));
       res.send({ success: true });
       const message = req.body;
       assert(message.attributes.commands !== null);

package/test/json_condition-with-intent-params-conversation_test.js

@@ -0,0 +1,282 @@
+var assert = require('assert');
+let axios = require('axios');
+const tybot = require("../");
+const tybotRoute = tybot.router;
+var express = require('express');
+var app = express();
+app.use("/", tybotRoute);
+app.use((err, req, res, next) => {
+  console.error("General error", err);
+});
+require('dotenv').config();
+const bodyParser = require('body-parser');
+const { v4: uuidv4 } = require('uuid');
+const bots_data = require('./json_condition-with-intent-params_bot.js').bots_data;
+
+const PROJECT_ID = "projectID"; //process.env.TEST_ACTIONS_PROJECT_ID;
+const REQUEST_ID = "support-group-" + PROJECT_ID + "-" + uuidv4().replace(/-/g, "");
+const BOT_ID = "botID"; //process.env.TEST_ACTIONS_BOT_ID;
+const CHATBOT_TOKEN = "XXX"; //process.env.ACTIONS_CHATBOT_TOKEN;
+
+describe('Conversation for JSONCondition with intent params test', async () => {
+
+  let app_listener;
+
+  before(() => {
+    return new Promise(async (resolve, reject) => {
+      console.log("Starting tilebot server...");
+      tybot.startApp(
+        {
+          // MONGODB_URI: process.env.mongoUrl,
+          bots: bots_data,
+          API_ENDPOINT: process.env.API_ENDPOINT,
+          REDIS_HOST: process.env.REDIS_HOST,
+          REDIS_PORT: process.env.REDIS_PORT,
+          REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+          log: process.env.API_LOG
+        }, () => {
+          console.log("Tilebot route successfully started.");
+          var port = process.env.PORT || 10001;
+          app_listener = app.listen(port, () => {
+            console.log('Tilebot connector listening on port ', port);
+            resolve();
+          });
+        });
+    })
+  });
+
+  after(function (done) {
+    app_listener.close(() => {
+      // console.log('ACTIONS app_listener closed.');
+      done();
+    });
+  });
+
+  it('/condition with params{"star_type":"supernova"}', (done) => {
+    console.log('/condition with params{"star_type":"supernova"}');
+    // let message_id = uuidv4();
+    let listener;
+    let endpointServer = express();
+    endpointServer.use(bodyParser.json());
+    endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
+      console.log("...req.body:", JSON.stringify(req.body));
+      res.send({ success: true });
+      const message = req.body;
+      assert(message.attributes.commands !== null);
+      assert(message.attributes.commands.length === 2);
+      const command2 = message.attributes.commands[1];
+    
+      assert(command2.type === "message");
+      assert(command2.message.text === "My name is supernova and I'm 2B km large");
+      getChatbotParameters(REQUEST_ID, (err, params) => {
+        if (err) {
+          assert.ok(false);
+        }
+        else {
+          assert(params);
+        //   assert(params["last_message_id"] === message_id);
+          assert(params["project_id"] === PROJECT_ID);
+          assert(params["star_type"] === "supernova");
+          assert(params["my_name"] === "supernova");
+          assert(params["size"] === "2B");
+          listener.close(() => {
+            done();
+          });
+        }
+      });
+
+    });
+
+    listener = endpointServer.listen(10002, '0.0.0.0', () => {
+      // console.log('endpointServer started', listener.address());
+      let request = {
+        "payload": {
+        //   "_id": message_id,
+          "senderFullname": "guest#367e",
+          "type": "text",
+          "sender": "A-SENDER",
+          "recipient": REQUEST_ID,
+          "text": '/condition with params{"star_type":"supernova"}',
+          "id_project": PROJECT_ID,
+          "metadata": "",
+          "request": {
+            "request_id": REQUEST_ID
+          }
+        },
+        "token": CHATBOT_TOKEN
+      }
+      sendMessageToBot(request, BOT_ID, () => {
+        // console.log("Message sent:\n", request);
+      });
+    });
+  });
+
+  it('/condition with params{"star_type":"nebula"}', (done) => {
+    console.log('/condition with params{"star_type":"nebula"}');
+    // let message_id = uuidv4();
+    let listener;
+    let endpointServer = express();
+    endpointServer.use(bodyParser.json());
+    endpointServer.post('/:projectId/requests/:requestId/messages', function (req, res) {
+      console.log("...req.body:", JSON.stringify(req.body));
+      res.send({ success: true });
+      const message = req.body;
+      assert(message.attributes.commands !== null);
+      assert(message.attributes.commands.length === 2);
+      const command2 = message.attributes.commands[1];
+    
+      assert(command2.type === "message");
+      assert(command2.message.text === "My name is nebula and I'm 500k km large");
+      getChatbotParameters(REQUEST_ID, (err, params) => {
+        if (err) {
+          assert.ok(false);
+        }
+        else {
+          console.log("params:", params)
+          assert(params);
+        //   assert(params["last_message_id"] === message_id);
+          assert(params["project_id"] === PROJECT_ID);
+          assert(params["star_type"] === "nebula");
+          assert(params["my_name"] === "nebula");
+          assert(params["size"] === "500k");
+          listener.close(() => {
+            done();
+          });
+        }
+      });
+
+    });
+
+    listener = endpointServer.listen(10002, '0.0.0.0', () => {
+      // console.log('endpointServer started', listener.address());
+      let request = {
+        "payload": {
+        //   "_id": message_id,
+          "senderFullname": "guest#367e",
+          "type": "text",
+          "sender": "A-SENDER",
+          "recipient": REQUEST_ID,
+          "text": '/condition with params{"star_type":"nebula"}',
+          "id_project": PROJECT_ID,
+          "metadata": "",
+          "request": {
+            "request_id": REQUEST_ID
+          }
+        },
+        "token": CHATBOT_TOKEN
+      }
+      sendMessageToBot(request, BOT_ID, () => {
+        // console.log("Message sent:\n", request);
+      });
+    });
+  });
+
+});
+
+/**
+ * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
+ * /${TILEBOT_ROUTE}/ext/${botId}
+ *
+ * @param {Object} message. The message to send
+ * @param {string} botId. Tiledesk botId
+ * @param {string} token. User token
+ */
+function sendMessageToBot(message, botId, callback) {
+  // const jwt_token = this.fixToken(token);
+  const url = `${process.env.TYBOT_ENDPOINT}/ext/${botId}`;
+  // console.log("sendMessageToBot URL", url);
+  const HTTPREQUEST = {
+    url: url,
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    json: message,
+    method: 'POST'
+  };
+  myrequest(
+    HTTPREQUEST,
+    function (err, resbody) {
+      if (err) {
+        if (callback) {
+          callback(err);
+        }
+      }
+      else {
+        if (callback) {
+          callback(null, resbody);
+        }
+      }
+    }, false
+  );
+}
+
+/**
+ * A stub to get the request parameters, hosted by tilebot on:
+ * /${TILEBOT_ROUTE}/ext/parameters/requests/${requestId}?all
+ *
+ * @param {string} requestId. Tiledesk chatbot/requestId parameters
+ */
+function getChatbotParameters(requestId, callback) {
+  // const jwt_token = this.fixToken(token);
+  const url = `${process.env.TYBOT_ENDPOINT}/ext/parameters/requests/${requestId}?all`;
+  const HTTPREQUEST = {
+    url: url,
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    method: 'get'
+  };
+  myrequest(
+    HTTPREQUEST,
+    function (err, resbody) {
+      if (err) {
+        if (callback) {
+          callback(err);
+        }
+      }
+      else {
+        if (callback) {
+          callback(null, resbody);
+        }
+      }
+    }, false
+  );
+}
+
+function myrequest(options, callback, log) {
+  if (log) {
+    console.log("API URL:", options.url);
+    console.log("** Options:", JSON.stringify(options));
+  }
+  axios(
+    {
+      url: options.url,
+      method: options.method,
+      data: options.json,
+      params: options.params,
+      headers: options.headers
+    })
+    .then((res) => {
+      if (log) {
+        console.log("Response for url:", options.url);
+        console.log("Response headers:\n", JSON.stringify(res.headers));
+        //console.log("******** Response for url:", res);
+      }
+      if (res && res.status == 200 && res.data) {
+        if (callback) {
+          callback(null, res.data);
+        }
+      }
+      else {
+        if (callback) {
+          callback(TiledeskClient.getErr({ message: "Response status not 200" }, options, res), null, null);
+        }
+      }
+    })
+    .catch((error) => {
+      console.error("An error occurred:", error);
+      if (callback) {
+        callback(error, null, null);
+      }
+    });
+}

package/test/json_condition-with-intent-params_bot.js

@@ -0,0 +1,159 @@
+const bot = {
+	"webhook_enabled": false,
+	"language": "en",
+	"name": "Link Button",
+	"type": "tilebot",
+	"intents": [{
+		"webhook_enabled": false,
+		"enabled": true,
+		"actions": [{
+			"_tdActionType": "reply",
+			"text": "Start\r\n",
+			"attributes": {
+				"commands": [{
+					"type": "wait",
+					"time": 500
+				}, {
+					"type": "message",
+					"message": {
+						"type": "text",
+						"text": "Start",
+						"attributes": {
+							"attachment": {
+								"type": "template",
+								"buttons": [{
+									"value": "/condition with params{\"star_type\":\"supernova\"}",
+									"type": "text",
+									"target": "blank",
+									"link": "",
+									"action": "",
+									"show_echo": true
+								}, {
+									"value": "/condition with params{\"star_type\":\"nebula\"}",
+									"type": "text",
+									"target": "blank",
+									"link": "",
+									"action": "",
+									"show_echo": true
+								}]
+							}
+						}
+					}
+				}]
+			},
+			"_tdActionTitle": null
+		}],
+		"question": "\\start",
+		"intent_display_name": "start",
+		"language": "en",
+		"intent_id": "550a5f10-f161-43d1-a308-97576797d54d"
+	}, {
+		"webhook_enabled": false,
+		"enabled": true,
+		"actions": [{
+			"_tdActionType": "reply",
+			"text": "I didn't understand. Can you rephrase your question?",
+			"attributes": {
+				"commands": [{
+					"type": "message",
+					"message": {
+						"type": "text",
+						"text": "I didn't understand. Can you rephrase your question?"
+					}
+				}]
+			}
+		}],
+		"question": "defaultFallback",
+		"intent_display_name": "defaultFallback",
+		"language": "en",
+		"intent_id": "543f9b38-376a-447b-ba9c-dda4cae91cd9"
+	}, {
+		"webhook_enabled": false,
+		"enabled": true,
+		"actions": [{
+			"_tdActionTitle": "star_type === supernova",
+			"_tdActionType": "jsoncondition",
+			"groups": [{
+				"type": "expression",
+				"conditions": [{
+					"type": "condition",
+					"operand1": "star_type",
+					"operator": "equalAsStrings",
+					"operand2": {
+						"type": "const",
+						"value": "supernova",
+						"name": ""
+					}
+				}]
+			}],
+			"stopOnConditionMet": false,
+			"trueIntent": "#1ccbf281-ea62-4567-a481-c1cc48266168",
+			"falseIntent": "#1ccbf281-ea62-4567-a481-c1cc48266168",
+			"trueIntentAttributes": {
+				"my_name": "supernova",
+				"size": "2B"
+			},
+			"falseIntentAttributes": {
+				"my_name": "nebula",
+				"size": "500k"
+			}
+		}],
+		"language": "en",
+		"intent_display_name": "condition with params",
+		"intent_id": "e538b93d-47e7-4888-8f23-e10f878ac901"
+	}, {
+		"webhook_enabled": false,
+		"enabled": true,
+		"actions": [{
+			"_tdActionTitle": null,
+			"_tdActionType": "setattribute",
+			"expression": "?",
+			"assignTo": "star_type"
+		}],
+		"language": "en",
+		"intent_display_name": "variables declaration",
+		"intent_id": "f629c3ab-b317-486d-802f-e7e458a4c839"
+	}, {
+		"webhook_enabled": false,
+		"enabled": true,
+		"actions": [{
+			"_tdActionTitle": null,
+			"_tdActionType": "reply",
+			"attributes": {
+				"disableInputMessage": false,
+				"commands": [{
+					"type": "wait",
+					"time": 500
+				}, {
+					"type": "message",
+					"message": {
+						"type": "text",
+						"text": "My name is ${my_name} and I'm ${size} km large"
+					}
+				}]
+			},
+			"text": "My name is ${my_name} and I'm ${size} km large\r\n"
+		}],
+		"language": "en",
+		"intent_display_name": "result",
+		"intent_id": "1ccbf281-ea62-4567-a481-c1cc48266168"
+	}]
+}
+
+// normalize the bot structure for the static intent search
+let intents = bot.intents;
+delete bot.intents;
+// console.log ("bot still is", JSON.stringify(bot));
+// console.log ("bintents still are", intents[0]);
+intent_dict = {};
+for (let i = 0; i < intents.length; i++) {
+  intent_dict[intents[i].intent_display_name] = intents[i];
+  intent_dict["#" + intents[i].intent_id] = intents[i];
+}
+bot.intents = intent_dict;
+const bots_data = {
+  "bots": {}
+}
+bots_data.bots["botID"] = bot;
+
+module.exports = { bots_data: bots_data };

package/test/web_request-conversation_test.js

@@ -83,7 +83,7 @@ describe('Conversation for JSONCondition test', async () => {
       assert(command1.type === "message");
       assert(command1.message.text === "var1: Application var");
       assert(command3.type === "message");
-      console.log("command3.message.text", command3.message.text)
+      // console.log("command3.message.text", command3.message.text)
       assert(command3.message.text === "service_reply: Your name is Andrea");
       getChatbotParameters(REQUEST_ID, (err, params) => {
         if (err) {

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -1,7 +1,7 @@
 const { TiledeskChatbotUtil } = require('@tiledesk/tiledesk-chatbot-util');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { DirDeflectToHelpCenter } = require('./directives/DirDeflectToHelpCenter');
-const { DirOfflineHours } = require('./directives/DirOfflineHours'); // DEPRECATED
+// const { DirOfflineHours } = require('./directives/DirOfflineHours'); // DEPRECATED
 const { DirMoveToAgent } = require('./directives/DirMoveToAgent');
 const { DirMessage } = require('./directives/DirMessage');
 const { DirWait } = require('./directives/DirWait');
@@ -11,10 +11,10 @@ const { DirLockIntent } = require('./directives/DirLockIntent');
 const { DirUnlockIntent } = require('./directives/DirUnlockIntent');
 const { DirDepartment } = require('./directives/DirDepartment');
 const { DirIntent } = require('./directives/DirIntent');
-const { DirWhenOpen } = require('./directives/DirWhenOpen'); // DEPRECATED
+// const { DirWhenOpen } = require('./directives/DirWhenOpen'); // DEPRECATED
 const { DirDisableInputText } = require('./directives/DirDisableInputText');
 const { DirClose } = require('./directives/DirClose');
-const { DirIfAvailableAgents } = require('./directives/DirIfAvailableAgents'); // DEPRECATED
+// const { DirIfAvailableAgents } = require('./directives/DirIfAvailableAgents'); // DEPRECATED
 const { DirFireTiledeskEvent } = require('./directives/DirFireTiledeskEvent');
 const { DirSendEmail } = require('./directives/DirSendEmail');
 const { Directives } = require('./directives/Directives');
@@ -49,6 +49,7 @@ class DirectivesChatbotPlug {
     this.HELP_CENTER_API_ENDPOINT = config.HELP_CENTER_API_ENDPOINT;
     this.tdcache = config.cache;
     this.directives = config.directives;
+    console.log("We have the support request:", JSON.stringify(this.supportRequest))
   }
 
   exec(pipeline) {
@@ -96,6 +97,8 @@ class DirectivesChatbotPlug {
       return;
     }
     const supportRequest = this.supportRequest;
+    console.log("supportRequest is:", JSON.stringify(supportRequest))
+    
     const token = this.token;
     const API_URL = this.API_URL;
     const TILEBOT_ENDPOINT = this.TILEBOT_ENDPOINT;
@@ -103,7 +106,9 @@ class DirectivesChatbotPlug {
     // const requestId = supportRequest.request_id
     let depId;
     if (supportRequest.department && supportRequest.department._id) {
+      if (this.log) {console.log("setting depId:", supportRequest.department._id);}      
       depId = supportRequest.department._id;
+      if (this.log) {console.log("depId is:", depId);}
     }
     const projectId = supportRequest.id_project;
     const tdcache = this.tdcache;
@@ -127,6 +132,7 @@ class DirectivesChatbotPlug {
       tdclient: tdclient,
       log: this.log
     }
+    if (this.log) {console.log("this.context.departmentId is:", this.context.departmentId);}
     
     this.curr_directive_index = -1;
     if (this.log) { console.log("processing directives...");}
@@ -257,9 +263,18 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.IF_ONLINE_AGENTS) {
+      // console.log("...DirIfOnlineAgents")
       new DirIfOnlineAgents(context).execute(directive, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
+        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.FUNCTION_VALUE) {
@@ -311,57 +326,57 @@ class DirectivesChatbotPlug {
         this.process(next_dir);
       });
     }
-    else if (directive_name === Directives.WHEN_OPEN) {
-      // DEPRECATED
-      const whenOpenDir = new DirWhenOpen(
-        {
-          tdclient: this.context.tdclient, // matches open hours
-          log: false
-        });
-      whenOpenDir.execute(directive, directives, curr_directive_index, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
-      });
-    }
-    else if (directive_name === Directives.WHEN_CLOSED) {
-      // DEPRECATED
-      const whenOpenDir = new DirWhenOpen(
-        {
-          tdclient: this.context.tdclient,
-          checkOpen: false, // matches closed hours
-          log: false
-        });
-      whenOpenDir.execute(directive, directives, curr_directive_index, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
-      });
-    }
-    else if (directive_name === Directives.IF_AGENTS) {
-      // DEPRECATED
-      const ifNoAgentsDir = new DirIfAvailableAgents(
-        {
-          tdclient: this.context.tdclient,
-          checkAgents: true, // check available agents > 0
-          log: false
-        });
-      ifNoAgentsDir.execute(directive, directives, curr_directive_index, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
-      });
-    }
-    else if (directive_name === Directives.IF_NO_AGENTS) {
-      // DEPRECATED
-      const ifNoAgentsDir = new DirIfAvailableAgents(
-        {
-          tdclient: this.context.tdclient,
-          checkAgents: false, // check no available agents 
-          log: false
-        });
-      ifNoAgentsDir.execute(directive, directives, curr_directive_index, async () => {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
-      });
-    }
+    // else if (directive_name === Directives.WHEN_OPEN) {
+    //   // DEPRECATED
+    //   const whenOpenDir = new DirWhenOpen(
+    //     {
+    //       tdclient: this.context.tdclient, // matches open hours
+    //       log: false
+    //     });
+    //   whenOpenDir.execute(directive, directives, curr_directive_index, async () => {
+    //     let next_dir = await this.nextDirective(this.directives);
+    //     this.process(next_dir);
+    //   });
+    // }
+    // else if (directive_name === Directives.WHEN_CLOSED) {
+    //   // DEPRECATED
+    //   const whenOpenDir = new DirWhenOpen(
+    //     {
+    //       tdclient: this.context.tdclient,
+    //       checkOpen: false, // matches closed hours
+    //       log: false
+    //     });
+    //   whenOpenDir.execute(directive, directives, curr_directive_index, async () => {
+    //     let next_dir = await this.nextDirective(this.directives);
+    //     this.process(next_dir);
+    //   });
+    // }
+    // else if (directive_name === Directives.IF_AGENTS) {
+    //   // DEPRECATED
+    //   const ifNoAgentsDir = new DirIfAvailableAgents(
+    //     {
+    //       tdclient: this.context.tdclient,
+    //       checkAgents: true, // check available agents > 0
+    //       log: false
+    //     });
+    //   ifNoAgentsDir.execute(directive, directives, curr_directive_index, async () => {
+    //     let next_dir = await this.nextDirective(this.directives);
+    //     this.process(next_dir);
+    //   });
+    // }
+    // else if (directive_name === Directives.IF_NO_AGENTS) {
+    //   // DEPRECATED
+    //   const ifNoAgentsDir = new DirIfAvailableAgents(
+    //     {
+    //       tdclient: this.context.tdclient,
+    //       checkAgents: false, // check no available agents 
+    //       log: false
+    //     });
+    //   ifNoAgentsDir.execute(directive, directives, curr_directive_index, async () => {
+    //     let next_dir = await this.nextDirective(this.directives);
+    //     this.process(next_dir);
+    //   });
+    // }
     else if (directive_name === Directives.AGENT) {
       console.log("...DirMoveToAgent");
       new DirMoveToAgent(context).execute(directive, async () => {
@@ -369,35 +384,35 @@ class DirectivesChatbotPlug {
         this.process(next_dir);
       });
     }
-    else if (directive_name === Directives.WHEN_ONLINE_MOVE_TO_AGENT) { // DEPRECATED?
-      // let depId;
-      // if (context.supportRequest && context.supportRequest.department && context.supportRequest.department._id) {
-        // depId = context.supportRequest.department._id;
-        // console.log("context.supportRequest", JSON.stringify(context.supportRequest));
-        // const agentDir = new DirMoveToAgent(
-        //   {
-        //     tdclient: context.tdclient,
-        //     requestId: context.requestId,
-        //     depId: depId
-        //   }
-        // );
-        // if (!directive.action) {
-        //   directive.action = {}
-        //   directive.action = {
-        //     whenOnlineOnly: true
-        //   }
-        // }
-        new DirMoveToAgent(context).execute(directive, async () => {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-        });
-      // }
-      // else {
-      //   console.log("Warning. DepId null while calling 'WHEN_ONLINE_MOVE_TO_AGENT' directive")
-      //   let next_dir = await this.nextDirective(this.directives);
-      //   this.process(next_dir);
-      // }
-    }
+    // else if (directive_name === Directives.WHEN_ONLINE_MOVE_TO_AGENT) { // DEPRECATED?
+    //   // let depId;
+    //   // if (context.supportRequest && context.supportRequest.department && context.supportRequest.department._id) {
+    //     // depId = context.supportRequest.department._id;
+    //     // console.log("context.supportRequest", JSON.stringify(context.supportRequest));
+    //     // const agentDir = new DirMoveToAgent(
+    //     //   {
+    //     //     tdclient: context.tdclient,
+    //     //     requestId: context.requestId,
+    //     //     depId: depId
+    //     //   }
+    //     // );
+    //     // if (!directive.action) {
+    //     //   directive.action = {}
+    //     //   directive.action = {
+    //     //     whenOnlineOnly: true
+    //     //   }
+    //     // }
+    //     new DirMoveToAgent(context).execute(directive, async () => {
+    //       let next_dir = await this.nextDirective(this.directives);
+    //       this.process(next_dir);
+    //     });
+    //   // }
+    //   // else {
+    //   //   console.log("Warning. DepId null while calling 'WHEN_ONLINE_MOVE_TO_AGENT' directive")
+    //   //   let next_dir = await this.nextDirective(this.directives);
+    //   //   this.process(next_dir);
+    //   // }
+    // }
     else if (directive_name === Directives.CLOSE) {
       // console.log("Exec close()")
       new DirClose(context).execute(directive, async () => {
@@ -450,7 +465,7 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.WEB_REQUEST) {
-      console.log("...DirWebRequest");
+      // console.log("...DirWebRequest");
       new DirWebRequest(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
         this.process(next_dir);
@@ -505,18 +520,18 @@ class DirectivesChatbotPlug {
       if (directive == null) {
         theend();
       }
-      else if (directive_name === Directives.WHEN_OFFLINE_HOURS) { // DEPRECATED
-        const offlineHoursDir = new DirOfflineHours(tdclient);
-        offlineHoursDir.execute(directive, pipeline, () => {
-          process(nextDirective());
-        });
-      }
-      else if (directive_name === Directives.DISABLE_INPUT_TEXT) { // DEPRECATED => will change in a "message-option" --disableInput
-        const disableInputTextDir = new DirDisableInputText();
-        disableInputTextDir.execute(directive, pipeline, () => {
-          process(nextDirective());
-        });
-      }
+      // else if (directive_name === Directives.WHEN_OFFLINE_HOURS) { // DEPRECATED
+      //   const offlineHoursDir = new DirOfflineHours(tdclient);
+      //   offlineHoursDir.execute(directive, pipeline, () => {
+      //     process(nextDirective());
+      //   });
+      // }
+      // else if (directive_name === Directives.DISABLE_INPUT_TEXT) { // DEPRECATED => will change in a "message-option" --disableInput
+      //   const disableInputTextDir = new DirDisableInputText();
+      //   disableInputTextDir.execute(directive, pipeline, () => {
+      //     process(nextDirective());
+      //   });
+      // }
       else if (directive_name === Directives.DEFLECT_TO_HELP_CENTER) {
         const helpDir = new DirDeflectToHelpCenter({HELP_CENTER_API_ENDPOINT: this.HELP_CENTER_API_ENDPOINT, projectId: projectId});
         helpDir.execute(directive, pipeline, 3, () => {

package/tiledeskChatbotPlugs/SplitsChatbotPlug.js

@@ -34,7 +34,7 @@ class SplitsChatbotPlug {
     // to the original json message with split commands
     let commands = TiledeskChatbotUtil.splitPars(message.text);
     if (this.log) {
-      console.log("commands", commands)
+      console.log("commands", JSON.stringify(commands))
     }
     if (commands && commands.length > 1) {
       if (!message.attributes) {

package/tiledeskChatbotPlugs/WebhookChatbotPlug.js

@@ -21,9 +21,9 @@ class WebhookChatbotPlug {
     if (this.log) {console.log("WEBHOOK?", answer.attributes.webhook);}
     if (answer.attributes && answer.attributes.webhook && answer.attributes.webhook === true) {
       if (this.log) {console.log("EXECUTING WEBHOOK URL!", this.webhookurl);}
-      if (this.log) {console.log("EXECUTING WEBHOOK ON CONTEXT:", context);}
+      if (this.log) {console.log("EXECUTING WEBHOOK ON CONTEXT:", JSON.stringify(context));}
       this.execWebhook(answer, context, this.webhookurl, (err, message_from_webhook) => {
-        if (this.log) {console.log("message", message_from_webhook);}
+        if (this.log) {console.log("message_from_webhook:", message_from_webhook);}
         if (err) {
           console.error("Error calling webhook:", this.webhookurl)
           pipeline.nextplug();
@@ -31,7 +31,7 @@ class WebhookChatbotPlug {
         else {
           if (this.log) {console.log("Webhook successfully end:", message_from_webhook);}
           const pipeline_original_message = pipeline.message
-          if (this.log) {console.log("pipeline.message before webhook", pipeline.message);}
+          if (this.log) {console.log("pipeline.message before webhook", JSON.stringify(pipeline.message));}
 
           // **** setting message from webhook,
           // **** MERGING with original not overwritten data, manually
@@ -69,8 +69,8 @@ class WebhookChatbotPlug {
   
   execWebhook(reply_message, context, webhookurl, callback) {
     if (this.log) {
-      console.log("WEBHOOK. on context", context)
-      console.log("WEBHOOK. on message", reply_message)
+      console.log("WEBHOOK. on context", JSON.stringify(context));
+      console.log("WEBHOOK. on message", JSON.stringify(reply_message));
     }
     const HTTPREQUEST = {
       url: webhookurl,
@@ -186,8 +186,8 @@ class WebhookChatbotPlug {
       if (log) {
         console.log("Response for url:", options.url);
         console.log("Response headers:\n", JSON.stringify(res.headers));
-        console.log("******** Response for url:", res);
-        console.log("Response body:\n", res.data);
+        // console.log("******** Response for url:", JSON.stringify(res));
+        console.log("Response body:\n", JSON.stringify(res.data));
       }
       if (callback) {
         callback(null, res);

package/tiledeskChatbotPlugs/directives/DirDepartment.js

@@ -49,7 +49,7 @@ class DirDepartment {
 
   moveToDepartment(requestId, depName, callback) {
     this.tdclient.getAllDepartments((err, deps) => {
-      if (this.log) {console.log("deps:", deps, err);}
+      if (this.log) {console.log("deps:", deps);}
       if (err) {
         console.error("getAllDepartments() error:", err);
         callback();

package/tiledeskChatbotPlugs/directives/DirIfOnlineAgents.js

@@ -61,8 +61,8 @@ class DirIfOnlineAgents {
       callback();
       return;
     }
-    this.go(action, () => {
-      callback();
+    this.go(action, (stop) => {
+      callback(stop);
     });
   }
 
@@ -76,6 +76,9 @@ class DirIfOnlineAgents {
     }
     const trueIntent = action.trueIntent;
     const falseIntent = action.falseIntent;
+    const trueIntentAttributes = action.trueIntentAttributes;
+    const falseIntentAttributes = action.falseIntentAttributes;
+    let stopOnConditionMet = action.stopOnConditionMet;
     this.tdclient.openNow((err, result) => {
       if (this.log) {console.log("openNow():", result);}
       if (err) {
@@ -95,10 +98,10 @@ class DirIfOnlineAgents {
               if (this.log) {console.log("Agents count:", agents.length);}
               if (agents.length > 0) {
                 if (trueIntent) {
-                  let intentDirective = DirIntent.intentDirectiveFor(trueIntent);
+                  let intentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
                   if (this.log) {console.log("agents (openHours) => trueIntent");}
                   this.intentDir.execute(intentDirective, () => {
-                    callback();
+                    callback(stopOnConditionMet);
                   });
                 }
                 else {
@@ -107,10 +110,10 @@ class DirIfOnlineAgents {
                 }
               }
               else if (falseIntent) {
-                let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
+                let intentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
                 if (this.log) {console.log("!agents (openHours) => falseIntent", falseIntent);}
                 this.intentDir.execute(intentDirective, () => {
-                  callback();
+                  callback(stopOnConditionMet);
                 });
               }
               else {
@@ -121,7 +124,7 @@ class DirIfOnlineAgents {
         }
         else if (result && !result.isopen) {
           if (falseIntent) {
-            let intentDirective = DirIntent.intentDirectiveFor(falseIntent);
+            let intentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
             if (this.log) {console.log("!agents (!openHours) => falseIntent");}
             this.intentDir.execute(intentDirective, () => {
               callback();
@@ -139,17 +142,6 @@ class DirIfOnlineAgents {
     });
   }
 
-  // intentDirectiveFor(intent) {
-  //   let intentDirective = {
-  //     action: {
-  //       body: {
-  //         intentName: intent
-  //       }
-  //     }
-  //   }
-  //   return intentDirective;
-  // }
-
   parseParams(directive_parameter) {
     let trueIntent = null;
     let falseIntent = null;

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

@@ -67,8 +67,10 @@ class DirIfOpenHours {
   }
 
   go(action, callback) {
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
+    const trueIntent = action.trueIntent;
+    const falseIntent = action.falseIntent;
+    const trueIntentAttributes = action.trueIntentAttributes;
+    const falseIntentAttributes = action.falseIntentAttributes;
     const stopOnConditionMet = action.stopOnConditionMet;
     if (trueIntent && trueIntent.trim() === "") {
       trueIntent = null;

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -118,7 +118,29 @@ class DirIntent {
     // }
   }
 
-  static intentDirectiveFor(intent) {
+  static intentDirectiveFor(intent, json_params) {
+    let string_params = null;
+    if (json_params) {
+      try {
+        string_params = JSON.stringify(json_params);
+      }
+      catch (error) {
+        console.error("Error stringigying JSON PARAMS", json_params);
+      }
+    }
+    if (string_params != null) {
+      intent += string_params
+    }
+    let intentDirective = {
+      action: {
+        intentName: intent
+      }
+    }
+    return intentDirective;
+  }
+
+  static fullIntentDirectiveFor(intent, json_params) {
+    let string_params = JSON.stringify(params);
     let intentDirective = {
       action: {
         intentName: intent

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -56,10 +56,12 @@ class DirJSONCondition {
   }
 
   async go(action, callback) {
-    const groups = action.jsonCondition.groups;
-    // const groups = action.groups; // NEXT
-    let trueIntent = action.trueIntent;
-    let falseIntent = action.falseIntent;
+    // const groups = action.jsonCondition.groups;
+    const groups = action.groups; // NEXT
+    const trueIntent = action.trueIntent;
+    const falseIntent = action.falseIntent;
+    const trueIntentAttributes = action.trueIntentAttributes;
+    const falseIntentAttributes = action.falseIntentAttributes;
     let stopOnConditionMet = action.stopOnConditionMet;
     if (this.log) {console.log("groups:", JSON.stringify(groups));}
     if (trueIntent && trueIntent.trim() === "") {
@@ -80,11 +82,11 @@ class DirJSONCondition {
     }
     let trueIntentDirective = null;
     if (trueIntent) {
-      trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent);
+      trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
     }
     let falseIntentDirective = null;
     if (falseIntent) {
-      falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent);
+      falseIntentDirective = DirIntent.intentDirectiveFor(falseIntent, falseIntentAttributes);
     }
     let variables = null;
     if (this.context.tdcache) {

package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js

@@ -48,6 +48,20 @@ class DirMoveToAgent {
   }
 
   async go(action, callback) {
+    let depId = null;
+    if (this.log) {console.log("DirMoveToAgent this.context.departmentId:", this.context.departmentId);}
+    if (this.context.departmentId) {
+      depId = this.context.departmentId
+      if (this.log) {console.log("DirMoveToAgent depId:", depId);}
+    }
+    else if (this.tdcache) {
+      depId = 
+      await TiledeskChatbot.getParameterStatic(
+        this.tdcache, this.requestId, TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY
+      );
+      if (this.log) {console.log("DirMoveToAgent depId (cache):", depId);}
+    }
+    if (this.log) {console.log("DirMoveToAgent anyway depId is:", depId);}
     if (action.whenOnlineOnly === true) {
       this.tdclient.openNow( async (err, result) => {
         if (err) {
@@ -56,11 +70,7 @@ class DirMoveToAgent {
         }
         else {
           if (result && result.isopen) {
-            if (this.tdcache) {
-              depId = 
-              await TiledeskChatbot.getParameterStatic(
-                this.tdcache, this.requestId, TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY
-              );
+            if (depId) {
               this.tdclient.agent(this.requestId, depId, (err) => {
                 if (err) {
                   console.error("Error moving to agent during online hours:", err);
@@ -82,24 +92,29 @@ class DirMoveToAgent {
       });
     }
     else {
-      if (this.tdcache) {
-        const depId = 
-        await TiledeskChatbot.getParameterStatic(
-          this.tdcache, this.requestId, TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY
-        );
-        this.tdclient.agent(this.requestId, depId, (err) => {
-          if (err) {
-            console.error("Error moving to agent:", err);
-          }
-          else {
-            //console.log("Successfully moved to agent");
-          }
+      // if (this.tdcache) {
+        // const depId = 
+        // await TiledeskChatbot.getParameterStatic(
+        //   this.tdcache, this.requestId, TiledeskChatbotConst.REQ_DEPARTMENT_ID_KEY
+        // );
+        if (depId) {
+          this.tdclient.agent(this.requestId, depId, (err) => {
+            if (err) {
+              console.error("Error moving to agent:", err);
+            }
+            else {
+              //console.log("Successfully moved to agent");
+            }
+            callback();
+          });
+        }
+        else {
           callback();
-        });
-      }
-      else {
-        callback();
-      }
+        }
+      // }
+      // else {
+      //   callback();
+      // }
     }
   }