@armi-wave/common 1.23.28 → 1.23.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/build/index.d.ts CHANGED
@@ -12,17 +12,19 @@ import PostCommentDownvote from './models/PostCommentDownvote';
12
12
  import PostReplyLike from './models/PostReplyLike';
13
13
  import PostReplyUpvote from './models/PostReplyUpvote';
14
14
  import PostReplyDownvote from './models/PostReplyDownvote';
15
+ import TextPostUpvote from './models/TextPostUpvote';
16
+ import TextPostDownvote from './models/TextPostDownvote';
15
17
  import BadRequestError from './errors/bad-request-error';
16
18
  import DatabaseConnectionError from './errors/database-connection-error';
17
19
  import CustomError from './errors/custom-error';
18
20
  import NotAuthorizedError from './errors/not-authorized-error';
19
21
  import NotFoundError from './errors/not-found-error';
20
22
  import RequestValidationError from './errors/request-validation-error';
21
- export { User, Post, TextPost, VideoPost, Comment, Reply, Follow, Like, PostCommentLike, PostCommentUpvote, PostCommentDownvote, PostReplyLike, PostReplyUpvote, PostReplyDownvote, };
23
+ export { User, Post, TextPost, VideoPost, Comment, Reply, Follow, Like, PostCommentLike, PostCommentUpvote, PostCommentDownvote, PostReplyLike, PostReplyUpvote, PostReplyDownvote, TextPostUpvote, TextPostDownvote, };
22
24
  export { BadRequestError, DatabaseConnectionError, CustomError, NotAuthorizedError, NotFoundError, RequestValidationError, };
23
25
  export * from './middlewares/current-user';
24
26
  export * from './middlewares/error-handler';
25
27
  export * from './middlewares/require-auth';
26
28
  export * from './middlewares/validate-request';
27
29
  export { minioClient, ensureBucketExists } from './utils/minioClient';
28
- export { multerMiddleware, MulterRequest } from './utils/multerConfig';
30
+ export { imageMiddleware, videoMiddleware, textPostMiddleware, createUploadMiddleware, MulterRequest, MulterFileRequest, } from './utils/multerConfig';
package/build/index.js CHANGED
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
17
17
  return (mod && mod.__esModule) ? mod : { "default": mod };
18
18
  };
19
19
  Object.defineProperty(exports, "__esModule", { value: true });
20
- 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;
20
+ 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.TextPostDownvote = exports.TextPostUpvote = 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;
21
21
  const User_1 = __importDefault(require("./models/User"));
22
22
  exports.User = User_1.default;
23
23
  const Post_1 = __importDefault(require("./models/Post"));
@@ -46,6 +46,10 @@ const PostReplyUpvote_1 = __importDefault(require("./models/PostReplyUpvote"));
46
46
  exports.PostReplyUpvote = PostReplyUpvote_1.default;
47
47
  const PostReplyDownvote_1 = __importDefault(require("./models/PostReplyDownvote"));
48
48
  exports.PostReplyDownvote = PostReplyDownvote_1.default;
49
+ const TextPostUpvote_1 = __importDefault(require("./models/TextPostUpvote"));
50
+ exports.TextPostUpvote = TextPostUpvote_1.default;
51
+ const TextPostDownvote_1 = __importDefault(require("./models/TextPostDownvote"));
52
+ exports.TextPostDownvote = TextPostDownvote_1.default;
49
53
  const bad_request_error_1 = __importDefault(require("./errors/bad-request-error"));
50
54
  exports.BadRequestError = bad_request_error_1.default;
51
55
  const database_connection_error_1 = __importDefault(require("./errors/database-connection-error"));
@@ -66,4 +70,7 @@ var minioClient_1 = require("./utils/minioClient");
66
70
  Object.defineProperty(exports, "minioClient", { enumerable: true, get: function () { return minioClient_1.minioClient; } });
67
71
  Object.defineProperty(exports, "ensureBucketExists", { enumerable: true, get: function () { return minioClient_1.ensureBucketExists; } });
68
72
  var multerConfig_1 = require("./utils/multerConfig");
69
- Object.defineProperty(exports, "multerMiddleware", { enumerable: true, get: function () { return multerConfig_1.multerMiddleware; } });
73
+ Object.defineProperty(exports, "imageMiddleware", { enumerable: true, get: function () { return multerConfig_1.imageMiddleware; } });
74
+ Object.defineProperty(exports, "videoMiddleware", { enumerable: true, get: function () { return multerConfig_1.videoMiddleware; } });
75
+ Object.defineProperty(exports, "textPostMiddleware", { enumerable: true, get: function () { return multerConfig_1.textPostMiddleware; } });
76
+ Object.defineProperty(exports, "createUploadMiddleware", { enumerable: true, get: function () { return multerConfig_1.createUploadMiddleware; } });
@@ -0,0 +1,10 @@
1
+ import mongoose, { Document, Model } from 'mongoose';
2
+ interface TextPostDownvote extends Document {
3
+ userId: mongoose.Types.ObjectId;
4
+ textPostId: mongoose.Types.ObjectId;
5
+ createdAt: Date;
6
+ }
7
+ interface TextPostDownvoteModel extends Model<TextPostDownvote> {
8
+ }
9
+ declare const TextPostDownvote: TextPostDownvoteModel;
10
+ export default TextPostDownvote;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ const mongoose_1 = __importStar(require("mongoose"));
37
+ // Define the schema
38
+ const textPostDownvoteSchema = new mongoose_1.Schema({
39
+ userId: {
40
+ type: mongoose_1.Schema.Types.ObjectId,
41
+ ref: 'User',
42
+ required: true,
43
+ index: true,
44
+ },
45
+ textPostId: {
46
+ type: mongoose_1.Schema.Types.ObjectId,
47
+ ref: 'TextPost',
48
+ required: true,
49
+ index: true,
50
+ },
51
+ createdAt: { type: Date, default: Date.now },
52
+ }, {
53
+ toJSON: {
54
+ transform(doc, ret) {
55
+ ret.id = ret._id;
56
+ delete ret.__v;
57
+ delete ret._id;
58
+ },
59
+ },
60
+ });
61
+ // Ensure a user cannot upvote the same post multiple times
62
+ textPostDownvoteSchema.index({ userId: 1, commentId: 1 }, { unique: true });
63
+ // Create and export the model
64
+ const TextPostDownvote = mongoose_1.default.model('TextPostDownvote', textPostDownvoteSchema);
65
+ exports.default = TextPostDownvote;
@@ -0,0 +1,10 @@
1
+ import mongoose, { Document, Model } from 'mongoose';
2
+ interface TextPostUpvote extends Document {
3
+ userId: mongoose.Types.ObjectId;
4
+ textPostId: mongoose.Types.ObjectId;
5
+ createdAt: Date;
6
+ }
7
+ interface TextPostUpvoteModel extends Model<TextPostUpvote> {
8
+ }
9
+ declare const TextPostUpvote: TextPostUpvoteModel;
10
+ export default TextPostUpvote;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ const mongoose_1 = __importStar(require("mongoose"));
37
+ // Define the schema
38
+ const textPostUpvoteSchema = new mongoose_1.Schema({
39
+ userId: {
40
+ type: mongoose_1.Schema.Types.ObjectId,
41
+ ref: 'User',
42
+ required: true,
43
+ index: true,
44
+ },
45
+ textPostId: {
46
+ type: mongoose_1.Schema.Types.ObjectId,
47
+ ref: 'TextPost',
48
+ required: true,
49
+ index: true,
50
+ },
51
+ createdAt: { type: Date, default: Date.now },
52
+ }, {
53
+ toJSON: {
54
+ transform(doc, ret) {
55
+ ret.id = ret._id;
56
+ delete ret.__v;
57
+ delete ret._id;
58
+ },
59
+ },
60
+ });
61
+ // Ensure a user cannot upvote the same post multiple times
62
+ textPostUpvoteSchema.index({ userId: 1, commentId: 1 }, { unique: true });
63
+ // Create and export the model
64
+ const TextPostUpvote = mongoose_1.default.model('TextPostUpvote', textPostUpvoteSchema);
65
+ exports.default = TextPostUpvote;
@@ -2,5 +2,14 @@ import { Request, Response, NextFunction } from 'express';
2
2
  interface MulterRequest extends Request {
3
3
  file?: Express.Multer.File;
4
4
  }
5
- declare const multerMiddleware: (req: Request, res: Response, next: NextFunction) => void;
6
- export { multerMiddleware, MulterRequest };
5
+ declare const imageMiddleware: (req: Request, res: Response, next: NextFunction) => void;
6
+ declare const videoMiddleware: (req: Request, res: Response, next: NextFunction) => void;
7
+ declare const textPostMiddleware: (req: Request, res: Response, next: NextFunction) => void;
8
+ declare const createUploadMiddleware: (type: "image" | "video" | "text") => (req: Request, res: Response, next: NextFunction) => void;
9
+ interface MulterFileRequest extends Request {
10
+ file?: Express.Multer.File;
11
+ files?: {
12
+ [fieldname: string]: Express.Multer.File[];
13
+ };
14
+ }
15
+ export { imageMiddleware, videoMiddleware, textPostMiddleware, createUploadMiddleware, MulterRequest, MulterFileRequest, };
@@ -3,32 +3,136 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.multerMiddleware = void 0;
6
+ exports.createUploadMiddleware = exports.textPostMiddleware = exports.videoMiddleware = exports.imageMiddleware = void 0;
7
7
  const multer_1 = __importDefault(require("multer"));
8
8
  // Use memory storage to avoid saving files locally
9
9
  const storage = multer_1.default.memoryStorage();
10
- // File filter function with proper TypeScript typing
11
- const fileFilter = (req, file, cb) => {
10
+ // Maximum file sizes
11
+ const MAX_IMAGE_SIZE = 10 * 1024 * 1024; // 10MB
12
+ const MAX_VIDEO_SIZE = 100 * 1024 * 1024; // 100MB
13
+ const MAX_DOCUMENT_SIZE = 20 * 1024 * 1024; // 20MB
14
+ // File filter for images only
15
+ const imageFileFilter = (req, file, cb) => {
12
16
  if (file.mimetype.startsWith('image/')) {
13
- cb(null, true); // Accept only image files
17
+ cb(null, true);
14
18
  }
15
19
  else {
16
20
  cb(new Error('Invalid file type. Only images are allowed.'));
17
21
  }
18
22
  };
19
- // Set up multer with memory storage and proper TypeScript typing
20
- const upload = (0, multer_1.default)({
23
+ // File filter for videos only
24
+ const videoFileFilter = (req, file, cb) => {
25
+ if (file.mimetype.startsWith('video/')) {
26
+ cb(null, true);
27
+ }
28
+ else {
29
+ cb(new Error('Invalid file type. Only videos are allowed.'));
30
+ }
31
+ };
32
+ // File filter for text posts (allows images, videos, and documents)
33
+ const textPostFileFilter = (req, file, cb) => {
34
+ // Accept images, videos, and common document types
35
+ if (file.mimetype.startsWith('image/') ||
36
+ file.mimetype.startsWith('video/') ||
37
+ file.mimetype.startsWith('application/pdf') ||
38
+ file.mimetype === 'application/msword' ||
39
+ file.mimetype ===
40
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ||
41
+ file.mimetype === 'application/vnd.ms-excel' ||
42
+ file.mimetype ===
43
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
44
+ file.mimetype === 'text/plain') {
45
+ cb(null, true);
46
+ }
47
+ else {
48
+ cb(new Error('Invalid file type. Only images, videos, and documents are allowed.'));
49
+ }
50
+ };
51
+ // Set up multer configs for different post types
52
+ const imageUpload = (0, multer_1.default)({
53
+ storage,
54
+ limits: { fileSize: MAX_IMAGE_SIZE },
55
+ fileFilter: imageFileFilter,
56
+ });
57
+ const videoUpload = (0, multer_1.default)({
58
+ storage,
59
+ limits: { fileSize: MAX_VIDEO_SIZE },
60
+ fileFilter: videoFileFilter,
61
+ });
62
+ const textPostUpload = (0, multer_1.default)({
21
63
  storage,
22
- limits: { fileSize: 10 * 1024 * 1024 }, // Max file size: 10MB
23
- fileFilter,
64
+ limits: { fileSize: MAX_DOCUMENT_SIZE },
65
+ fileFilter: textPostFileFilter,
24
66
  });
25
- // Middleware Wrapper to Ensure Correct Typing
26
- const multerMiddleware = (req, res, next) => {
27
- upload.single('image')(req, res, (err) => {
67
+ // Create middleware functions for each post type
68
+ const imageMiddleware = (req, res, next) => {
69
+ imageUpload.single('image')(req, res, (err) => {
70
+ if (err) {
71
+ if (err instanceof multer_1.default.MulterError) {
72
+ // Handle specific Multer errors
73
+ if (err.code === 'LIMIT_FILE_SIZE') {
74
+ return res.status(413).json({
75
+ error: `File too large. Maximum size is ${MAX_IMAGE_SIZE / (1024 * 1024)}MB`,
76
+ });
77
+ }
78
+ }
79
+ return res.status(400).json({ error: err.message });
80
+ }
81
+ next();
82
+ });
83
+ };
84
+ exports.imageMiddleware = imageMiddleware;
85
+ const videoMiddleware = (req, res, next) => {
86
+ videoUpload.single('video')(req, res, (err) => {
28
87
  if (err) {
29
- return next(err); // Pass Multer errors to Express error handler
88
+ if (err instanceof multer_1.default.MulterError) {
89
+ if (err.code === 'LIMIT_FILE_SIZE') {
90
+ return res.status(413).json({
91
+ error: `File too large. Maximum size is ${MAX_VIDEO_SIZE / (1024 * 1024)}MB`,
92
+ });
93
+ }
94
+ }
95
+ return res.status(400).json({ error: err.message });
30
96
  }
31
- next(); // Proceed to the next middleware
97
+ next();
32
98
  });
33
99
  };
34
- exports.multerMiddleware = multerMiddleware;
100
+ exports.videoMiddleware = videoMiddleware;
101
+ const textPostMiddleware = (req, res, next) => {
102
+ // Use array to handle different field names based on file type
103
+ const uploadFields = [
104
+ { name: 'image', maxCount: 1 },
105
+ { name: 'video', maxCount: 1 },
106
+ { name: 'document', maxCount: 1 },
107
+ ];
108
+ textPostUpload.fields(uploadFields)(req, res, (err) => {
109
+ if (err) {
110
+ if (err instanceof multer_1.default.MulterError) {
111
+ if (err.code === 'LIMIT_FILE_SIZE') {
112
+ return res.status(413).json({
113
+ error: `File too large. Maximum size is ${MAX_DOCUMENT_SIZE / (1024 * 1024)}MB`,
114
+ });
115
+ }
116
+ }
117
+ return res.status(400).json({ error: err.message });
118
+ }
119
+ next();
120
+ });
121
+ };
122
+ exports.textPostMiddleware = textPostMiddleware;
123
+ // Or create a single configurable middleware (alternative approach)
124
+ const createUploadMiddleware = (type) => {
125
+ return (req, res, next) => {
126
+ switch (type) {
127
+ case 'image':
128
+ return imageMiddleware(req, res, next);
129
+ case 'video':
130
+ return videoMiddleware(req, res, next);
131
+ case 'text':
132
+ return textPostMiddleware(req, res, next);
133
+ default:
134
+ return next(new Error('Invalid upload type'));
135
+ }
136
+ };
137
+ };
138
+ exports.createUploadMiddleware = createUploadMiddleware;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@armi-wave/common",
3
- "version": "1.23.28",
3
+ "version": "1.23.30",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",