namirasoft-node 1.4.75 → 1.4.76
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.js +22 -9
- package/dist/BaseController.js.map +1 -1
- package/package.json +1 -1
- package/src/BaseController.ts +30 -8
package/dist/BaseController.js
CHANGED
|
@@ -52,6 +52,15 @@ class BaseController {
|
|
|
52
52
|
this.meta = new Meta_1.Meta(info, this.req);
|
|
53
53
|
this.output = null;
|
|
54
54
|
this.result = null;
|
|
55
|
+
let showLog = (log) => __awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
if (this.log.show)
|
|
57
|
+
if (!this.log.can.some((x) => !x())) {
|
|
58
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
59
|
+
yield this.log.onBefore[i]();
|
|
60
|
+
log();
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
let failed = false;
|
|
55
64
|
try {
|
|
56
65
|
this.meta.onStart();
|
|
57
66
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
@@ -89,6 +98,7 @@ class BaseController {
|
|
|
89
98
|
namirasoft_core_1.ErrorOperation.throwHTTP(400, "Invalid accept: " + accpet);
|
|
90
99
|
}
|
|
91
100
|
catch (error) {
|
|
101
|
+
failed = true;
|
|
92
102
|
let message;
|
|
93
103
|
if (error instanceof Error) {
|
|
94
104
|
this.meta.error = error;
|
|
@@ -98,12 +108,17 @@ class BaseController {
|
|
|
98
108
|
message = error + "";
|
|
99
109
|
if (error instanceof namirasoft_core_1.HTTPError) {
|
|
100
110
|
this.meta.code = error.code;
|
|
101
|
-
|
|
111
|
+
yield showLog(() => {
|
|
112
|
+
this.app.logger.error(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
113
|
+
});
|
|
102
114
|
}
|
|
103
115
|
else {
|
|
104
116
|
this.meta.code = 500;
|
|
105
|
-
if (error instanceof Error)
|
|
106
|
-
|
|
117
|
+
if (error instanceof Error) {
|
|
118
|
+
yield showLog(() => {
|
|
119
|
+
this.app.logger.critical(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
120
|
+
});
|
|
121
|
+
}
|
|
107
122
|
}
|
|
108
123
|
this.meta.message = message;
|
|
109
124
|
if (error instanceof namirasoft_core_1.HTTPError)
|
|
@@ -118,12 +133,10 @@ class BaseController {
|
|
|
118
133
|
this.result = this.output;
|
|
119
134
|
}
|
|
120
135
|
this.meta.onFinish();
|
|
121
|
-
if (
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
this.app.logger.info(this.meta);
|
|
126
|
-
}
|
|
136
|
+
if (!failed)
|
|
137
|
+
yield showLog(() => {
|
|
138
|
+
this.app.logger.info(JSON.stringify(this.meta, undefined, 4));
|
|
139
|
+
});
|
|
127
140
|
if (this.meta.redirect_location)
|
|
128
141
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|
|
129
142
|
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;IAoChC,YAAY,GAAuB,EAAE,GAAoB,EAAE,GAAqB;QAlCtE,QAAG,GAIT;YACI,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,EAAE;YACP,QAAQ,EAAE,EAAE;SACf,CAAC;QASI,mBAAc,GAAY,IAAI,CAAC;QAC/B,WAAM,GAGZ;YACI,IAAI,EAAE;gBACF,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,OAAO;aACjB;YACD,GAAG,EAAE;gBACD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,kBAAkB;aAC3B;SACJ,CAAC;QACI,cAAS,GAAY,KAAK,CAAC;QAC9B,iBAAY,GAAY,IAAI,CAAC;QAC7B,qBAAgB,GAAY,IAAI,CAAC;QAGpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IACS,UAAU;QAEhB,OAAO,IAAI,CAAC;IAChB,CAAC;IAMK,sBAAsB;;YAExB,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAQK,GAAG;;YAEL,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,IAAI,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
|
@@ -75,6 +75,20 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
75
75
|
// output
|
|
76
76
|
this.output = null;
|
|
77
77
|
this.result = null;
|
|
78
|
+
|
|
79
|
+
let showLog = async (log: () => void) =>
|
|
80
|
+
{
|
|
81
|
+
if (this.log.show)
|
|
82
|
+
if (!this.log.can.some((x) => !x()))
|
|
83
|
+
{
|
|
84
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
85
|
+
await this.log.onBefore[i]();
|
|
86
|
+
log();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
let failed = false;
|
|
91
|
+
|
|
78
92
|
try
|
|
79
93
|
{
|
|
80
94
|
// meta
|
|
@@ -129,6 +143,7 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
129
143
|
ErrorOperation.throwHTTP(400, "Invalid accept: " + accpet);
|
|
130
144
|
} catch (error)
|
|
131
145
|
{
|
|
146
|
+
failed = true;
|
|
132
147
|
let message: string;
|
|
133
148
|
if (error instanceof Error)
|
|
134
149
|
{
|
|
@@ -141,13 +156,21 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
141
156
|
if (error instanceof HTTPError)
|
|
142
157
|
{
|
|
143
158
|
this.meta.code = error.code;
|
|
144
|
-
|
|
159
|
+
await showLog(() =>
|
|
160
|
+
{
|
|
161
|
+
this.app.logger.error(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
162
|
+
});
|
|
145
163
|
}
|
|
146
164
|
else
|
|
147
165
|
{
|
|
148
166
|
this.meta.code = 500;
|
|
149
167
|
if (error instanceof Error)
|
|
150
|
-
|
|
168
|
+
{
|
|
169
|
+
await showLog(() =>
|
|
170
|
+
{
|
|
171
|
+
this.app.logger.critical(error.message, error.stack, JSON.stringify(this.meta, undefined, 4));
|
|
172
|
+
});
|
|
173
|
+
}
|
|
151
174
|
}
|
|
152
175
|
this.meta.message = message;
|
|
153
176
|
if (error instanceof HTTPError)
|
|
@@ -166,13 +189,12 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
166
189
|
|
|
167
190
|
// finish
|
|
168
191
|
this.meta.onFinish();
|
|
169
|
-
|
|
170
|
-
|
|
192
|
+
|
|
193
|
+
if (!failed)
|
|
194
|
+
await showLog(() =>
|
|
171
195
|
{
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
this.app.logger.info(this.meta);
|
|
175
|
-
}
|
|
196
|
+
this.app.logger.info(JSON.stringify(this.meta, undefined, 4));
|
|
197
|
+
});
|
|
176
198
|
|
|
177
199
|
if (this.meta.redirect_location)
|
|
178
200
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|