framework-do-dede 0.0.42 → 0.0.44
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.
|
@@ -42,12 +42,8 @@ export default class ControllerHandler {
|
|
|
42
42
|
let middlewareData = {};
|
|
43
43
|
if (middlewares) {
|
|
44
44
|
for (const middleware of middlewares) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
middlewareData = { ...middlewareResult, ...middlewareData };
|
|
48
|
-
}
|
|
49
|
-
catch (error) {
|
|
50
|
-
}
|
|
45
|
+
const middlewareResult = await middleware.execute({ headers: input.headers, ...mergedParams });
|
|
46
|
+
middlewareData = { ...middlewareResult, ...middlewareData };
|
|
51
47
|
}
|
|
52
48
|
}
|
|
53
49
|
const request = { headers: input.headers, data: mergedParams, middlewareData };
|
package/dist/http/HttpServer.js
CHANGED
|
@@ -39,27 +39,38 @@ export default class HttpServer {
|
|
|
39
39
|
elysia(httpServerParams, route, handler) {
|
|
40
40
|
const method = httpServerParams.method;
|
|
41
41
|
(this.framework[method])(route, async ({ headers, set, query, params, body, request }) => {
|
|
42
|
-
try {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return output;
|
|
53
|
-
}
|
|
54
|
-
catch (error) {
|
|
55
|
-
console.log('on HTTPserver error ', error);
|
|
42
|
+
// try {
|
|
43
|
+
headers['ip'] = this.framework.server?.requestIP(request).address;
|
|
44
|
+
set.status = httpServerParams.statusCode ?? 200;
|
|
45
|
+
return Promise.resolve().then(() => handler({
|
|
46
|
+
headers,
|
|
47
|
+
query,
|
|
48
|
+
params,
|
|
49
|
+
body
|
|
50
|
+
})).then((output) => output)
|
|
51
|
+
.catch((error) => {
|
|
56
52
|
if (error instanceof ServerError) {
|
|
57
53
|
set.status = error.getStatusCode();
|
|
58
54
|
throw error;
|
|
59
55
|
}
|
|
60
56
|
set.status = 500;
|
|
61
57
|
throw new InternalServerError(error.message, this.defaultMessageError);
|
|
62
|
-
}
|
|
58
|
+
});
|
|
59
|
+
// const output = await handler({
|
|
60
|
+
// headers,
|
|
61
|
+
// query,
|
|
62
|
+
// params,
|
|
63
|
+
// body
|
|
64
|
+
// })
|
|
65
|
+
// return output
|
|
66
|
+
// } catch (error: any) {
|
|
67
|
+
// if (error instanceof ServerError) {
|
|
68
|
+
// set.status = error.getStatusCode()
|
|
69
|
+
// throw error;
|
|
70
|
+
// }
|
|
71
|
+
// set.status = 500
|
|
72
|
+
// throw new InternalServerError(error.message, this.defaultMessageError)
|
|
73
|
+
// }
|
|
63
74
|
});
|
|
64
75
|
}
|
|
65
76
|
express(httpServerParams, route, handler) {
|