@sphereon/ssi-express-support 0.17.6-unstable.8 → 0.18.0
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/express-utils.d.ts.map +1 -1
- package/dist/express-utils.js +18 -11
- package/dist/express-utils.js.map +1 -1
- package/package.json +2 -2
- package/src/express-utils.ts +18 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-utils.d.ts","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC/C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"express-utils.d.ts","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC/C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,8CA+BtH;AAED,eAAO,MAAM,gBAAgB,QAAS,GAAG,OAAO,eAAe,OAAO,gBAAgB,QAAQ,YAAY,sDAYzG,CAAA"}
|
package/dist/express-utils.js
CHANGED
|
@@ -2,18 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.jsonErrorHandler = exports.sendErrorResponse = void 0;
|
|
4
4
|
function sendErrorResponse(response, statusCode, message, error) {
|
|
5
|
-
|
|
5
|
+
let msg = message;
|
|
6
|
+
if (!msg) {
|
|
6
7
|
console.error('Message was null when calling sendErrorResponse. This should not happen');
|
|
7
|
-
|
|
8
|
+
msg = 'An unexpected error occurred';
|
|
8
9
|
statusCode = 500;
|
|
9
10
|
}
|
|
10
11
|
else {
|
|
11
|
-
console.error(`sendErrorResponse: ${typeof
|
|
12
|
+
console.error(`sendErrorResponse: ${typeof msg === 'string' ? msg : JSON.stringify(msg)}`);
|
|
12
13
|
}
|
|
13
14
|
if (error) {
|
|
14
|
-
|
|
15
|
+
if (error instanceof Error) {
|
|
16
|
+
console.error(error.message);
|
|
17
|
+
}
|
|
18
|
+
console.error(`error: ${JSON.stringify(error)}`);
|
|
15
19
|
}
|
|
16
|
-
if (statusCode
|
|
20
|
+
if (statusCode === 500) {
|
|
17
21
|
console.error(Error().stack);
|
|
18
22
|
}
|
|
19
23
|
if (response.headersSent) {
|
|
@@ -21,20 +25,23 @@ function sendErrorResponse(response, statusCode, message, error) {
|
|
|
21
25
|
return response;
|
|
22
26
|
}
|
|
23
27
|
response.statusCode = statusCode;
|
|
24
|
-
if (typeof
|
|
25
|
-
|
|
28
|
+
if (typeof msg === 'string' && !msg.startsWith('{')) {
|
|
29
|
+
msg = { error: msg };
|
|
26
30
|
}
|
|
27
|
-
if (typeof
|
|
31
|
+
if (typeof msg === 'string' && msg.startsWith('{')) {
|
|
28
32
|
response.header('Content-Type', 'application/json');
|
|
29
|
-
return response.status(statusCode).end(
|
|
33
|
+
return response.status(statusCode).end(msg);
|
|
30
34
|
}
|
|
31
|
-
return response.status(statusCode).json(
|
|
35
|
+
return response.status(statusCode).json(msg);
|
|
32
36
|
}
|
|
33
37
|
exports.sendErrorResponse = sendErrorResponse;
|
|
34
38
|
const jsonErrorHandler = (err, req, res, next) => {
|
|
35
39
|
var _a;
|
|
36
40
|
const statusCode = 'statusCode' in err ? err.statusCode : 500;
|
|
37
|
-
|
|
41
|
+
let errorMsg = typeof err === 'string' ? err : (_a = err.message) !== null && _a !== void 0 ? _a : err;
|
|
42
|
+
if (typeof errorMsg !== 'string') {
|
|
43
|
+
errorMsg = JSON.stringify(errorMsg);
|
|
44
|
+
}
|
|
38
45
|
if (res.headersSent) {
|
|
39
46
|
console.log('Headers already sent, when calling error handler. Will defer to next error handler');
|
|
40
47
|
console.log(`Error was: ${JSON.stringify(err)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":";;;AACA,SAAgB,iBAAiB,CAAC,QAA0B,EAAE,UAAkB,EAAE,OAAwB,EAAE,KAAW;IACrH,IAAI,
|
|
1
|
+
{"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":";;;AACA,SAAgB,iBAAiB,CAAC,QAA0B,EAAE,UAAkB,EAAE,OAAwB,EAAE,KAAW;IACrH,IAAI,GAAG,GAAG,OAAO,CAAA;IACjB,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAA;QACxF,GAAG,GAAG,8BAA8B,CAAA;QACpC,UAAU,GAAG,GAAG,CAAA;KACjB;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;KAC3F;IACD,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;SAC7B;QACD,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;KACjD;IACD,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;KAC7B;IACD,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;QACvD,OAAO,QAAQ,CAAA;KAChB;IACD,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACnD,GAAG,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;KACrB;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAClD,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KAC5C;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AA/BD,8CA+BC;AAEM,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,GAAoB,EAAE,GAAqB,EAAE,IAAkB,EAAE,EAAE;;IAC5G,MAAM,UAAU,GAAW,YAAY,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAA;IACrE,IAAI,QAAQ,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,OAAO,mCAAI,GAAG,CAAA;IACjE,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;KACpC;IACD,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,OAAO,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;QACjG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;KACjB;IACD,OAAO,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAChG,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sphereon/ssi-express-support",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.0",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -76,5 +76,5 @@
|
|
|
76
76
|
"SSI",
|
|
77
77
|
"Agent"
|
|
78
78
|
],
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "afad00bef1e0ce6ac1637169b2e8a3b46f287255"
|
|
80
80
|
}
|
package/src/express-utils.ts
CHANGED
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import express, { NextFunction } from 'express'
|
|
2
2
|
export function sendErrorResponse(response: express.Response, statusCode: number, message: string | object, error?: any) {
|
|
3
|
-
|
|
3
|
+
let msg = message
|
|
4
|
+
if (!msg) {
|
|
4
5
|
console.error('Message was null when calling sendErrorResponse. This should not happen')
|
|
5
|
-
|
|
6
|
+
msg = 'An unexpected error occurred'
|
|
6
7
|
statusCode = 500
|
|
7
8
|
} else {
|
|
8
|
-
console.error(`sendErrorResponse: ${typeof
|
|
9
|
+
console.error(`sendErrorResponse: ${typeof msg === 'string' ? msg : JSON.stringify(msg)}`)
|
|
9
10
|
}
|
|
10
11
|
if (error) {
|
|
11
|
-
|
|
12
|
+
if (error instanceof Error) {
|
|
13
|
+
console.error(error.message)
|
|
14
|
+
}
|
|
15
|
+
console.error(`error: ${JSON.stringify(error)}`)
|
|
12
16
|
}
|
|
13
|
-
if(statusCode
|
|
17
|
+
if (statusCode === 500) {
|
|
14
18
|
console.error(Error().stack)
|
|
15
19
|
}
|
|
16
20
|
if (response.headersSent) {
|
|
@@ -18,19 +22,22 @@ export function sendErrorResponse(response: express.Response, statusCode: number
|
|
|
18
22
|
return response
|
|
19
23
|
}
|
|
20
24
|
response.statusCode = statusCode
|
|
21
|
-
if (typeof
|
|
22
|
-
|
|
25
|
+
if (typeof msg === 'string' && !msg.startsWith('{')) {
|
|
26
|
+
msg = { error: msg }
|
|
23
27
|
}
|
|
24
|
-
if (typeof
|
|
28
|
+
if (typeof msg === 'string' && msg.startsWith('{')) {
|
|
25
29
|
response.header('Content-Type', 'application/json')
|
|
26
|
-
return response.status(statusCode).end(
|
|
30
|
+
return response.status(statusCode).end(msg)
|
|
27
31
|
}
|
|
28
|
-
return response.status(statusCode).json(
|
|
32
|
+
return response.status(statusCode).json(msg)
|
|
29
33
|
}
|
|
30
34
|
|
|
31
35
|
export const jsonErrorHandler = (err: any, req: express.Request, res: express.Response, next: NextFunction) => {
|
|
32
36
|
const statusCode: number = 'statusCode' in err ? err.statusCode : 500
|
|
33
|
-
|
|
37
|
+
let errorMsg = typeof err === 'string' ? err : err.message ?? err
|
|
38
|
+
if (typeof errorMsg !== 'string') {
|
|
39
|
+
errorMsg = JSON.stringify(errorMsg)
|
|
40
|
+
}
|
|
34
41
|
if (res.headersSent) {
|
|
35
42
|
console.log('Headers already sent, when calling error handler. Will defer to next error handler')
|
|
36
43
|
console.log(`Error was: ${JSON.stringify(err)}`)
|