framework-do-dede 0.0.27 → 0.0.29

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.
@@ -3,4 +3,5 @@ export default class ControllerHandler {
3
3
  constructor(httpServer: HttpServer, port: number);
4
4
  private registryControllers;
5
5
  private filter;
6
+ private extractError;
6
7
  }
@@ -1,4 +1,5 @@
1
1
  import { Registry } from "../di/registry";
2
+ import { ServerError } from "../http";
2
3
  export default class ControllerHandler {
3
4
  constructor(httpServer, port) {
4
5
  for (const { instance, instanceMethod, middlewares, method, route, statusCode, params, query, validation } of this.registryControllers()) {
@@ -9,6 +10,30 @@ export default class ControllerHandler {
9
10
  params,
10
11
  query
11
12
  }, async (input) => {
13
+ console.log('headers = ', input.headers);
14
+ const requestMetrics = {
15
+ date: new Date(),
16
+ startTime: 0,
17
+ elapsedTime: 0,
18
+ endTime: 0,
19
+ method,
20
+ route,
21
+ agent: input.headers['user-agent'],
22
+ ip: input.headers['ip'],
23
+ contentLength: input.headers['content-length'],
24
+ handler: {
25
+ instance: instance.constructor.name,
26
+ method: instanceMethod
27
+ },
28
+ };
29
+ const logger = {
30
+ date: requestMetrics.date,
31
+ method: requestMetrics.method.toLocaleUpperCase(),
32
+ route: requestMetrics.route,
33
+ handler: requestMetrics.handler
34
+ };
35
+ console.log('\x1b[35m%s\x1b[0m', `🏳️ [LOG] Init: "${logger.handler.instance}.${logger.handler.method}:" - ${JSON.stringify(logger)}`);
36
+ requestMetrics.startTime = performance.now();
12
37
  const filterParams = this.filter(input.params, params);
13
38
  const queryParams = this.filter(input.query, query);
14
39
  let mergedParams = { ...filterParams, ...queryParams, ...(input.body || {}) };
@@ -22,7 +47,20 @@ export default class ControllerHandler {
22
47
  }
23
48
  }
24
49
  const request = { headers: input.headers, data: mergedParams, middlewareData };
25
- return await instance[instanceMethod](mergedParams, request);
50
+ try {
51
+ const response = await instance[instanceMethod](mergedParams, request);
52
+ console.log('\x1b[32m%s\x1b[0m', `✅ [LOG] Finish: "${logger.handler.instance}.${logger.handler.method}:" - ${requestMetrics.elapsedTime}ms`);
53
+ return response;
54
+ }
55
+ catch (error) {
56
+ console.log('\x1b[31m%s\x1b[0m', `❌ [LOG] Erro: "${logger.handler.instance}.${logger.handler.method}:" - error: ${error.message}`);
57
+ requestMetrics.error = this.extractError(error);
58
+ }
59
+ finally {
60
+ requestMetrics.endTime = performance.now();
61
+ requestMetrics.elapsedTime = requestMetrics.endTime - requestMetrics.startTime;
62
+ console.log('requestMetrics = ', requestMetrics);
63
+ }
26
64
  });
27
65
  }
28
66
  httpServer.listen(port);
@@ -74,4 +112,17 @@ export default class ControllerHandler {
74
112
  }
75
113
  return filter;
76
114
  }
115
+ extractError(error) {
116
+ let statusCode;
117
+ if (error instanceof ServerError)
118
+ statusCode = error.getStatusCode();
119
+ else
120
+ statusCode = 500;
121
+ return {
122
+ stack: error.stack?.toString(),
123
+ originalMessage: error.message,
124
+ message: error.message,
125
+ statusCode
126
+ };
127
+ }
77
128
  }
@@ -35,8 +35,9 @@ export default class HttpServer {
35
35
  }
36
36
  elysia(httpServerParams, route, handler) {
37
37
  const method = httpServerParams.method;
38
- (this.framework[method])(route, async ({ headers, set, query, params, body, request, path }) => {
38
+ (this.framework[method])(route, async ({ headers, set, query, params, body, request }) => {
39
39
  try {
40
+ headers['ip'] = this.framework.server?.requestIP(request).address;
40
41
  set.status = httpServerParams.statusCode ?? 200;
41
42
  const output = await handler({
42
43
  headers,
@@ -65,6 +66,7 @@ export default class HttpServer {
65
66
  express(httpServerParams, route, handler) {
66
67
  const method = httpServerParams.method;
67
68
  this.framework[method](route, async (request, res) => {
69
+ request.headers['ip'] = request.ip;
68
70
  try {
69
71
  const output = await handler({
70
72
  headers: request.headers,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "framework-do-dede",
3
- "version": "0.0.27",
3
+ "version": "0.0.29",
4
4
  "type": "module",
5
5
  "main": "./dist/index.cjs",
6
6
  "module": "./dist/index.js",