@ozdao/prometheus-framework 0.1.15 → 0.1.17

package/src/modules/files/controllers/files.controller.js

@@ -1,151 +1,47 @@
-const multer = require('multer');
-const path = require('path');
-const fs = require('fs');
-
-const createMulterStorage = (folderName, publicPath) => {
-
-  return multer.diskStorage({
-    destination: function (req, file, cb) {
-      let user = {};
-      try {
-        user = JSON.parse(req.cookies.user);
-      } catch (err) {
-        return cb(new Error('Unable to parse user from cookies'));
-      }
-
-      if (!user._id) {
-        return cb(new Error('No user _id found in cookies'));
-      }
-
-      const userUploadPath = path.join(publicPath, 'users', String(user._id), folderName);
-    
-      fs.mkdirSync(userUploadPath, { recursive: true });
-
-      cb(null, userUploadPath);
-    },
-    filename: function (req, file, cb) {
-      cb(null, Date.now() + path.extname(file.originalname));
-    }
-  });
-}
-
-const createStorage = (folderName, publicPath) => {
-
-    return multer.diskStorage({
-      destination: function (req, file, cb) {
-        let user = {};
-        try {
-          user = JSON.parse(req.cookies.user);
-        } catch (err) {
-          return cb(new Error('Unable to parse user from cookies'));
-        }
-
-        if (!user._id) {
-          return cb(new Error('No user _id found in cookies'));
-        }
-
-        const userUploadPath = path.join(publicPath, folderName);
-      
-        fs.mkdirSync(userUploadPath, { recursive: true });
-
-        cb(null, userUploadPath);
-      },
-      filename: function (req, file, cb) {
-        cb(null, Date.now() + path.extname(file.originalname));
-      }
-    });
-}
-
 const controllerFactory = (db, publicPath) => {
-  const uploadImageController = async (req, res, next) => {
-    const upload = multer({ storage: createMulterStorage('blog', publicPath) }).single('file');
-
-    console.log(req.file)
-
-    upload(req, res, function(err) {
-      if (err instanceof multer.MulterError) {
-          console.log(err)
-        return res.status(500).json(err);
-      } else if (err) {
-        console.log(err)
-        return res.status(500).json(err);
-      }
-      if (!req.file) {
-        return res.status(400).send({ message: 'No file uploaded.' });
-      }
-
-      const user = JSON.parse(req.cookies.user);
-
-      res.status(200).send({ 
-        message: 'File uploaded successfully.',
-        filename: req.file.filename,
-        filepath: `/users/${user._id}/blog/${req.file.filename}`
-      });
-    });
-  };
 
   const uploadFileController = async (req, res, next) => {
+    if (!req.file) {
+      return res.status(400).send({ message: 'No file uploaded.' });
+    }
 
-    const folderName = req.query.folderName ? req.query.folderName : 'unsorted'; // получаем folderName из параметров запроса
-    const upload = multer({ storage: createStorage(folderName, publicPath) }).single('file');
-
-    console.log(folderName)
-    console.log(req.files)
-
-    upload(req, res, function(err) {
-      if (err instanceof multer.MulterError) {
-          console.log(err)
-        return res.status(500).json(err);
-      } else if (err) {
-        console.log(err)
-        return res.status(500).json(err);
-      }
-      if (!req.file) {
-        return res.status(400).send({ message: 'No file uploaded.' });
-      }
-
-      const user = JSON.parse(req.cookies.user);
-
+    try {
       res.status(200).send({ 
         message: 'File uploaded successfully.',
         filename: req.file.filename,
-        filepath: `/${folderName}/${req.file.filename}`
+        filepath: `/${req.query.folderName || 'unsorted'}/${req.file.filename}`
       });
-    });
+    } catch (error) {
+      console.error('Error in uploadFileController:', error);
+      return res.status(500).send({ message: 'Error during file processing.' });
+    }
   };
 
-  const uploadMultipleFile = async (req, res, next) => {
-    const folderName = req.query.folderName; // получаем folderName из параметров запроса
-    const upload = multer({ storage: createStorage(folderName) }).array('file');
-
-    upload(req, res, function(err) {
-      if (err instanceof multer.MulterError) {
-          console.log(err)
-        return res.status(500).json(err);
-      } else if (err) {
-        console.log(err)
-        return res.status(500).json(err);
-      }
-      if (!req.files || req.files.length === 0) {
-        return res.status(400).send({ message: 'No file uploaded.' });
-      }
-
-      const user = JSON.parse(req.cookies.user);
+  const uploadMultipleFileController = async (req, res, next) => {
+    if (!req.files || req.files.length === 0) {
+      return res.status(400).send({ message: 'No files uploaded.' });
+    }
 
-      // send back all filenames and paths
-      res.status(200).send(req.files.map(file => ({
+    try {
+      const fileResponses = req.files.map(file => ({
         message: 'File uploaded successfully.',
         filename: file.filename,
-        filepath: `/${folderName}/${file.filename}`,
-      })));
-    });
+        filepath: `/${req.query.folderName || 'unsorted'}/${file.filename}`
+      }));
+
+      // Your logic related to the DB or further processing can be here.
+
+      res.status(200).send(fileResponses);
+    } catch (error) {
+      console.error('Error in uploadMultipleFileController:', error);
+      return res.status(500).send({ message: 'Error during files processing.' });
+    }
   };
 
   return {
-    uploadImageController,
     uploadFileController,
-    uploadMultipleFile
+    uploadMultipleFileController
   };
 };
 
-module.exports = controllerFactory;
+module.exports = controllerFactory;

package/src/modules/files/middlewares/server/index.js

@@ -0,0 +1,10 @@
+// middlewareIndexFactory.js
+const middlewareIndexFactory = (db, publicPath) => {
+  const middlewareMulter = require("./middlewareMulter")(db, publicPath);
+
+  return {
+    middlewareMulter
+  };
+};
+
+module.exports = middlewareIndexFactory;

package/src/modules/files/middlewares/server/md.js

@@ -0,0 +1,151 @@
+const multer = require('multer');
+const path = require('path');
+const fs = require('fs');
+
+const createMulterStorage = (folderName, publicPath) => {
+
+  return multer.diskStorage({
+    destination: function (req, file, cb) {
+      let user = {};
+      try {
+        user = JSON.parse(req.cookies.user);
+      } catch (err) {
+        return cb(new Error('Unable to parse user from cookies'));
+      }
+
+      if (!user._id) {
+        return cb(new Error('No user _id found in cookies'));
+      }
+
+      const userUploadPath = path.join(publicPath, 'users', String(user._id), folderName);
+    
+      fs.mkdirSync(userUploadPath, { recursive: true });
+
+      cb(null, userUploadPath);
+    },
+    filename: function (req, file, cb) {
+      cb(null, Date.now() + path.extname(file.originalname));
+    }
+  });
+}
+
+const createStorage = (folderName, publicPath) => {
+
+    return multer.diskStorage({
+      destination: function (req, file, cb) {
+        let user = {};
+        try {
+          user = JSON.parse(req.cookies.user);
+        } catch (err) {
+          return cb(new Error('Unable to parse user from cookies'));
+        }
+
+        if (!user._id) {
+          return cb(new Error('No user _id found in cookies'));
+        }
+
+        const userUploadPath = path.join(publicPath, folderName);
+      
+        fs.mkdirSync(userUploadPath, { recursive: true });
+
+        cb(null, userUploadPath);
+      },
+      filename: function (req, file, cb) {
+        cb(null, Date.now() + path.extname(file.originalname));
+      }
+    });
+}
+
+const controllerFactory = (db, publicPath) => {
+  const uploadImageController = async (req, res, next) => {
+    const upload = multer({ storage: createMulterStorage('blog', publicPath) }).single('file');
+
+    console.log(req.file)
+
+    upload(req, res, function(err) {
+      if (err instanceof multer.MulterError) {
+          console.log(err)
+        return res.status(500).json(err);
+      } else if (err) {
+        console.log(err)
+        return res.status(500).json(err);
+      }
+      if (!req.file) {
+        return res.status(400).send({ message: 'No file uploaded.' });
+      }
+
+      const user = JSON.parse(req.cookies.user);
+
+      res.status(200).send({ 
+        message: 'File uploaded successfully.',
+        filename: req.file.filename,
+        filepath: `/users/${user._id}/blog/${req.file.filename}`
+      });
+    });
+  };
+
+  const uploadFileController = async (req, res, next) => {
+
+    const folderName = req.query.folderName ? req.query.folderName : 'unsorted'; // получаем folderName из параметров запроса
+    const upload = multer({ storage: createStorage(folderName, publicPath) }).single('file');
+
+    console.log(folderName)
+    console.log(req.files)
+
+    upload(req, res, function(err) {
+      if (err instanceof multer.MulterError) {
+          console.log(err)
+        return res.status(500).json(err);
+      } else if (err) {
+        console.log(err)
+        return res.status(500).json(err);
+      }
+      if (!req.file) {
+        return res.status(400).send({ message: 'No file uploaded.' });
+      }
+
+      const user = JSON.parse(req.cookies.user);
+
+      res.status(200).send({ 
+        message: 'File uploaded successfully.',
+        filename: req.file.filename,
+        filepath: `/${folderName}/${req.file.filename}`
+      });
+    });
+  };
+
+  const uploadMultipleFile = async (req, res, next) => {
+    const folderName = req.query.folderName; // получаем folderName из параметров запроса
+    const upload = multer({ storage: createStorage(folderName) }).array('file');
+
+    upload(req, res, function(err) {
+      if (err instanceof multer.MulterError) {
+          console.log(err)
+        return res.status(500).json(err);
+      } else if (err) {
+        console.log(err)
+        return res.status(500).json(err);
+      }
+      if (!req.files || req.files.length === 0) {
+        return res.status(400).send({ message: 'No file uploaded.' });
+      }
+
+      const user = JSON.parse(req.cookies.user);
+
+      // send back all filenames and paths
+      res.status(200).send(req.files.map(file => ({
+        message: 'File uploaded successfully.',
+        filename: file.filename,
+        filepath: `/${folderName}/${file.filename}`,
+      })));
+    });
+  };
+
+  return {
+    uploadImageController,
+    uploadFileController,
+    uploadMultipleFile
+  };
+};
+
+module.exports = controllerFactory;

package/src/modules/files/middlewares/server/middlewareMulter.js

@@ -0,0 +1,121 @@
+// middlewareFactory.js
+const sharp = require('sharp');
+const fs = require('fs');
+const path = require('path');
+const multer = require('multer');
+
+const createStorage = (folderName, publicPath) => {
+    console.log(folderName)
+    console.log(publicPath)
+
+  return multer.diskStorage({
+    destination: function (req, file, cb) {
+      let user = {};
+      // try {
+      //   user = JSON.parse(req.cookies.user);
+      // } catch (err) {
+      //   return cb(new Error('Unable to parse user from cookies'));
+      // }
+
+      // if (!user._id) {
+      //   return cb(new Error('No user _id found in cookies'));
+      // }
+
+      const userUploadPath = path.join(publicPath, folderName);
+    
+      fs.mkdirSync(userUploadPath, { recursive: true });
+
+      cb(null, userUploadPath);
+    },
+    filename: function (req, file, cb) {
+      cb(null, Date.now() + path.extname(file.originalname));
+    }
+  });
+}
+
+const createThumbnail = async (originalPath, thumbnailPath) => {
+  try {
+    await sharp(originalPath)
+      .resize(200) 
+      .toFile(thumbnailPath);
+  } catch (error) {
+    console.error("Error creating thumbnail:", error);
+  }
+};
+
+
+const middlewareFactory = (db, publicPath) => {
+  const uploadSingleFileMiddleware = async (req, res, next) => {
+
+    const folderName = req.query.folderName ? req.query.folderName : 'unsorted'; // получаем folderName из параметров запроса
+    const upload = multer({ storage: createStorage(folderName, publicPath) }).single('file');  
+      console.log(folderName)
+    console.log(publicPath)
+    
+    upload(req, res, function(err) {
+      if (err instanceof multer.MulterError) {
+        // A Multer error occurred when uploading.
+        return res.status(500).json(err);
+      } else if (err) {
+        // An unknown error occurred when uploading.
+        return res.status(500).json(err);
+      }
+      next(); // Everything went fine.
+    });
+  }
+
+  const uploadMultipleFilesMiddleware = async (req, res, next) => {
+
+
+    const folderName = req.query.folderName ? req.query.folderName : 'unsorted'; // получаем folderName из параметров запроса
+    const upload = multer({ storage: createStorage(folderName, publicPath) }).array('file');
+
+    upload(req, res, function(err) {
+      if (err instanceof multer.MulterError) {
+        return res.status(500).json(err);
+      } else if (err) {
+        return res.status(500).json(err);
+      }
+      next();
+    });
+  }
+
+  const generatePreviewMiddleware = async (req, res, next) => {
+    if (req.file) { // if a single file is uploaded
+      try {
+        const originalPath = req.file.path;
+        const thumbnailPath = path.join(
+          path.dirname(originalPath),
+          'thumbnail_' + path.basename(originalPath)
+        );
+        await createThumbnail(originalPath, thumbnailPath);
+      } catch (error) {
+        console.error('Error generating preview for single file:', error);
+      }
+    } else if (req.files) { // if multiple files are uploaded
+      try {
+        await Promise.all(req.files.map(async file => {
+          const originalPath = file.path;
+          const thumbnailPath = path.join(
+            path.dirname(originalPath),
+            'thumbnail_' + path.basename(originalPath)
+          );
+          await createThumbnail(originalPath, thumbnailPath);
+        }));
+      } catch (error) {
+        console.error('Error generating previews for multiple files:', error);
+      }
+    }
+    next();
+  };
+
+
+
+  return {
+    uploadSingleFileMiddleware,
+    uploadMultipleFilesMiddleware,
+    generatePreviewMiddleware
+  };
+};
+
+module.exports = middlewareFactory;

package/src/modules/files/routes/files.routes.js

@@ -1,16 +1,19 @@
 // Factories
 const controllerFactory = require("../controllers/files.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryFiles = require('../middlewares/server');
 
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db, publicPath);
 
+  const { authJwt } = middlewareFactoryGlobal(db);
+  console.log('Public path is ' + publicPath)
+  const { middlewareMulter } = middlewareFactoryFiles(db, publicPath);
+
   app.use(function(req, res, next) {
     
     const origin = req.headers.origin;
-    
-    console.log(origin)
 
     if (origins.includes(origin)) {
       res.setHeader('Access-Control-Allow-Origin', origin);
@@ -20,20 +23,31 @@ module.exports = function(app, db, origins, publicPath) {
 
     next();
   });
-  
+
   app.post(
     "/api/upload/image",
+    [
+      middlewareMulter.uploadSingleFileMiddleware,
+      middlewareMulter.generatePreviewMiddleware
+    ],
     controller.uploadFileController
   );
 
   app.post(
     "/api/upload/file",
+    [
+      middlewareMulter.uploadSingleFileMiddleware,
+      middlewareMulter.generatePreviewMiddleware
+    ],
     controller.uploadFileController
   );
 
   app.post(
     "/api/upload/multiple",
-    controller.uploadMultipleFile
+    [
+      middlewareMulter.uploadMultipleFilesMiddleware,
+      middlewareMulter.generatePreviewMiddleware
+    ],
+    controller.uploadMultipleFileController
   );
-
 };