@tiledesk/tiledesk-tybot-connector 0.1.87 → 0.1.89

package/CHANGELOG.md

@@ -5,8 +5,17 @@
 available on:
  ▶️ https://www.npmjs.com/package/@tiledesk/tiledesk-tybot-connector
 
+### 0.1.89
+- DirWebRequest: fixed sending data: 'null'
+- Improved MockBotsDataSource.js to support search also by intent_id
+- Added test for qapla WebRequest
+
+### 0.1.88
+- Added language parse with accept-language-parser. Now user_language has just the first language ISO code
+
 ### 0.1.87
 - Fixed commands-merged text in replies (text was empty for non messages with no filters)
+- Renamed env LOG var from API_LOG to TILEBOT_LOG
 
 ### 0.1.86
 - Added OPERATOR "notStartsWith"

package/index.js

@@ -12,6 +12,7 @@ const { TiledeskIntentsMachine } = require('./models/TiledeskIntentsMachine.js')
 const { MockBotsDataSource } = require('./models/MockBotsDataSource.js');
 const { TiledeskChatbotConst } = require('./models/TiledeskChatbotConst');
 const { IntentsMachineFactory } = require('./models/IntentsMachineFactory');
+let parser = require('accept-language-parser');
 
 router.use(bodyParser.json({limit: '50mb'}));
 router.use(bodyParser.urlencoded({ extended: true , limit: '50mb'}));
@@ -250,8 +251,17 @@ async function updateRequestVariables(chatbot, message, projectId, requestId) {
   }
   // console.log("message.request.language", message.request["language"]);
   if (message.request) {
+    let user_language = message.request["language"];
+    if (message.request["language"]) {
+      // console.log("HTTP language:", message.request["language"]);
+      var languages = parser.parse(message.request["language"]);
+      // console.log("languages:", languages);
+      if (languages && languages.length > 0 && languages[0].code) {
+        user_language = languages[0].code;
+      }
+    }
     await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_SOURCE_PAGE_KEY, message.request.sourcePage);
-    await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_LANGUAGE_KEY, message.request["language"]);
+    await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_LANGUAGE_KEY, user_language);
     await chatbot.addParameter(TiledeskChatbotConst.REQ_USER_AGENT_KEY, message.request.userAgent);
   }
   // console.log("message.request.language", message.request["language"])

package/models/MockBotsDataSource.js

@@ -47,8 +47,26 @@ class MockBotsDataSource {
    */
   async getByIntentDisplayName(botId, intentName) {
     // console.log("this.data_", JSON.stringify(this.data.bots[botId]))
-    const intent = this.data.bots[botId].intents[intentName];
+    // const intent = this.data.bots[botId].intents[intentName];
     // console.log("got intent:", intent);
+    let intent;
+    try {
+      let key = intentName.trim();
+      // console.log("key is:", key);
+      if (key.startsWith("#")) {
+        let intent_id = key.substring(key.indexOf("#") + 1);
+        intent = this.data.bots[botId].intents_by_intent_id[intent_id];
+      }
+      else {
+        // console.log("key is intent name:", key);
+        let intent_id = key;
+        intent = this.data.bots[botId].intents[intent_id];
+        // console.log("Intent found", intent);
+      }
+    }
+    catch(err) {
+      console.error("Error is:", err);
+    }
     return intent;
   }
 

package/models/TiledeskChatbotUtil.js

@@ -190,7 +190,7 @@ class TiledeskChatbotUtil {
                                     message.text = commands[i].message.text;    
                                 }
                                 else {
-                                    message.text = commands[i].message.text + "\n\n" + message.text;
+                                    message.text = (commands[i].message.text + "\n\n" + message.text).trim();
                                 }
                                 // console.log("new text:", message.text)
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.1.87",
+  "version": "0.1.89",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -29,6 +29,9 @@
     "redis": "^3.1.2",
     "uuid": "^3.3.3",
     "vm2": "^3.9.13",
-    "mocha": "^10.2.0"
+    "accept-language-parser": "^1.5.0"
+  },
+  "devDependencies": {
+    "mocha": "^8.4.0"
   }
 }

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -62,7 +62,7 @@ class DirWebRequest {
       // }
     }
     let json = null;
-    if (action.jsonBody) {
+    if (action.jsonBody && action.jsonBody !== "{}") {
       let jsonBody = filler.fill(action.jsonBody, requestVariables);
       try {
         json = JSON.parse(jsonBody);
@@ -79,6 +79,7 @@ class DirWebRequest {
       json: json,
       method: action.method
     };
+    if (this.log) {console.log("webRequest HTTPREQUEST", HTTPREQUEST);}
     this.myrequest(
       HTTPREQUEST, async (err, resbody) => {
         if (this.log) {console.log("webRequest resbody:", resbody);}
@@ -127,9 +128,20 @@ class DirWebRequest {
             if (this.log) {console.log("(webRequest) assignments:", assignments);}
             for (const [attr_name, attr_eval_expression] of Object.entries(assignments)) {
               if (this.log) {console.log("", attr_name, attr_eval_expression);}
-              const attributeValue = TiledeskJSONEval.eval(json_body, attr_eval_expression);
-              if (this.log) {console.log("(webRequest) Assigning to:", attr_name, "value:", attributeValue);}
-              await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, attr_name, attributeValue);
+              let attributeValue;
+              try {
+                attributeValue = TiledeskJSONEval.eval(json_body, attr_eval_expression);
+                if (this.log) {console.log("(webRequest) Assigning to:", attr_name, "value:", attributeValue);}
+              }
+              catch(err) {
+                console.error("Error:", err);
+              }
+              try {
+                await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, attr_name, attributeValue);
+              }
+              catch(err) {
+                console.error("Error:", err);
+              }
             }
             if (this.log) {
               console.log("(webRequest) All attributes:");
@@ -154,10 +166,15 @@ class DirWebRequest {
     let axios_options = {
       url: options.url,
       method: options.method,
-      data: options.json,
       params: options.params,
       headers: options.headers
     }
+    if (options.json !== null) {
+      axios_options.data = options.json
+    }
+    if (this.log) {
+      console.log("axios_options:", JSON.stringify(axios_options));
+    }
     if (options.url.startsWith("https:")) {
       const httpsAgent = new https.Agent({
         rejectUnauthorized: false,
@@ -182,7 +199,7 @@ class DirWebRequest {
       }
     })
     .catch( (error) => {
-      // console.error("An error occurred:", JSON.stringify(error));
+      console.error("An error occurred:", JSON.stringify(error));
       if (callback) {
         callback(error, null);
       }