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

package/tiledeskChatbotPlugs/directives/DirConnectBlock.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 DirConnectBlock {
   constructor(context) {
@@ -66,7 +67,7 @@ class DirConnectBlock {
     }
     winston.debug("(DirConnectBlock) move to intent message: ", intent_command_request);
 
-    this.sendMessageToBot(this.TILEBOT_ENDPOINT, intent_command_request, botId, () => {
+    tilebotService.sendMessageToBot(intent_command_request, botId, () => {
       callback();
     });
   }
@@ -102,77 +103,7 @@ class DirConnectBlock {
     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}`;
-    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("(DirConnectBlock) Axios error: ", error.response.data);
-      if (callback) {
-        callback(error, null, null);
-      }
-    });
-  }
+  
 }
 
 module.exports = { DirConnectBlock };

package/tiledeskChatbotPlugs/directives/DirContactUpdate.js

@@ -1,8 +1,8 @@
 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 { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
+const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirCustomerio.js

@@ -1,10 +1,11 @@
 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");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const integrationService = require("../../services/IntegrationService");
 
 class DirCustomerio {
 
@@ -15,6 +16,8 @@ class DirCustomerio {
     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;
@@ -71,7 +74,7 @@ class DirCustomerio {
     const customerio_base_url = process.env.CUSTOMERIO_ENDPOINT || "https://track.customer.io/api/v1";
     winston.debug("(DirCustomerio) customerio_base_url: " + customerio_base_url); 
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'customerio', this.token);
     if (!key) {
       winston.debug("(DirCustomerio) - Key not found in Integrations.");
       let status = 422;
@@ -257,37 +260,6 @@ class DirCustomerio {
       }
     }
   }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/customerio",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirCustomerio) Integration 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 = { DirCustomerio }

package/tiledeskChatbotPlugs/directives/DirDeflectToHelpCenter.js

@@ -1,6 +1,6 @@
 const { HelpCenterQuery } = require('@tiledesk/helpcenter-query-client');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot.js');
-const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot.js');
+const { TiledeskChatbotConst } = require('../../engine/TiledeskChatbotConst.js');
 const ms = require('minimist-string');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');

package/tiledeskChatbotPlugs/directives/DirDeleteVariable.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 winston = require('../../utils/winston');
 

package/tiledeskChatbotPlugs/directives/DirForm.js

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

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -1,12 +1,14 @@
 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");
-const { TiledeskChatbotConst } = require("../../models/TiledeskChatbotConst");
-const { TiledeskChatbotUtil } = require("../../models/TiledeskChatbotUtil");
+const { TiledeskChatbotConst } = require("../../engine/TiledeskChatbotConst");
+const { TiledeskChatbotUtil } = require("../../utils/TiledeskChatbotUtil");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
 
 class DirGptTask {
 
@@ -18,6 +20,8 @@ class DirGptTask {
     this.chatbot = this.context.chatbot;
     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;
@@ -113,7 +117,7 @@ class DirGptTask {
     const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
     winston.debug("(DirGptTask)  openai_url " + openai_url);
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'openai', this.token);
     if (!key) {
       winston.debug("(DirGptTask) - Key not found in Integrations. Searching in kb settings...");
       key = await this.getKeyFromKbSettings();
@@ -192,7 +196,8 @@ class DirGptTask {
       method: 'POST'
     }
     winston.debug("(DirGptTask) HttpRequest: ", HTTPREQUEST);
-    this.#myrequest(
+    
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
           winston.debug("(DirGptTask) openai err: ", err);
@@ -303,74 +308,6 @@ class DirGptTask {
     }
   }
 
-  #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("(DirGptTask) Axios error: ", JSON.stringify(error));
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirGptTask) 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)
-            }
-          }
-        })
-    })
-  }
-
   async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
@@ -384,7 +321,7 @@ class DirGptTask {
       }
       winston.debug("(DirGptTask) KB HttpRequest ", KB_HTTPREQUEST); 
 
-      this.#myrequest(
+      httpUtils.request(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("(DirGptTask) Get KnowledgeBase err:", err.message);
@@ -414,7 +351,7 @@ class DirGptTask {
       }
       winston.debug("(DirGptTask) check quote availability HttpRequest ", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             resolve(true)
@@ -444,7 +381,7 @@ class DirGptTask {
       }
       winston.debug("(DirGptTask) update quote HttpRequest ", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.debug("(DirGptTask) Increment tokens quote err: ", err);

package/tiledeskChatbotPlugs/directives/DirGptTask_OLD.js

@@ -1,8 +1,9 @@
 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");
+const httpUtils = require("../../utils/HttpUtils");
 require('dotenv').config();
 
 class DirGptTask {
@@ -98,8 +99,8 @@ class DirGptTask {
       method: "GET"
     }
     if (this.log) { console.log("DirGptTask INTEGRATIONS_HTTPREQUEST ", INTEGRATIONS_HTTPREQUEST) }
-
-    this.#myrequest(
+    
+    httpUtils.request(
       INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
         if (err) {
           if (callback) {
@@ -133,7 +134,7 @@ class DirGptTask {
             }
             if (this.log) { console.log("DirGptTask KB_HTTPREQUEST", KB_HTTPREQUEST); }
 
-            this.#myrequest(
+            httpUtils.request(
               KB_HTTPREQUEST, async (err, resbody) => {
                 if (err) {
                   if (callback) {
@@ -199,7 +200,7 @@ class DirGptTask {
                       method: 'POST'
                     }
                     if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
-                    this.#myrequest(
+                    httpUtils.request(
                       HTTPREQUEST, async (err, resbody) => {
                         if (err) {
                           if (this.log) {
@@ -267,7 +268,7 @@ class DirGptTask {
               method: 'POST'
             }
             if (this.log) { console.log("DirGptTask HTTPREQUEST: ", HTTPREQUEST); }
-            this.#myrequest(
+            httpUtils.request(
               HTTPREQUEST, async (err, resbody) => {
                 if (err) {
                   if (this.log) {
@@ -381,53 +382,7 @@ class DirGptTask {
       }
     }
   }
-
-  #myrequest(options, callback) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(options));
-    }
-    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 (this.log) {
-      console.log("axios_options:", JSON.stringify(axios_options));
-    }
-    if (options.url.startsWith("https:")) {
-      const httpsAgent = new https.Agent({
-        rejectUnauthorized: false,
-      });
-      axios_options.httpsAgent = httpsAgent;
-    }
-    axios(axios_options)
-      .then((res) => {
-        if (this.log) {
-          console.log("Response for url:", options.url);
-          console.log("Response headers:\n", JSON.stringify(res.headers));
-        }
-        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);
-        }
-      });
-  }
+  
 }
 
 module.exports = { DirGptTask }

package/tiledeskChatbotPlugs/directives/DirHubspot.js

@@ -1,10 +1,11 @@
 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");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const integrationService = require("../../services/IntegrationService");
 
 class DirHubspot {
 
@@ -15,6 +16,8 @@ class DirHubspot {
     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;
@@ -73,7 +76,7 @@ class DirHubspot {
     const hubspot_base_url = process.env.HUBSPOT_ENDPOINT || "https://api.hubapi.com/crm/v3/";
     winston.debug("(DirHubspot) hubspot_base_url " + hubspot_base_url);
 
-    let key = await this.getKeyFromIntegrations();
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, 'hubspot', this.token);
     if (!key) {
       winston.debug("(DirHubspot)  - Key not found in Integrations.");
       if (falseIntent) {
@@ -254,38 +257,6 @@ class DirHubspot {
       }
     }
   }
-
-  async getKeyFromIntegrations() {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/hubspot",
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      winston.debug("(DirHubspot) Integration 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 = { DirHubspot }

package/tiledeskChatbotPlugs/directives/DirIfOnlineAgentsV2.js

@@ -2,9 +2,10 @@
 const { DirIntent } = require('./DirIntent');
 const axios = require("axios").default;
 let https = require("https");
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 class DirIfOnlineAgentsV2 {
 
@@ -190,7 +191,7 @@ class DirIfOnlineAgentsV2 {
         // json: true,
         method: 'GET',
       };
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST,
         function(err, resbody) {
           if (err) {
@@ -210,43 +211,6 @@ class DirIfOnlineAgentsV2 {
     
   }
 
-  #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("(DirIfOnlineAgents) Axios error: ", error.response.data);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
   fixToken(token) {
     if (token.startsWith('JWT ')) {
       return token

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

@@ -4,6 +4,7 @@ const { DirIntent } = require('./DirIntent');
 let https = require("https");
 const ms = require('minimist-string');
 const winston = require('../../utils/winston');
+const httpUtils = require('../../utils/HttpUtils');
 
 class DirIfOpenHours {
 
@@ -89,7 +90,7 @@ class DirIfOpenHours {
     }
     winston.debug("(DirIfOpenHours) HttpRequest ", HTTPREQUEST);
     
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
 
         winston.debug("(DirIfOpenHours) resbody:", resbody);
@@ -160,43 +161,6 @@ class DirIfOpenHours {
     // });
   }
 
-  #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("(DirIfOpenHours) Axios error: ", error);
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
   parseParams(directive_parameter) {
     let trueIntent = null;
     let falseIntent = null;