@beautinique/be-middlewares 1.0.7 → 1.0.9
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/dist/index.d.ts +1 -1
- package/dist/middlewares/cors.middleware.d.ts +1 -1
- package/dist/middlewares/cors.middleware.js +3 -3
- package/dist/middlewares/database.middleware.d.ts +1 -1
- package/dist/middlewares/database.middleware.js +3 -3
- package/dist/middlewares/index.d.ts +8 -8
- package/dist/middlewares/index.js +1 -1
- package/dist/middlewares/logger-middleware/errorLogger.d.ts +3 -0
- package/dist/middlewares/logger-middleware/errorLogger.js +23 -0
- package/dist/middlewares/logger-middleware/errorLogger.js.map +1 -0
- package/dist/middlewares/logger-middleware/index.d.ts +6 -0
- package/dist/middlewares/logger-middleware/index.js +16 -0
- package/dist/middlewares/logger-middleware/index.js.map +1 -0
- package/dist/middlewares/logger-middleware/logger.d.ts +3 -0
- package/dist/middlewares/logger-middleware/logger.js +57 -0
- package/dist/middlewares/logger-middleware/logger.js.map +1 -0
- package/dist/middlewares/logger-middleware/requestLogger.d.ts +3 -0
- package/dist/middlewares/logger-middleware/requestLogger.js +34 -0
- package/dist/middlewares/logger-middleware/requestLogger.js.map +1 -0
- package/dist/middlewares/multer.middleware.d.ts +2 -2
- package/dist/middlewares/multer.middleware.js +18 -23
- package/dist/middlewares/multer.middleware.js.map +1 -1
- package/dist/middlewares/parseToJson.middleware.d.ts +1 -1
- package/dist/middlewares/parseToJson.middleware.js +2 -2
- package/dist/middlewares/request.middleware.d.ts +2 -2
- package/dist/middlewares/request.middleware.js +10 -12
- package/dist/middlewares/request.middleware.js.map +1 -1
- package/dist/middlewares/response-middlewares/error.response.middleware.d.ts +3 -3
- package/dist/middlewares/response-middlewares/error.response.middleware.js +4 -6
- package/dist/middlewares/response-middlewares/error.response.middleware.js.map +1 -1
- package/dist/middlewares/response-middlewares/index.d.ts +4 -4
- package/dist/middlewares/response-middlewares/notFound.response.middleware.d.ts +1 -1
- package/dist/middlewares/response-middlewares/notFound.response.middleware.js +6 -9
- package/dist/middlewares/response-middlewares/notFound.response.middleware.js.map +1 -1
- package/dist/middlewares/response-middlewares/success.response.middleware.d.ts +1 -9
- package/dist/middlewares/response-middlewares/success.response.middleware.js.map +1 -1
- package/dist/middlewares/response-middlewares/tryCatch.response.middleware.d.ts +4 -4
- package/dist/middlewares/response-middlewares/tryCatch.response.middleware.js +3 -3
- package/dist/middlewares/response-middlewares/tryCatch.response.middleware.js.map +1 -1
- package/dist/middlewares/zod.middleware.d.ts +2 -2
- package/dist/middlewares/zod.middleware.js +3 -3
- package/dist/types/index.d.ts +10 -5
- package/dist/utils/index.d.ts +2 -2
- package/dist/utils/index.js +19 -25
- package/dist/utils/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/middlewares/logger.middleware.d.ts +0 -11
- package/dist/middlewares/logger.middleware.js +0 -63
- package/dist/middlewares/logger.middleware.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from
|
|
1
|
+
export * from './middlewares';
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.checkOrigin = void 0;
|
|
7
7
|
const cors_1 = __importDefault(require("cors"));
|
|
8
8
|
const be_classes_1 = require("@beautinique/be-classes");
|
|
9
|
-
const checkOrigin = ({ origins, methods = [
|
|
9
|
+
const checkOrigin = ({ origins, methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], allowedHeaders = ['Content-Type', 'Authorization'], credentials = true, }) => {
|
|
10
10
|
const options = {
|
|
11
11
|
origin: (origin, callback) => {
|
|
12
12
|
if (!origin || origins.includes(origin)) {
|
|
@@ -14,9 +14,9 @@ const checkOrigin = ({ origins, methods = ["GET", "POST", "PUT", "PATCH", "DELET
|
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
16
|
callback(new be_classes_1.AppError({
|
|
17
|
-
message:
|
|
17
|
+
message: 'Not allowed by CORS',
|
|
18
18
|
statusCode: 403,
|
|
19
|
-
code:
|
|
19
|
+
code: 'AUTH_ERROR',
|
|
20
20
|
}));
|
|
21
21
|
}
|
|
22
22
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
2
|
type DbConnectionChecker = () => boolean;
|
|
3
3
|
export declare const checkConnection: (isDbReady: DbConnectionChecker) => (_: Request, __: Response, next: NextFunction) => void;
|
|
4
4
|
export {};
|
|
@@ -6,13 +6,13 @@ const checkConnection = (isDbReady) => {
|
|
|
6
6
|
return (_, __, next) => {
|
|
7
7
|
try {
|
|
8
8
|
if (isDbReady()) {
|
|
9
|
-
console.log(
|
|
9
|
+
console.log('✅ DB connection is ready');
|
|
10
10
|
}
|
|
11
11
|
else {
|
|
12
12
|
throw new be_classes_1.AppError({
|
|
13
|
-
message:
|
|
13
|
+
message: 'Database not ready',
|
|
14
14
|
statusCode: 500,
|
|
15
|
-
code:
|
|
15
|
+
code: 'INTERNAL_ERROR',
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
next();
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export * as ResponseMiddleware from
|
|
2
|
-
export * as CorsMiddleware from
|
|
3
|
-
export * as DatabaseMiddleware from
|
|
4
|
-
export * as LoggerMiddleware from
|
|
5
|
-
export * as MulterMiddleware from
|
|
6
|
-
export * as JSONMiddleware from
|
|
7
|
-
export * as RequestMiddleware from
|
|
8
|
-
export * as ZodMiddleware from
|
|
1
|
+
export * as ResponseMiddleware from './response-middlewares';
|
|
2
|
+
export * as CorsMiddleware from './cors.middleware';
|
|
3
|
+
export * as DatabaseMiddleware from './database.middleware';
|
|
4
|
+
export * as LoggerMiddleware from './logger-middleware';
|
|
5
|
+
export * as MulterMiddleware from './multer.middleware';
|
|
6
|
+
export * as JSONMiddleware from './parseToJson.middleware';
|
|
7
|
+
export * as RequestMiddleware from './request.middleware';
|
|
8
|
+
export * as ZodMiddleware from './zod.middleware';
|
|
@@ -37,7 +37,7 @@ exports.ZodMiddleware = exports.RequestMiddleware = exports.JSONMiddleware = exp
|
|
|
37
37
|
exports.ResponseMiddleware = __importStar(require("./response-middlewares"));
|
|
38
38
|
exports.CorsMiddleware = __importStar(require("./cors.middleware"));
|
|
39
39
|
exports.DatabaseMiddleware = __importStar(require("./database.middleware"));
|
|
40
|
-
exports.LoggerMiddleware = __importStar(require("./logger
|
|
40
|
+
exports.LoggerMiddleware = __importStar(require("./logger-middleware"));
|
|
41
41
|
exports.MulterMiddleware = __importStar(require("./multer.middleware"));
|
|
42
42
|
exports.JSONMiddleware = __importStar(require("./parseToJson.middleware"));
|
|
43
43
|
exports.RequestMiddleware = __importStar(require("./request.middleware"));
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createErrorLogger = void 0;
|
|
4
|
+
const createErrorLogger = (logger) => {
|
|
5
|
+
return (err, req, _res, next) => {
|
|
6
|
+
const statusCode = err.statusCode || 500;
|
|
7
|
+
if (statusCode < 500) {
|
|
8
|
+
return next(err);
|
|
9
|
+
}
|
|
10
|
+
logger.error({
|
|
11
|
+
type: 'error',
|
|
12
|
+
message: 'Unhandled error',
|
|
13
|
+
requestId: req.requestId,
|
|
14
|
+
method: req.method,
|
|
15
|
+
url: req.originalUrl,
|
|
16
|
+
statusCode,
|
|
17
|
+
stack: err.stack,
|
|
18
|
+
});
|
|
19
|
+
next(err);
|
|
20
|
+
};
|
|
21
|
+
};
|
|
22
|
+
exports.createErrorLogger = createErrorLogger;
|
|
23
|
+
//# sourceMappingURL=errorLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorLogger.js","sourceRoot":"","sources":["../../../src/middlewares/logger-middleware/errorLogger.ts"],"names":[],"mappings":";;;AAGO,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE;IAClD,OAAO,CAAC,GAAQ,EAAE,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;QACpE,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC;QAGzC,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QAED,MAAM,CAAC,KAAK,CAAC;YACX,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iBAAiB;YAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,GAAG,CAAC,WAAW;YACpB,UAAU;YACV,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { TLoggerConfig } from '../../types';
|
|
2
|
+
export declare const createLogger: (options?: TLoggerConfig) => {
|
|
3
|
+
logger: import("winston").Logger;
|
|
4
|
+
requestLogger: (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void;
|
|
5
|
+
errorLogger: (err: any, req: import("express").Request, _res: import("express").Response, next: import("express").NextFunction) => void;
|
|
6
|
+
};
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createLogger = void 0;
|
|
4
|
+
const errorLogger_1 = require("./errorLogger");
|
|
5
|
+
const logger_1 = require("./logger");
|
|
6
|
+
const requestLogger_1 = require("./requestLogger");
|
|
7
|
+
const createLogger = (options = {}) => {
|
|
8
|
+
const logger = (0, logger_1.createWinstonLogger)(options);
|
|
9
|
+
return {
|
|
10
|
+
logger,
|
|
11
|
+
requestLogger: (0, requestLogger_1.createRequestLogger)(logger),
|
|
12
|
+
errorLogger: (0, errorLogger_1.createErrorLogger)(logger),
|
|
13
|
+
};
|
|
14
|
+
};
|
|
15
|
+
exports.createLogger = createLogger;
|
|
16
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/middlewares/logger-middleware/index.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAClD,qCAA+C;AAC/C,mDAAsD;AAE/C,MAAM,YAAY,GAAG,CAAC,UAAyB,EAAE,EAAE,EAAE;IAC1D,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO;QACL,MAAM;QACN,aAAa,EAAE,IAAA,mCAAmB,EAAC,MAAM,CAAC;QAC1C,WAAW,EAAE,IAAA,+BAAiB,EAAC,MAAM,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.createWinstonLogger = void 0;
|
|
7
|
+
const winston_1 = __importDefault(require("winston"));
|
|
8
|
+
const { combine, timestamp, printf, colorize, errors, json } = winston_1.default.format;
|
|
9
|
+
const createConsoleFormat = (serviceName) => printf(({ level, message, timestamp, stack, ...meta }) => {
|
|
10
|
+
const metaString = Object.keys(meta).length > 0 ? `\n${JSON.stringify(meta, null, 2)}` : '';
|
|
11
|
+
return `${timestamp} [${serviceName}] [${level}]: ${stack || message}${metaString}`;
|
|
12
|
+
});
|
|
13
|
+
const createWinstonLogger = ({ serviceName = 'app', logDir = 'logs', level = 'info', }) => {
|
|
14
|
+
return winston_1.default.createLogger({
|
|
15
|
+
level,
|
|
16
|
+
defaultMeta: { service: serviceName },
|
|
17
|
+
transports: [
|
|
18
|
+
new winston_1.default.transports.Console({
|
|
19
|
+
format: combine(colorize({ all: true }), timestamp(), errors({ stack: true }), createConsoleFormat(serviceName)),
|
|
20
|
+
}),
|
|
21
|
+
new winston_1.default.transports.File({
|
|
22
|
+
filename: `${logDir}/requests.log`,
|
|
23
|
+
format: combine(timestamp(), json(), winston_1.default.format((info) => (info.type === 'request' ? info : false))()),
|
|
24
|
+
}),
|
|
25
|
+
new winston_1.default.transports.File({
|
|
26
|
+
filename: `${logDir}/success.log`,
|
|
27
|
+
level: 'info',
|
|
28
|
+
format: combine(timestamp(), json(), winston_1.default.format((info) => {
|
|
29
|
+
const statusCode = info.statusCode;
|
|
30
|
+
return info.type === 'request' && statusCode && statusCode >= 200 && statusCode < 300
|
|
31
|
+
? info
|
|
32
|
+
: false;
|
|
33
|
+
})()),
|
|
34
|
+
}),
|
|
35
|
+
new winston_1.default.transports.File({
|
|
36
|
+
filename: `${logDir}/warnings.log`,
|
|
37
|
+
level: 'warn',
|
|
38
|
+
format: combine(timestamp(), json(), winston_1.default.format((info) => {
|
|
39
|
+
const statusCode = info.statusCode;
|
|
40
|
+
return info.type === 'request' &&
|
|
41
|
+
statusCode &&
|
|
42
|
+
statusCode >= 400 &&
|
|
43
|
+
statusCode < 500
|
|
44
|
+
? info
|
|
45
|
+
: false;
|
|
46
|
+
})()),
|
|
47
|
+
}),
|
|
48
|
+
new winston_1.default.transports.File({
|
|
49
|
+
filename: `${logDir}/error.log`,
|
|
50
|
+
level: 'error',
|
|
51
|
+
format: combine(timestamp(), json(), winston_1.default.format((info) => info.type === 'error' || info.statusCode >= 500 ? info : false)()),
|
|
52
|
+
}),
|
|
53
|
+
],
|
|
54
|
+
});
|
|
55
|
+
};
|
|
56
|
+
exports.createWinstonLogger = createWinstonLogger;
|
|
57
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/middlewares/logger-middleware/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createRequestLogger = void 0;
|
|
4
|
+
const createRequestLogger = (logger) => {
|
|
5
|
+
return (req, res, next) => {
|
|
6
|
+
const start = Date.now();
|
|
7
|
+
res.on('finish', () => {
|
|
8
|
+
const duration = Date.now() - start;
|
|
9
|
+
const logData = {
|
|
10
|
+
type: 'request',
|
|
11
|
+
message: 'Request completed',
|
|
12
|
+
requestId: req.requestId,
|
|
13
|
+
method: req.method,
|
|
14
|
+
url: req.originalUrl,
|
|
15
|
+
statusCode: res.statusCode,
|
|
16
|
+
duration: `${duration}ms`,
|
|
17
|
+
ip: req.ip,
|
|
18
|
+
userAgent: req.get('user-agent'),
|
|
19
|
+
};
|
|
20
|
+
if (res.statusCode >= 500) {
|
|
21
|
+
logger.error(logData);
|
|
22
|
+
}
|
|
23
|
+
else if (res.statusCode >= 400) {
|
|
24
|
+
logger.warn(logData);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
logger.info(logData);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
next();
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
exports.createRequestLogger = createRequestLogger;
|
|
34
|
+
//# sourceMappingURL=requestLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requestLogger.js","sourceRoot":"","sources":["../../../src/middlewares/logger-middleware/requestLogger.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,EAAE;IACpD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YAEpC,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,mBAAmB;gBAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;gBACpB,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,QAAQ,EAAE,GAAG,QAAQ,IAAI;gBACzB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC;aACjC,CAAC;YAEF,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC1B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;iBAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
import { IMulterValidation } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
|
+
import { IMulterValidation } from '../types';
|
|
3
3
|
export declare const validate: ({ type, fieldName, maxCount, fieldsConfig, limits, format, size, isDev, }: IMulterValidation) => (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -12,32 +12,32 @@ const validate = ({ type, fieldName, maxCount, fieldsConfig, limits, format, siz
|
|
|
12
12
|
const upload = (0, multer_1.default)({ storage, limits });
|
|
13
13
|
let uploadMiddleware;
|
|
14
14
|
switch (type) {
|
|
15
|
-
case
|
|
15
|
+
case 'single':
|
|
16
16
|
if (!fieldName) {
|
|
17
|
-
throw new Error(
|
|
17
|
+
throw new Error('Field name is required for single upload.');
|
|
18
18
|
}
|
|
19
19
|
uploadMiddleware = upload.single(fieldName);
|
|
20
20
|
break;
|
|
21
|
-
case
|
|
21
|
+
case 'array':
|
|
22
22
|
if (!fieldName) {
|
|
23
|
-
throw new Error(
|
|
23
|
+
throw new Error('Field name is required for array upload.');
|
|
24
24
|
}
|
|
25
25
|
uploadMiddleware = upload.array(fieldName, maxCount);
|
|
26
26
|
break;
|
|
27
|
-
case
|
|
27
|
+
case 'fields':
|
|
28
28
|
if (!fieldsConfig) {
|
|
29
|
-
throw new Error(
|
|
29
|
+
throw new Error('fieldsConfig is required.');
|
|
30
30
|
}
|
|
31
31
|
uploadMiddleware = upload.fields(fieldsConfig);
|
|
32
32
|
break;
|
|
33
|
-
case
|
|
33
|
+
case 'any':
|
|
34
34
|
uploadMiddleware = upload.any();
|
|
35
35
|
break;
|
|
36
|
-
case
|
|
36
|
+
case 'none':
|
|
37
37
|
uploadMiddleware = upload.none();
|
|
38
38
|
break;
|
|
39
39
|
default:
|
|
40
|
-
throw new Error(
|
|
40
|
+
throw new Error('Invalid upload type');
|
|
41
41
|
}
|
|
42
42
|
return (req, res, next) => {
|
|
43
43
|
uploadMiddleware(req, res, (err) => {
|
|
@@ -45,30 +45,25 @@ const validate = ({ type, fieldName, maxCount, fieldsConfig, limits, format, siz
|
|
|
45
45
|
error.merge((0, utils_1.getMulterDefaultError)({ err, fieldName, maxCount, isDev }));
|
|
46
46
|
if (error.hasErrors()) {
|
|
47
47
|
return next(error.throw({
|
|
48
|
-
message: err?.message ||
|
|
48
|
+
message: err?.message || 'Upload failed',
|
|
49
49
|
statusCode: 400,
|
|
50
|
-
code:
|
|
50
|
+
code: 'UPLOAD_ERROR',
|
|
51
51
|
}));
|
|
52
52
|
}
|
|
53
|
-
const checkableTypes = [
|
|
54
|
-
"single",
|
|
55
|
-
"array",
|
|
56
|
-
"any",
|
|
57
|
-
"fields",
|
|
58
|
-
];
|
|
53
|
+
const checkableTypes = ['single', 'array', 'any', 'fields'];
|
|
59
54
|
if (checkableTypes.includes(type)) {
|
|
60
55
|
let files = [];
|
|
61
56
|
switch (type) {
|
|
62
|
-
case
|
|
57
|
+
case 'fields': {
|
|
63
58
|
files = Object.values(req.files || {}).flat();
|
|
64
59
|
break;
|
|
65
60
|
}
|
|
66
|
-
case
|
|
67
|
-
case
|
|
61
|
+
case 'array':
|
|
62
|
+
case 'any': {
|
|
68
63
|
files = req.files || [];
|
|
69
64
|
break;
|
|
70
65
|
}
|
|
71
|
-
case
|
|
66
|
+
case 'single': {
|
|
72
67
|
if (req.file)
|
|
73
68
|
files = [req.file];
|
|
74
69
|
break;
|
|
@@ -77,9 +72,9 @@ const validate = ({ type, fieldName, maxCount, fieldsConfig, limits, format, siz
|
|
|
77
72
|
error.merge((0, utils_1.getCustomError)({ files, size, format }));
|
|
78
73
|
if (error.hasErrors()) {
|
|
79
74
|
return next(error.throw({
|
|
80
|
-
message:
|
|
75
|
+
message: 'File validation failed',
|
|
81
76
|
statusCode: 400,
|
|
82
|
-
code:
|
|
77
|
+
code: 'UPLOAD_ERROR',
|
|
83
78
|
}));
|
|
84
79
|
}
|
|
85
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/multer.middleware.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAG5B,wDAAuD;AAEvD,oCAAiE;AAE1D,MAAM,QAAQ,GAAG,CAAC,EACvB,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,KAAK,GAAG,KAAK,GACK,EAAE,EAAE;IACtB,MAAM,OAAO,GAAG,gBAAM,CAAC,aAAa,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,gBAAgC,CAAC;IAGrC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,QAAQ;YACX,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;YACD,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM;QAER,KAAK,OAAO;YACV,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC9D,CAAC;YACD,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACrD,MAAM;QAER,KAAK,QAAQ;YACX,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC/C,CAAC;YACD,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM;QAER,KAAK,KAAK;YACR,gBAAgB,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM;QAER,KAAK,MAAM;YACT,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;YACjC,MAAM;QAER;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC;IAGD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YACjC,MAAM,KAAK,GAAG,IAAI,yBAAY,EAAE,CAAC;YAGjC,KAAK,CAAC,KAAK,CAAC,IAAA,6BAAqB,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAExE,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;gBACtB,OAAO,IAAI,CACT,KAAK,CAAC,KAAK,CAAC;oBACV,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,eAAe;oBACxC,UAAU,EAAE,GAAG;oBACf,IAAI,EAAE,cAAc;iBACrB,CAAC,CACH,CAAC;YACJ,CAAC;YAGD,MAAM,cAAc,GAAgC
|
|
1
|
+
{"version":3,"file":"multer.middleware.js","sourceRoot":"","sources":["../../src/middlewares/multer.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Request, Response, NextFunction } from
|
|
1
|
+
import { Request, Response, NextFunction } from 'express';
|
|
2
2
|
export declare const parseToJson: (fieldsToParse?: string[]) => (req: Request, _: Response, next: NextFunction) => void;
|
|
@@ -8,10 +8,10 @@ const parseToJson = (fieldsToParse = []) => {
|
|
|
8
8
|
const value = req.body?.[key];
|
|
9
9
|
if (value === undefined || value === null)
|
|
10
10
|
return;
|
|
11
|
-
if (typeof value ===
|
|
11
|
+
if (typeof value === 'string') {
|
|
12
12
|
try {
|
|
13
13
|
const parsed = (0, be_utils_1.parseData)(value);
|
|
14
|
-
if (parsed && typeof parsed ===
|
|
14
|
+
if (parsed && typeof parsed === 'object') {
|
|
15
15
|
req.body[key] = parsed;
|
|
16
16
|
}
|
|
17
17
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
import { TRequestCheckOptions } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
|
+
import { TRequestCheckOptions } from '../types';
|
|
3
3
|
export declare const emptyRequest: (options: TRequestCheckOptions) => (req: Request, _: Response, next: NextFunction) => void;
|
|
4
4
|
export declare const requestId: (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -7,51 +7,49 @@ const emptyRequest = (options) => (req, _, next) => {
|
|
|
7
7
|
try {
|
|
8
8
|
const { body, file, files, fileOrBody, filesOrBody, params, query } = options;
|
|
9
9
|
const isBodyEmpty = !req.body || Object.keys(req.body).length === 0;
|
|
10
|
-
const isFileEmpty = !req.file ||
|
|
11
|
-
|
|
12
|
-
const isFilesEmpty = !req.files ||
|
|
13
|
-
(typeof req.files === "object" && Object.keys(req.files).length === 0);
|
|
10
|
+
const isFileEmpty = !req.file || (typeof req.file === 'object' && Object.keys(req.file).length === 0);
|
|
11
|
+
const isFilesEmpty = !req.files || (typeof req.files === 'object' && Object.keys(req.files).length === 0);
|
|
14
12
|
const isParamsEmpty = !req.params || Object.keys(req.params).length === 0;
|
|
15
13
|
const isQueryEmpty = !req.query || Object.keys(req.query).length === 0;
|
|
16
14
|
if (filesOrBody && !file && isBodyEmpty && isFilesEmpty) {
|
|
17
15
|
throw new be_classes_1.AppError({
|
|
18
|
-
message:
|
|
16
|
+
message: 'Please provide some data in the body or files!',
|
|
19
17
|
statusCode: 400,
|
|
20
18
|
});
|
|
21
19
|
}
|
|
22
20
|
if (fileOrBody && !files && isBodyEmpty && isFileEmpty) {
|
|
23
21
|
throw new be_classes_1.AppError({
|
|
24
|
-
message:
|
|
22
|
+
message: 'Please provide some data in the body or file!',
|
|
25
23
|
statusCode: 400,
|
|
26
24
|
});
|
|
27
25
|
}
|
|
28
26
|
if (!files && !file && body && isBodyEmpty) {
|
|
29
27
|
throw new be_classes_1.AppError({
|
|
30
|
-
message:
|
|
28
|
+
message: 'Please provide some data in the body!',
|
|
31
29
|
statusCode: 400,
|
|
32
30
|
});
|
|
33
31
|
}
|
|
34
32
|
if (files && !file && !body && isFilesEmpty) {
|
|
35
33
|
throw new be_classes_1.AppError({
|
|
36
|
-
message:
|
|
34
|
+
message: 'Please provide some files!',
|
|
37
35
|
statusCode: 400,
|
|
38
36
|
});
|
|
39
37
|
}
|
|
40
38
|
if (file && !files && !body && isFileEmpty) {
|
|
41
39
|
throw new be_classes_1.AppError({
|
|
42
|
-
message:
|
|
40
|
+
message: 'Please provide some files!',
|
|
43
41
|
statusCode: 400,
|
|
44
42
|
});
|
|
45
43
|
}
|
|
46
44
|
if (params && isParamsEmpty) {
|
|
47
45
|
throw new be_classes_1.AppError({
|
|
48
|
-
message:
|
|
46
|
+
message: 'Please provide some params!',
|
|
49
47
|
statusCode: 400,
|
|
50
48
|
});
|
|
51
49
|
}
|
|
52
50
|
if (query && isQueryEmpty) {
|
|
53
51
|
throw new be_classes_1.AppError({
|
|
54
|
-
message:
|
|
52
|
+
message: 'Please provide some query!',
|
|
55
53
|
statusCode: 400,
|
|
56
54
|
});
|
|
57
55
|
}
|
|
@@ -65,7 +63,7 @@ exports.emptyRequest = emptyRequest;
|
|
|
65
63
|
const requestId = (req, res, next) => {
|
|
66
64
|
const id = (0, crypto_1.randomUUID)();
|
|
67
65
|
req.requestId = id;
|
|
68
|
-
res.setHeader(
|
|
66
|
+
res.setHeader('X-Request-Id', id);
|
|
69
67
|
next();
|
|
70
68
|
};
|
|
71
69
|
exports.requestId = requestId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.middleware.js","sourceRoot":"","sources":["../../src/middlewares/request.middleware.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AACpC,wDAAmD;AAG5C,MAAM,YAAY,GACvB,CAAC,OAA6B,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"request.middleware.js","sourceRoot":"","sources":["../../src/middlewares/request.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
import { Error as MongooseError } from
|
|
3
|
-
import { AppError } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
|
+
import { Error as MongooseError } from 'mongoose';
|
|
3
|
+
import { AppError } from '@beautinique/be-classes';
|
|
4
4
|
interface ErrorMiddlewareOptions {
|
|
5
5
|
isDev?: boolean;
|
|
6
6
|
}
|
|
@@ -15,9 +15,9 @@ const error = ({ isDev = false } = {}) => {
|
|
|
15
15
|
}));
|
|
16
16
|
const { fieldErrors, globalErrors } = (0, be_utils_1.segregateErrors)(rawErrors);
|
|
17
17
|
error = new be_classes_1.AppError({
|
|
18
|
-
message:
|
|
18
|
+
message: 'Validation Error',
|
|
19
19
|
statusCode: 400,
|
|
20
|
-
code:
|
|
20
|
+
code: 'VALIDATION_ERROR',
|
|
21
21
|
fieldErrors,
|
|
22
22
|
globalErrors,
|
|
23
23
|
});
|
|
@@ -27,11 +27,9 @@ const error = ({ isDev = false } = {}) => {
|
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
error = new be_classes_1.AppError({
|
|
30
|
-
message: isDev
|
|
31
|
-
? err?.message || "Internal Server Error"
|
|
32
|
-
: "Something went wrong!",
|
|
30
|
+
message: isDev ? err?.message || 'Internal Server Error' : 'Something went wrong!',
|
|
33
31
|
statusCode: 500,
|
|
34
|
-
code:
|
|
32
|
+
code: 'INTERNAL_ERROR',
|
|
35
33
|
isOperational: false,
|
|
36
34
|
});
|
|
37
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/error.response.middleware.ts"],"names":[],"mappings":";;;AACA,uCAAkD;AAClD,wDAAmD;AACnD,oDAAwD;AAExD,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAM9C,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,KAA6B,EAAE,EAAE,EAAE;IACtE,OAAO,CACL,GAA0D,EAC1D,GAAY,EACZ,GAAa,EACb,CAAe,EACf,EAAE;QACF,IAAI,KAAoC,CAAC;QAEzC,IAAI,GAAG,YAAY,gBAAa,CAAC,eAAe,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvE,KAAK;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAC,CAAC;YAEJ,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAe,EAAC,SAAS,CAAC,CAAC;YAEjE,KAAK,GAAG,IAAI,qBAAQ,CAAC;gBACnB,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,kBAAkB;gBACxB,WAAW;gBACX,YAAY;aACb,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,GAAG,YAAY,qBAAQ,EAAE,CAAC;YACnC,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,IAAI,qBAAQ,CAAC;gBACnB,OAAO,EAAE,KAAK
|
|
1
|
+
{"version":3,"file":"error.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/error.response.middleware.ts"],"names":[],"mappings":";;;AACA,uCAAkD;AAClD,wDAAmD;AACnD,oDAAwD;AAExD,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAM9C,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,KAA6B,EAAE,EAAE,EAAE;IACtE,OAAO,CACL,GAA0D,EAC1D,GAAY,EACZ,GAAa,EACb,CAAe,EACf,EAAE;QACF,IAAI,KAAoC,CAAC;QAEzC,IAAI,GAAG,YAAY,gBAAa,CAAC,eAAe,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvE,KAAK;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAC,CAAC;YAEJ,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAe,EAAC,SAAS,CAAC,CAAC;YAEjE,KAAK,GAAG,IAAI,qBAAQ,CAAC;gBACnB,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,kBAAkB;gBACxB,WAAW;gBACX,YAAY;aACb,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,GAAG,YAAY,qBAAQ,EAAE,CAAC;YACnC,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,IAAI,qBAAQ,CAAC;gBACnB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,IAAI,uBAAuB,CAAC,CAAC,CAAC,uBAAuB;gBAClF,UAAU,EAAE,GAAG;gBACf,IAAI,EAAE,gBAAgB;gBACtB,aAAa,EAAE,KAAK;aACrB,CAAC,CAAC;QACL,CAAC;QAED,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;YACvC,GAAG,YAAY;YACf,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;YACpC,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,EAAE;YACtC,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,GAAG,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;SACrC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,KAAK,SA8ChB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
1
|
+
export * from './error.response.middleware';
|
|
2
|
+
export * from './notFound.response.middleware';
|
|
3
|
+
export * from './success.response.middleware';
|
|
4
|
+
export * from './tryCatch.response.middleware';
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
2
|
export declare const notFound: (req: Request, res: Response, _: NextFunction) => void;
|
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.notFound = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const notFound = (req, res, _) => {
|
|
9
|
-
const acceptedType = req.accepts([
|
|
10
|
-
if (acceptedType ===
|
|
11
|
-
res.status(404).sendFile(path_1.default.resolve(
|
|
9
|
+
const acceptedType = req.accepts(['html', 'json', 'text']);
|
|
10
|
+
if (acceptedType === 'html') {
|
|
11
|
+
res.status(404).sendFile(path_1.default.resolve('public', '404.html'));
|
|
12
12
|
}
|
|
13
|
-
else if (acceptedType ===
|
|
13
|
+
else if (acceptedType === 'json') {
|
|
14
14
|
res.status(404).json({
|
|
15
15
|
success: false,
|
|
16
16
|
error: true,
|
|
@@ -18,11 +18,8 @@ const notFound = (req, res, _) => {
|
|
|
18
18
|
statusCode: 404,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
|
-
else if (acceptedType ===
|
|
22
|
-
res
|
|
23
|
-
.status(404)
|
|
24
|
-
.type("txt")
|
|
25
|
-
.send(`Cannot find ${req.originalUrl} on this server`);
|
|
21
|
+
else if (acceptedType === 'text') {
|
|
22
|
+
res.status(404).type('txt').send(`Cannot find ${req.originalUrl} on this server`);
|
|
26
23
|
}
|
|
27
24
|
else {
|
|
28
25
|
res.status(404).json({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notFound.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/notFound.response.middleware.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAEjB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"notFound.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/notFound.response.middleware.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAEjB,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,CAAe,EAAQ,EAAE;IAC7E,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE3D,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAE5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;IAC/D,CAAC;SAAM,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAEnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,eAAe,GAAG,CAAC,WAAW,iBAAiB;YACxD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAEnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,WAAW,iBAAiB,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QAEN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,eAAe,GAAG,CAAC,WAAW,iBAAiB;YACxD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA1BW,QAAA,QAAQ,YA0BnB"}
|
|
@@ -1,10 +1,2 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
declare module "express-serve-static-core" {
|
|
3
|
-
interface Response {
|
|
4
|
-
success: (statusCode: number, message: string, data?: object) => void;
|
|
5
|
-
}
|
|
6
|
-
interface Request {
|
|
7
|
-
requestId?: string;
|
|
8
|
-
}
|
|
9
|
-
}
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
10
2
|
export declare const success: (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"success.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/success.response.middleware.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;
|
|
1
|
+
{"version":3,"file":"success.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/success.response.middleware.ts"],"names":[],"mappings":";;;AAAA,wDAAqD;AAG9C,MAAM,OAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACzE,GAAG,CAAC,OAAO,GAAG,CAAC,UAAkB,EAAE,OAAe,EAAE,OAAe,EAAE,EAAE,EAAE;QACvE,MAAM,QAAQ,GAAG,IAAI,uBAAU,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,GAAG,QAAQ;SACZ,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,EAAE,CAAC;AACT,CAAC,CAAC;AAbW,QAAA,OAAO,WAalB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
import { ClientSession } from
|
|
3
|
-
export declare const tryCatch: (fn: (req:
|
|
4
|
-
export declare const tryCatchWithSession: (fn: (req:
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
|
+
import { ClientSession } from 'mongoose';
|
|
3
|
+
export declare const tryCatch: <T extends Request>(fn: (req: T, res: Response, next: NextFunction) => Promise<any>) => (req: T, res: Response, next: NextFunction) => void;
|
|
4
|
+
export declare const tryCatchWithSession: <T extends Request>(fn: (req: T, res: Response, session: ClientSession) => Promise<any>) => (req: T, res: Response, next: NextFunction) => Promise<void>;
|
|
@@ -4,16 +4,16 @@ exports.tryCatchWithSession = exports.tryCatch = void 0;
|
|
|
4
4
|
const mongoose_1 = require("mongoose");
|
|
5
5
|
const tryCatch = (fn) => {
|
|
6
6
|
return (req, res, next) => {
|
|
7
|
-
fn(req, res, next).catch(next);
|
|
7
|
+
Promise.resolve(fn(req, res, next)).catch(next);
|
|
8
8
|
};
|
|
9
9
|
};
|
|
10
10
|
exports.tryCatch = tryCatch;
|
|
11
11
|
const tryCatchWithSession = (fn) => {
|
|
12
12
|
return async (req, res, next) => {
|
|
13
13
|
const session = await (0, mongoose_1.startSession)();
|
|
14
|
-
session.startTransaction();
|
|
15
14
|
try {
|
|
16
|
-
|
|
15
|
+
session.startTransaction();
|
|
16
|
+
await Promise.resolve(fn(req, res, session));
|
|
17
17
|
await session.commitTransaction();
|
|
18
18
|
}
|
|
19
19
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tryCatch.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/tryCatch.response.middleware.ts"],"names":[],"mappings":";;;AACA,uCAAuD;AAEhD,MAAM,QAAQ,GAAG,CACtB,
|
|
1
|
+
{"version":3,"file":"tryCatch.response.middleware.js","sourceRoot":"","sources":["../../../src/middlewares/response-middlewares/tryCatch.response.middleware.ts"],"names":[],"mappings":";;;AACA,uCAAuD;AAEhD,MAAM,QAAQ,GAAG,CACtB,EAA+D,EAC/D,EAAE;IACF,OAAO,CAAC,GAAM,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACnD,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,QAAQ,YAMnB;AAEK,MAAM,mBAAmB,GAAG,CACjC,EAAmE,EACnE,EAAE;IACF,OAAO,KAAK,EAAE,GAAM,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAY,GAAE,CAAC;QAErC,IAAI,CAAC;YACH,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAE3B,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAE7C,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { NextFunction, Request, Response } from
|
|
2
|
-
import { schemaValidator } from
|
|
1
|
+
import { NextFunction, Request, Response } from 'express';
|
|
2
|
+
import { schemaValidator } from '@beautinique/be-zod';
|
|
3
3
|
export declare const validateSchema: <T extends Parameters<typeof schemaValidator>[0]>(schema: T) => (req: Request, _: Response, next: NextFunction) => void;
|
|
@@ -8,14 +8,14 @@ const validateSchema = (schema) => (req, _, next) => {
|
|
|
8
8
|
const result = (0, be_zod_1.schemaValidator)(schema, req.body ?? {});
|
|
9
9
|
if (!result.success) {
|
|
10
10
|
const errors = result.error.issues.map((err) => ({
|
|
11
|
-
field: err.path.join(
|
|
11
|
+
field: err.path.join('.'),
|
|
12
12
|
message: err.message,
|
|
13
13
|
}));
|
|
14
14
|
const { fieldErrors, globalErrors } = (0, be_utils_1.segregateErrors)(errors);
|
|
15
15
|
return next(new be_classes_1.AppError({
|
|
16
|
-
message:
|
|
16
|
+
message: 'Validation Error',
|
|
17
17
|
statusCode: 400,
|
|
18
|
-
code:
|
|
18
|
+
code: 'VALIDATION_ERROR',
|
|
19
19
|
fieldErrors,
|
|
20
20
|
globalErrors,
|
|
21
21
|
}));
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
import { MulterError, Options } from
|
|
2
|
-
type TMediaKey =
|
|
1
|
+
import { MulterError, Options } from 'multer';
|
|
2
|
+
type TMediaKey = 'IMAGE' | 'VIDEO' | 'OTHER';
|
|
3
3
|
type TCommonMulterFileConfigs = {
|
|
4
4
|
format?: Partial<Record<TMediaKey, string[]>>;
|
|
5
5
|
size?: Partial<Record<TMediaKey, number>>;
|
|
6
6
|
};
|
|
7
7
|
export interface IMulterValidation extends TCommonMulterFileConfigs {
|
|
8
|
-
type:
|
|
8
|
+
type: 'single' | 'array' | 'any' | 'fields' | 'none';
|
|
9
9
|
fieldName?: string;
|
|
10
10
|
maxCount?: number;
|
|
11
11
|
fieldsConfig?: {
|
|
12
12
|
name: string;
|
|
13
13
|
maxCount: number;
|
|
14
14
|
}[];
|
|
15
|
-
limits?: Options[
|
|
15
|
+
limits?: Options['limits'];
|
|
16
16
|
isDev?: boolean;
|
|
17
17
|
}
|
|
18
18
|
export interface IMulterCustomError extends TCommonMulterFileConfigs {
|
|
19
19
|
files: Express.Multer.File[];
|
|
20
20
|
}
|
|
21
|
-
export interface IMulterDefaultError extends Pick<IMulterValidation,
|
|
21
|
+
export interface IMulterDefaultError extends Pick<IMulterValidation, 'fieldName' | 'maxCount'> {
|
|
22
22
|
isDev: boolean;
|
|
23
23
|
err?: MulterError | Error;
|
|
24
24
|
}
|
|
@@ -31,4 +31,9 @@ export type TRequestCheckOptions = {
|
|
|
31
31
|
params?: boolean;
|
|
32
32
|
query?: boolean;
|
|
33
33
|
};
|
|
34
|
+
export interface TLoggerConfig {
|
|
35
|
+
serviceName?: string;
|
|
36
|
+
logDir?: string;
|
|
37
|
+
level?: 'error' | 'warn' | 'info' | 'http' | 'verbose' | 'debug' | 'silly';
|
|
38
|
+
}
|
|
34
39
|
export {};
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { IMulterCustomError, IMulterDefaultError } from
|
|
2
|
-
export declare const getCustomError: ({ files, format, size
|
|
1
|
+
import { IMulterCustomError, IMulterDefaultError } from '../types';
|
|
2
|
+
export declare const getCustomError: ({ files, format, size }: IMulterCustomError) => import("@beautinique/be-classes").TErrorPayload;
|
|
3
3
|
export declare const getMulterDefaultError: ({ err, fieldName, maxCount, isDev, }: IMulterDefaultError) => import("@beautinique/be-classes").TErrorPayload;
|
package/dist/utils/index.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.getMulterDefaultError = exports.getCustomError = void 0;
|
|
|
4
4
|
const be_classes_1 = require("@beautinique/be-classes");
|
|
5
5
|
const be_constants_1 = require("@beautinique/be-constants");
|
|
6
6
|
const multer_1 = require("multer");
|
|
7
|
-
const getCustomError = ({ files = [], format, size
|
|
7
|
+
const getCustomError = ({ files = [], format, size }) => {
|
|
8
8
|
const error = new be_classes_1.ErrorBuilder();
|
|
9
9
|
const imageSizeLimit = size?.IMAGE ?? be_constants_1.MAX_SIZE.IMAGE;
|
|
10
10
|
const videoSizeLimit = size?.VIDEO ?? be_constants_1.MAX_SIZE.VIDEO;
|
|
@@ -18,7 +18,7 @@ const getCustomError = ({ files = [], format, size, }) => {
|
|
|
18
18
|
const isVideo = allowedVideoTypes.includes(mimetype);
|
|
19
19
|
const isOther = allowedOtherTypes.includes(mimetype);
|
|
20
20
|
const fileSizeMB = (size / be_constants_1.MB).toFixed(2);
|
|
21
|
-
let allowedSizeMB =
|
|
21
|
+
let allowedSizeMB = '0';
|
|
22
22
|
if (isImage)
|
|
23
23
|
allowedSizeMB = (imageSizeLimit / be_constants_1.MB).toFixed(2);
|
|
24
24
|
else if (isVideo)
|
|
@@ -38,61 +38,55 @@ const getCustomError = ({ files = [], format, size, }) => {
|
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
if (!isImage && !isVideo && !isOther) {
|
|
41
|
-
const allowedTypes = [
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
...allowedOtherTypes,
|
|
45
|
-
]
|
|
46
|
-
.map((t) => t.split("/")[1])
|
|
47
|
-
.join(", ");
|
|
41
|
+
const allowedTypes = [...allowedImageTypes, ...allowedVideoTypes, ...allowedOtherTypes]
|
|
42
|
+
.map((t) => t.split('/')[1])
|
|
43
|
+
.join(', ');
|
|
48
44
|
error.addField(fieldname, `File '${originalname}' has invalid type '${mimetype}'. Allowed: [${allowedTypes}]`);
|
|
49
45
|
}
|
|
50
46
|
}
|
|
51
47
|
return error.build();
|
|
52
48
|
};
|
|
53
49
|
exports.getCustomError = getCustomError;
|
|
54
|
-
const getMulterDefaultError = ({ err, fieldName =
|
|
50
|
+
const getMulterDefaultError = ({ err, fieldName = '', maxCount, isDev, }) => {
|
|
55
51
|
const error = new be_classes_1.ErrorBuilder();
|
|
56
52
|
if (!err)
|
|
57
53
|
return error.build();
|
|
58
54
|
const getCause = (cause) => {
|
|
59
|
-
return cause && isDev ? ` (cause: ${String(cause)})` :
|
|
55
|
+
return cause && isDev ? ` (cause: ${String(cause)})` : '';
|
|
60
56
|
};
|
|
61
57
|
if (err instanceof multer_1.MulterError) {
|
|
62
|
-
const field = err.field || fieldName ||
|
|
58
|
+
const field = err.field || fieldName || '';
|
|
63
59
|
switch (err.code) {
|
|
64
|
-
case
|
|
65
|
-
const base = err.field
|
|
66
|
-
? `Unexpected file '${field}'.`
|
|
67
|
-
: `Unexpected file upload.`;
|
|
60
|
+
case 'LIMIT_UNEXPECTED_FILE': {
|
|
61
|
+
const base = err.field ? `Unexpected file '${field}'.` : `Unexpected file upload.`;
|
|
68
62
|
const msg = fieldName && maxCount
|
|
69
|
-
? `${base} Expected '${fieldName}', max ${maxCount} file${maxCount > 1 ?
|
|
63
|
+
? `${base} Expected '${fieldName}', max ${maxCount} file${maxCount > 1 ? 's' : ''}.`
|
|
70
64
|
: base;
|
|
71
65
|
error.addField(field, `${msg}${getCause(err.cause)}`);
|
|
72
66
|
break;
|
|
73
67
|
}
|
|
74
|
-
case
|
|
75
|
-
error.addField(field, `Too many files uploaded. Allowed: ${maxCount ??
|
|
68
|
+
case 'LIMIT_FILE_COUNT': {
|
|
69
|
+
error.addField(field, `Too many files uploaded. Allowed: ${maxCount ?? 'limited'}${getCause(err.cause)}`);
|
|
76
70
|
break;
|
|
77
71
|
}
|
|
78
|
-
case
|
|
72
|
+
case 'LIMIT_FILE_SIZE': {
|
|
79
73
|
error.addField(field, `File too large '${field}'.` + getCause(err.cause));
|
|
80
74
|
break;
|
|
81
75
|
}
|
|
82
|
-
case
|
|
76
|
+
case 'LIMIT_FIELD_COUNT': {
|
|
83
77
|
error.addField(field, `Too many fields in request.${getCause(err.cause)}`);
|
|
84
78
|
break;
|
|
85
79
|
}
|
|
86
|
-
case
|
|
80
|
+
case 'LIMIT_FIELD_KEY': {
|
|
87
81
|
error.addField(field, `Invalid field key.${getCause(err)}`);
|
|
88
82
|
break;
|
|
89
83
|
}
|
|
90
|
-
case
|
|
84
|
+
case 'LIMIT_FIELD_VALUE': {
|
|
91
85
|
error.addField(field, `Field value too large.${getCause(err)}`);
|
|
92
86
|
break;
|
|
93
87
|
}
|
|
94
|
-
case
|
|
95
|
-
case
|
|
88
|
+
case 'LIMIT_PART_COUNT':
|
|
89
|
+
case 'MISSING_FIELD_NAME': {
|
|
96
90
|
error.addField(field, `Malformed multipart request.${getCause(err)}`);
|
|
97
91
|
break;
|
|
98
92
|
}
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,wDAAuD;AACvD,4DAAoE;AACpE,mCAAqC;AAG9B,MAAM,cAAc,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@beautinique/be-middlewares",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"description": "Middlewares for the Beautinique backend project.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
"cors": "^2.8.6",
|
|
31
31
|
"express": "^5.2.1",
|
|
32
32
|
"mongoose": "^9.4.1",
|
|
33
|
+
"prettier": "^3.8.3",
|
|
33
34
|
"typescript": "^6.0.2"
|
|
34
35
|
},
|
|
35
36
|
"peerDependencies": {
|
|
@@ -42,7 +43,6 @@
|
|
|
42
43
|
"@beautinique/be-constants": "^1.0.6",
|
|
43
44
|
"@beautinique/be-utils": "^1.0.3",
|
|
44
45
|
"@beautinique/be-zod": "^1.0.11",
|
|
45
|
-
"express-winston": "^4.2.0",
|
|
46
46
|
"multer": "^2.1.1",
|
|
47
47
|
"winston": "^3.19.0"
|
|
48
48
|
}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import winston from "winston";
|
|
2
|
-
interface LoggerOptions {
|
|
3
|
-
logDir?: string;
|
|
4
|
-
level?: string;
|
|
5
|
-
}
|
|
6
|
-
export declare const createLogger: ({ logDir, level, }?: LoggerOptions) => {
|
|
7
|
-
logger: winston.Logger;
|
|
8
|
-
requestLog: import("express").Handler;
|
|
9
|
-
errorLog: import("express").ErrorRequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
|
|
10
|
-
};
|
|
11
|
-
export {};
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createLogger = void 0;
|
|
7
|
-
const winston_1 = __importDefault(require("winston"));
|
|
8
|
-
const express_winston_1 = __importDefault(require("express-winston"));
|
|
9
|
-
const { combine, timestamp, printf, colorize } = winston_1.default.format;
|
|
10
|
-
const logFormat = printf(({ level, message, timestamp }) => {
|
|
11
|
-
return `${timestamp} [${level}]: ${message}`;
|
|
12
|
-
});
|
|
13
|
-
const createLogger = ({ logDir = "logs", level = "info", } = {}) => {
|
|
14
|
-
const winstonInstance = winston_1.default.createLogger({
|
|
15
|
-
level,
|
|
16
|
-
format: combine(timestamp(), logFormat),
|
|
17
|
-
transports: [
|
|
18
|
-
new winston_1.default.transports.Console({
|
|
19
|
-
format: combine(colorize(), timestamp(), logFormat),
|
|
20
|
-
}),
|
|
21
|
-
new winston_1.default.transports.File({
|
|
22
|
-
filename: `${logDir}/error.log`,
|
|
23
|
-
level: "error",
|
|
24
|
-
format: combine(winston_1.default.format((info) => (info.level === "error" ? info : false))(), timestamp(), logFormat),
|
|
25
|
-
}),
|
|
26
|
-
new winston_1.default.transports.File({
|
|
27
|
-
filename: `${logDir}/combined.log`,
|
|
28
|
-
level: "info",
|
|
29
|
-
format: combine(winston_1.default.format((info) => (info.level === "info" ? info : false))(), timestamp(), logFormat),
|
|
30
|
-
}),
|
|
31
|
-
],
|
|
32
|
-
});
|
|
33
|
-
const requestLog = express_winston_1.default.logger({
|
|
34
|
-
winstonInstance,
|
|
35
|
-
msg: "[{{req.requestId}}] {{req.method}} {{req.url}} {{res.statusCode}} {{res.responseTime}}ms",
|
|
36
|
-
expressFormat: false,
|
|
37
|
-
colorize: false,
|
|
38
|
-
meta: false,
|
|
39
|
-
requestWhitelist: [...express_winston_1.default.requestWhitelist, "requestId"],
|
|
40
|
-
ignoreRoute: (req) => req.method === "OPTIONS",
|
|
41
|
-
});
|
|
42
|
-
const errorLog = express_winston_1.default.errorLogger({
|
|
43
|
-
winstonInstance,
|
|
44
|
-
msg: "[{{req.requestId}}] {{req.method}} {{req.url}} {{res.statusCode}} {{err.message}}",
|
|
45
|
-
meta: true,
|
|
46
|
-
requestWhitelist: [...express_winston_1.default.requestWhitelist, "requestId"],
|
|
47
|
-
level: (_req, _res, err) => {
|
|
48
|
-
const e = err;
|
|
49
|
-
return e.statusCode && e.statusCode >= 500 ? "error" : "warn";
|
|
50
|
-
},
|
|
51
|
-
skip: (_req, _res, err) => {
|
|
52
|
-
const e = err;
|
|
53
|
-
return !e.statusCode || e.statusCode < 400;
|
|
54
|
-
},
|
|
55
|
-
});
|
|
56
|
-
return {
|
|
57
|
-
logger: winstonInstance,
|
|
58
|
-
requestLog,
|
|
59
|
-
errorLog,
|
|
60
|
-
};
|
|
61
|
-
};
|
|
62
|
-
exports.createLogger = createLogger;
|
|
63
|
-
//# sourceMappingURL=logger.middleware.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"logger.middleware.js","sourceRoot":"","sources":["../../src/middlewares/logger.middleware.ts"],"names":[],"mappings":"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"}
|