@armi-wave/common 1.23.27 → 1.23.29

package/build/index.d.ts

@@ -25,4 +25,4 @@ export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
 export * from './middlewares/validate-request';
 export { minioClient, ensureBucketExists } from './utils/minioClient';
-export { multerMiddleware, MulterRequest } from './utils/multerConfig';
+export { imageMiddleware, videoMiddleware, textPostMiddleware, createUploadMiddleware, MulterRequest, MulterFileRequest, } from './utils/multerConfig';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.multerMiddleware = exports.ensureBucketExists = exports.minioClient = exports.RequestValidationError = exports.NotFoundError = exports.NotAuthorizedError = exports.CustomError = exports.DatabaseConnectionError = exports.BadRequestError = exports.PostReplyDownvote = exports.PostReplyUpvote = exports.PostReplyLike = exports.PostCommentDownvote = exports.PostCommentUpvote = exports.PostCommentLike = exports.Like = exports.Follow = exports.Reply = exports.Comment = exports.VideoPost = exports.TextPost = exports.Post = exports.User = void 0;
+exports.createUploadMiddleware = exports.textPostMiddleware = exports.videoMiddleware = exports.imageMiddleware = exports.ensureBucketExists = exports.minioClient = exports.RequestValidationError = exports.NotFoundError = exports.NotAuthorizedError = exports.CustomError = exports.DatabaseConnectionError = exports.BadRequestError = exports.PostReplyDownvote = exports.PostReplyUpvote = exports.PostReplyLike = exports.PostCommentDownvote = exports.PostCommentUpvote = exports.PostCommentLike = exports.Like = exports.Follow = exports.Reply = exports.Comment = exports.VideoPost = exports.TextPost = exports.Post = exports.User = void 0;
 const User_1 = __importDefault(require("./models/User"));
 exports.User = User_1.default;
 const Post_1 = __importDefault(require("./models/Post"));
@@ -66,4 +66,7 @@ var minioClient_1 = require("./utils/minioClient");
 Object.defineProperty(exports, "minioClient", { enumerable: true, get: function () { return minioClient_1.minioClient; } });
 Object.defineProperty(exports, "ensureBucketExists", { enumerable: true, get: function () { return minioClient_1.ensureBucketExists; } });
 var multerConfig_1 = require("./utils/multerConfig");
-Object.defineProperty(exports, "multerMiddleware", { enumerable: true, get: function () { return multerConfig_1.multerMiddleware; } });
+Object.defineProperty(exports, "imageMiddleware", { enumerable: true, get: function () { return multerConfig_1.imageMiddleware; } });
+Object.defineProperty(exports, "videoMiddleware", { enumerable: true, get: function () { return multerConfig_1.videoMiddleware; } });
+Object.defineProperty(exports, "textPostMiddleware", { enumerable: true, get: function () { return multerConfig_1.textPostMiddleware; } });
+Object.defineProperty(exports, "createUploadMiddleware", { enumerable: true, get: function () { return multerConfig_1.createUploadMiddleware; } });

package/build/models/TextPost.d.ts

@@ -3,7 +3,7 @@ import { PostType } from '../enums/PostType';
 import { Mention } from './Mention';
 interface TextPost extends Document {
     userId: mongoose.Types.ObjectId;
-    textPostId: mongoose.Types.ObjectId;
+    textPostId?: mongoose.Types.ObjectId;
     username: string;
     profilePicUrl: string;
     caption: string;

package/build/models/TextPost.js

@@ -44,8 +44,8 @@ const textPostSchema = new mongoose_1.Schema({
     textPostId: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: 'TextPost',
-        required: true,
         index: true,
+        required: false,
     },
     username: { type: String, required: true },
     profilePicUrl: { type: String, default: '' },

package/build/utils/multerConfig.d.ts

@@ -2,5 +2,14 @@ import { Request, Response, NextFunction } from 'express';
 interface MulterRequest extends Request {
     file?: Express.Multer.File;
 }
-declare const multerMiddleware: (req: Request, res: Response, next: NextFunction) => void;
-export { multerMiddleware, MulterRequest };
+declare const imageMiddleware: (req: Request, res: Response, next: NextFunction) => void;
+declare const videoMiddleware: (req: Request, res: Response, next: NextFunction) => void;
+declare const textPostMiddleware: (req: Request, res: Response, next: NextFunction) => void;
+declare const createUploadMiddleware: (type: "image" | "video" | "text") => (req: Request, res: Response, next: NextFunction) => void;
+interface MulterFileRequest extends Request {
+    file?: Express.Multer.File;
+    files?: {
+        [fieldname: string]: Express.Multer.File[];
+    };
+}
+export { imageMiddleware, videoMiddleware, textPostMiddleware, createUploadMiddleware, MulterRequest, MulterFileRequest, };

package/build/utils/multerConfig.js

@@ -3,32 +3,136 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.multerMiddleware = void 0;
+exports.createUploadMiddleware = exports.textPostMiddleware = exports.videoMiddleware = exports.imageMiddleware = void 0;
 const multer_1 = __importDefault(require("multer"));
 // Use memory storage to avoid saving files locally
 const storage = multer_1.default.memoryStorage();
-// File filter function with proper TypeScript typing
-const fileFilter = (req, file, cb) => {
+// Maximum file sizes
+const MAX_IMAGE_SIZE = 10 * 1024 * 1024; // 10MB
+const MAX_VIDEO_SIZE = 100 * 1024 * 1024; // 100MB
+const MAX_DOCUMENT_SIZE = 20 * 1024 * 1024; // 20MB
+// File filter for images only
+const imageFileFilter = (req, file, cb) => {
     if (file.mimetype.startsWith('image/')) {
-        cb(null, true); // Accept only image files
+        cb(null, true);
     }
     else {
         cb(new Error('Invalid file type. Only images are allowed.'));
     }
 };
-// Set up multer with memory storage and proper TypeScript typing
-const upload = (0, multer_1.default)({
+// File filter for videos only
+const videoFileFilter = (req, file, cb) => {
+    if (file.mimetype.startsWith('video/')) {
+        cb(null, true);
+    }
+    else {
+        cb(new Error('Invalid file type. Only videos are allowed.'));
+    }
+};
+// File filter for text posts (allows images, videos, and documents)
+const textPostFileFilter = (req, file, cb) => {
+    // Accept images, videos, and common document types
+    if (file.mimetype.startsWith('image/') ||
+        file.mimetype.startsWith('video/') ||
+        file.mimetype.startsWith('application/pdf') ||
+        file.mimetype === 'application/msword' ||
+        file.mimetype ===
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ||
+        file.mimetype === 'application/vnd.ms-excel' ||
+        file.mimetype ===
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+        file.mimetype === 'text/plain') {
+        cb(null, true);
+    }
+    else {
+        cb(new Error('Invalid file type. Only images, videos, and documents are allowed.'));
+    }
+};
+// Set up multer configs for different post types
+const imageUpload = (0, multer_1.default)({
+    storage,
+    limits: { fileSize: MAX_IMAGE_SIZE },
+    fileFilter: imageFileFilter,
+});
+const videoUpload = (0, multer_1.default)({
+    storage,
+    limits: { fileSize: MAX_VIDEO_SIZE },
+    fileFilter: videoFileFilter,
+});
+const textPostUpload = (0, multer_1.default)({
     storage,
-    limits: { fileSize: 10 * 1024 * 1024 }, // Max file size: 10MB
-    fileFilter,
+    limits: { fileSize: MAX_DOCUMENT_SIZE },
+    fileFilter: textPostFileFilter,
 });
-// ✅ Middleware Wrapper to Ensure Correct Typing
-const multerMiddleware = (req, res, next) => {
-    upload.single('image')(req, res, (err) => {
+// Create middleware functions for each post type
+const imageMiddleware = (req, res, next) => {
+    imageUpload.single('image')(req, res, (err) => {
+        if (err) {
+            if (err instanceof multer_1.default.MulterError) {
+                // Handle specific Multer errors
+                if (err.code === 'LIMIT_FILE_SIZE') {
+                    return res.status(413).json({
+                        error: `File too large. Maximum size is ${MAX_IMAGE_SIZE / (1024 * 1024)}MB`,
+                    });
+                }
+            }
+            return res.status(400).json({ error: err.message });
+        }
+        next();
+    });
+};
+exports.imageMiddleware = imageMiddleware;
+const videoMiddleware = (req, res, next) => {
+    videoUpload.single('video')(req, res, (err) => {
         if (err) {
-            return next(err); // Pass Multer errors to Express error handler
+            if (err instanceof multer_1.default.MulterError) {
+                if (err.code === 'LIMIT_FILE_SIZE') {
+                    return res.status(413).json({
+                        error: `File too large. Maximum size is ${MAX_VIDEO_SIZE / (1024 * 1024)}MB`,
+                    });
+                }
+            }
+            return res.status(400).json({ error: err.message });
         }
-        next(); // Proceed to the next middleware
+        next();
     });
 };
-exports.multerMiddleware = multerMiddleware;
+exports.videoMiddleware = videoMiddleware;
+const textPostMiddleware = (req, res, next) => {
+    // Use array to handle different field names based on file type
+    const uploadFields = [
+        { name: 'image', maxCount: 1 },
+        { name: 'video', maxCount: 1 },
+        { name: 'document', maxCount: 1 },
+    ];
+    textPostUpload.fields(uploadFields)(req, res, (err) => {
+        if (err) {
+            if (err instanceof multer_1.default.MulterError) {
+                if (err.code === 'LIMIT_FILE_SIZE') {
+                    return res.status(413).json({
+                        error: `File too large. Maximum size is ${MAX_DOCUMENT_SIZE / (1024 * 1024)}MB`,
+                    });
+                }
+            }
+            return res.status(400).json({ error: err.message });
+        }
+        next();
+    });
+};
+exports.textPostMiddleware = textPostMiddleware;
+// Or create a single configurable middleware (alternative approach)
+const createUploadMiddleware = (type) => {
+    return (req, res, next) => {
+        switch (type) {
+            case 'image':
+                return imageMiddleware(req, res, next);
+            case 'video':
+                return videoMiddleware(req, res, next);
+            case 'text':
+                return textPostMiddleware(req, res, next);
+            default:
+                return next(new Error('Invalid upload type'));
+        }
+    };
+};
+exports.createUploadMiddleware = createUploadMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armi-wave/common",
-  "version": "1.23.27",
+  "version": "1.23.29",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",