namirasoft-node 1.3.19 → 1.3.20
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
CHANGED
|
@@ -29,6 +29,7 @@ export declare abstract class BaseController<D extends BaseDatabase, State, Prop
|
|
|
29
29
|
type: string;
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
|
+
protected sensitive: boolean;
|
|
32
33
|
constructor(app: BaseApplication<D>, req: express.Request, res: express.Response);
|
|
33
34
|
protected getAnomaly(): AnomalyDetector | null;
|
|
34
35
|
abstract getDatabase(): D;
|
package/dist/BaseController.js
CHANGED
|
@@ -28,6 +28,7 @@ class BaseController {
|
|
|
28
28
|
type: "application/json"
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
|
+
this.sensitive = false;
|
|
31
32
|
this.app = app;
|
|
32
33
|
this.req = req;
|
|
33
34
|
this.res = res;
|
|
@@ -48,9 +49,10 @@ class BaseController {
|
|
|
48
49
|
this.result = null;
|
|
49
50
|
try {
|
|
50
51
|
this.meta.onStart();
|
|
51
|
-
if (this.
|
|
52
|
-
if (
|
|
53
|
-
this.
|
|
52
|
+
if (!this.sensitive)
|
|
53
|
+
if (this.showLogAtTheBeginning)
|
|
54
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
55
|
+
this.app.logger.info(this.meta);
|
|
54
56
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
55
57
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
56
58
|
let isSchema = accpet.includes("application/schema");
|
|
@@ -101,12 +103,14 @@ class BaseController {
|
|
|
101
103
|
message = error + "";
|
|
102
104
|
if (error instanceof namirasoft_core_1.HTTPError) {
|
|
103
105
|
this.meta.code = error.code;
|
|
104
|
-
|
|
106
|
+
if (!this.sensitive)
|
|
107
|
+
this.app.logger.error(error.message + "\n" + JSON.stringify(this.meta), error.stack);
|
|
105
108
|
}
|
|
106
109
|
else {
|
|
107
110
|
this.meta.code = 500;
|
|
108
111
|
if (error instanceof Error)
|
|
109
|
-
|
|
112
|
+
if (!this.sensitive)
|
|
113
|
+
this.app.logger.critical(error.message + "\n" + JSON.stringify(this.meta), error.stack);
|
|
110
114
|
}
|
|
111
115
|
this.meta.message = message;
|
|
112
116
|
if (error instanceof namirasoft_core_1.HTTPError)
|
|
@@ -121,9 +125,10 @@ class BaseController {
|
|
|
121
125
|
this.result = this.output;
|
|
122
126
|
}
|
|
123
127
|
this.meta.onFinish();
|
|
124
|
-
if (this.
|
|
125
|
-
if (
|
|
126
|
-
this.
|
|
128
|
+
if (!this.sensitive)
|
|
129
|
+
if (this.showLogAtTheEnd)
|
|
130
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
131
|
+
this.app.logger.info(this.meta);
|
|
127
132
|
return this.res.status(this.meta.code).send(this.result);
|
|
128
133
|
});
|
|
129
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,iCAA8B;AAC9B,qDAAuF;AAEvF,yDAAuG;AAEvG,MAAsB,cAAc;IA4BhC,YAAY,GAAuB,EAAE,GAAoB,EAAE,GAAqB;QA1BtE,0BAAqB,GAAY,KAAK,CAAC;QACvC,oBAAe,GAAY,IAAI,CAAC;QAUhC,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;
|
|
1
|
+
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,iCAA8B;AAC9B,qDAAuF;AAEvF,yDAAuG;AAEvG,MAAsB,cAAc;IA4BhC,YAAY,GAAuB,EAAE,GAAoB,EAAE,GAAqB;QA1BtE,0BAAqB,GAAY,KAAK,CAAC;QACvC,oBAAe,GAAY,IAAI,CAAC;QAUhC,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;QAGjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACvC,CAAC;IACS,UAAU;QAEhB,OAAO,IAAI,CAAC;IAChB,CAAC;IAQK,sBAAsB;;YAExB,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAQK,GAAG;;YAEL,IAAI,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IACA;gBAEI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,CAAC,IAAI,CAAC,SAAS;oBACf,IAAI,IAAI,CAAC,qBAAqB;wBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;4BACnC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE5C,IAAI,MAAM,GAAW,IAAI,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC9E,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC3E,IAAI,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;gBACrD,IAAI,MAAM,EACV;oBAEI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACrB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC9B,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAGnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;oBAGvB,IAAI,OAAO,GAA2B,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxD,IAAI,OAAO,IAAI,IAAI;wBACf,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;4BAC9C,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,+BAA+B,CAAC,CAAC;oBAGvE,gCAAY,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,IAAI,CAAC,cAAc,EACvB;wBACI,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;wBAC3B,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBAClD,IAAI,OAAO,IAAI,IAAI;4BACf,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;6BAE5C;4BACI,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAClC;gCACI,IAAI,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gCACzB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;oCACtB,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;6BACtC;yBACJ;wBACD,gCAAY,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;qBAC3C;oBAGD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBAGlC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;iBAC3B;qBACI,IAAI,QAAQ,EACjB;oBAEI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACrB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;iBACxC;;oBAEG,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,kBAAkB,GAAG,MAAM,CAAC,CAAC;aAClE;YAAC,OAAO,KAAK,EACd;gBACI,IAAI,OAAe,CAAC;gBACpB,IAAI,KAAK,YAAY,KAAK,EAC1B;oBACI,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;oBACxB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;iBAC3B;;oBAEG,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC;gBAEzB,IAAI,KAAK,YAAY,2BAAS,EAC9B;oBACI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;oBAC5B,IAAI,CAAC,IAAI,CAAC,SAAS;wBACf,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;iBAC5F;qBAED;oBACI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;oBACrB,IAAI,KAAK,YAAY,KAAK;wBACtB,IAAI,CAAC,IAAI,CAAC,SAAS;4BACf,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;iBACnG;gBACD,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC5B,IAAI,KAAK,YAAY,2BAAS;oBAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;;oBAEhC,IAAI,CAAC,MAAM,GAAG,8BAA8B,CAAC;aACpD;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB;gBACI,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI;oBACnB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;;oBAExB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;aACjC;YAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,SAAS;gBACf,IAAI,IAAI,CAAC,eAAe;oBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACnC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC;KAAA;IACK,SAAS;;YAEX,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,MAAM,GAAG,IAAI,oCAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7F,MAAM,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC/C,MAAM,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACzC,MAAM,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC/C,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA1LD,wCA0LC"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.3.
|
|
11
|
+
"version": "1.3.20",
|
|
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": "^4.17.21",
|
|
23
|
-
"@types/node": "^20.12.
|
|
23
|
+
"@types/node": "^20.12.7",
|
|
24
24
|
"@types/nodemailer": "^6.4.14",
|
|
25
25
|
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
26
26
|
"@types/serve-index": "^1.9.4",
|
package/src/BaseController.ts
CHANGED
|
@@ -34,7 +34,7 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
34
34
|
type: "application/json"
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
|
-
|
|
37
|
+
protected sensitive: boolean = false;
|
|
38
38
|
constructor(app: BaseApplication<D>, req: express.Request, res: express.Response)
|
|
39
39
|
{
|
|
40
40
|
this.app = app;
|
|
@@ -74,9 +74,10 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
74
74
|
{
|
|
75
75
|
// meta
|
|
76
76
|
this.meta.onStart();
|
|
77
|
-
if (this.
|
|
78
|
-
if (
|
|
79
|
-
this.
|
|
77
|
+
if (!this.sensitive)
|
|
78
|
+
if (this.showLogAtTheBeginning)
|
|
79
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
80
|
+
this.app.logger.info(this.meta);
|
|
80
81
|
|
|
81
82
|
let accpet: string = new ObjectService(this.req.headers.accept).getString("");
|
|
82
83
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
@@ -148,13 +149,15 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
148
149
|
if (error instanceof HTTPError)
|
|
149
150
|
{
|
|
150
151
|
this.meta.code = error.code;
|
|
151
|
-
|
|
152
|
+
if (!this.sensitive)
|
|
153
|
+
this.app.logger.error(error.message + "\n" + JSON.stringify(this.meta), error.stack);
|
|
152
154
|
}
|
|
153
155
|
else
|
|
154
156
|
{
|
|
155
157
|
this.meta.code = 500;
|
|
156
158
|
if (error instanceof Error)
|
|
157
|
-
|
|
159
|
+
if (!this.sensitive)
|
|
160
|
+
this.app.logger.critical(error.message + "\n" + JSON.stringify(this.meta), error.stack);
|
|
158
161
|
}
|
|
159
162
|
this.meta.message = message;
|
|
160
163
|
if (error instanceof HTTPError)
|
|
@@ -172,9 +175,10 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
172
175
|
}
|
|
173
176
|
// finish
|
|
174
177
|
this.meta.onFinish();
|
|
175
|
-
if (this.
|
|
176
|
-
if (
|
|
177
|
-
this.
|
|
178
|
+
if (!this.sensitive)
|
|
179
|
+
if (this.showLogAtTheEnd)
|
|
180
|
+
if (!this.meta.url.endsWith("/healthz"))
|
|
181
|
+
this.app.logger.info(this.meta);
|
|
178
182
|
return this.res.status(this.meta.code).send(this.result);
|
|
179
183
|
}
|
|
180
184
|
async getSchema(): Promise<ControllerSchema>
|