@tiledesk/tiledesk-tybot-connector 0.5.0-rc2 → 0.5.1-rc1

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -3,6 +3,7 @@ let https = require("https");
 const { v4: uuidv4 } = require('uuid');
 const ms = require('minimist-string');
 const winston = require('../../utils/winston');
+const tilebotService = require('../../services/TilebotService');
 
 class DirIntent {
 
@@ -72,7 +73,7 @@ class DirIntent {
     }
     winston.debug("DirIntent move to intent message: ", intent_command_request);
 
-    this.sendMessageToBot(this.TILEBOT_ENDPOINT, intent_command_request, botId, () => {
+    tilebotService.sendMessageToBot(intent_command_request, botId, () => {
       callback(true);
     });
 
@@ -109,82 +110,6 @@ class DirIntent {
     return intentDirective;
   }
 
-  /**
-   * 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
-   */
-  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
-    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
-    const HTTPREQUEST = {
-      url: url,
-      headers: {
-        'Content-Type' : 'application/json'
-      },
-      json: message,
-      method: 'POST'
-    };
-    this.myrequest(
-      HTTPREQUEST,
-      function(err, resbody) {
-        if (err) {
-          if (callback) {
-            callback(err);
-          }
-        }
-        else {
-          if (callback) {
-            callback(null, resbody);
-          }
-        }
-      }, false
-    );
-  }
-
-  myrequest(options, callback, log) {
-    winston.debug("DirIntent API URL:" + options.url);
-    winston.debug("DirIntent Options:", options);
-
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      data: options.json,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-    .then((res) => {
-      if (this.log) {
-        winston.debug("DirIntent Response for url: " + options.url);
-        winston.debug("DirIntentResponse headers:\n", res.headers);
-      }
-      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) => {
-      winston.error("(DirIntent) Axios error: ", error.response.data);
-      if (callback) {
-        callback(error, null, null);
-      }
-    });
-  }
 }
 
 module.exports = { DirIntent };

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -1,5 +1,5 @@
 const { DirIntent } = require('./DirIntent');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -1,5 +1,5 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
+const { TiledeskChatbot } = require("../../engine/TiledeskChatbot");
 const { Filler } = require("../Filler");
 const { DirIntent } = require("./DirIntent");
 let https = require("https");

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -1,6 +1,6 @@
 const { Directives } = require('./Directives.js');
 const { TiledeskClient } = require("@tiledesk/tiledesk-client");
-const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
+const { TiledeskChatbot } = require("../../engine/TiledeskChatbot.js");
 const { Filler } = require("../Filler");
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirMessageToBot.js

@@ -1,7 +1,8 @@
 let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
-const winston = require('../../utils/winston')
+const winston = require('../../utils/winston');
+const tilebotService = require('../../services/TilebotService');
 
 class DirMessageToBot {
 
@@ -45,81 +46,11 @@ class DirMessageToBot {
     }
     winston.debug("(DirMessageToBot) sending message: ", outgoing_message);
     
-    this.sendMessageToBot(this.TILEBOT_ENDPOINT, outgoing_message, botId, () => {
+    tilebotService.sendMessageToBot(outgoing_message, botId, () => {
       callback(true);
     });
   }
 
-  /**
-   * 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
-   */
-  sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
-     
-    const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
-    winston.verbose("sendMessageToBot URL" + url);
-    const HTTPREQUEST = {
-      url: url,
-      headers: {
-        'Content-Type' : 'application/json'
-      },
-      json: message,
-      method: 'POST'
-    };
-    this.myrequest(
-      HTTPREQUEST,
-      function(err, resbody) {
-        if (err) {
-          if (callback) {
-            callback(err);
-          }
-        }
-        else {
-          if (callback) {
-            callback(null, resbody);
-          }
-        }
-      }, false
-    );
-  }
-
-  myrequest(options, callback, log) {
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      data: options.json,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options).then((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) => {
-      winston.error("(DirMessageToBot) Axios error: ", error.response.data);
-      if (callback) {
-        callback(error, null, null);
-      }
-    });
-  }
 }
 
 module.exports = { DirMessageToBot };

package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js

@@ -1,7 +1,7 @@
 // const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { Directives } = require('./Directives');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirMoveToUnassigned.js

@@ -1,7 +1,7 @@
 // const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { Directives } = require('./Directives');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirQapla.js

@@ -1,10 +1,12 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
+const { TiledeskChatbot } = require("../../engine/TiledeskChatbot");
 const { Filler } = require("../Filler");
 let https = require("https");
 const { DirIntent } = require("./DirIntent");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
 
 class DirQapla {
 
@@ -15,6 +17,8 @@ class DirQapla {
     this.context = context;
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
+    this.projectId = this.context.projectId;
+    this.token = this.context.token;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
     this.log = context.log;
@@ -88,7 +92,7 @@ class DirQapla {
 
     if (!key) {
       winston.debug("(DirQapla) DirQapla - Key not found into action. Searching in integrations...");
-      key = await this.getKeyFromIntegrations();
+      key = await integrationService.getKeyFromIntegrations(this.projectId, 'qapla', this.token);
     }
 
     if (!key) {
@@ -117,7 +121,7 @@ class DirQapla {
     }
     winston.debug("(DirQapla) HttpRequest ", QAPLA_HTTPREQUEST);
 
-    this.#myrequest(
+    httpUtils.request(
       QAPLA_HTTPREQUEST, async (err, resbody) => {
         if (err) {
           if (callback) {
@@ -218,75 +222,6 @@ class DirQapla {
       }
     }
   }
-
-  #myrequest(options, callback) {
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.json !== null) {
-      axios_options.data = options.json
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
-        }
-      })
-      .catch((error) => {
-        winston.error("(DirQapla) Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/qapla",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirQapla) Integrations HttpRequest ", INTEGRATIONS_HTTPREQUEST)
-
-      this.#myrequest(
-        INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
-          if (err) {
-            resolve(null);
-          } else {
-
-            if (integration &&
-              integration.value) {
-              resolve(integration.value.apikey)
-            }
-            else {
-              resolve(null)
-            }
-          }
-        })
-    })
-  }
-
 }
 
 module.exports = { DirQapla }

package/tiledeskChatbotPlugs/directives/DirRandomReply.js

@@ -1,6 +1,6 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirReplaceBot.js

@@ -1,5 +1,5 @@
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirReplaceBotV2.js

@@ -1,10 +1,11 @@
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 
 const axios = require("axios").default;
 let https = require("https");
 const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 class DirReplaceBotV2 {
 
@@ -76,7 +77,7 @@ class DirReplaceBotV2 {
       method: 'PUT'
     }
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
           winston.error("(DirReplaceBotV2) DirReplaceBot error: ", err);
@@ -135,42 +136,6 @@ class DirReplaceBotV2 {
     // });
   }
 
-  #myrequest(options, callback) {
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.json !== null) {
-      axios_options.data = options.json
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
-        }
-      })
-      .catch((error) => {
-        winston.error("(DirAskGPT) Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
 }
 
 module.exports = { DirReplaceBotV2 };

package/tiledeskChatbotPlugs/directives/DirReplaceBotV3.js

@@ -1,10 +1,11 @@
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 
 const axios = require("axios").default;
 let https = require("https");
 const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 class DirReplaceBotV3 {
 
@@ -75,7 +76,7 @@ class DirReplaceBotV3 {
       method: 'PUT'
     }
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
           winston.error("(DirReplaceBotV3) error: ", err);
@@ -111,43 +112,6 @@ class DirReplaceBotV3 {
     )
   }
 
-  #myrequest(options, callback) {
-    let axios_options = {
-      url: options.url,
-      method: options.method,
-      params: options.params,
-      headers: options.headers
-    }
-    if (options.json !== null) {
-      axios_options.data = options.json
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (res && res.status == 200 && res.data) {
-          if (callback) {
-            callback(null, res.data);
-          }
-        }
-        else {
-          if (callback) {
-            callback(new Error("Response status is not 200"), null);
-          }
-        }
-      })
-      .catch((error) => {
-        winston.error("(DirAskGPT) Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
 }
 
 module.exports = { DirReplaceBotV3 };

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -1,6 +1,6 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 let axios = require('axios');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -1,7 +1,7 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 const { DirIntent } = require("./DirIntent");
 // const { defaultOptions } = require('liquidjs');
 const { DirMessageToBot } = require('./DirMessageToBot');

package/tiledeskChatbotPlugs/directives/DirSendEmail.js

@@ -1,6 +1,6 @@
 const { param } = require('express/lib/request');
 const ms = require('minimist-string');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 // const { TiledeskClient } = require('@tiledesk/tiledesk-client');

package/tiledeskChatbotPlugs/directives/DirSendWhatsapp.js

@@ -1,8 +1,9 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require("../Filler");
 const { DirIntent } = require("./DirIntent");
 const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
 
 let whatsapp_api_url;
 
@@ -94,7 +95,7 @@ class DirSendWhatsapp {
 
     winston.debug("(DirSendWhatsapp) HttpRequest:  ", HTTPREQUEST);
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
           winston.error("(DirSendWhatsapp)  error: ", err)
@@ -216,33 +217,6 @@ class DirSendWhatsapp {
 
     })
   }
-
-  // HTTP REQUEST
-  async #myrequest(options, callback, log) {
-    return await axios({
-      url: options.url,
-      method: options.method,
-      data: options.json,
-      params: options.params,
-      headers: options.headers
-    }).then((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((err) => {
-      winston.error("(DirSendWhatsapp) Axios errro: ", err);
-      if (callback) {
-        callback(err, null, null);
-      }
-    })
-  }
 }
 
 module.exports = { DirSendWhatsapp }

package/tiledeskChatbotPlugs/directives/DirSetAttribute.js

@@ -1,4 +1,4 @@
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const { TiledeskMath } = require('../../TiledeskMath');
 const { TiledeskString } = require('../../TiledeskString');

package/tiledeskChatbotPlugs/directives/DirSetAttributeV2.js

@@ -1,10 +1,11 @@
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
 const { TiledeskMath } = require('../../TiledeskMath');
 const { TiledeskString } = require('../../TiledeskString');
 const { Filler } = require('../Filler');
 const validate = require('jsonschema').validate;
 const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 const schema = {
     "type": "object",
@@ -195,7 +196,7 @@ class DirSetAttributeV2 {
             method: 'POST'
         }
         winston.debug("(DirSetAttributeV2) HttpRequest: ", HTTPREQUEST);
-        this.#myrequest(
+        httpUtils.request(
             HTTPREQUEST, async (err, resbody) => {
                 if (err) {
                     if (this.log) {
@@ -291,42 +292,6 @@ class DirSetAttributeV2 {
         }
     }
 
-    #myrequest(options, callback) {
-        let axios_options = {
-          url: options.url,
-          method: options.method,
-          params: options.params,
-          headers: options.headers
-        }
-        if (options.json !== null) {
-          axios_options.data = options.json
-        }
-        if (options.url.startsWith("https:")) {
-          const httpsAgent = new https.Agent({
-            rejectUnauthorized: false,
-          });
-          axios_options.httpsAgent = httpsAgent;
-        }
-        axios(axios_options)
-        .then((res) => {
-            if (res && res.status == 200 && res.data) {
-                if (callback) {
-                callback(null, res.data);
-                }
-            }
-            else {
-                if (callback) {
-                callback(new Error("Response status is not 200"), null);
-                }
-            }
-        })
-        .catch((error) => {
-            if (callback) {
-                callback(error, null);
-            }
-        });
-    }
-
     fixToken(token) {
         if (token.startsWith('JWT ')) {
           return token

package/tiledeskChatbotPlugs/directives/DirWait.js

@@ -1,5 +1,5 @@
 
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const winston = require('../../utils/winston');
 
 class DirWait {

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -1,7 +1,7 @@
 let axios = require('axios');
 let https = require("https");
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskJSONEval } = require('../../TiledeskJSONEval');
 const winston = require('../../utils/winston');