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

package/models/faq.js

@@ -1,6 +1,7 @@
 var mongoose = require('mongoose');
 var Schema = mongoose.Schema;
 var { nanoid } = require("nanoid");
+const winston = require('../utils/winston')
 //const { v4: uuidv4 } = require('uuid');
 var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "none";
 
@@ -105,14 +106,10 @@ FaqSchema.index({ id_project: 1, id_faq_kb: 1, intent_display_name: 1  }, { uniq
 
  var faq = mongoose.model('faq', FaqSchema);
 
- //faq.on('index', function(error) {
-  // "_id index cannot be sparse"
-  //console.debug('index:', error);
-//});
 
 if (process.env.MONGOOSE_SYNCINDEX) {
   faq.syncIndexes();
-  console.info("faq syncIndexes")
+  winston.verbose("faq syncIndexes")
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.5.0-rc2",
+  "version": "0.5.1-rc1",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/{TiledeskServices → services}/AIService.js

@@ -1,4 +1,5 @@
-const Utils = require('./utils')
+const httpUtils = require("../utils/HttpUtils");
+
 class AiService {
 
     constructor(options){
@@ -13,7 +14,7 @@ class AiService {
               url: `${this.APIURL}/${this.PROJECT_ID}/llm/transcription`,
               headers: {
                 'Content-Type' : 'application/json',
-                'Authorization': Utils.fixToken(this.TOKEN)
+                'Authorization': httpUtils.fixToken(this.TOKEN)
               },
               json: {
                 url: url
@@ -21,7 +22,7 @@ class AiService {
               method: 'POST',
               httpsOptions: this.httpsOptions
           };
-          Utils.myrequest(
+          httpUtils.request(
             HTTPREQUEST,
             function(err, resbody) {
                 if (err) {

package/{models/faqKbService.js → services/FaqKbService.js}

@@ -1,4 +1,4 @@
-var Faq_kb = require("./faq_kb");
+var Faq_kb = require("../models/faq_kb");
 
 class FaqKbService {
 

package/{models/faqService.js → services/FaqService.js}

@@ -1,10 +1,11 @@
-var Faq = require("./faq");
-var Faq_kb = require("./faq_kb");
+var Faq = require("../models/faq");
+var Faq_kb = require("../models/faq_kb");
+const winston = require('../utils/winston');
 
 class FaqService {
 
   async getAll(faq_kb_id) {
-    console.log("(Service) GET ALL FAQ OF THE BOT ID (req.query): ", faq_kb_id);
+    winston.verbose("(Service) GET ALL FAQ OF THE BOT ID (req.query): " + faq_kb_id);
     return new Promise((resolve, reject) => {
       let query = { id_faq_kb: faq_kb_id};
       Faq.find(query).lean().exec( (err, faqs) => {

package/services/IntegrationService.js

@@ -0,0 +1,43 @@
+const httpUtils = require('../utils/HttpUtils');
+const winston = require('../utils/winston');
+let API_ENDPOINT = process.env.API_ENDPOINT;
+
+class IntegrationService {
+
+    constructor() {}
+
+    async getKeyFromIntegrations(id_project, integration_name, token) {
+        return new Promise((resolve) => {
+    
+          const INTEGRATIONS_HTTPREQUEST = {
+            url: API_ENDPOINT + "/" + id_project + "/integration/name/" + integration_name,
+            headers: {
+              'Content-Type': 'application/json',
+              'Authorization': 'JWT ' + token
+            },
+            method: "GET"
+          }
+          winston.debug("Integration HttpRequest ", INTEGRATIONS_HTTPREQUEST)
+    
+          httpUtils.request(
+            INTEGRATIONS_HTTPREQUEST, async (err, integration) => {
+              if (err) {
+                resolve(null);
+              } else {
+    
+                if (integration &&
+                  integration.value) {
+                  resolve(integration.value.apikey)
+                }
+                else {
+                  resolve(null)
+                }
+              }
+            })
+        })
+      }
+
+}
+
+const integrationService = new IntegrationService();
+module.exports = integrationService;

package/services/TilebotService.js

@@ -0,0 +1,47 @@
+const httpUtils = require("../utils/HttpUtils");
+const winston = require('../utils/winston');
+const TILEBOT_ENDPOINT = process.env.TILEBOT_ENDPOINT;
+
+class TilebotService {
+
+    constructor() { }
+
+    /**
+     * 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(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'
+        };
+        httpUtils.request(
+            HTTPREQUEST,
+            function (err, resbody) {
+                if (err) {
+                    if (callback) {
+                        callback(err);
+                    }
+                }
+                else {
+                    if (callback) {
+                        callback(null, resbody);
+                    }
+                }
+            }, false
+        );
+    }
+}
+
+let tilebotService = new TilebotService();
+module.exports = tilebotService;

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -32,7 +32,7 @@ const { DirWhatsappByAttribute } = require('./directives/DirWhatsappByAttribute'
 const { DirAskGPT } = require('./directives/DirAskGPT');
 const { DirQapla } = require('./directives/DirQapla');
 
-const { TiledeskChatbot } = require('../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../engine/TiledeskChatbot');
 const { DirIfOnlineAgents } = require('./directives/DirIfOnlineAgents');
 const { DirReply } = require('./directives/DirReply');
 const { DirRandomReply } = require('./directives/DirRandomReply');
@@ -578,9 +578,8 @@ class DirectivesChatbotPlug {
     }
     else if (directive_name === Directives.AI_PROMPT) {
       new DirAiPrompt(context).execute(directive, async (stop) => {
-        if (context.log) { console.log("AiPrompt stop?", stop);}
         if (stop == true) {
-          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
+          winston.debug("(DirectivesChatbotPlug) DirAskGPTV2 Stopping Actions on: ", directive);
           this.theend();
         }
         else {

package/tiledeskChatbotPlugs/FillParamsChatbotPlug.js

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

package/tiledeskChatbotPlugs/TiledeskRequestVariables.js

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

package/tiledeskChatbotPlugs/directives/DEPRECATED_DirSetAttribute.js

@@ -1,4 +1,4 @@
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { Filler } = require('../Filler');
 
 class DirSetAttribute {

package/tiledeskChatbotPlugs/directives/DirAddTags.js

@@ -1,15 +1,16 @@
 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");
 const req = require("express/lib/request");
 const { update } = require("../../models/faq");
 const { TiledeskClient } = require("@tiledesk/tiledesk-client");
 require('dotenv').config();
 const winston = require('../../utils/winston');
+const httpUtils = require("../../utils/HttpUtils");
 
 class DirAddTags {
 
@@ -155,42 +156,6 @@ class DirAddTags {
 
   }
 
-  #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);
-        }
-      });
-  }
-
   async addNewTag(tag){
     return new Promise((resolve, reject)=> {
       const HTTPREQUEST = {
@@ -205,7 +170,8 @@ class DirAddTags {
           color: '#f0806f'
         }
       }
-      this.#myrequest(
+
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("(httprequest) DirAddTags add tags to list err: ", err);
@@ -239,7 +205,7 @@ class DirAddTags {
         json: json
       }
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("(httprequest) DirAddTags patch request with new tags err: ", err);
@@ -268,7 +234,7 @@ class DirAddTags {
         json: tags
       }
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             winston.error("(httprequest) DirAddTags put lead with new tags err: ", err);

package/tiledeskChatbotPlugs/directives/DirAiPrompt.js

@@ -1,11 +1,17 @@
 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 Utils = require("../../utils/HttpUtils");
+const utils = require("../../utils/HttpUtils");
+const httpUtils = require("../../utils/HttpUtils");
+const integrationService = require("../../services/IntegrationService");
+
 
 class DirAiPrompt {
 
@@ -17,19 +23,21 @@ class DirAiPrompt {
     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;
   }
 
   execute(directive, callback) {
-    if (this.log) { console.log("AiPrompt directive: ", directive); }
+    winston.verbose("Execute AiPrompt directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive: ", JSON.stringify(directive));
+      winston.debug("DirAiPrompt Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -39,9 +47,9 @@ class DirAiPrompt {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("DirAiPrompt action:", JSON.stringify(action)); }
+    winston.debug("DirAiPrompt action:", action);
     if (!this.tdcache) {
-      console.error("Error: DirAiPrompt tdcache is mandatory");
+      winston.error("Error: DirAiPrompt tdcache is mandatory");
       callback();
       return;
     }
@@ -53,10 +61,8 @@ class DirAiPrompt {
     let transcript;
     let answer = "No answer"
 
-    if (this.log) {
-      console.log("DirAiPrompt trueIntent", trueIntent)
-      console.log("DirAiPrompt falseIntent", falseIntent)
-    }
+    winston.debug("DirAskGPTV2 trueIntent", trueIntent)
+    winston.debug("DirAskGPTV2 falseIntent", falseIntent)
 
     await this.checkMandatoryParameters(action).catch( async (missing_param) => {
       await this.chatbot.addParameter("flowError", "AiPrompt Error: '" + missing_param + "' attribute is undefined");
@@ -84,23 +90,23 @@ class DirAiPrompt {
         this.context.tdcache,
         this.context.requestId,
         TiledeskChatbotConst.REQ_TRANSCRIPT_KEY);
-      if (this.log) { console.log("DirAiPrompt transcript string: ", transcript_string) }
+        winston.debug("DirAiPrompt transcript string: " + transcript_string)
 
       if (transcript_string) {
         transcript = await TiledeskChatbotUtil.transcriptJSON(transcript_string);
-        if (this.log) { console.log("DirAiPrompt transcript: ", transcript) }
+        winston.debug("DirAiPrompt transcript: ", transcript)
       } else {
-        if (this.log) { console.log("DirAiPrompt transcript_string is undefined. Skip JSON translation for chat history") }
+        winston.verbose("DirAiPrompt transcript_string is undefined. Skip JSON translation for chat history")
       }
     }
 
     const AI_endpoint = process.env.AI_ENDPOINT
-    if (this.log) { console.log("DirAiPrompt AI_endpoint ", AI_endpoint); }
+    winston.verbose("DirAiPrompt AI_endpoint " + AI_endpoint);
 
-    let key = await this.getKeyFromIntegrations(action.llm);
+    let key = await integrationService.getKeyFromIntegrations(this.projectId, action.llm, this.token);
 
     if (!key) {
-      console.error("Error: DirAiPrompt llm key not found in integrations");
+      winston.error("Error: DirAiPrompt llm key not found in integrations");
       await this.chatbot.addParameter("flowError", "AiPrompt Error: missing key for llm " + action.llm);
       if (falseIntent) {
         await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -127,7 +133,7 @@ class DirAiPrompt {
       json.chat_history_dict = await this.transcriptToLLM(transcript);
     }
 
-    if (this.log) { console.log("DirAiPrompt json: ", json) }
+    winston.debug("DirAiPrompt json: ", json);
 
     const HTTPREQUEST = {
       url: AI_endpoint + '/ask',
@@ -137,14 +143,12 @@ class DirAiPrompt {
       json: json,
       method: 'POST'
     }
-    if (this.log) { console.log("DirAiPrompt HTTPREQUEST: ", HTTPREQUEST); }
+    winston.debug("DirAiPrompt HttpRequest: ", HTTPREQUEST);
 
-    this.#myrequest(
+    httpUtils.request(
       HTTPREQUEST, async (err, resbody) => {
         if (err) {
-          if (this.log) {
-            console.error("(httprequest) DirAiPrompt openai err:", err.response.data);
-          }
+          winston.error("DirAiPrompt openai err:", err.response.data);
           await this.#assignAttributes(action, answer);
           let error;
           if (err.response?.data?.detail[0]) {
@@ -164,7 +168,7 @@ class DirAiPrompt {
           return;
         } else {
 
-          if (this.log) { console.log("DirAiPrompt resbody: ", JSON.stringify(resbody)); }
+          winston.debug("DirAiPrompt resbody: ", resbody);
           answer = resbody.answer;
         
           await this.#assignAttributes(action, answer);
@@ -260,7 +264,7 @@ class DirAiPrompt {
         })
       }
       else {
-        if (this.log) { console.log("No trueIntentDirective specified"); }
+        winston.debug("DirAiPrompt No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -275,7 +279,7 @@ class DirAiPrompt {
         });
       }
       else {
-        if (this.log) { console.log("No falseIntentDirective specified"); }
+        winston.debug("DirAiPrompt No falseIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -284,103 +288,16 @@ class DirAiPrompt {
   }
 
   async #assignAttributes(action, answer) {
-    if (this.log) {
-      console.log("assignAttributes action:", action)
-      console.log("assignAttributes answer:", answer)
-    }
+    winston.debug("DirAiPrompt assignAttributes action: ", action)
+    winston.debug("DirAiPrompt assignAttributes answer: " + answer)
+
     if (this.context.tdcache) {
       if (action.assignReplyTo && answer) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignReplyTo, answer);
       }
-      // Debug log
-      if (this.log) {
-        const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-        for (const [key, value] of Object.entries(all_parameters)) {
-          if (this.log) { console.log("(gpttask) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
     }
   }
 
-  #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) => {
-        console.error("(DirAiPrompt) Axios error: ", JSON.stringify(error));
-        if (callback) {
-          callback(error, null);
-        }
-      });
-  }
-
-  async getKeyFromIntegrations(model) {
-    return new Promise((resolve) => {
-
-      const INTEGRATIONS_HTTPREQUEST = {
-        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/" +  model,
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'JWT ' + this.context.token
-        },
-        method: "GET"
-      }
-      if (this.log) { console.log("DirAiPrompt 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) => {
 
@@ -392,15 +309,12 @@ class DirAiPrompt {
         },
         method: "GET"
       }
-      if (this.log) { console.log("DirAiPrompt KB_HTTPREQUEST", KB_HTTPREQUEST); }
+      winston.debug("DirAiPrompt KB HttpRequest", KB_HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         KB_HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAiPrompt Get KnowledgeBase err:", err.message);
-            if (this.log) {
-              console.error("(httprequest) DirAiPrompt Get KnowledgeBase full err", err);
-            }
+            winston.error("(httprequest) DirAiPrompt Get KnowledgeBase err: " + err.message);
             resolve(null);
           } else {
             if (!resbody.gptkey) {
@@ -425,9 +339,9 @@ class DirAiPrompt {
         },
         method: "GET"
       }
-      if (this.log) { console.log("DirAiPrompt check quote availability HTTPREQUEST", HTTPREQUEST); }
+      winston.debug("DirAiPrompt check quote availability HttpRequest", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
             resolve(true)
@@ -455,15 +369,15 @@ class DirAiPrompt {
         json: tokens_usage,
         method: "POST"
       }
-      if (this.log) { console.log("DirAiPrompt check quote availability HTTPREQUEST", HTTPREQUEST); }
+      winston.debug("DirAiPrompt update quote HttpRequest", HTTPREQUEST);
 
-      this.#myrequest(
+      httpUtils.request(
         HTTPREQUEST, async (err, resbody) => {
           if (err) {
-            console.error("(httprequest) DirAiPrompt Increment tokens quote err: ", err);
+            winston.error("(httprequest) DirAiPrompt Increment tokens quote err: ", err);
             reject(false)
           } else {
-            if (this.log) { console.log("(httprequest) DirAiPrompt Increment token quote resbody: ", resbody); }
+            winston.debug("(httprequest) DirAiPrompt Increment token quote resbody: ", resbody);
             resolve(true);
           }
         }