@alanszp/express-common-fn 12.0.0 → 12.0.2
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/commonErrorsHandler.js +12 -4
- package/dist/commonErrorsHandler.js.map +1 -1
- package/node_modules/@alanszp/audit/package.json +5 -3
- package/node_modules/@alanszp/errors/package.json +6 -4
- package/node_modules/@alanszp/express/package.json +5 -5
- package/node_modules/@alanszp/jwt/package.json +1 -2
- package/node_modules/@alanszp/logger/package.json +1 -2
- package/package.json +5 -5
- package/src/commonErrorsHandler.ts +13 -4
|
@@ -31,10 +31,18 @@ function commonErrorsHandler(loggerFn) {
|
|
|
31
31
|
const instanceLogger = logger.child(opts.extraContext);
|
|
32
32
|
if (error instanceof errors_1.RenderableError) {
|
|
33
33
|
const statusCode = error instanceof errors_1.HttpRenderableError ? error.httpCode() : 500;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
if (statusCode >= 500) {
|
|
35
|
+
instanceLogger.error(`${baseLog}.error.${error.code()}`, {
|
|
36
|
+
statusCode,
|
|
37
|
+
error,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
instanceLogger.info(`${baseLog}.error.${error.code()}`, {
|
|
42
|
+
statusCode,
|
|
43
|
+
error,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
38
46
|
res.status(statusCode).json(error.toView());
|
|
39
47
|
return;
|
|
40
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonErrorsHandler.js","sourceRoot":"","sources":["../src/commonErrorsHandler.ts"],"names":[],"mappings":";;;AAAA,wCAA8C;AAC9C,4CAKyB;AAGzB,qCAAgE;AAOhE,MAAM,cAAc,GAAuB;IACzC,cAAc,EAAE,GAAG;IACnB,YAAY,EAAE,EAAE;CACjB,CAAC;AAEF,SAAS,cAAc;IACrB,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,OAAO;QACP,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CAAC,QAAuB;IACzD,OAAO,SAAS,kBAAkB,CAChC,KAAc,EACd,GAAa,EACb,OAAe,EACf,OAAqC;QAErC,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC;QAE1B,MAAM,IAAI,mCACL,cAAc,GACd,OAAO,CACX,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEvD,IAAI,KAAK,YAAY,wBAAe,EAAE;YACpC,MAAM,UAAU,GACd,KAAK,YAAY,4BAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"commonErrorsHandler.js","sourceRoot":"","sources":["../src/commonErrorsHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/audit",
|
|
3
|
-
"version": "12.0.
|
|
3
|
+
"version": "12.0.2",
|
|
4
4
|
"description": "Alan's audit util.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -18,13 +18,15 @@
|
|
|
18
18
|
"prepack": "yarn run build",
|
|
19
19
|
"yalc-publish": "yarn run yalc publish"
|
|
20
20
|
},
|
|
21
|
+
"peerDependencies": {
|
|
22
|
+
"@alanszp/errors": ">=12.0.0"
|
|
23
|
+
},
|
|
21
24
|
"dependencies": {
|
|
22
|
-
"@alanszp/errors": "^12.0.0",
|
|
23
25
|
"@alanszp/logger": "^12.0.0",
|
|
24
26
|
"lodash": "^4.17.21"
|
|
25
27
|
},
|
|
26
28
|
"devDependencies": {
|
|
27
29
|
"@types/node": "^20.11.17"
|
|
28
30
|
},
|
|
29
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "7f93084c31e9e82d2cf8ba06d5807b1701a65a5f"
|
|
30
32
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/errors",
|
|
3
|
-
"version": "12.0.
|
|
3
|
+
"version": "12.0.1",
|
|
4
4
|
"description": "Alan's basic errors classes.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -18,14 +18,16 @@
|
|
|
18
18
|
"prepack": "yarn run build",
|
|
19
19
|
"yalc-publish": "yarn run yalc publish"
|
|
20
20
|
},
|
|
21
|
+
"peerDependencies": {
|
|
22
|
+
"@alanszp/errors": ">=12.0.0"
|
|
23
|
+
},
|
|
21
24
|
"devDependencies": {
|
|
25
|
+
"@alanszp/core": "^12.0.0",
|
|
22
26
|
"@types/node": "^20.11.17",
|
|
23
27
|
"ts-node": "^10.0.0",
|
|
24
28
|
"typescript": "^4.3.4"
|
|
25
29
|
},
|
|
26
30
|
"dependencies": {
|
|
27
|
-
"@alanszp/core": "^12.0.0",
|
|
28
31
|
"lodash": "^4.17.21"
|
|
29
|
-
}
|
|
30
|
-
"gitHead": "085a76a387bc0e272e09e9cb1b6f48f814512940"
|
|
32
|
+
}
|
|
31
33
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/express",
|
|
3
|
-
"version": "12.0.
|
|
3
|
+
"version": "12.0.2",
|
|
4
4
|
"description": "Alan's express utils and middlewares.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
"yalc-publish": "yarn run yalc publish"
|
|
21
21
|
},
|
|
22
22
|
"peerDependencies": {
|
|
23
|
+
"@alanszp/errors": ">=12.0.0",
|
|
23
24
|
"express": "^4.17.1"
|
|
24
25
|
},
|
|
25
26
|
"devDependencies": {
|
|
@@ -35,15 +36,14 @@
|
|
|
35
36
|
"typescript": "^4.3.4"
|
|
36
37
|
},
|
|
37
38
|
"dependencies": {
|
|
38
|
-
"@alanszp/audit": "^12.0.
|
|
39
|
-
"@alanszp/errors": "^12.0.0",
|
|
39
|
+
"@alanszp/audit": "^12.0.2",
|
|
40
40
|
"@alanszp/jwt": "^12.0.0",
|
|
41
41
|
"@alanszp/logger": "^12.0.0",
|
|
42
|
-
"@alanszp/shared-context": "^12.0.
|
|
42
|
+
"@alanszp/shared-context": "^12.0.2",
|
|
43
43
|
"@babel/core": "^7.23.9",
|
|
44
44
|
"@paralleldrive/cuid2": "^2.2.2",
|
|
45
45
|
"body-parser": "^1.20.2",
|
|
46
46
|
"lodash": "^4.17.21"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "7f93084c31e9e82d2cf8ba06d5807b1701a65a5f"
|
|
49
49
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/express-common-fn",
|
|
3
|
-
"version": "12.0.
|
|
3
|
+
"version": "12.0.2",
|
|
4
4
|
"description": "Alan's express function to handle common errors and format uniformly.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@alanszp/core": "^12.0.0",
|
|
23
|
-
"@alanszp/
|
|
24
|
-
"@alanszp/express": "^12.0.0",
|
|
23
|
+
"@alanszp/express": "^12.0.2",
|
|
25
24
|
"@alanszp/logger": "^12.0.0",
|
|
26
|
-
"@alanszp/validations": "^12.0.
|
|
25
|
+
"@alanszp/validations": "^12.0.2"
|
|
27
26
|
},
|
|
28
27
|
"peerDependencies": {
|
|
28
|
+
"@alanszp/errors": ">=12.0.0",
|
|
29
29
|
"express": "^4.17.1",
|
|
30
30
|
"typeorm": "^0.2.34"
|
|
31
31
|
},
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
"typeorm": "^0.2.34",
|
|
36
36
|
"typescript": "4.7.4"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "7f93084c31e9e82d2cf8ba06d5807b1701a65a5f"
|
|
39
39
|
}
|
|
@@ -55,10 +55,19 @@ export function commonErrorsHandler(loggerFn: () => ILogger) {
|
|
|
55
55
|
if (error instanceof RenderableError) {
|
|
56
56
|
const statusCode =
|
|
57
57
|
error instanceof HttpRenderableError ? error.httpCode() : 500;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
error
|
|
61
|
-
|
|
58
|
+
|
|
59
|
+
if (statusCode >= 500) {
|
|
60
|
+
instanceLogger.error(`${baseLog}.error.${error.code()}`, {
|
|
61
|
+
statusCode,
|
|
62
|
+
error,
|
|
63
|
+
});
|
|
64
|
+
} else {
|
|
65
|
+
instanceLogger.info(`${baseLog}.error.${error.code()}`, {
|
|
66
|
+
statusCode,
|
|
67
|
+
error,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
|
|
62
71
|
res.status(statusCode).json(error.toView());
|
|
63
72
|
return;
|
|
64
73
|
}
|