@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/dist/files.server.js

@@ -1,37 +1,28 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-3b53548e.js");
-const index = require("./index-05aa7cae.js");
-const require$$0 = require("sharp");
+const require$$0 = require("path");
+const index = require("./index-a8dffc0c.js");
+const require$$0$1 = require("sharp");
 const require$$1 = require("fs");
-const require$$2 = require("path");
-const require$$3 = require("multer");
+const require$$2 = require("fs/promises");
+require("os");
+const require$$5 = require("busboy");
 require("jsonwebtoken");
 require("mongodb");
+const path = require$$0;
 const controllerFactory$1 = (db, publicPath) => {
-  const uploadFileController = async (req, res, next) => {
-    if (!req.file) {
-      return res.status(400).send({ message: "No file uploaded." });
-    }
-    try {
-      res.status(200).send({
-        message: "File uploaded successfully.",
-        filename: 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 uploadMultipleFileController = async (req, res, next) => {
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: "No files uploaded." });
     }
+    const convertToRelativePath = (absolutePath, publicPath2) => {
+      return "/" + path.relative(publicPath2, absolutePath);
+    };
+    req.files = req.files.map((file) => convertToRelativePath(file, publicPath));
     try {
       const fileResponses = req.files.map((file) => ({
         message: "File uploaded successfully.",
-        filename: file.filename,
-        filepath: `/${req.query.folderName || "unsorted"}/${file.filename}`
+        filepath: file
       }));
       res.status(200).send(fileResponses);
     } catch (error) {
@@ -40,36 +31,26 @@ const controllerFactory$1 = (db, publicPath) => {
     }
   };
   return {
-    uploadFileController,
     uploadMultipleFileController
   };
 };
 var files_controller = controllerFactory$1;
-var middlewareMulter;
-var hasRequiredMiddlewareMulter;
-function requireMiddlewareMulter() {
-  if (hasRequiredMiddlewareMulter)
-    return middlewareMulter;
-  hasRequiredMiddlewareMulter = 1;
-  const sharp = require$$0;
+var middlewareBusboy;
+var hasRequiredMiddlewareBusboy;
+function requireMiddlewareBusboy() {
+  if (hasRequiredMiddlewareBusboy)
+    return middlewareBusboy;
+  hasRequiredMiddlewareBusboy = 1;
+  const sharp = require$$0$1;
   const fs = require$$1;
-  const path = require$$2;
-  const multer = require$$3;
-  const createStorage = (folderName, publicPath) => {
-    console.log(folderName);
-    console.log(publicPath);
-    return multer.diskStorage({
-      destination: function(req, file, cb) {
-        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) => {
+  const fsp = require$$2;
+  const path2 = require$$0;
+  const busboy = require$$5;
+  const createThumbnail = async (originalPath) => {
+    const thumbnailPath = path2.join(
+      path2.dirname(originalPath),
+      "thumbnail_" + path2.basename(originalPath)
+    );
     try {
       await sharp(originalPath).rotate().resize({ width: 800 }).toFile(thumbnailPath);
     } catch (error) {
@@ -77,73 +58,95 @@ function requireMiddlewareMulter() {
     }
   };
   const middlewareFactory = (db, publicPath) => {
-    const uploadSingleFileMiddleware = async (req, res, next) => {
-      const folderName = req.query.folderName ? req.query.folderName : "unsorted";
-      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) {
-          return res.status(500).json(err);
-        } else if (err) {
-          return res.status(500).json(err);
-        }
-        next();
-      });
-    };
-    const uploadMultipleFilesMiddleware = async (req, res, next) => {
-      const folderName = req.query.folderName ? req.query.folderName : "unsorted";
-      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) {
-        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) {
-        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);
-        }
+      const files = req.file ? [req.file] : req.files;
+      try {
+        await Promise.all(files.map((file) => createThumbnail(file)));
+      } catch (error) {
+        console.error("Error generating previews:", error);
       }
       next();
     };
+    const uploadMultipleFilesMiddleware = (req, res, next) => {
+      let folderName = req.query.folderName || "unsorted";
+      if (!folderName.startsWith("/")) {
+        folderName = "/" + folderName;
+      }
+      let files = [];
+      let filesWrongSize = [];
+      let filesWrongType = [];
+      let filePath = path2.join(publicPath, folderName);
+      let filePromise;
+      try {
+        const bb = busboy({
+          headers: req.headers,
+          limits: {
+            fileSize: 10 * 1024 * 1024
+          }
+        });
+        bb.on("error", (err) => {
+          next(err);
+        });
+        let fileFullPath;
+        bb.on("file", (name2, file, info) => {
+          if (info.filename.length > 0) {
+            file.resume();
+          }
+          if (info.mimeType != "image/png" && info.mimeType != "image/jpeg" && info.mimeType != "image/gif") {
+            filesWrongType.push(info.filename);
+            file.resume();
+          }
+          let fileName = `${Math.floor(Math.random() * 1e4)}-${info.filename}`;
+          fileFullPath = path2.join(filePath, fileName);
+          fileRelativePath = path2.join(folderName, fileName);
+          filePromise = new Promise((resolve, reject) => {
+            const writeStream = fs.createWriteStream(fileFullPath).on("error", reject).on("finish", resolve);
+            file.on("error", reject);
+            file.pipe(writeStream);
+          });
+          files.push(fileFullPath);
+          file.on("limit", () => {
+            filesWrongSize.push(info.filename);
+            fsp.unlink(fileFullPath);
+            const index2 = files.indexOf(fileFullPath);
+            if (index2 !== -1) {
+              files.splice(index2, 1);
+            }
+            file.resume();
+          });
+        });
+        bb.on("close", async () => {
+          try {
+            if (!filePromise) {
+              res.status(400).json({ message: `Uploaded file '${name}' is missing` });
+              return;
+            }
+            await filePromise;
+            req.files = files;
+            next();
+          } catch (err) {
+            next(err);
+          } finally {
+            bb.removeAllListeners();
+          }
+        });
+        req.pipe(bb);
+      } catch (err) {
+        res.status(400).json({ message: `Could not retrieve file from request - ${err.message}` });
+      }
+    };
     return {
-      uploadSingleFileMiddleware,
       uploadMultipleFilesMiddleware,
       generatePreviewMiddleware
     };
   };
-  middlewareMulter = middlewareFactory;
-  return middlewareMulter;
+  middlewareBusboy = middlewareFactory;
+  return middlewareBusboy;
 }
 const middlewareIndexFactory = (db, publicPath) => {
-  const middlewareMulter2 = requireMiddlewareMulter()(db, publicPath);
+  const middlewareBusboy2 = requireMiddlewareBusboy()(db, publicPath);
   return {
-    middlewareMulter: middlewareMulter2
+    middlewareBusboy: middlewareBusboy2
   };
 };
 var server = middlewareIndexFactory;
@@ -151,10 +154,10 @@ const controllerFactory = files_controller;
 const middlewareFactoryGlobal = index.server;
 const middlewareFactoryFiles = server;
 var files_routes = function(app, db, origins, publicPath) {
-  const controller = controllerFactory();
+  const controller = controllerFactory(db, publicPath);
   middlewareFactoryGlobal(db);
   console.log("Public path is " + publicPath);
-  const { middlewareMulter: middlewareMulter2 } = middlewareFactoryFiles(db, publicPath);
+  const { middlewareBusboy: middlewareBusboy2 } = middlewareFactoryFiles(db, publicPath);
   app.use(function(req, res, next) {
     const origin = req.headers.origin;
     if (origins.includes(origin)) {
@@ -166,24 +169,24 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareMulter2.uploadSingleFileMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
-    controller.uploadFileController
+    controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/file",
     [
-      middlewareMulter2.uploadSingleFileMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
-    controller.uploadFileController
+    controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/multiple",
     [
-      middlewareMulter2.uploadMultipleFilesMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
   );

package/dist/files.server.mjs

@@ -1,36 +1,27 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-83b1d755.mjs";
-import { s as server$1 } from "./index-d5066b82.mjs";
-import require$$0 from "sharp";
+import require$$0 from "path";
+import { s as server$1 } from "./index-d769324d.mjs";
+import require$$0$1 from "sharp";
 import require$$1 from "fs";
-import require$$2 from "path";
-import require$$3 from "multer";
+import require$$2 from "fs/promises";
+import "os";
+import require$$5 from "busboy";
 import "jsonwebtoken";
 import "mongodb";
+const path = require$$0;
 const controllerFactory$1 = (db, publicPath) => {
-  const uploadFileController = async (req, res, next) => {
-    if (!req.file) {
-      return res.status(400).send({ message: "No file uploaded." });
-    }
-    try {
-      res.status(200).send({
-        message: "File uploaded successfully.",
-        filename: 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 uploadMultipleFileController = async (req, res, next) => {
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: "No files uploaded." });
     }
+    const convertToRelativePath = (absolutePath, publicPath2) => {
+      return "/" + path.relative(publicPath2, absolutePath);
+    };
+    req.files = req.files.map((file) => convertToRelativePath(file, publicPath));
     try {
       const fileResponses = req.files.map((file) => ({
         message: "File uploaded successfully.",
-        filename: file.filename,
-        filepath: `/${req.query.folderName || "unsorted"}/${file.filename}`
+        filepath: file
       }));
       res.status(200).send(fileResponses);
     } catch (error) {
@@ -39,36 +30,26 @@ const controllerFactory$1 = (db, publicPath) => {
     }
   };
   return {
-    uploadFileController,
     uploadMultipleFileController
   };
 };
 var files_controller = controllerFactory$1;
-var middlewareMulter;
-var hasRequiredMiddlewareMulter;
-function requireMiddlewareMulter() {
-  if (hasRequiredMiddlewareMulter)
-    return middlewareMulter;
-  hasRequiredMiddlewareMulter = 1;
-  const sharp = require$$0;
+var middlewareBusboy;
+var hasRequiredMiddlewareBusboy;
+function requireMiddlewareBusboy() {
+  if (hasRequiredMiddlewareBusboy)
+    return middlewareBusboy;
+  hasRequiredMiddlewareBusboy = 1;
+  const sharp = require$$0$1;
   const fs = require$$1;
-  const path = require$$2;
-  const multer = require$$3;
-  const createStorage = (folderName, publicPath) => {
-    console.log(folderName);
-    console.log(publicPath);
-    return multer.diskStorage({
-      destination: function(req, file, cb) {
-        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) => {
+  const fsp = require$$2;
+  const path2 = require$$0;
+  const busboy = require$$5;
+  const createThumbnail = async (originalPath) => {
+    const thumbnailPath = path2.join(
+      path2.dirname(originalPath),
+      "thumbnail_" + path2.basename(originalPath)
+    );
     try {
       await sharp(originalPath).rotate().resize({ width: 800 }).toFile(thumbnailPath);
     } catch (error) {
@@ -76,73 +57,95 @@ function requireMiddlewareMulter() {
     }
   };
   const middlewareFactory = (db, publicPath) => {
-    const uploadSingleFileMiddleware = async (req, res, next) => {
-      const folderName = req.query.folderName ? req.query.folderName : "unsorted";
-      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) {
-          return res.status(500).json(err);
-        } else if (err) {
-          return res.status(500).json(err);
-        }
-        next();
-      });
-    };
-    const uploadMultipleFilesMiddleware = async (req, res, next) => {
-      const folderName = req.query.folderName ? req.query.folderName : "unsorted";
-      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) {
-        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) {
-        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);
-        }
+      const files = req.file ? [req.file] : req.files;
+      try {
+        await Promise.all(files.map((file) => createThumbnail(file)));
+      } catch (error) {
+        console.error("Error generating previews:", error);
       }
       next();
     };
+    const uploadMultipleFilesMiddleware = (req, res, next) => {
+      let folderName = req.query.folderName || "unsorted";
+      if (!folderName.startsWith("/")) {
+        folderName = "/" + folderName;
+      }
+      let files = [];
+      let filesWrongSize = [];
+      let filesWrongType = [];
+      let filePath = path2.join(publicPath, folderName);
+      let filePromise;
+      try {
+        const bb = busboy({
+          headers: req.headers,
+          limits: {
+            fileSize: 10 * 1024 * 1024
+          }
+        });
+        bb.on("error", (err) => {
+          next(err);
+        });
+        let fileFullPath;
+        bb.on("file", (name2, file, info) => {
+          if (info.filename.length > 0) {
+            file.resume();
+          }
+          if (info.mimeType != "image/png" && info.mimeType != "image/jpeg" && info.mimeType != "image/gif") {
+            filesWrongType.push(info.filename);
+            file.resume();
+          }
+          let fileName = `${Math.floor(Math.random() * 1e4)}-${info.filename}`;
+          fileFullPath = path2.join(filePath, fileName);
+          fileRelativePath = path2.join(folderName, fileName);
+          filePromise = new Promise((resolve, reject) => {
+            const writeStream = fs.createWriteStream(fileFullPath).on("error", reject).on("finish", resolve);
+            file.on("error", reject);
+            file.pipe(writeStream);
+          });
+          files.push(fileFullPath);
+          file.on("limit", () => {
+            filesWrongSize.push(info.filename);
+            fsp.unlink(fileFullPath);
+            const index = files.indexOf(fileFullPath);
+            if (index !== -1) {
+              files.splice(index, 1);
+            }
+            file.resume();
+          });
+        });
+        bb.on("close", async () => {
+          try {
+            if (!filePromise) {
+              res.status(400).json({ message: `Uploaded file '${name}' is missing` });
+              return;
+            }
+            await filePromise;
+            req.files = files;
+            next();
+          } catch (err) {
+            next(err);
+          } finally {
+            bb.removeAllListeners();
+          }
+        });
+        req.pipe(bb);
+      } catch (err) {
+        res.status(400).json({ message: `Could not retrieve file from request - ${err.message}` });
+      }
+    };
     return {
-      uploadSingleFileMiddleware,
       uploadMultipleFilesMiddleware,
       generatePreviewMiddleware
     };
   };
-  middlewareMulter = middlewareFactory;
-  return middlewareMulter;
+  middlewareBusboy = middlewareFactory;
+  return middlewareBusboy;
 }
 const middlewareIndexFactory = (db, publicPath) => {
-  const middlewareMulter2 = requireMiddlewareMulter()(db, publicPath);
+  const middlewareBusboy2 = requireMiddlewareBusboy()(db, publicPath);
   return {
-    middlewareMulter: middlewareMulter2
+    middlewareBusboy: middlewareBusboy2
   };
 };
 var server = middlewareIndexFactory;
@@ -150,10 +153,10 @@ const controllerFactory = files_controller;
 const middlewareFactoryGlobal = server$1;
 const middlewareFactoryFiles = server;
 var files_routes = function(app, db, origins, publicPath) {
-  const controller = controllerFactory();
+  const controller = controllerFactory(db, publicPath);
   middlewareFactoryGlobal(db);
   console.log("Public path is " + publicPath);
-  const { middlewareMulter: middlewareMulter2 } = middlewareFactoryFiles(db, publicPath);
+  const { middlewareBusboy: middlewareBusboy2 } = middlewareFactoryFiles(db, publicPath);
   app.use(function(req, res, next) {
     const origin = req.headers.origin;
     if (origins.includes(origin)) {
@@ -165,24 +168,24 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareMulter2.uploadSingleFileMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
-    controller.uploadFileController
+    controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/file",
     [
-      middlewareMulter2.uploadSingleFileMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
-    controller.uploadFileController
+    controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/multiple",
     [
-      middlewareMulter2.uploadMultipleFilesMiddleware,
-      middlewareMulter2.generatePreviewMiddleware
+      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
   );

package/dist/gallery.server.js

@@ -1,10 +1,10 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-3b53548e.js");
-const require$$2 = require("path");
-const index = require("./index-05aa7cae.js");
+const require$$0 = require("path");
+const index = require("./index-a8dffc0c.js");
 require("jsonwebtoken");
 require("mongodb");
-const path = require$$2;
+const path = require$$0;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {

package/dist/gallery.server.mjs

@@ -1,9 +1,9 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-83b1d755.mjs";
-import require$$2 from "path";
-import { s as server } from "./index-d5066b82.mjs";
+import require$$0 from "path";
+import { s as server } from "./index-d769324d.mjs";
 import "jsonwebtoken";
 import "mongodb";
-const path = require$$2;
+const path = require$$0;
 const controllerFactory$1 = (db) => {
   const Photo = db.photo;
   const read = async (req, res) => {

package/dist/globals.server.js

@@ -2,7 +2,7 @@
 const _commonjsHelpers = require("./_commonjsHelpers-3b53548e.js");
 const require$$0 = require("sitemap");
 const require$$1 = require("zlib");
-const mailing$1 = require("./mailing-263ed61c.js");
+const mailing$1 = require("./mailing-fe16a26a.js");
 require("dotenv");
 require("nodemailer");
 require("axios");

package/dist/globals.server.mjs

@@ -1,7 +1,7 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-83b1d755.mjs";
 import require$$0 from "sitemap";
 import require$$1 from "zlib";
-import { m as mailing$1 } from "./mailing-18191799.mjs";
+import { m as mailing$1 } from "./mailing-37c2ba41.mjs";
 import "dotenv";
 import "nodemailer";
 import "axios";