@tiledesk/tiledesk-server 2.2.39 → 2.3.3

package/README.md

@@ -9,11 +9,23 @@
 
 # Introduction
 
-Tiledesk-server is the server engine of Tiledesk. Tiledesk is an Open Source Live Chat platform with integrated ChatBot written in NodeJs and Express. Build your own customer support with a multi-channel platform for Web, Android and iOS. More info here https://www.tiledesk.com.
+Tiledesk-server is the server engine of Tiledesk. Tiledesk is an Open Source Live Chat platform with integrated Chatbots written in NodeJs and Express. Build your own customer support with a multi-channel platform for Web, Android and iOS. 
 
-You can find more info here: https://developer.tiledesk.com
+Designed to be open source since the beginning, we actively worked on it to create a totally new, first class customer service platform based on instant messaging.
 
-# Prerequisites
+What is Tiledesk today? It became the open source “conversational app development” platform that everyone needs 😌
+
+You can use Tiledesk to increase sales for your website or for post-sales customer service. Every conversation can be automated using our first class native chatbot technology.
+You can also connect your own applications using our APIs or Webhooks.
+Moreover you can deploy entire visual applications inside a conversation. And your applications can converse with your chatbots or your end-users! We know this is cool 😎
+
+Tiledesk is multichannel in a totally new way. You can write your chatbot scripts with images, buttons and other cool elements that your channels support. But you will configureyour chatbot replies only once. They will run on every channel, auto-adapting the responses to the target channel whatever it is, Whatsapp, Facebook Messenger, Telegram etc.
+
+More info on Tiledesk website: https://www.tiledesk.com.
+
+You can find technical documentation here: https://developer.tiledesk.com
+
+# Prerequisites for Installation
 
 * [Nodejs](https://www.npmjs.com/) and npm installed. Suggested versions are NodeJS 12.20.2 and NPM 6.14.11 
 * [MongoDb](https://www.mongodb.com) installed
@@ -80,6 +92,8 @@ Deploy with button:
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/Tiledesk/tiledesk-server)
 
+# Community? Questions? Support ?
+If you need help or just want to hang out, come, say hi on our [<img width="15" alt="Tiledesk discord" src="https://seeklogo.com/images/D/discord-color-logo-E5E6DFEF80-seeklogo.com.png"> Discord](https://discord.gg/nERZEZ7SmG) server.
 
 # REST API
 

package/app.js

@@ -87,6 +87,9 @@ var lead = require('./routes/lead');
 var message = require('./routes/message');
 var messagesRootRoute = require('./routes/messagesRoot');
 var department = require('./routes/department');
+var group = require('./routes/group');
+var resthook = require('./routes/subscription');
+var tag = require('./routes/tag');
 var faq = require('./routes/faq');
 var faq_kb = require('./routes/faq_kb');
 var project = require('./routes/project');
@@ -124,6 +127,9 @@ var RouterLogger = require('./models/routerLogger');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
+var subscriptionNotifier = require('./services/subscriptionNotifier');
+subscriptionNotifier.start();
+
 var botSubscriptionNotifier = require('./services/BotSubscriptionNotifier');
 botSubscriptionNotifier.start();
  
@@ -169,8 +175,6 @@ if (process.env.CREATE_INITIAL_DATA !== "false") {
 
 
 
-
-
 var app = express();
 
 
@@ -398,6 +402,8 @@ app.use('/auth', auth);
 app.use('/testauth', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtest);
 
 app.use('/widgets', widgetsLoader);
+app.use('/w', widgetsLoader);
+
 app.use('/images', images);
 app.use('/files', files);
 app.use('/urls', urls);
@@ -441,8 +447,14 @@ app.use('/:projectid/departments', department);
 
 
 
+
+
 channelManager.useUnderProjects(app);
 
+app.use('/:projectid/groups', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], group);
+app.use('/:projectid/tags', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], tag);
+app.use('/:projectid/subscriptions', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], resthook);
+
 //deprecated
 app.use('/:projectid/faq', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], faq);
 app.use('/:projectid/intents', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], faq);

package/channels/chat21/chat21WebHook.js

@@ -201,12 +201,21 @@ router.post('/', function (req, res) {
                         return winston.error("project_user not found with query: ", queryProjectUser);                        
                       }
 
+
+                      // var auto_close;
+
+                      // // qui projecy nn c'è devi leggerlo
+                      // if (req.project.attributes.auto_close === false) {
+                      //   auto_close = 10;
+                      // }
+
                       
                       var new_request = {
                         request_id: message.recipient, project_user_id:project_user_id, lead_id:createdLead._id, id_project:projectid, first_text:message.text,
                         departmentid:departmentid, sourcePage:sourcePage, language:language, userAgent:client, status:requestStatus, createdBy: undefined,
                         attributes:rAttributes, subject:undefined, preflight:false, channel:undefined, location:undefined,
                         lead:createdLead, requester:project_user
+                        // , auto_close: auto_close
                       };
     
                       winston.debug("new_request", new_request);
@@ -398,7 +407,9 @@ router.post('/', function (req, res) {
                       // winston.debug('updatedParticipantsRequest', updatedParticipantsRequest);
                       // manca id
 
-                      return requestService.closeRequestByRequestId(recipient_id, projectId).then(function(updatedStatusRequest) {
+                      // closeRequestByRequestId(request_id, id_project, skipStatsUpdate, notify, closed_by)
+                      const closed_by = user_id;
+                      return requestService.closeRequestByRequestId(recipient_id, projectId, false, true,closed_by ).then(function(updatedStatusRequest) {
                         
                         winston.debug('updatedStatusRequest', updatedStatusRequest.toObject());
                         return res.json(updatedStatusRequest);                      

package/event/botEvent.js

@@ -123,7 +123,7 @@ messageEvent.on('message.create', function(message) {
             if (bot.type==="internal") {
                 botEvent.emit('bot.message.received.notify.internal', message);
                
-            }else {
+            }else {  //external 
                 if (bot.url) {
                     var botNotification = {bot: bot, message: message};
                     botEvent.emit('bot.message.received.notify.external', botNotification);

package/event/subscriptionEvent.js

@@ -0,0 +1,11 @@
+const EventEmitter = require('events');
+
+class SubscriptionEvent extends EventEmitter {}
+var winston = require('../config/winston');
+
+
+const subscriptionEvent = new SubscriptionEvent();
+
+
+
+module.exports = subscriptionEvent;

package/middleware/passport.js

@@ -83,9 +83,12 @@ module.exports = function(passport) {
               // qui arriva questo 
               // decoded:  {"_id":"5ce3ee855c520200176c189e","updatedAt":"2019-05-31T09:50:22.949Z","createdAt":"2019-05-21T12:26:45.192Z","name":"botext","url":"https://tiledesk-v2-simple--andrealeo83.repl.co","id_project":"5ce3d1ceb25ad30017274bc5","trashed":false,"createdBy":"5ce3d1c7b25ad30017274bc2","__v":0,"external":true,"iat":1559297130,"aud":"https://tiledesk.com","iss":"https://tiledesk.com","sub":"5ce3ee855c520200176c189e@tiledesk.com/bot"}
 
-              winston.debug("decoded.aud: "+ decoded.aud );
 
               if (decoded && decoded.aud) {
+
+                winston.debug("decoded.aud: "+ decoded.aud );
+
+                
                 const audUrl  = new URL(decoded.aud);
                 winston.debug("audUrl: "+ audUrl );
                 const path = audUrl.pathname;

package/models/lead.js

@@ -96,6 +96,8 @@ var LeadSchema = new Schema({
 LeadSchema.index({fullname: 'text', email: 'text'},
  {"name":"lead_fulltext","default_language": defaultFullTextLanguage,"language_override": "dummy"}); // schema level
 
+  // suggested by atlas
+LeadSchema.index({status: 1, id_project: 1, createdAt: -1});
 
  var lead = mongoose.model('lead', LeadSchema);
 

package/models/request.js

@@ -58,7 +58,7 @@ var RequestSchema = new Schema({
     type: Schema.Types.ObjectId,
     ref: 'project_user',
     required: false, //ENABLEIT,
-    index: true
+    // index: true //unused
   },
 
 
@@ -100,7 +100,7 @@ var RequestSchema = new Schema({
     type: Number,
     required: false,
     default: RequestConstants.UNASSIGNED,
-    index: true
+    // index: true //unused
   }, 
 
 
@@ -134,17 +134,20 @@ var RequestSchema = new Schema({
     index: true,
     default: "medium" //translate on client side
   },
-  
+
+  followers: [{ 
+    type: Schema.Types.ObjectId, 
+    ref: 'project_user' }],
 
   participantsAgents: {  
     type: Array,
     required: false,
-    index: true,
+    // index: true, //i think unused
   },
   participantsBots: {  
     type: Array,
     required: false,
-    index: true,
+    // index: true, //i think unused
   },
   department: {
     type: Schema.Types.ObjectId,
@@ -161,20 +164,20 @@ var RequestSchema = new Schema({
   // First reply time is the time between ticket creation and the first public comment from an agent, displayed in minutes. Some qualifications include:
   first_response_at: {
     type: Date,
-    index: true
+    // index: true // unused
   },
 
   //timestamp when the agent reply the first time to a visitor
   assigned_at: {
     type: Date,
-    index: true
+    // index: true //unused
   },
 
   // Wait Time (Average and Longest): The average and longest times visitors have been waiting for their chats to be served.
   // Wait time is calculated as duration between the first visitor message in the chat and the first agent message. Wait time will be 0 for agent initiated or trigger initiated chats.
   waiting_time: {
     type: Number,
-    index: true
+    // index: true // why?
   },
 
 
@@ -187,9 +190,12 @@ var RequestSchema = new Schema({
   //   default: 0
   // },
 
-  closed_at: {
+  closed_at: { 
     type: Date
   },
+  closed_by: { 
+    type: String
+  },
 
   tags: [TagSchema],
 
@@ -205,7 +211,11 @@ var RequestSchema = new Schema({
   }, 
   snapshot: {
     type: RequestSnapshotSchema,
-    select: true
+    select: true,
+    //index: false,
+    // includeIndices: false,
+    excludeIndexes: true //testa bene
+
     // select: false
   }, 
 
@@ -254,7 +264,10 @@ var RequestSchema = new Schema({
     required: false
   },
   location: LocationSchema,
-  
+  auto_close: {
+    type: Number,
+    index: true
+  },
   id_project: {
     type: String,
     required: true,
@@ -434,8 +447,22 @@ RequestSchema.index({ id_project: 1, preflight:1, updatedAt: -1 }); // used quer
 
 RequestSchema.index({ hasBot: 1, createdAt: 1 }); // suggested by atlas
 
+// suggested by atlas
+RequestSchema.index({ lead: 1, id_project: 1, participants: 1, preflight: 1, createdAt: -1 });
+// suggested by atlas
+RequestSchema.index({ lead: 1, id_project: 1, preflight: 1, createdAt: -1 });
+
+// suggested by atlas
+RequestSchema.index({ lead: 1, "snapshot.agents.id_user": 1, id_project: 1, preflight: 1, createdAt: -1 });
+
+// suggested by atlas
 RequestSchema.index({ id_project: 1, ticket_id: 1 });
 
+// suggested by atlas
+RequestSchema.index({ id_project: 1, createdAt: 1, preflight: 1});
+
+//suggested by atlas profiler. Used by auto closing requests
+RequestSchema.index({ hasBot: 1, status: 1, createdAt: 1});
 
 
 //   cannot index parallel arrays [agents] [participants] {"driv

package/models/subscriptionLog.js

@@ -0,0 +1,34 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+
+
+
+var SubscriptionLogSchema = new Schema({
+  event: {
+    type: String,
+    required: true
+  },
+  target: {
+    type: String,
+    required: true
+  },
+  response: {
+    type: String,
+  },
+  body: {
+    type: String,
+  },
+  err: {
+    type: String,
+  },
+  id_project: {
+    type: String,
+    required: true,
+     index:true
+  }
+}, {
+    timestamps: true
+  }
+);
+
+module.exports = mongoose.model('subscriptionLog', SubscriptionLogSchema);

package/models/tagLibrary.js

@@ -0,0 +1,42 @@
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var TagSchema = require('./tag');
+
+
+
+var TagLibrarySchema = new Schema({
+  ...TagSchema.obj,
+  // tag: {
+  //   type: String,
+  //   required: true,
+  //   index: true
+  // },  
+  // color: {
+  //   type: String,
+  //   required: false,
+  //   index: false
+  // },  
+  // attributes: {
+  //   type: Object,
+  // },
+  id_project: {
+    type: String,
+    required: true,
+    index: true
+  },
+  createdBy: {
+    type: String,
+    required: true
+  }
+},{
+  timestamps: true
+}
+);
+
+TagLibrarySchema.index({ id_project: 1, tag: 1 }, { unique: true }); 
+
+
+ var Tag = mongoose.model('tag', TagLibrarySchema);
+
+
+module.exports = Tag;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.39",
+  "version": "2.3.3",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -29,29 +29,21 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
-    "@tiledesk-ent/tiledesk-server-activities": "^1.1.18",
-    "@tiledesk-ent/tiledesk-server-analytics": "^1.1.12",
     "@tiledesk-ent/tiledesk-server-cache": "^1.1.10",
-    "@tiledesk-ent/tiledesk-server-canned": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-departments": "^1.1.3",
     "@tiledesk-ent/tiledesk-server-dialogflow": "^1.1.6",
-    "@tiledesk-ent/tiledesk-server-groups": "^1.1.3",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
-    "@tiledesk-ent/tiledesk-server-mt": "^1.1.8",
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-queue": "^1.1.11",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
-    "@tiledesk-ent/tiledesk-server-resthook": "^1.1.53",
     "@tiledesk-ent/tiledesk-server-routing-queue": "^1.1.11",
-    "@tiledesk-ent/tiledesk-server-tags": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-triggers": "^1.1.82",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
     "@tiledesk/tiledesk-chat21-app": "^1.1.4",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
-    "@tiledesk/tiledesk-rasa-connector": "^1.0.5",
+    "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
+    "@tiledesk/tiledesk-rasa-connector": "^1.0.7",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
@@ -94,6 +86,7 @@
     "passport": "^0.4.1",
     "passport-http": "^0.3.0",
     "passport-jwt": "^4.0.0",
+    "pdfmake": "^0.2.5",
     "promise-events": "^0.2.4",
     "request": "^2.88.2",
     "request-promise": "^4.2.6",