namirasoft-node 1.4.74 → 1.4.75
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 +2 -8
- package/dist/BaseController.js +7 -21
- package/dist/BaseController.js.map +1 -1
- package/package.json +1 -1
- package/src/BaseController.ts +10 -31
package/dist/BaseController.d.ts
CHANGED
|
@@ -10,14 +10,8 @@ export declare abstract class BaseController<D extends {
|
|
|
10
10
|
}, State, Props, Output> {
|
|
11
11
|
protected log: {
|
|
12
12
|
show: boolean;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
onBefore: (() => Promise<void>)[];
|
|
16
|
-
};
|
|
17
|
-
end: {
|
|
18
|
-
show: boolean;
|
|
19
|
-
onBefore: (() => Promise<void>)[];
|
|
20
|
-
};
|
|
13
|
+
can: (() => Promise<boolean>)[];
|
|
14
|
+
onBefore: (() => Promise<void>)[];
|
|
21
15
|
};
|
|
22
16
|
app: BaseApplication<D>;
|
|
23
17
|
req: express.Request;
|
package/dist/BaseController.js
CHANGED
|
@@ -17,14 +17,8 @@ class BaseController {
|
|
|
17
17
|
constructor(app, req, res) {
|
|
18
18
|
this.log = {
|
|
19
19
|
show: true,
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
onBefore: []
|
|
23
|
-
},
|
|
24
|
-
end: {
|
|
25
|
-
show: false,
|
|
26
|
-
onBefore: []
|
|
27
|
-
}
|
|
20
|
+
can: [],
|
|
21
|
+
onBefore: []
|
|
28
22
|
};
|
|
29
23
|
this.validate_query = true;
|
|
30
24
|
this.bodyAs = {
|
|
@@ -60,13 +54,6 @@ class BaseController {
|
|
|
60
54
|
this.result = null;
|
|
61
55
|
try {
|
|
62
56
|
this.meta.onStart();
|
|
63
|
-
if (this.log.show)
|
|
64
|
-
if (this.log.beginning.show)
|
|
65
|
-
if (!this.meta.url.endsWith("/healthz")) {
|
|
66
|
-
for (let i = 0; i < this.log.beginning.onBefore.length; i++)
|
|
67
|
-
yield this.log.beginning.onBefore[i]();
|
|
68
|
-
this.app.logger.info(this.meta);
|
|
69
|
-
}
|
|
70
57
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
71
58
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
72
59
|
let isSchema = accpet.includes("application/schema");
|
|
@@ -132,12 +119,11 @@ class BaseController {
|
|
|
132
119
|
}
|
|
133
120
|
this.meta.onFinish();
|
|
134
121
|
if (this.log.show)
|
|
135
|
-
if (this.log.
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}
|
|
122
|
+
if (!this.log.can.some((x) => !x())) {
|
|
123
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
124
|
+
yield this.log.onBefore[i]();
|
|
125
|
+
this.app.logger.info(this.meta);
|
|
126
|
+
}
|
|
141
127
|
if (this.meta.redirect_location)
|
|
142
128
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|
|
143
129
|
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
|
@@ -10,24 +10,12 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
10
10
|
{
|
|
11
11
|
protected log: {
|
|
12
12
|
show: boolean;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
onBefore: (() => Promise<void>)[];
|
|
16
|
-
}
|
|
17
|
-
end: {
|
|
18
|
-
show: boolean;
|
|
19
|
-
onBefore: (() => Promise<void>)[];
|
|
20
|
-
}
|
|
13
|
+
can: (() => Promise<boolean>)[];
|
|
14
|
+
onBefore: (() => Promise<void>)[];
|
|
21
15
|
} = {
|
|
22
16
|
show: true,
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
onBefore: []
|
|
26
|
-
},
|
|
27
|
-
end: {
|
|
28
|
-
show: false,
|
|
29
|
-
onBefore: []
|
|
30
|
-
}
|
|
17
|
+
can: [],
|
|
18
|
+
onBefore: []
|
|
31
19
|
};
|
|
32
20
|
public app: BaseApplication<D>;
|
|
33
21
|
public req: express.Request;
|
|
@@ -91,14 +79,6 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
91
79
|
{
|
|
92
80
|
// meta
|
|
93
81
|
this.meta.onStart();
|
|
94
|
-
if (this.log.show)
|
|
95
|
-
if (this.log.beginning.show)
|
|
96
|
-
if (!this.meta.url.endsWith("/healthz"))
|
|
97
|
-
{
|
|
98
|
-
for (let i = 0; i < this.log.beginning.onBefore.length; i++)
|
|
99
|
-
await this.log.beginning.onBefore[i]();
|
|
100
|
-
this.app.logger.info(this.meta);
|
|
101
|
-
}
|
|
102
82
|
|
|
103
83
|
let accpet: string = new ObjectService(this.req.headers.accept).getString("");
|
|
104
84
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
@@ -187,13 +167,12 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
187
167
|
// finish
|
|
188
168
|
this.meta.onFinish();
|
|
189
169
|
if (this.log.show)
|
|
190
|
-
if (this.log.
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
}
|
|
170
|
+
if (!this.log.can.some((x) => !x()))
|
|
171
|
+
{
|
|
172
|
+
for (let i = 0; i < this.log.onBefore.length; i++)
|
|
173
|
+
await this.log.onBefore[i]();
|
|
174
|
+
this.app.logger.info(this.meta);
|
|
175
|
+
}
|
|
197
176
|
|
|
198
177
|
if (this.meta.redirect_location)
|
|
199
178
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|