@ozdao/prometheus-framework 0.2.32 → 0.2.34

package/dist/events.server.js

@@ -163,6 +163,8 @@ function getProjectStage() {
       date: 1,
       numberOfTickets: 1,
       participantsPhotos: 1,
+      special: 1,
+      specialData: 1,
       hasTicket: 1,
       tickets: 1,
       createdAt: 1
@@ -290,6 +292,7 @@ const middlewareFactory = (db) => {
     }
   };
   const update = async (req, res) => {
+    console.log(req.body);
     try {
       const event = await Event.findOneAndUpdate({ url: req.body.url }, { $set: req.body }, { new: true }).exec();
       if (!event) {
@@ -555,6 +558,34 @@ var event_model = (db) => {
       end: {
         type: Date
       }
+    },
+    specialData: {
+      type: Object,
+      default: () => ({
+        subtitle: "NMS Presents",
+        ticketPrice: "499",
+        ticketImage: null,
+        ticketLinkStripe: null,
+        video: null,
+        guests: [],
+        guestVideo: null,
+        guestTitle: null,
+        guestDescription: null,
+        guestFacebook: null,
+        guestInstagram: null,
+        guestTelegram: null,
+        guestTwitter: null,
+        guestSoundcloud: null,
+        guestSpotify: null,
+        logos: [],
+        lineup: [],
+        lineupBackground: null
+      })
+    },
+    // Adding special boolean property
+    special: {
+      type: Boolean,
+      default: false
     }
   }, {
     timestamps: {

package/dist/events.server.mjs

@@ -161,6 +161,8 @@ function getProjectStage() {
       date: 1,
       numberOfTickets: 1,
       participantsPhotos: 1,
+      special: 1,
+      specialData: 1,
       hasTicket: 1,
       tickets: 1,
       createdAt: 1
@@ -288,6 +290,7 @@ const middlewareFactory = (db) => {
     }
   };
   const update = async (req, res) => {
+    console.log(req.body);
     try {
       const event = await Event.findOneAndUpdate({ url: req.body.url }, { $set: req.body }, { new: true }).exec();
       if (!event) {
@@ -553,6 +556,34 @@ var event_model = (db) => {
       end: {
         type: Date
       }
+    },
+    specialData: {
+      type: Object,
+      default: () => ({
+        subtitle: "NMS Presents",
+        ticketPrice: "499",
+        ticketImage: null,
+        ticketLinkStripe: null,
+        video: null,
+        guests: [],
+        guestVideo: null,
+        guestTitle: null,
+        guestDescription: null,
+        guestFacebook: null,
+        guestInstagram: null,
+        guestTelegram: null,
+        guestTwitter: null,
+        guestSoundcloud: null,
+        guestSpotify: null,
+        logos: [],
+        lineup: [],
+        lineupBackground: null
+      })
+    },
+    // Adding special boolean property
+    special: {
+      type: Boolean,
+      default: false
     }
   }, {
     timestamps: {

package/dist/files.server.js

@@ -5,13 +5,14 @@ const index = require("./index-a8dffc0c.js");
 const require$$0$1 = require("sharp");
 const require$$1 = require("fs");
 const require$$2 = require("fs/promises");
-require("os");
-const require$$5 = require("busboy");
+const require$$4 = require("busboy");
 require("jsonwebtoken");
 require("mongodb");
 const path = require$$0;
 const controllerFactory$1 = (db, publicPath) => {
   const uploadMultipleFileController = async (req, res, next) => {
+    console.log("uploadMultipleFileController called");
+    console.log("Files received:", req.files ? req.files.length : 0);
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: "No files uploaded." });
     }
@@ -45,98 +46,119 @@ function requireMiddlewareBusboy() {
   const fs = require$$1;
   const fsp = require$$2;
   const path2 = require$$0;
-  const busboy = require$$5;
+  const busboy = require$$4;
   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);
+      const metadata = await sharp(originalPath).metadata();
+      const resizeOptions = {};
+      if (metadata.width > 800) {
+        resizeOptions.width = 800;
+      }
+      await sharp(originalPath).rotate().resize(resizeOptions).toFile(thumbnailPath);
     } catch (error) {
       console.error("Error creating thumbnail:", error);
+      throw error;
     }
   };
+  const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = "unsorted", maxSize = 10 * 1024 * 1024, allowedTypes = null }) => {
+    console.log("handleFileUpload middleware called");
+    console.log("Options:" + folderNameDefault + maxSize + allowedTypes);
+    let folderName = req.query.folderName || folderNameDefault;
+    folderName = decodeURIComponent(folderName);
+    folderName = folderName.startsWith("/") ? folderName : "/" + folderName;
+    const filePath = path2.join(publicPath, folderName);
+    let files = [];
+    let filesWrongSize = [];
+    let filesWrongType = [];
+    let fileProcessingPromises = [];
+    const bb = busboy({
+      headers: req.headers,
+      limits: { fileSize: maxSize }
+    });
+    bb.on("file", (name, file, info) => {
+      console.log(`Received file: ${info.filename}, Type: ${info.mimeType}`);
+      const isValidType = !allowedTypes || allowedTypes.includes(info.mimeType);
+      if (!isValidType) {
+        console.log(`File of wrong type: ${info.filename}`);
+        filesWrongType.push(info.filename);
+        file.resume();
+        return;
+      }
+      const fileName = `${Math.floor(Math.random() * 1e4)}-${info.filename}`;
+      const fileFullPath = path2.join(filePath, fileName);
+      const fileProcess = fsp.mkdir(path2.dirname(fileFullPath), { recursive: true }).then(() => new Promise((resolve, reject) => {
+        const stream = file.pipe(fs.createWriteStream(fileFullPath));
+        stream.on("finish", () => {
+          files.push(path2.relative(publicPath, fileFullPath));
+          resolve();
+        });
+        stream.on("error", reject);
+      }));
+      fileProcessingPromises.push(fileProcess);
+      file.on("limit", () => {
+        filesWrongSize.push(info.filename);
+        fsp.unlink(fileFullPath).catch((err) => console.error(`Error deleting oversized file: ${err.message}`));
+      });
+    });
+    bb.on("finish", () => {
+      Promise.all(fileProcessingPromises).then(() => {
+        console.log(`Upload finished. Files: ${files.length}, Wrong Size: ${filesWrongSize.length}, Wrong Type: ${filesWrongType.length}`);
+        req.files = files;
+        if (files.length === 0 && (filesWrongSize.length > 0 || filesWrongType.length > 0)) {
+          let errorMessage = "No files uploaded.";
+          if (filesWrongSize.length > 0) {
+            errorMessage += " Some files were too large.";
+          }
+          if (filesWrongType.length > 0) {
+            errorMessage += " Some files were of an unsupported type.";
+          }
+          return res.status(400).json({ message: errorMessage });
+        }
+        next();
+      }).catch((error) => {
+        console.error("Failed processing one or more files", error);
+        res.status(500).json({ message: "Error processing files" });
+      });
+    });
+    req.pipe(bb);
+  };
   const middlewareFactory = (db, publicPath) => {
     const generatePreviewMiddleware = async (req, res, next) => {
-      const files = req.file ? [req.file] : req.files;
+      const files = req.files;
       try {
-        await Promise.all(files.map((file) => createThumbnail(file)));
+        await Promise.all(files.map((file) => createThumbnail(path2.join(publicPath, file))));
       } catch (error) {
         console.error("Error generating previews:", error);
+        return res.status(500).json({ message: "Internal server error while generating previews." });
       }
       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}` });
-      }
+    const uploadFilesMiddleware = (req, res, next) => {
+      const allowedTypes = [
+        "image/png",
+        "image/jpeg",
+        "image/jpg",
+        "image/gif",
+        "application/pdf",
+        "image/svg+xml",
+        "video/mp4",
+        "video/quicktime",
+        // MOV
+        "video/webm"
+      ];
+      handleFileUpload(req, res, next, publicPath, { folderNameDefault: "unsorted", maxSize: 10 * 1024 * 1024, allowedTypes });
+    };
+    const uploadImagesMiddleware = (req, res, next) => {
+      const allowedTypes = ["image/png", "image/jpeg", "image/jpg", "image/gif"];
+      handleFileUpload(req, res, next, publicPath, { folderNameDefault: "unsorted", maxSize: 10 * 1024 * 1024, allowedTypes });
     };
     return {
-      uploadMultipleFilesMiddleware,
+      uploadImagesMiddleware,
+      uploadFilesMiddleware,
       generatePreviewMiddleware
     };
   };
@@ -169,7 +191,7 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.uploadImagesMiddleware,
       middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
@@ -177,15 +199,14 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/file",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
-      middlewareBusboy2.generatePreviewMiddleware
+      middlewareBusboy2.uploadFilesMiddleware
     ],
     controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/multiple",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.uploadImagesMiddleware,
       middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController

package/dist/files.server.mjs

@@ -4,13 +4,14 @@ import { s as server$1 } from "./index-d769324d.mjs";
 import require$$0$1 from "sharp";
 import require$$1 from "fs";
 import require$$2 from "fs/promises";
-import "os";
-import require$$5 from "busboy";
+import require$$4 from "busboy";
 import "jsonwebtoken";
 import "mongodb";
 const path = require$$0;
 const controllerFactory$1 = (db, publicPath) => {
   const uploadMultipleFileController = async (req, res, next) => {
+    console.log("uploadMultipleFileController called");
+    console.log("Files received:", req.files ? req.files.length : 0);
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: "No files uploaded." });
     }
@@ -44,98 +45,119 @@ function requireMiddlewareBusboy() {
   const fs = require$$1;
   const fsp = require$$2;
   const path2 = require$$0;
-  const busboy = require$$5;
+  const busboy = require$$4;
   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);
+      const metadata = await sharp(originalPath).metadata();
+      const resizeOptions = {};
+      if (metadata.width > 800) {
+        resizeOptions.width = 800;
+      }
+      await sharp(originalPath).rotate().resize(resizeOptions).toFile(thumbnailPath);
     } catch (error) {
       console.error("Error creating thumbnail:", error);
+      throw error;
     }
   };
+  const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = "unsorted", maxSize = 10 * 1024 * 1024, allowedTypes = null }) => {
+    console.log("handleFileUpload middleware called");
+    console.log("Options:" + folderNameDefault + maxSize + allowedTypes);
+    let folderName = req.query.folderName || folderNameDefault;
+    folderName = decodeURIComponent(folderName);
+    folderName = folderName.startsWith("/") ? folderName : "/" + folderName;
+    const filePath = path2.join(publicPath, folderName);
+    let files = [];
+    let filesWrongSize = [];
+    let filesWrongType = [];
+    let fileProcessingPromises = [];
+    const bb = busboy({
+      headers: req.headers,
+      limits: { fileSize: maxSize }
+    });
+    bb.on("file", (name, file, info) => {
+      console.log(`Received file: ${info.filename}, Type: ${info.mimeType}`);
+      const isValidType = !allowedTypes || allowedTypes.includes(info.mimeType);
+      if (!isValidType) {
+        console.log(`File of wrong type: ${info.filename}`);
+        filesWrongType.push(info.filename);
+        file.resume();
+        return;
+      }
+      const fileName = `${Math.floor(Math.random() * 1e4)}-${info.filename}`;
+      const fileFullPath = path2.join(filePath, fileName);
+      const fileProcess = fsp.mkdir(path2.dirname(fileFullPath), { recursive: true }).then(() => new Promise((resolve, reject) => {
+        const stream = file.pipe(fs.createWriteStream(fileFullPath));
+        stream.on("finish", () => {
+          files.push(path2.relative(publicPath, fileFullPath));
+          resolve();
+        });
+        stream.on("error", reject);
+      }));
+      fileProcessingPromises.push(fileProcess);
+      file.on("limit", () => {
+        filesWrongSize.push(info.filename);
+        fsp.unlink(fileFullPath).catch((err) => console.error(`Error deleting oversized file: ${err.message}`));
+      });
+    });
+    bb.on("finish", () => {
+      Promise.all(fileProcessingPromises).then(() => {
+        console.log(`Upload finished. Files: ${files.length}, Wrong Size: ${filesWrongSize.length}, Wrong Type: ${filesWrongType.length}`);
+        req.files = files;
+        if (files.length === 0 && (filesWrongSize.length > 0 || filesWrongType.length > 0)) {
+          let errorMessage = "No files uploaded.";
+          if (filesWrongSize.length > 0) {
+            errorMessage += " Some files were too large.";
+          }
+          if (filesWrongType.length > 0) {
+            errorMessage += " Some files were of an unsupported type.";
+          }
+          return res.status(400).json({ message: errorMessage });
+        }
+        next();
+      }).catch((error) => {
+        console.error("Failed processing one or more files", error);
+        res.status(500).json({ message: "Error processing files" });
+      });
+    });
+    req.pipe(bb);
+  };
   const middlewareFactory = (db, publicPath) => {
     const generatePreviewMiddleware = async (req, res, next) => {
-      const files = req.file ? [req.file] : req.files;
+      const files = req.files;
       try {
-        await Promise.all(files.map((file) => createThumbnail(file)));
+        await Promise.all(files.map((file) => createThumbnail(path2.join(publicPath, file))));
       } catch (error) {
         console.error("Error generating previews:", error);
+        return res.status(500).json({ message: "Internal server error while generating previews." });
       }
       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}` });
-      }
+    const uploadFilesMiddleware = (req, res, next) => {
+      const allowedTypes = [
+        "image/png",
+        "image/jpeg",
+        "image/jpg",
+        "image/gif",
+        "application/pdf",
+        "image/svg+xml",
+        "video/mp4",
+        "video/quicktime",
+        // MOV
+        "video/webm"
+      ];
+      handleFileUpload(req, res, next, publicPath, { folderNameDefault: "unsorted", maxSize: 10 * 1024 * 1024, allowedTypes });
+    };
+    const uploadImagesMiddleware = (req, res, next) => {
+      const allowedTypes = ["image/png", "image/jpeg", "image/jpg", "image/gif"];
+      handleFileUpload(req, res, next, publicPath, { folderNameDefault: "unsorted", maxSize: 10 * 1024 * 1024, allowedTypes });
     };
     return {
-      uploadMultipleFilesMiddleware,
+      uploadImagesMiddleware,
+      uploadFilesMiddleware,
       generatePreviewMiddleware
     };
   };
@@ -168,7 +190,7 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.uploadImagesMiddleware,
       middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
@@ -176,15 +198,14 @@ var files_routes = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/file",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
-      middlewareBusboy2.generatePreviewMiddleware
+      middlewareBusboy2.uploadFilesMiddleware
     ],
     controller.uploadMultipleFileController
   );
   app.post(
     "/api/upload/multiple",
     [
-      middlewareBusboy2.uploadMultipleFilesMiddleware,
+      middlewareBusboy2.uploadImagesMiddleware,
       middlewareBusboy2.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController

package/dist/globals.server.js

@@ -47,7 +47,6 @@ const sitemap = sitemap$1;
 const mailing = mailing$1.mailing;
 const parseCookie = parseCookie_1;
 var globals_server = {
-  middlewareFactory,
   sitemap,
   mailing,
   parseCookie

package/dist/globals.server.mjs

@@ -46,7 +46,6 @@ const sitemap = sitemap$1;
 const mailing = mailing$1;
 const parseCookie = parseCookie_1;
 var globals_server = {
-  middlewareFactory,
   sitemap,
   mailing,
   parseCookie