@hyper.software/common-helpers 1.9.1 → 1.9.3
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.
|
@@ -3,7 +3,15 @@ export interface IErrorHandlerOptions {
|
|
|
3
3
|
}
|
|
4
4
|
export declare const expressErrorHandlerMiddleware: (options: IErrorHandlerOptions) => (err: Error | any, req: any, res: any, _next: any) => any;
|
|
5
5
|
export declare const expressHttpErrorHandler: (options: IErrorHandlerOptions) => (err: Error | any, req: any, res: any) => any;
|
|
6
|
-
export declare function formatErrorForLogging(req: any, error: any, prefix?: string): string
|
|
6
|
+
export declare function formatErrorForLogging(req: any, error: any, prefix?: string): (string | {
|
|
7
|
+
subdomain: any;
|
|
8
|
+
language: string;
|
|
9
|
+
currentUser: {
|
|
10
|
+
id: any;
|
|
11
|
+
email: any;
|
|
12
|
+
};
|
|
13
|
+
error: string;
|
|
14
|
+
})[];
|
|
7
15
|
export declare function formatUser(user?: any): {
|
|
8
16
|
id: any;
|
|
9
17
|
email: any;
|
|
@@ -29,21 +29,20 @@ var expressHttpErrorHandler = function (options) { return function (err, req, re
|
|
|
29
29
|
if (response) {
|
|
30
30
|
switch (err.logLevel) {
|
|
31
31
|
case errors_types_1.LogLevel.info:
|
|
32
|
-
|
|
32
|
+
logger.info(formatErrorForLogging(req, err));
|
|
33
33
|
break;
|
|
34
34
|
case errors_types_1.LogLevel.warn:
|
|
35
|
-
|
|
35
|
+
logger.warn(formatErrorForLogging(req, err));
|
|
36
36
|
break;
|
|
37
37
|
case errors_types_1.LogLevel.error:
|
|
38
|
-
|
|
38
|
+
logger.error(formatErrorForLogging(req, err));
|
|
39
39
|
break;
|
|
40
40
|
default:
|
|
41
|
-
|
|
41
|
+
logger.error(formatErrorForLogging(req, err));
|
|
42
42
|
}
|
|
43
43
|
return res.status(statusCode).json(response);
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
return res.status(statusCode).json('Unhandled error');
|
|
45
|
+
return res.status(statusCode).json(formatErrorForLogging(req, err));
|
|
47
46
|
}
|
|
48
47
|
catch (err) {
|
|
49
48
|
logger.error(formatErrorForLogging(req, err, "!!!THE LOGGER CRASHED!!! "));
|
|
@@ -55,9 +54,17 @@ function formatErrorForLogging(req, error, prefix) {
|
|
|
55
54
|
if (prefix === void 0) { prefix = ''; }
|
|
56
55
|
var errorToString = (0, errorMappers_1.mapErrorToString)(error);
|
|
57
56
|
var language = req.headers['accept-language'];
|
|
58
|
-
var
|
|
57
|
+
var user = formatUser(req.user);
|
|
59
58
|
var subdomain = (req.subdomains || []).join('.');
|
|
60
|
-
return
|
|
59
|
+
return [
|
|
60
|
+
"".concat(prefix, " [").concat(req.method, "] ").concat(req.url),
|
|
61
|
+
{
|
|
62
|
+
subdomain: subdomain,
|
|
63
|
+
language: language,
|
|
64
|
+
currentUser: user,
|
|
65
|
+
error: errorToString,
|
|
66
|
+
},
|
|
67
|
+
];
|
|
61
68
|
}
|
|
62
69
|
function formatUser(user) {
|
|
63
70
|
if (user === void 0) { user = {}; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":"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"}
|