namirasoft-node 1.4.72 → 1.4.73
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 +11 -2
- package/dist/BaseController.js +24 -8
- package/dist/BaseController.js.map +1 -1
- package/package.json +4 -4
- package/src/BaseController.ts +37 -8
package/dist/BaseController.d.ts
CHANGED
|
@@ -8,8 +8,17 @@ import { BaseTypeSchema, BaseVariableSchema, ControllerSchema } from 'namirasoft
|
|
|
8
8
|
export declare abstract class BaseController<D extends {
|
|
9
9
|
[name: string]: BaseDatabase;
|
|
10
10
|
}, State, Props, Output> {
|
|
11
|
-
protected
|
|
12
|
-
|
|
11
|
+
protected log: {
|
|
12
|
+
show: boolean;
|
|
13
|
+
beginning: {
|
|
14
|
+
show: boolean;
|
|
15
|
+
onBefore: () => Promise<void>;
|
|
16
|
+
};
|
|
17
|
+
end: {
|
|
18
|
+
show: boolean;
|
|
19
|
+
onBefore: () => Promise<void>;
|
|
20
|
+
};
|
|
21
|
+
};
|
|
13
22
|
app: BaseApplication<D>;
|
|
14
23
|
req: express.Request;
|
|
15
24
|
res: express.Response;
|
package/dist/BaseController.js
CHANGED
|
@@ -15,8 +15,17 @@ const namirasoft_core_1 = require("namirasoft-core");
|
|
|
15
15
|
const namirasoft_schema_1 = require("namirasoft-schema");
|
|
16
16
|
class BaseController {
|
|
17
17
|
constructor(app, req, res) {
|
|
18
|
-
this.
|
|
19
|
-
|
|
18
|
+
this.log = {
|
|
19
|
+
show: true,
|
|
20
|
+
beginning: {
|
|
21
|
+
show: false,
|
|
22
|
+
onBefore: () => __awaiter(this, void 0, void 0, function* () { })
|
|
23
|
+
},
|
|
24
|
+
end: {
|
|
25
|
+
show: false,
|
|
26
|
+
onBefore: () => __awaiter(this, void 0, void 0, function* () { })
|
|
27
|
+
}
|
|
28
|
+
};
|
|
20
29
|
this.validate_query = true;
|
|
21
30
|
this.bodyAs = {
|
|
22
31
|
json: {
|
|
@@ -45,15 +54,19 @@ class BaseController {
|
|
|
45
54
|
}
|
|
46
55
|
run() {
|
|
47
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
+
var _a, _b, _c, _d;
|
|
48
58
|
let info = this.getInfo();
|
|
49
59
|
this.meta = new Meta_1.Meta(info, this.req, this.sensitive);
|
|
50
60
|
this.output = null;
|
|
51
61
|
this.result = null;
|
|
52
62
|
try {
|
|
53
63
|
this.meta.onStart();
|
|
54
|
-
if (this.
|
|
55
|
-
if (
|
|
56
|
-
this.
|
|
64
|
+
if (this.log.show)
|
|
65
|
+
if (this.log.beginning.show)
|
|
66
|
+
if (!this.meta.url.endsWith("/healthz")) {
|
|
67
|
+
yield ((_b = (_a = this.log.beginning).onBefore) === null || _b === void 0 ? void 0 : _b.call(_a));
|
|
68
|
+
this.app.logger.info(this.meta);
|
|
69
|
+
}
|
|
57
70
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
58
71
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
59
72
|
let isSchema = accpet.includes("application/schema");
|
|
@@ -118,9 +131,12 @@ class BaseController {
|
|
|
118
131
|
this.result = this.output;
|
|
119
132
|
}
|
|
120
133
|
this.meta.onFinish();
|
|
121
|
-
if (this.
|
|
122
|
-
if (
|
|
123
|
-
this.
|
|
134
|
+
if (this.log.show)
|
|
135
|
+
if (this.log.end.show)
|
|
136
|
+
if (!this.meta.url.endsWith("/healthz")) {
|
|
137
|
+
yield ((_d = (_c = this.log.end).onBefore) === null || _d === void 0 ? void 0 : _d.call(_c));
|
|
138
|
+
this.app.logger.info(this.meta);
|
|
139
|
+
}
|
|
124
140
|
if (this.meta.redirect_location)
|
|
125
141
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|
|
126
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;
|
|
1
|
+
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.73",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@supercharge/request-ip": "^1.2.0",
|
|
21
21
|
"@types/cors": "^2.8.17",
|
|
22
22
|
"@types/express": "^5.0.0",
|
|
23
|
-
"@types/node": "^22.13.
|
|
23
|
+
"@types/node": "^22.13.4",
|
|
24
24
|
"@types/node-cron": "^3.0.11",
|
|
25
25
|
"@types/nodemailer": "^6.4.17",
|
|
26
26
|
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"cors": "^2.8.5",
|
|
31
31
|
"express": "^4.21.2",
|
|
32
32
|
"joi": "^17.13.3",
|
|
33
|
-
"namirasoft-core": "^1.4.
|
|
34
|
-
"namirasoft-log": "^1.4.
|
|
33
|
+
"namirasoft-core": "^1.4.51",
|
|
34
|
+
"namirasoft-log": "^1.4.20",
|
|
35
35
|
"namirasoft-schema": "^1.4.25",
|
|
36
36
|
"node-cron": "^3.0.3",
|
|
37
37
|
"nodemailer": "^6.10.0",
|
package/src/BaseController.ts
CHANGED
|
@@ -8,8 +8,27 @@ import { BaseTypeSchema, BaseVariableSchema, ControllerSchema, JoiValidator } fr
|
|
|
8
8
|
|
|
9
9
|
export abstract class BaseController<D extends { [name: string]: BaseDatabase }, State, Props, Output>
|
|
10
10
|
{
|
|
11
|
-
protected
|
|
12
|
-
|
|
11
|
+
protected log: {
|
|
12
|
+
show: boolean;
|
|
13
|
+
beginning: {
|
|
14
|
+
show: boolean;
|
|
15
|
+
onBefore: () => Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
end: {
|
|
18
|
+
show: boolean;
|
|
19
|
+
onBefore: () => Promise<void>;
|
|
20
|
+
}
|
|
21
|
+
} = {
|
|
22
|
+
show: true,
|
|
23
|
+
beginning: {
|
|
24
|
+
show: false,
|
|
25
|
+
onBefore: async () => { }
|
|
26
|
+
},
|
|
27
|
+
end: {
|
|
28
|
+
show: false,
|
|
29
|
+
onBefore: async () => { }
|
|
30
|
+
}
|
|
31
|
+
};
|
|
13
32
|
public app: BaseApplication<D>;
|
|
14
33
|
public req: express.Request;
|
|
15
34
|
public res: express.Response;
|
|
@@ -72,9 +91,13 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
72
91
|
{
|
|
73
92
|
// meta
|
|
74
93
|
this.meta.onStart();
|
|
75
|
-
if (this.
|
|
76
|
-
if (
|
|
77
|
-
this.
|
|
94
|
+
if (this.log.show)
|
|
95
|
+
if (this.log.beginning.show)
|
|
96
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
97
|
+
{
|
|
98
|
+
await this.log.beginning.onBefore?.();
|
|
99
|
+
this.app.logger.info(this.meta);
|
|
100
|
+
}
|
|
78
101
|
|
|
79
102
|
let accpet: string = new ObjectService(this.req.headers.accept).getString("");
|
|
80
103
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
@@ -159,11 +182,17 @@ export abstract class BaseController<D extends { [name: string]: BaseDatabase },
|
|
|
159
182
|
else
|
|
160
183
|
this.result = this.output;
|
|
161
184
|
}
|
|
185
|
+
|
|
162
186
|
// finish
|
|
163
187
|
this.meta.onFinish();
|
|
164
|
-
if (this.
|
|
165
|
-
if (
|
|
166
|
-
this.
|
|
188
|
+
if (this.log.show)
|
|
189
|
+
if (this.log.end.show)
|
|
190
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
191
|
+
{
|
|
192
|
+
await this.log.end.onBefore?.();
|
|
193
|
+
this.app.logger.info(this.meta);
|
|
194
|
+
}
|
|
195
|
+
|
|
167
196
|
if (this.meta.redirect_location)
|
|
168
197
|
return this.res.redirect(this.meta.code, this.meta.redirect_location);
|
|
169
198
|
return this.res.status(this.meta.code).send(this.result);
|