@tiledesk/tiledesk-tybot-connector 0.1.72 → 0.1.74

package/.env

@@ -6,4 +6,4 @@ TYBOT_ENDPOINT=http://localhost:10001
 _TYBOT_ENDPOINT=http://localhost:3000
 CHATBOT_TOKEN=JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3ZWJob29rX2VuYWJsZWQiOmZhbHNlLCJ0eXBlIjoiZXh0ZXJuYWwiLCJsYW5ndWFnZSI6ImVuIiwicHVibGljIjpmYWxzZSwiX2lkIjoiNjM4Yzc5MDQxZGI0NDkwMDM1MTEwMjYwIiwibmFtZSI6IlRoZSBGb3JtIHYyIC0gZXh0IiwidXJsIjoiaHR0cHM6Ly90aWxlYm90LWRldi5oZXJva3VhcHAuY29tL2V4dC82MzhjNzhkNzFkYjQ0OTAwMzUxMTAxYzIiLCJpZF9wcm9qZWN0IjoiNjM4Yzc4YTYxZGI0NDkwMDM1MTBmZjkxIiwidHJhc2hlZCI6ZmFsc2UsImNyZWF0ZWRCeSI6IjVlMDlkMTZkNGQzNjExMDAxNzUwNmQ3ZiIsImNyZWF0ZWRBdCI6IjIwMjItMTItMDRUMTA6NDA6MDQuMjA3WiIsInVwZGF0ZWRBdCI6IjIwMjItMTItMDVUMDc6MjE6MDIuOTIxWiIsIl9fdiI6MCwiZGVzY3JpcHRpb24iOiJPbiBIZXJva3UiLCJpYXQiOjE2NzA2NzE4ODksImF1ZCI6Imh0dHBzOi8vdGlsZWRlc2suY29tL2JvdHMvNjM4Yzc5MDQxZGI0NDkwMDM1MTEwMjYwIiwiaXNzIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJzdWIiOiJib3QiLCJqdGkiOiJmNDVlZGIwYS0zNzVhLTQ0NjMtYjFhZi1jM2ZiZDg4YmE3ZGQifQ.FbW3csHl1sQgSyRz5Jg0qaTvvpXWXgWHlJ1JWoVbv3s
 _CHATBOT_ENDPOINT=http://localhost:10001
-_API_LOG=1
+API_LOG=1

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.74
+- DEBUG VERSION
+- Added if (log || projectId === "64218dfecdb804001380b9ba")
+
+### 0.1.73
+- Bug fixing: WebRequest headersString now is a JSON
+
 ### 0.1.72
 - Removed error-prone request caching.
 - Added botId caching on requestId with key: request_botId_key

package/ExtUtil.js

@@ -19,6 +19,7 @@ class ExtUtil {
     const messagePipeline = new MessagePipeline(static_bot_answer, null);
     // /// const webhookurl = bot.webhook_url;
     // /// messagePipeline.addPlug(new WebhookChatbotPlug(message.request, webhookurl, token));
+    console.log("111")
     messagePipeline.addPlug(directivesPlug);
     messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache, log)); // in original message
     messagePipeline.addPlug(new SplitsChatbotPlug(log));

package/index.js

@@ -353,8 +353,13 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   const projectId = req.params.projectId;
   const requestId = req.params.requestId;
   const token = req.headers["authorization"];
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => projectId:", projectId);}
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => requestId:", requestId);}
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => req.headers:", req.headers);}
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => token:", token);}
+  
   let answer = req.body;
-  // if (log) {console.log("answer on sendSupportMessageExt:", JSON.stringify(answer));}
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => answer on sendSupportMessageExt:", JSON.stringify(answer));}
   const tdclient = new TiledeskClient({
     projectId: projectId,
     token: token,
@@ -386,34 +391,35 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
     // console.log("Cache request found.");
   }
   catch(err) {
-    console.error("Request not found:", requestId);
+    console.error("64218dfecdb804001380b9ba => Request not found:", requestId);
   }
     // if (log) {console.log("(No tdcache) Got request with APIs");}
   // }
   if (!request) {
-    if (log) {console.log("chatbot-pure directives still work. Tiledesk specific directives don't");}
+    if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => Creating new Request. Chatbot-pure directives still work. Tiledesk specific directives don't");}
     const request_botId_key = "tilebot:botId_requests:" + requestId;
     const botId = await tdcache.get(request_botId_key);
-    if (log) {console.log("current botId [" + request_botId_key + "]:", botId);}
+    if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => current botId [" + request_botId_key + "]:", botId);}
     request = {
       request_id: requestId,
       id_project: projectId,
       bot_id: botId
     }
   }
-  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);
+  if (log || projectId === "64218dfecdb804001380b9ba") {
+    console.log("64218dfecdb804001380b9ba => /ext request....", JSON.stringify(request));
+    console.log("64218dfecdb804001380b9ba => /ext APIURL....", APIURL);
+    console.log("64218dfecdb804001380b9ba => /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});
+  // let directivesPlug = null;
   // PIPELINE-EXT
   // if (log) {console.log("answer to process:", JSON.stringify(answer));}
   const original_answer_text = answer.text;
   const bot_answer = await ExtUtil.execPipelineExt(request, answer, directivesPlug, tdcache, log);
-  // console.log("bot_answer", bot_answer)
+  if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => bot_answer", JSON.stringify(bot_answer))}
   if (bot_answer) {
-    if (log) {console.log("adding to bot_answer original_answer_text:", JSON.stringify(original_answer_text));}
+    if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => adding to bot_answer original_answer_text:", JSON.stringify(original_answer_text));}
     if (!bot_answer.attributes) {
       bot_answer.attributes = {};
     }
@@ -423,8 +429,9 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
     bot_answer.attributes["_raw_message"] = original_answer_text;
     // if (log) {console.log("bot_answer", JSON.stringify(bot_answer));}
     tdclient.sendSupportMessage(requestId, bot_answer, (err, response) => {
+      if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => bot_answer sent:", JSON.stringify(bot_answer));}
       if (err) {
-        console.error("Error sending message", err);
+        console.error("64218dfecdb804001380b9ba => Error sending message", err);
       }
       directivesPlug.processDirectives( () => {
         if (log) {console.log("After message - Directives executed.");}
@@ -432,6 +439,7 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
     });
   }
   else {
+    if (log || projectId === "64218dfecdb804001380b9ba") {console.log("64218dfecdb804001380b9ba => !bot_answer");}
     directivesPlug.processDirectives( () => {
       if (log) {console.log("Directives executed.");}
     });
@@ -606,10 +614,6 @@ async function connectRedis() {
     console.log("(Tilebot) Redis connected.");
   }
   return;
-  // console.info("Tilebot started.");
-  // if (completionCallback) {
-  //   completionCallback();
-  // }
 }
 
 module.exports = { router: router, startApp: startApp};

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "Tiledesk Tybot connector",
+
   "main": "index.js",
   "scripts": {
     "test": "mocha --timeout 60000 --exit",

package/test/web_request-bot.js

@@ -66,7 +66,11 @@ const bot = {
 		"actions": [{
 			"_tdActionTitle": "var1",
 			"url": "http://localhost:10002/test/webrequest/get/plain",
-			"headersString": "{\"Content-Type\":\"application/json\",\"Cache-Control\":\"no-cache\",\"User-Agent\":\"TiledeskBotRuntime\"}",
+			"headersString": {
+				"Content-Type": "application/json",
+				"Cache-Control": "no-cache",
+				"User-Agent": "TiledeskBotRuntime"
+			},
 			"jsonBody": "{}",
 			"assignTo": "var1",
 			"method": "GET",
@@ -74,7 +78,12 @@ const bot = {
 		}, {
 			"_tdActionTitle": "service_reply",
 			"url": "http://localhost:10002/test/webrequest/post/plain",
-			"headersString": "{\"Content-Type\":\"application/json\",\"Cache-Control\":\"no-cache\",\"User-Agent\":\"TiledeskBotRuntime\",\"Accept\":\"*/*\"}",
+			"headersString": {
+				"Content-Type": "application/json",
+				"Cache-Control": "no-cache",
+				"User-Agent": "TiledeskBotRuntime",
+				"Accept": "*/*"
+			},
 			"jsonBody": "{\n\t\"name\": \"Andrea\"\n}",
 			"assignTo": "service_reply",
 			"method": "POST",

package/test/web_request-conversation_test.js

@@ -59,11 +59,18 @@ describe('Conversation for JSONCondition test', async () => {
     let endpointServer = express();
     endpointServer.use(bodyParser.json());
     endpointServer.get('/test/webrequest/get/plain', async (req, res) => {
-      // console.log("******/get/plain");
+      console.log("/webrequest GET req.headers:", req.headers);
+      assert(req.headers["user-agent"] === "TiledeskBotRuntime");
+      assert(req.headers["content-type"] === "application/json");
+      assert(req.headers["cache-control"] === "no-cache");
       res.send("Application var");
     });
     endpointServer.post('/test/webrequest/post/plain', async (req, res) => {
-      // console.log("******/post/plain req.body:", req.body);
+      console.log("/webrequest POST req.headers:", req.headers);
+      assert(req.headers["user-agent"] === "TiledeskBotRuntime");
+      assert(req.headers["content-type"] === "application/json");
+      assert(req.headers["cache-control"] === "no-cache");
+      assert(req.headers["accept"] === "*/*");
       if (req && req.body && req.body.name) {
         res.send("Your name is " + req.body.name);
       }

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -42,15 +42,20 @@ class DirWebRequest {
     const filler = new Filler();
     const url = filler.fill(action.url, requestVariables);
 
-    let headers = null;
+    let headers = {};
     if (action.headersString) {
-      let headersString = filler.fill(action.headersString, requestVariables);
-      try {
-        headers = JSON.parse(headersString);
-      }
-      catch(err) {
-        console.error("Error parsing webRequest headersString as JSON:", headersString);
+      let headersDict = action.headersString
+      for (const [key, value] of Object.entries(headersDict)) {
+        if (this.log) {console.log("header:", key, "value:", value)}
+        let filled_value = filler.fill(value, requestVariables);
+        headers[key] = filled_value;
       }
+      // try {
+      //   headers = JSON.parse(headersString);
+      // }
+      // catch(err) {
+      //   console.error("Error parsing webRequest headersString as JSON:", headersString);
+      // }
       // for (const [key, value] of Object.entries(action.headers)) {
       //   action.headers[key] = filler.fill(value, requestVariables);
       // }