@tiledesk/tiledesk-server 2.4.100 → 2.4.101

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.4.101
+- Added new route for knowledge base
+- Bug fix: conflicts with old knowledge base
+
 # 2.4.100
 - Updated tybot-connector to 0.2.50
 - Added new route for knowledge base

package/app.js

@@ -81,6 +81,15 @@ mongoose.set('useFindAndModify', false); // https://mongoosejs.com/docs/deprecat
 mongoose.set('useCreateIndex', true);
 mongoose.set('useUnifiedTopology', false); 
 
+// CONNECT REDIS - CHECK IT
+const { TdCache } = require('./utils/TdCache');
+let tdCache = new TdCache({
+    host: process.env.CACHE_REDIS_HOST,
+    port: process.env.CACHE_REDIS_PORT,
+    password: process.env.CACHE_REDIS_PASSWORD
+});
+
+tdCache.connect();
 
 // ROUTES DECLARATION
 var troubleshooting = require('./routes/troubleshooting');
@@ -113,6 +122,8 @@ var key = require('./routes/key');
 var widgets = require('./routes/widget');
 var widgetsLoader = require('./routes/widgetLoader');
 var openai = require('./routes/openai');
+var quotes = require('./routes/quotes');
+var integration = require('./routes/integration')
 var kbsettings = require('./routes/kbsettings');
 var kb = require('./routes/kb');
 
@@ -158,7 +169,7 @@ botEvent.listen(); //queued but disabled
 
 var trainingService = require('./services/trainingService');
 trainingService.start();
- 
+
 // job_here
 
 var geoService = require('./services/geoService');
@@ -196,6 +207,10 @@ var IPFilter = require('./middleware/ipFilter');
 var BanUserNotifier = require('./services/banUserNotifier');
 BanUserNotifier.listen();
 const { ChatbotService } = require('./services/chatbotService');
+const { QuoteManager } = require('./services/QuoteManager');
+
+let qm = new QuoteManager({ tdCache: tdCache });
+qm.start();
 
 var modulesManager = undefined;
 try {
@@ -224,13 +239,13 @@ if (process.env.CREATE_INITIAL_DATA !== "false") {
 
 var app = express();
 
-
-
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
 app.set('chatbot_service', new ChatbotService())
+app.set('redis_client', tdCache);
+app.set('quote_manager', qm);
 
 
 // TODO DELETE IT IN THE NEXT RELEASE
@@ -255,7 +270,6 @@ if (process.env.ENABLE_ALTERNATIVE_CORS_MIDDLEWARE === "true") {
 // app.use(morgan('combined'));
 
 
-
 // app.use(bodyParser.json());
 
 // https://stackoverflow.com/questions/18710225/node-js-get-raw-request-body-using-express
@@ -297,6 +311,7 @@ if (process.env.DISABLE_SESSION_STRATEGY==true ||  process.env.DISABLE_SESSION_S
 
   if (process.env.ENABLE_REDIS_SESSION==true ||  process.env.ENABLE_REDIS_SESSION=="true" ) {
   
+      console.log("Starting redis...") // errors occurs
       // Initialize client.
       // let redisClient = createClient()
       // redisClient.connect().catch(console.error)
@@ -343,6 +358,24 @@ app.options('*', cors());
 // const customRedisRateLimiter = require("./rateLimiter").customRedisRateLimiter;
 // app.use(customRedisRateLimiter);
 
+// MIDDLEWARE FOR REQUESTS QUOTE
+// app.use('/:projectid/requests', function (req, res, next) {
+  
+//   console.log("MIDDLEWARE FIRED ---> REQUESTS");
+//   console.log("(Requests Middleware) method: ", req.method);
+//   if (req.method === 'POST') {
+
+//   let quoteManager = new QuoteManager({ project: mockProject, tdCache: mockTdCache } )
+    
+//   } else {
+//     next();
+//   }
+
+
+// });
+
+
+
 if (process.env.ROUTELOGGER_ENABLED==="true") {
   winston.info("RouterLogger enabled ");
   app.use(function (req, res, next) {
@@ -386,10 +419,10 @@ if (process.env.ROUTELOGGER_ENABLED==="true") {
 app.get('/', function (req, res) {  
   res.send('Hello from Tiledesk server. It\'s UP. See the documentation here http://developer.tiledesk.com');
 });
-
   
 
 
+
 var projectIdSetter = function (req, res, next) {
   var projectid = req.params.projectid;
   winston.debug("projectIdSetter projectid: "+ projectid);
@@ -439,8 +472,6 @@ var projectSetter = function (req, res, next) {
 }
 
 
-
-
 // app.use('/admin', admin);
 
 //oauth2
@@ -560,7 +591,12 @@ app.use('/:projectid/emails',[passport.authenticate(['basic', 'jwt'], { session:
 app.use('/:projectid/properties',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], property);
 app.use('/:projectid/segments',[passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], segment);
 
-app.use('/:projectid/openai', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai);
+// app.use('/:projectid/openai', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent')], openai);
+app.use('/:projectid/openai', openai);
+app.use('/:projectid/quotes', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], quotes)
+
+app.use('/:projectid/integration', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], integration )
+
 app.use('/:projectid/kbsettings', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], kbsettings);
 app.use('/:projectid/kb', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('admin', ['bot','subscription'])], kb);
 
@@ -601,7 +637,7 @@ app.use(function (err, req, res, next) {
 
 
 
-
+// mettere middleware qui per le quote
 
 
 

package/event/emailEvent.js

@@ -0,0 +1,13 @@
+
+const EventEmitter = require('events');
+
+class EmailEvent extends EventEmitter {
+    constructor() {
+        super();
+        this.queueEnabled = false;
+    }
+}
+
+const emailEvent = new EmailEvent();
+
+module.exports =  emailEvent;

package/event/integrationEvent.js

@@ -0,0 +1,13 @@
+const EventEmitter = require('events');
+
+let winston = require('../config/winston');
+
+class IntegrationEvent extends EventEmitter {
+    constructor() {
+        super();
+    }
+}
+
+const integrationEvent = new IntegrationEvent();
+
+module.exports = integrationEvent;

package/models/integrations.js

@@ -0,0 +1,23 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var winston = require('../config/winston');
+
+var IntegrationsSchema = new Schema({
+    id_project: {
+        type: String,
+        required: true,
+        index: true
+    },
+    name: {
+        type: String,
+        required: true
+    },
+    value: {
+        type: Object,
+        required: true,
+        default: {}
+    }
+})
+
+
+module.exports = mongoose.model('integration', IntegrationsSchema);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.100",
+  "version": "2.4.101",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/cache/mongoose-cachegoose-fn.js

@@ -6,6 +6,7 @@
  var departmentEvent = require("../../event/departmentEvent");   
  var authEvent = require("../../event/authEvent");   
  var labelEvent = require("../../event/labelEvent");
+ var integrationEvent = require("../../event/integrationEvent");
 
  var triggerEventEmitter = require("../trigger/event/triggerEventEmitter");
  var subscriptionEvent = require("../../event/subscriptionEvent");   
@@ -725,6 +726,17 @@
         });
     });
 
+    // l'evento è relativo a tutte le integrazioni, è sufficiente solo un evento
+    // per create, update, delete di una singola creation
+    integrationEvent.on("integration.update", (integrations, id_project) => {
+        let key = "project:" + id_project + ":integrations";
+        winston.verbose("Creating cache for integration.create with key: " + key);
+        client.set(key, integrations, cacheUtil.longTTL, (err, reply) => {
+            winston.verbose("Created cache for integration.create", {err: err} );
+            winston.debug("Created cache for integration.create reply", reply);
+        })
+    })
+
     // fai cache per subscription.create, .update .delete
 
 

package/pubmodules/emailNotification/requestNotification.js

@@ -118,6 +118,7 @@ listen() {
             // send an email only if offline and has an email (send also to followers)
             return that.sendUserEmail(message.id_project, message);
           } else { //send email  to followers
+            winston.debug("send direct email****");
 
             that.sendToFollower(message.id_project, message);
 

package/routes/auth.js

@@ -296,12 +296,14 @@ router.post('/signinWithCustomToken', [
 
            var newUser;
            try {
-            newUser = await userService.signup(req.user.email, uuidv4(), req.user.firstname, req.user.lastname, false);
+
+            // Bug with email in camelcase
+            newUser = await userService.signup(req.user.email.toLowerCase(), uuidv4(), req.user.firstname, req.user.lastname, false);
            } catch(e) {
             winston.debug('error signup already exists??: ')
 
             if (e.code = "E11000") {
-              newUser = await User.findOne({email: req.user.email , status: 100}).exec();
+              newUser = await User.findOne({email: req.user.email.toLowerCase(), status: 100}).exec();
               winston.debug('signup found')
 
             } 
@@ -373,7 +375,11 @@ router.post('/signinWithCustomToken', [
                 
               }
 
-              return res.json({ success: true, token: 'JWT ' + returnToken, user: userToReturn });
+              if (returnToken.indexOf("JWT")==0) {
+                returnToken = "JWT " + returnToken;
+              }
+
+              return res.json({ success: true, token: returnToken, user: userToReturn });
           });
         } else {
           winston.debug('project user already exists ');
@@ -381,7 +387,7 @@ router.post('/signinWithCustomToken', [
           if (project_user.status==="active") {
 
             if (req.user.role && (req.user.role === RoleConstants.OWNER || req.user.role === RoleConstants.ADMIN || req.user.role === RoleConstants.AGENT)) {
-              let userFromDB = await User.findOne({email: req.user.email , status: 100}).exec();
+              let userFromDB = await User.findOne({email: req.user.email.toLowerCase(), status: 100}).exec();
 
               var signOptions = {         
                 issuer:  'https://tiledesk.com',   
@@ -402,7 +408,10 @@ router.post('/signinWithCustomToken', [
               let returnToken = jwt.sign(userJson, configSecret, signOptions); //priv_jwt pp_jwt
 
 
-              return res.json({ success: true, token: "JWT " + returnToken, user: userFromDB });
+              if (returnToken.indexOf("JWT")==0) {
+                returnToken = "JWT " + returnToken;
+              }
+              return res.json({ success: true, token: returnToken, user: userFromDB });
               // return res.json({ success: true, token: req.headers["authorization"], user: userFromDB });
               
 

package/routes/email.js

@@ -327,8 +327,10 @@ router.post('/internal/send',
 
   winston.info("Sending an email with text : " + text + " to " + to);
 
-             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
-  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto);
+  let quoteManager = req.app.get('quote_manager');
+
+  //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined, replyto, quoteManager);
   
   res.json({"queued": true});
     

package/routes/faq.js

@@ -467,6 +467,7 @@ router.put('/:faqid', function (req, res) {
 // DELETE REMOTE AND LOCAL FAQ
 router.delete('/:faqid', function (req, res) {
 
+  console.log("delete called")
   winston.debug('DELETE FAQ - FAQ ID ', req.params.faqid);
 
   let faqid = req.params.faqid;

package/routes/integration.js

@@ -0,0 +1,199 @@
+let express = require('express');
+let router = express.Router();
+var winston = require('../config/winston');
+let Integration = require('../models/integrations');
+const cacheEnabler = require('../services/cacheEnabler');
+var cacheUtil = require('../utils/cacheUtil');
+const integrationEvent = require('../event/integrationEvent');
+
+
+// Get all integration for a project id 
+router.get('/', async (req, res) => {
+
+    let id_project = req.projectid;
+    winston.debug("Get all integration for the project " + id_project);
+
+    let i = Integration.find({ id_project: id_project });
+    if (cacheEnabler.integrations) {
+        // cacheUtil.longTTL is 1 hour (default), evaluate 1 month (2592000 s)
+        i.cache(cacheUtil.longTTL, "project:" + id_project + ":integrations");
+        winston.debug('integration cache enabled for get all integrations');
+    }
+    i.exec((err, integrations) => {
+        if (err) {
+            winston.error("Error getting integrations: ", err);
+            return res.status(500).send({ success: false, message: "Error getting integrations "});
+        }
+        res.status(200).send(integrations);
+    })
+    // without cache
+    // Integration.find({ id_project: id_project }, (err, integrations) => {
+    //     if (err) {
+    //         console.error("Error finding all integrations for the project " + id_project + " - err: " + err);
+    //         return res.status(404).send({ success: false, err: err })
+    //     }
+    //     console.log("Integrations found: ", integrations);
+    //     res.status(200).send(integrations);
+    // })
+})
+
+// Get one integration
+router.get('/:integration_id', async (req, res) => {
+    
+    let integration_id = req.params.integration_id;
+    winston.debug("Get integration with id " + integration_id);
+
+    Integration.findById(integration_id, (err, integration) => {
+        if (err) {
+            winston.error("Error find integration by id: ", err);
+            return res.status(404).send({ success: false, err: err });
+        }
+        res.status(200).send(integration);
+    })
+
+})
+
+router.get('/name/:integration_name', async (req, res) => {
+
+    let id_project = req.projectid;
+    winston.debug("Get all integration for the project " + id_project);
+
+    let integration_name = req.params.integration_name;
+    winston.debug("Get integration with id " + integration_name);
+
+    Integration.findOne({ id_project: id_project, name: integration_name }, (err, integration) => {
+        if (err) {
+            winston.error("Error find integration by name: ", err);
+            return res.status(404).send({ success: false, err: err });
+        }
+
+        if (!integration) {
+            winston.debug("Integration not found");
+            return res.status(200).send("Integration not found");
+        }
+        
+        res.status(200).send(integration);
+    })
+})
+
+// Add new integration
+router.post('/', async (req, res) => {
+
+    let id_project = req.projectid;
+    winston.debug("Add new integration ", req.body);
+
+
+    let newIntegration = {
+        id_project: id_project,
+        name: req.body.name
+    }
+    if (req.body.value) {
+        newIntegration.value = req.body.value;
+    }
+
+    Integration.findOneAndUpdate({ id_project: id_project, name: req.body.name },  newIntegration, { new: true, upsert: true, setDefaultsOnInsert: false}, (err, savedIntegration) => {
+        if (err) {
+            winston.error("Error creating new integration ", err);
+            return res.status(404).send({ success: false, err: err })
+        }
+
+        winston.debug("New integration created: ", savedIntegration);
+        
+        Integration.find({ id_project: id_project }, (err, integrations) => {
+            if (err) {
+                winston.error("Error getting all integrations");
+            } else {
+                integrationEvent.emit('integration.update', integrations, id_project);
+            }
+        })
+        
+        res.status(200).send(savedIntegration);
+    })
+
+    // let newIntegration = new Integration({
+    //     id_project: id_project,
+    //     name: req.body.name,
+    //     value: req.body.value
+    // })
+
+    // newIntegration.save((err, savedIntegration) => {
+    //     if (err) {
+    //         console.error("Error creating new integration ", err);
+    //         return res.status(404).send({ success: false, err: err })
+    //     }
+
+    //     console.log("New integration created: ", savedIntegration);
+
+    //     Integration.find({ id_project: id_project }, (err, integrations) => {
+    //         if (err) {
+    //             console.error("Error getting all integrations");
+    //         } else {
+    //             console.log("emit integration.create event")
+    //             integrationEvent.emit('integration.create', integrations, id_project);
+    //         }
+
+    //     })
+        
+    //     res.status(200).send(savedIntegration);
+
+    // })
+    
+})
+
+router.put('/:integration_id', async (req, res) => {
+
+    let id_project = req.projectid;
+    let integration_id = req.params.integration_id;
+    
+    let update = {};
+    if (req.body.name != undefined) {
+        update.name = req.body.name;
+    }
+    if (req.body.value != undefined) {
+        update.value = req.body.value
+    }
+
+    Integration.findByIdAndUpdate(integration_id, update, { new: true, upsert: true }, (err, savedIntegration) => {
+        if (err) {
+            winston.error("Error find by id and update integration: ", err);
+            return res.status({ success: false, error: err })
+        }
+
+        Integration.find({ id_project: id_project }, (err, integrations) => {
+            if (err) {
+                winston.error("Error getting all integrations");
+            } else {
+                integrationEvent.emit('integration.update', integrations, id_project);
+            }
+        })
+
+        res.status(200).send(savedIntegration);
+    })
+})
+
+router.delete('/:integration_id', async (req, res) => {
+
+    let id_project = req.projectid;
+    let integration_id = req.params.integration_id;
+
+    Integration.findByIdAndDelete(integration_id, (err, result) => {
+        if (err) {
+            winston.error("Error find by id and delete integration: ", err);
+            return res.status({ success: false, error: err })
+        }
+
+        Integration.find({ id_project: id_project }, (err, integrations) => {
+            if (err) {
+                winston.error("Error getting all integrations");
+            } else {
+                integrationEvent.emit('integration.update', integrations, id_project);
+            }
+        })
+
+        res.status(200).send({ success: true, messages: "Integration deleted successfully"});
+
+    })
+})
+
+
+module.exports = router;

package/routes/kbsettings.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var { KBSettings } = require('../models/kb_setting');
-var { KB } = require('../models/kb_setting');
+// var { KB } = require('../models/kb_setting');
 // var KB = require('../models/kb_setting')
 var router = express.Router();
 var winston = require('../config/winston');
@@ -99,75 +99,11 @@ router.delete('/:settings_id/:kb_id', async (req, res) => {
 
 })
 
-// PROXY PUGLIA AI V2 - START
-router.post('/scrape/single', async (req, res) => {
-
-    let data = req.body;
-    winston.debug("/scrape/single data: ", data);
-
-    let gptkey = process.env.GPTKEY;
-    if (!gptkey) {
-        return res.status(403).send({ success: false, error: "GPT apikey undefined"})
-    }
-
-    data.gptkey = gptkey;
-    
-    openaiService.singleScrape(data).then((resp) => {
-        winston.debug("singleScrape resp: ", resp.data);
-        return res.status(200).send(resp.data);
-    }).catch((err) => {
-        winston.error("singleScrape err: ", err);
-        let status = err.response.status;
-        return res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-router.post('/scrape/status', async (req, res) => {
-
-    let data = req.body;
-    winston.debug("/scrapeStatus req.body: ", req.body);
-
-    openaiService.scrapeStatus(data).then((response) => {
-
-        winston.debug("scrapeStatus response.data: ", response.data);
-        res.status(200).send(response.data);
-    }).catch((err) => {
-        winston.error("scrapeStatus err: ", err);
-        let status = err.response.status;
-        res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-router.post('/ask', async (req, res) => {
-    let data = req.body;
-    winston.debug("/qa data: ", data);
-
-    if (!data.gptkey) {
-        let gptkey = process.env.GPTKEY;
-        if (!gptkey) {
-            return res.status(403).send({ success: false, error: "GPT apikey undefined"})
-        }
-        data.gptkey = gptkey;
-    }
-
-    openaiService.askNamespace(data).then((resp) => {
-        winston.debug("qa resp: ", resp.data);
-        res.status(200).send(resp.data);
-    }).catch((err) => {
-        winston.error("qa err: ", err);
-        let status = err.response.status;
-        res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-// PROXY PUGLIA AI V2 - END
-
 
 // PROXY PUGLIA AI - START
 router.post('/qa', async (req, res) => {
     let data = req.body;
     winston.debug("/qa data: ", data);
-    winston.info("/qa data: ", data);
 
     openaiService.ask(data).then((resp) => {
         winston.debug("qa resp: ", resp.data);
@@ -175,7 +111,6 @@ router.post('/qa', async (req, res) => {
     }).catch((err) => {
         winston.error("qa err: ", err);
         let status = err.response.status;
-        winston.info("status on error: ", status)
         res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
     })
 })
@@ -234,9 +169,9 @@ router.post('/checkstatus', async (req, res) => {
         }
 
         
-        res.status(200).send(resp);
+        res.status(200).send(return_data);
     }).catch((err) => {
-        winston.error("checkstatus err: ", err);
+        //winston.error("checkstatus err: ", err);
         let status = err.response.status;
         res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
     })
@@ -254,14 +189,10 @@ router.post('/:settings_id', async (req, res) => {
             return res.status(500).send({ success: false, error: err});
         } else {
 
-            let new_kb = new KB({
+            let new_kb = {
                 name: body.name,
-                url: body.url,
-                source: body.source,
-                type: body.type,
-                content: body.content,
-                namespace: body.namespace
-            })
+                url: body.url
+            }
             settings.kbs.push(new_kb);
 
             KBSettings.findByIdAndUpdate( settings_id, settings, { new: true }, (err, savedSettings) => {
@@ -269,11 +200,12 @@ router.post('/:settings_id', async (req, res) => {
                     winston.err("findByIdAndUpdate error: ", err);
                     res.status(500).send({ success: false, error: err });
                 } else {
-                    res.status(200).send(new_kb);
+                    res.status(200).send(savedSettings);
                 }
             })
         }
     })
 })
 
+
 module.exports = router;