@tiledesk/tiledesk-server 2.14.18 → 2.14.20

package/CHANGELOG.md

@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.14.20
+- Updated whatsapp-connector to 1.0.19
+- Added new endpoint for files uploading 
+
 # 2.14.18
 - Bug fix already existing email when login from google 
 

package/app.js

@@ -139,6 +139,7 @@ var cacheUtil = require("./utils/cacheUtil");
 var orgUtil = require("./utils/orgUtil");
 var images = require('./routes/images');
 var files = require('./routes/files');
+let filesp = require('./routes/filesp');
 var campaigns = require('./routes/campaigns');
 var logs = require('./routes/logs');
 var requestUtilRoot = require('./routes/requestUtilRoot');
@@ -645,6 +646,7 @@ app.use('/:projectid/logs', [passport.authenticate(['basic', 'jwt'], { session:
 app.use('/:projectid/webhooks', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('admin')], webhooks);
 app.use('/:projectid/copilot', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('agent')], copilot);
 
+app.use('/:projectid/files', filesp);
 
 if (pubModulesManager) {
   pubModulesManager.useUnderProjects(app);

package/middleware/file-type.js

@@ -0,0 +1,50 @@
+const FileType = require('file-type');
+const fs = require('fs');
+
+// List of text-based MIME types that FileType cannot detect (they don't have binary signatures)
+const TEXT_MIME_TYPES = [
+  'text/plain',
+  'text/csv'
+];
+
+async function verifyFileContent(buffer, mimetype) {
+  if (!buffer) throw new Error("No file provided");
+
+  try {
+    const fileType = await FileType.fromBuffer(buffer);
+
+    // If FileType couldn't detect the file type (returns null/undefined)
+    if (!fileType) {
+      // For text-based MIME types, accept the declared mimetype since FileType can't detect them
+      if (mimetype && TEXT_MIME_TYPES.includes(mimetype)) {
+        // Optionally verify that the content is valid UTF-8 text
+        try {
+          buffer.toString('utf8');
+          return true;
+        } catch (e) {
+          const err = new Error(`File content is not valid text for mimetype: ${mimetype}`);
+          err.source = "FileContentVerification";
+          throw err;
+        }
+      } else {
+        // For non-text files, FileType should be able to detect them
+        const err = new Error(`File content does not match mimetype. Detected: unknown, provided: ${mimetype}`);
+        err.source = "FileContentVerification";
+        throw err;
+      }
+    }
+
+    // If FileType detected a type, it must match the declared mimetype
+    if (mimetype && fileType.mime !== mimetype) {
+        const err = new Error(`File content does not match mimetype. Detected: ${fileType.mime}, provided: ${mimetype}`);
+        err.source = "FileContentVerification";
+        throw err;
+    }
+
+    return true;
+  } catch (err) {
+    throw err;
+  }
+}
+
+module.exports = verifyFileContent;

package/models/analyticResult.js

@@ -2,16 +2,14 @@ var mongoose = require('mongoose');
 var Schema = mongoose.Schema;
 // mongoose.set('debug', true);
 var winston = require('../config/winston');
-
 let config = require('../config/database');
 
-
 var databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI || config.database;
 
 var readPreference = process.env.ANALYTICS_READ_PREFERENCE ||  "primary";
 winston.info("Annalytics readPreference: " + readPreference);
 
-var conn      = mongoose.createConnection(databaseUri, { "autoIndex": true, readPreference: readPreference});	
+var conn = mongoose.createConnection(databaseUri, { "autoIndex": true, readPreference: readPreference});	
 
 
 var AnalyticResultSchema = new Schema({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.14.18",
+  "version": "2.14.20",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -52,7 +52,7 @@
     "@tiledesk/tiledesk-tybot-connector": "^2.0.43",
     "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.28",
     "@tiledesk/tiledesk-vxml-connector": "^0.1.89",
-    "@tiledesk/tiledesk-whatsapp-connector": "1.0.18",
+    "@tiledesk/tiledesk-whatsapp-connector": "1.0.19",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.13",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
@@ -74,6 +74,7 @@
     "express-session": "^1.17.3",
     "express-validator": "^6.14.2",
     "fast-csv": "^4.3.6",
+    "file-type": "^14.7.1",
     "geoip-lite": "^1.4.5",
     "handlebars": "^4.7.7",
     "handlebars-dateformat": "^1.1.3",

package/routes/files.js

@@ -15,6 +15,7 @@ const FileGridFsService = require('../services/fileGridFsService.js');
 const { path } = require('../models/tag');
 
 const fileService = new FileGridFsService("files");
+const fallbackFileService = new FileGridFsService("images");
 
 
 
@@ -67,33 +68,89 @@ router.post('/public', upload.single('file'), (req, res, next) => {
 
 
 
-router.get("/", (req, res) => {
+router.get("/", async (req, res) => {
   winston.debug('path', req.query.path);
-  // if (path.indexOf("/users/"))
-  fileService.getFileDataAsStream(req.query.path).pipe(res);
-  // const file = gfs
-  //   .find({
-  //     filename: req.query.path
-  //   })
-  //   .toArray((err, files) => {
-  //     if (!files || files.length === 0) {
-  //       return res.status(404).json({
-  //         err: "no files exist"
-  //       });
-  //     }
-  //     gfs.openDownloadStreamByName(req.query.path).pipe(res);
-  //   });
+  
+  let fService = fileService;
+  try {
+    let file = await fileService.find(req.query.path);
+    res.set({ "Content-Length": file.length});
+    res.set({ "Content-Type": file.contentType});
+  } catch (e) {
+    if (e.code == "ENOENT") {
+      winston.debug(`File ${req.query.path} not found on primary file service. Fallback to secondary.`)
+      
+      try {
+        let file = await fallbackFileService.find(req.query.path)
+        res.set({ "Content-Length": file.length });
+        res.set({ "Content-Type": file.contentType });
+        fService = fallbackFileService;
+      } catch (e) {
+        if (e.code == "ENOENT") {
+          winston.debug(`File ${req.query.path} not found on secondary file service.`)
+          return res.status(404).send({ success: false, error: 'File not found.' });
+        } else {
+          winston.error('Error getting file: ', e);
+          return res.status(500).send({success: false, error: 'Error getting file.'});
+        }
+      }
+    } else {
+      winston.error('Error getting file', e);
+      return res.status(500).send({success: false, error: 'Error getting file.'});
+    }
+  }
+  
+  fService.getFileDataAsStream(req.query.path).on('error', (e)=> {
+    if (e.code == "ENOENT") {
+      winston.debug('File not found: '+req.query.path);
+      return res.status(404).send({success: false, error: 'File not found.'});
+    } else {
+      winston.error('Error getting the file', e);
+      return res.status(500).send({success: false, error: 'Error getting file.'});
+    }      
+  }).pipe(res);
 });
 
 
-router.get("/download", (req, res) => {
+router.get("/download", async (req, res) => {
   winston.debug('path', req.query.path);
-  // if (path.indexOf("/users/"))
   let filename = pathlib.basename(req.query.path);
   winston.debug("filename:"+filename);
 
+  let fService = fileService;
+  try {
+    await fileService.find(req.query.path);
+  } catch (e) {
+    if (e.code == "ENOENT") {
+      winston.debug(`File ${req.query.path} not found on primary file service. Fallback to secondary.`)
+      try {
+        await fallbackFileService.find(req.query.path);
+        fService = fallbackFileService;
+      } catch (e) {
+        if (e.code == "ENOENT") {
+          winston.debug(`File ${req.query.path} not found on secondary file service.`)
+          return res.status(404).send({ success: false, error: 'File not found.' });
+        } else {
+          winston.error('Error getting file: ', e);
+          return res.status(500).send({success: false, error: 'Error getting file.'});
+        }
+      }
+    } else {
+      winston.error('Error getting file', e);
+      return res.status(500).send({success: false, error: 'Error getting file.'});
+    }
+  }
+
   res.attachment(filename);
-  fileService.getFileDataAsStream(req.query.path).pipe(res);
+  fService.getFileDataAsStream(req.query.path).on('error', (e)=> {
+    if (e.code == "ENOENT") {
+      winston.debug('File not found: '+req.query.path);
+      return res.status(404).send({success: false, error: 'File not found.'});
+    } else {
+      winston.error('Error getting the file', e);
+      return res.status(500).send({success: false, error: 'Error getting file.'});
+    }      
+  }).pipe(res);
 });