namirasoft-node 1.2.20 → 1.2.21
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 +5 -5
- package/dist/BaseController.js.map +1 -1
- package/dist/ServerToServerOperation.js +1 -1
- package/dist/ServerToServerOperation.js.map +1 -1
- package/package.json +7 -7
- package/src/BaseController.ts +5 -6
- package/src/ServerToServerOperation.ts +2 -2
package/dist/BaseController.d.ts
CHANGED
|
@@ -12,7 +12,6 @@ export declare abstract class BaseController<D extends BaseDatabase, State, Prop
|
|
|
12
12
|
protected app: BaseApplication<D>;
|
|
13
13
|
protected req: express.Request;
|
|
14
14
|
protected res: express.Response;
|
|
15
|
-
protected logger: ILogger;
|
|
16
15
|
protected meta: Meta;
|
|
17
16
|
protected output: Output | null;
|
|
18
17
|
protected result: any;
|
package/dist/BaseController.js
CHANGED
|
@@ -31,7 +31,7 @@ class BaseController {
|
|
|
31
31
|
this.app = app;
|
|
32
32
|
this.req = req;
|
|
33
33
|
this.res = res;
|
|
34
|
-
this.logger = this.getLogger();
|
|
34
|
+
this.app.logger = this.getLogger();
|
|
35
35
|
}
|
|
36
36
|
getAnomaly() {
|
|
37
37
|
return null;
|
|
@@ -46,7 +46,7 @@ class BaseController {
|
|
|
46
46
|
// meta
|
|
47
47
|
this.meta.onStart();
|
|
48
48
|
if (this.showLogAtTheBeginning)
|
|
49
|
-
this.logger.info(JSON.stringify(this.meta));
|
|
49
|
+
this.app.logger.info(JSON.stringify(this.meta));
|
|
50
50
|
let accpet = new namirasoft_core_1.ObjectService(this.req.headers.accept).getString("");
|
|
51
51
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
52
52
|
let isSchema = accpet.includes("application/schema");
|
|
@@ -92,12 +92,12 @@ class BaseController {
|
|
|
92
92
|
message = error + "";
|
|
93
93
|
if (error instanceof namirasoft_core_1.HTTPError) {
|
|
94
94
|
this.meta.code = error.code;
|
|
95
|
-
this.logger.error(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
95
|
+
this.app.logger.error(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
96
96
|
}
|
|
97
97
|
else {
|
|
98
98
|
this.meta.code = 500;
|
|
99
99
|
if (error instanceof Error)
|
|
100
|
-
this.logger.critical(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
100
|
+
this.app.logger.critical(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
101
101
|
}
|
|
102
102
|
this.meta.message = message;
|
|
103
103
|
if (error instanceof namirasoft_core_1.HTTPError)
|
|
@@ -115,7 +115,7 @@ class BaseController {
|
|
|
115
115
|
// finish
|
|
116
116
|
this.meta.onFinish();
|
|
117
117
|
if (this.showLogAtTheEnd)
|
|
118
|
-
this.logger.info(JSON.stringify(this.meta));
|
|
118
|
+
this.app.logger.info(JSON.stringify(this.meta));
|
|
119
119
|
return this.res.status(this.meta.code).send(this.result);
|
|
120
120
|
});
|
|
121
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../src/BaseController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,iCAA8B;AAC9B,qDAAuF;AAEvF,yDAAuG;AAEvG,MAAsB,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;QAIF,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;IAeK,GAAG;;YAEL,IAAI,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,SAAS;YACT,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IACA;gBACI,OAAO;gBACP,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,IAAI,CAAC,qBAAqB;oBAC1B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAEpD,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;oBACI,kBAAkB;oBAClB,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;oBAEnC,YAAY;oBACZ,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;oBAEvB,oBAAoB;oBACpB,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;oBAEvE,QAAQ;oBACR,gCAAY,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,IAAI,CAAC,cAAc;wBACnB,gCAAY,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBAE3E,kBAAkB;oBAClB,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBAElC,aAAa;oBACb,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;iBAC3B;qBACI,IAAI,QAAQ,EACjB;oBACI,kBAAkB;oBAClB,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,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;iBACnG;qBAED;oBACI,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;oBACrB,IAAI,KAAK,YAAY,KAAK;wBACtB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;iBAC1G;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;YACD,SAAS;YACT,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;YACD,SAAS;YACT,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,eAAe;gBACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,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;AAjKD,wCAiKC"}
|
|
@@ -6,7 +6,7 @@ const RequestHeaderService_1 = require("./RequestHeaderService");
|
|
|
6
6
|
class ServerToServerOperation {
|
|
7
7
|
static isValid(sign_key, data, req, sign_header) {
|
|
8
8
|
let signature = new RequestHeaderService_1.RequestHeaderService(req, sign_header).getString();
|
|
9
|
-
return namirasoft_core_1.
|
|
9
|
+
return namirasoft_core_1.HashOperation.isValidSHA256Secret(sign_key, data, signature);
|
|
10
10
|
}
|
|
11
11
|
static check(sign_key, data, req, sign_header) {
|
|
12
12
|
if (!sign_key)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerToServerOperation.js","sourceRoot":"","sources":["../src/ServerToServerOperation.ts"],"names":[],"mappings":";;;AACA,qDAAgE;AAChE,iEAA8D;AAE9D,MAAa,uBAAuB;IAEhC,MAAM,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAS,EAAE,GAAoB,EAAE,WAAmB;QAEjF,IAAI,SAAS,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;QACvE,OAAO,+BAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"ServerToServerOperation.js","sourceRoot":"","sources":["../src/ServerToServerOperation.ts"],"names":[],"mappings":";;;AACA,qDAAgE;AAChE,iEAA8D;AAE9D,MAAa,uBAAuB;IAEhC,MAAM,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAS,EAAE,GAAoB,EAAE,WAAmB;QAEjF,IAAI,SAAS,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;QACvE,OAAO,+BAAa,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,QAAgB,EAAE,IAAS,EAAE,GAAoB,EAAE,WAAmB;QAE/E,IAAI,CAAC,QAAQ;YACT,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,iCAAiC,CAAC,CAAC;QACrE,IAAI,CAAC,WAAW;YACZ,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,yCAAyC,CAAC,CAAC;QAC7E,IAAI,SAAS,GAAG,IAAI,2CAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;QACvE,IAAI,CAAC,SAAS;YACV,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC;YAC/C,gCAAc,CAAC,SAAS,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAC3D,CAAC;CACJ;AAnBD,0DAmBC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "namirasoft-node",
|
|
3
3
|
"description": "Namira Software Corporation Node NPM Package",
|
|
4
|
-
"version": "1.2.
|
|
4
|
+
"version": "1.2.21",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
7
7
|
"scripts": {},
|
|
@@ -11,18 +11,18 @@
|
|
|
11
11
|
"@supercharge/request-ip": "^1.2.0",
|
|
12
12
|
"@types/cors": "^2.8.17",
|
|
13
13
|
"@types/express": "^4.17.21",
|
|
14
|
-
"@types/node": "^20.11.
|
|
14
|
+
"@types/node": "^20.11.26",
|
|
15
15
|
"@types/nodemailer": "^6.4.14",
|
|
16
16
|
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
17
17
|
"@types/swagger-jsdoc": "^6.0.4",
|
|
18
18
|
"@types/swagger-ui-express": "^4.1.6",
|
|
19
19
|
"cors": "^2.8.5",
|
|
20
|
-
"express": "^4.18.
|
|
21
|
-
"joi": "^17.12.
|
|
22
|
-
"namirasoft-core": "^1.2.
|
|
20
|
+
"express": "^4.18.3",
|
|
21
|
+
"joi": "^17.12.2",
|
|
22
|
+
"namirasoft-core": "^1.2.16",
|
|
23
23
|
"namirasoft-log": "^1.2.0",
|
|
24
|
-
"namirasoft-schema": "^1.2.
|
|
25
|
-
"nodemailer": "^6.9.
|
|
24
|
+
"namirasoft-schema": "^1.2.16",
|
|
25
|
+
"nodemailer": "^6.9.12",
|
|
26
26
|
"nodemailer-smtp-transport": "^2.7.4",
|
|
27
27
|
"request-ip": "^3.3.0",
|
|
28
28
|
"swagger-jsdoc": "^6.2.8",
|
package/src/BaseController.ts
CHANGED
|
@@ -14,7 +14,6 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
14
14
|
protected app: BaseApplication<D>;
|
|
15
15
|
protected req: express.Request;
|
|
16
16
|
protected res: express.Response;
|
|
17
|
-
protected logger: ILogger;
|
|
18
17
|
protected meta!: Meta;
|
|
19
18
|
protected output!: Output | null;
|
|
20
19
|
protected result!: any;
|
|
@@ -41,7 +40,7 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
41
40
|
this.app = app;
|
|
42
41
|
this.req = req;
|
|
43
42
|
this.res = res;
|
|
44
|
-
this.logger = this.getLogger();
|
|
43
|
+
this.app.logger = this.getLogger();
|
|
45
44
|
}
|
|
46
45
|
protected getAnomaly(): AnomalyDetector | null
|
|
47
46
|
{
|
|
@@ -72,7 +71,7 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
72
71
|
// meta
|
|
73
72
|
this.meta.onStart();
|
|
74
73
|
if (this.showLogAtTheBeginning)
|
|
75
|
-
this.logger.info(JSON.stringify(this.meta));
|
|
74
|
+
this.app.logger.info(JSON.stringify(this.meta));
|
|
76
75
|
|
|
77
76
|
let accpet: string = new ObjectService(this.req.headers.accept).getString("");
|
|
78
77
|
let isJson = accpet.includes("application/json") || accpet.includes("*/*");
|
|
@@ -129,13 +128,13 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
129
128
|
if (error instanceof HTTPError)
|
|
130
129
|
{
|
|
131
130
|
this.meta.code = error.code;
|
|
132
|
-
this.logger.error(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
131
|
+
this.app.logger.error(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
133
132
|
}
|
|
134
133
|
else
|
|
135
134
|
{
|
|
136
135
|
this.meta.code = 500;
|
|
137
136
|
if (error instanceof Error)
|
|
138
|
-
this.logger.critical(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
137
|
+
this.app.logger.critical(error.message + "\n" + JSON.stringify(this.meta), undefined, error.stack);
|
|
139
138
|
}
|
|
140
139
|
this.meta.message = message;
|
|
141
140
|
if (error instanceof HTTPError)
|
|
@@ -154,7 +153,7 @@ export abstract class BaseController<D extends BaseDatabase, State, Props, Outpu
|
|
|
154
153
|
// finish
|
|
155
154
|
this.meta.onFinish();
|
|
156
155
|
if (this.showLogAtTheEnd)
|
|
157
|
-
this.logger.info(JSON.stringify(this.meta));
|
|
156
|
+
this.app.logger.info(JSON.stringify(this.meta));
|
|
158
157
|
return this.res.status(this.meta.code).send(this.result);
|
|
159
158
|
}
|
|
160
159
|
async getSchema(): Promise<ControllerSchema>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as express from 'express';
|
|
2
|
-
import { ErrorOperation,
|
|
2
|
+
import { ErrorOperation, HashOperation } from "namirasoft-core";
|
|
3
3
|
import { RequestHeaderService } from './RequestHeaderService';
|
|
4
4
|
|
|
5
5
|
export class ServerToServerOperation
|
|
@@ -7,7 +7,7 @@ export class ServerToServerOperation
|
|
|
7
7
|
static isValid(sign_key: string, data: any, req: express.Request, sign_header: string): boolean
|
|
8
8
|
{
|
|
9
9
|
let signature = new RequestHeaderService(req, sign_header).getString();
|
|
10
|
-
return
|
|
10
|
+
return HashOperation.isValidSHA256Secret(sign_key, data, signature);
|
|
11
11
|
}
|
|
12
12
|
static check(sign_key: string, data: any, req: express.Request, sign_header: string): void
|
|
13
13
|
{
|