powr-sdk-api 1.3.1 → 1.3.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.
- package/dist/middleware/error.js +14 -2
- package/dist/middleware/request.js +32 -6
- package/package.json +1 -1
package/dist/middleware/error.js
CHANGED
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
const errorCatcher = fn => (req, res, next) => {
|
|
4
|
-
Promise.resolve(fn(req, res, next)).catch(
|
|
4
|
+
Promise.resolve(fn(req, res, next)).catch(error => {
|
|
5
|
+
// Extract error message and status code
|
|
6
|
+
const message = error.message || 'Internal Server Error';
|
|
7
|
+
const statusCode = error.statusCode || 500;
|
|
8
|
+
|
|
9
|
+
// Pass error details to res.error
|
|
10
|
+
return res.error(message, statusCode, error);
|
|
11
|
+
});
|
|
5
12
|
};
|
|
6
13
|
const errorHandler = (err, req, res, next) => {
|
|
7
|
-
|
|
14
|
+
// Extract error message and status code
|
|
15
|
+
const message = err.message || 'Internal Server Error';
|
|
16
|
+
const statusCode = err.statusCode || 500;
|
|
17
|
+
|
|
18
|
+
// Pass error details to res.error
|
|
19
|
+
return res.error(message, statusCode, err);
|
|
8
20
|
};
|
|
9
21
|
module.exports = {
|
|
10
22
|
errorCatcher,
|
|
@@ -38,20 +38,46 @@ const requestHandler = (req, res, next) => {
|
|
|
38
38
|
// Add error handler to response object if not already present
|
|
39
39
|
if (!res.error) {
|
|
40
40
|
res.error = (message, statusCode = 500, error = null) => {
|
|
41
|
-
|
|
41
|
+
// Extract error details for logging and response
|
|
42
|
+
let errorDetails = null;
|
|
43
|
+
if (error) {
|
|
44
|
+
// If error is an Error object, extract relevant properties
|
|
45
|
+
if (error instanceof Error) {
|
|
46
|
+
errorDetails = {
|
|
47
|
+
message: error.message,
|
|
48
|
+
stack: error.stack
|
|
49
|
+
};
|
|
50
|
+
} else if (typeof error === 'object') {
|
|
51
|
+
// If error is already an object, use it directly
|
|
52
|
+
errorDetails = error;
|
|
53
|
+
} else {
|
|
54
|
+
// If error is a primitive, convert to string
|
|
55
|
+
errorDetails = {
|
|
56
|
+
message: String(error)
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// Ensure message is a string
|
|
62
|
+
const errorMessage = typeof message === 'string' ? message : message && message.message ? message.message : 'Internal Server Error';
|
|
63
|
+
|
|
64
|
+
// Log the error with details
|
|
65
|
+
logger.error(errorMessage, {
|
|
42
66
|
statusCode,
|
|
43
67
|
requestId: req.requestId,
|
|
44
|
-
error
|
|
68
|
+
error: errorDetails
|
|
45
69
|
});
|
|
70
|
+
|
|
71
|
+
// Create response object
|
|
46
72
|
const response = {
|
|
47
73
|
success: false,
|
|
48
|
-
message,
|
|
74
|
+
message: errorMessage,
|
|
49
75
|
requestId: req.requestId
|
|
50
76
|
};
|
|
51
77
|
|
|
52
|
-
// Include error in response if available
|
|
53
|
-
if (
|
|
54
|
-
response.error =
|
|
78
|
+
// Include error details in response if available
|
|
79
|
+
if (errorDetails) {
|
|
80
|
+
response.error = errorDetails;
|
|
55
81
|
}
|
|
56
82
|
return res.status(statusCode).json(response);
|
|
57
83
|
};
|