framework-do-dede 0.0.67 → 0.0.68
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.
|
@@ -11,6 +11,7 @@ export default class ControllerHandler {
|
|
|
11
11
|
params,
|
|
12
12
|
query,
|
|
13
13
|
}, async (input) => {
|
|
14
|
+
let wasError = false;
|
|
14
15
|
const startTime = performance.now();
|
|
15
16
|
const requestMetrics = {
|
|
16
17
|
date: new Date(),
|
|
@@ -38,15 +39,43 @@ export default class ControllerHandler {
|
|
|
38
39
|
const filterParams = this.filter(input.params, params);
|
|
39
40
|
const queryParams = this.filter(input.query, query);
|
|
40
41
|
let mergedParams = { ...filterParams, ...queryParams, ...(input.body || {}) };
|
|
41
|
-
if (validation)
|
|
42
|
-
mergedParams = validation.validate({ ...filterParams, ...queryParams, ...(input.body || {}) });
|
|
43
42
|
const request = { headers: input.headers, data: mergedParams, middlewareData: {} };
|
|
43
|
+
try {
|
|
44
|
+
if (validation) {
|
|
45
|
+
if (!offLogs)
|
|
46
|
+
Log.info(`⏳ [LOG] Executing validations`);
|
|
47
|
+
mergedParams = validation.validate({ ...filterParams, ...queryParams, ...(input.body || {}) });
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
const capturedError = this.extractError(error, httpServer);
|
|
52
|
+
requestMetrics.error = capturedError;
|
|
53
|
+
input.setStatus(capturedError.statusCode);
|
|
54
|
+
const endTime = performance.now();
|
|
55
|
+
if (!offLogs) {
|
|
56
|
+
Log.error(`❌ [LOG] Error validations: "${logger.handler.instance}.${logger.handler.method}"` + ` - in: ${(endTime - startTime).toFixed(2)} ms`);
|
|
57
|
+
Log.error(JSON.stringify(error));
|
|
58
|
+
}
|
|
59
|
+
wasError = true;
|
|
60
|
+
return {
|
|
61
|
+
message: capturedError.message,
|
|
62
|
+
statusCode: capturedError.statusCode
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
if (wasError) {
|
|
67
|
+
const endTime = performance.now();
|
|
68
|
+
requestMetrics.elapsedTime = `${(endTime - startTime).toFixed(2)} ms`;
|
|
69
|
+
if (metricsHandlers?.length) {
|
|
70
|
+
await Promise.all(metricsHandlers.map((handler) => handler.handle(requestMetrics, request)));
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
44
74
|
let middlewareData = {};
|
|
45
75
|
if (middlewares) {
|
|
46
76
|
if (!offLogs)
|
|
47
77
|
Log.info(`⏳ [LOG] Executing middlewares`);
|
|
48
78
|
let count = 0;
|
|
49
|
-
let wasError = false;
|
|
50
79
|
for (const middleware of middlewares) {
|
|
51
80
|
try {
|
|
52
81
|
const endTime = performance.now();
|
package/dist/http/HttpServer.js
CHANGED
|
@@ -56,7 +56,8 @@ export default class HttpServer {
|
|
|
56
56
|
express(httpServerParams, route, handler) {
|
|
57
57
|
const method = httpServerParams.method;
|
|
58
58
|
this.framework[method](route, async (request, res) => {
|
|
59
|
-
request.headers['ip'] = request.ip
|
|
59
|
+
request.headers['ip'] = request.ipç;
|
|
60
|
+
res.status(httpServerParams.statusCode ?? 200);
|
|
60
61
|
const output = await handler({
|
|
61
62
|
setStatus: (statusCode) => res.status(statusCode),
|
|
62
63
|
headers: request.headers,
|
|
@@ -64,7 +65,7 @@ export default class HttpServer {
|
|
|
64
65
|
params: request.params,
|
|
65
66
|
body: request.body
|
|
66
67
|
});
|
|
67
|
-
return res.
|
|
68
|
+
return res.json(output);
|
|
68
69
|
});
|
|
69
70
|
}
|
|
70
71
|
}
|