namirasoft-node 1.4.75 → 1.4.77
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/BaseController.d.ts +0 -1
- package/dist/BaseController.js +22 -10
- package/dist/BaseController.js.map +1 -1
- package/package.json +1 -1
- package/src/BaseController.ts +30 -9
package/dist/BaseController.d.ts
CHANGED
package/dist/BaseController.js
CHANGED
|
@@ -31,7 +31,6 @@ class BaseController {
|
|
|
31
31
|
type: "application/json"
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
|
-
this.sensitive = false;
|
|
35
34
|
this.generate_sdk = true;
|
|
36
35
|
this.generate_swagger = true;
|
|
37
36
|
this.app = app;
|
|
@@ -52,6 +51,15 @@ class BaseController {
|
|
|
52
51
|
this.meta = new Meta_1.Meta(info, this.req);
|
|
53
52
|
this.output = null;
|
|
54
53
|
this.result = null;
|
|
54
|
+
let showLog = (log) => __awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
if (this.log.show)
|
|
56
|
+
if (!this.log.can.some((x) => !x())) {
|
|
57
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
58
|
+
yield this.log.onBefore[i]();
|
|
59
|
+
log();
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
let failed = false;
|
|
55
63
|
try {
|
|
56
64
|
this.meta.onStart();
|
|
57
65
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
@@ -89,6 +97,7 @@ class BaseController {
|
|
|
89
97
|
namirasoft_core_1.ErrorOperation.throwHTTP(400, "Invalid accept: " + accpet);
|
|
90
98
|
}
|
|
91
99
|
catch (error) {
|
|
100
|
+
failed = true;
|
|
92
101
|
let message;
|
|
93
102
|
if (error instanceof Error) {
|
|
94
103
|
this.meta.error = error;
|
|
@@ -98,12 +107,17 @@ class BaseController {
|
|
|
98
107
|
message = error + "";
|
|
99
108
|
if (error instanceof namirasoft_core_1.HTTPError) {
|
|
100
109
|
this.meta.code = error.code;
|
|
101
|
-
|
|
110
|
+
yield showLog(() => {
|
|
111
|
+
this.app.logger.error(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
112
|
+
});
|
|
102
113
|
}
|
|
103
114
|
else {
|
|
104
115
|
this.meta.code = 500;
|
|
105
|
-
if (error instanceof Error)
|
|
106
|
-
|
|
116
|
+
if (error instanceof Error) {
|
|
117
|
+
yield showLog(() => {
|
|
118
|
+
this.app.logger.critical(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
119
|
+
});
|
|
120
|
+
}
|
|
107
121
|
}
|
|
108
122
|
this.meta.message = message;
|
|
109
123
|
if (error instanceof namirasoft_core_1.HTTPError)
|
|
@@ -118,12 +132,10 @@ class BaseController {
|
|
|
118
132
|
this.result = this.output;
|
|
119
133
|
}
|
|
120
134
|
this.meta.onFinish();
|
|
121
|
-
if (
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
this.app.logger.info(this.meta);
|
|
126
|
-
}
|
|
135
|
+
if (!failed)
|
|
136
|
+
yield showLog(() => {
|
|
137
|
+
this.app.logger.info(JSON.stringify(this.meta, undefined, 4));
|
|
138
|
+
});
|
|
127
139
|
if (this.meta.redirect_location)
|
|
128
140
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|
|
129
141
|
return this.res.status(this.meta.code).send(this.result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,iCAA8B;AAC9B,qDAAmG;AAEnG,yDAAuG;AAEvG,MAAsB,cAAc;
|
|
1
|
+
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/BaseController.ts
CHANGED
|
@@ -39,7 +39,6 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
39
39
|
type: "application/json"
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
|
-
protected sensitive: boolean = false;
|
|
43
42
|
public generate_sdk: boolean = true;
|
|
44
43
|
public generate_swagger: boolean = true;
|
|
45
44
|
constructor(app: BaseApplication<D>, req: express.Request, res: express.Response)
|
|
@@ -75,6 +74,20 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
75
74
|
// output
|
|
76
75
|
this.output = null;
|
|
77
76
|
this.result = null;
|
|
77
|
+
|
|
78
|
+
let showLog = async (log: () => void) =>
|
|
79
|
+
{
|
|
80
|
+
if (this.log.show)
|
|
81
|
+
if (!this.log.can.some((x) => !x()))
|
|
82
|
+
{
|
|
83
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
84
|
+
await this.log.onBefore[i]();
|
|
85
|
+
log();
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
let failed = false;
|
|
90
|
+
|
|
78
91
|
try
|
|
79
92
|
{
|
|
80
93
|
// meta
|
|
@@ -129,6 +142,7 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
129
142
|
ErrorOperation.throwHTTP(400, "Invalid accept: " + accpet);
|
|
130
143
|
} catch (error)
|
|
131
144
|
{
|
|
145
|
+
failed = true;
|
|
132
146
|
let message: string;
|
|
133
147
|
if (error instanceof Error)
|
|
134
148
|
{
|
|
@@ -141,13 +155,21 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
141
155
|
if (error instanceof HTTPError)
|
|
142
156
|
{
|
|
143
157
|
this.meta.code = error.code;
|
|
144
|
-
|
|
158
|
+
await showLog(() =>
|
|
159
|
+
{
|
|
160
|
+
this.app.logger.error(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
161
|
+
});
|
|
145
162
|
}
|
|
146
163
|
else
|
|
147
164
|
{
|
|
148
165
|
this.meta.code = 500;
|
|
149
166
|
if (error instanceof Error)
|
|
150
|
-
|
|
167
|
+
{
|
|
168
|
+
await showLog(() =>
|
|
169
|
+
{
|
|
170
|
+
this.app.logger.critical(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
171
|
+
});
|
|
172
|
+
}
|
|
151
173
|
}
|
|
152
174
|
this.meta.message = message;
|
|
153
175
|
if (error instanceof HTTPError)
|
|
@@ -166,13 +188,12 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
166
188
|
|
|
167
189
|
// finish
|
|
168
190
|
this.meta.onFinish();
|
|
169
|
-
|
|
170
|
-
|
|
191
|
+
|
|
192
|
+
if (!failed)
|
|
193
|
+
await showLog(() =>
|
|
171
194
|
{
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
this.app.logger.info(this.meta);
|
|
175
|
-
}
|
|
195
|
+
this.app.logger.info(JSON.stringify(this.meta, undefined, 4));
|
|
196
|
+
});
|
|
176
197
|
|
|
177
198
|
if (this.meta.redirect_location)
|
|
178
199
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|