@trojs/openapi-server 3.4.1 → 3.4.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/package.json +4 -4
- package/src/express-callback.js +54 -54
- package/src/router.js +1 -1
- package/types/express-callback.d.ts.map +1 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trojs/openapi-server",
|
|
3
3
|
"description": "OpenAPI Server",
|
|
4
|
-
"version": "3.4.
|
|
4
|
+
"version": "3.4.3",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Pieter Wigboldus",
|
|
7
7
|
"url": "https://trojs.org/"
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
],
|
|
38
38
|
"main": "src/server.js",
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@trojs/lint": "^0.
|
|
41
|
-
"@types/node": "^
|
|
40
|
+
"@trojs/lint": "^0.4.0",
|
|
41
|
+
"@types/node": "^24.0.0",
|
|
42
42
|
"@types/express-serve-static-core": "^5.0.0",
|
|
43
43
|
"eslint": "^9.15.0",
|
|
44
44
|
"globals": "^16.0.0",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"url": "https://github.com/trojs/openapi-server"
|
|
53
53
|
},
|
|
54
54
|
"engines": {
|
|
55
|
-
"node": ">= 20 < 21 || >= 22 <
|
|
55
|
+
"node": ">= 20 < 21 || >= 22 < 25"
|
|
56
56
|
},
|
|
57
57
|
"keywords": [
|
|
58
58
|
"openapi",
|
package/src/express-callback.js
CHANGED
|
@@ -20,7 +20,7 @@ import { parseParams } from './params.js'
|
|
|
20
20
|
* @returns {Function}
|
|
21
21
|
*/
|
|
22
22
|
export const makeExpressCallback
|
|
23
|
-
|
|
23
|
+
= ({ controller, specification, errorDetails, logger, meta, mock }) =>
|
|
24
24
|
/**
|
|
25
25
|
* Handle controller
|
|
26
26
|
* @async
|
|
@@ -29,68 +29,68 @@ export const makeExpressCallback
|
|
|
29
29
|
* @param {Response} response
|
|
30
30
|
* @returns {Promise<any>}
|
|
31
31
|
*/
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const responseBody = await controller({
|
|
46
|
-
context,
|
|
47
|
-
request,
|
|
48
|
-
response,
|
|
49
|
-
parameters,
|
|
50
|
-
specification,
|
|
51
|
-
post: request.body,
|
|
52
|
-
url,
|
|
53
|
-
logger,
|
|
54
|
-
meta
|
|
55
|
-
})
|
|
56
|
-
logger.debug({
|
|
57
|
-
url,
|
|
58
|
-
parameters,
|
|
59
|
-
post: request.body,
|
|
60
|
-
response: responseBody
|
|
61
|
-
})
|
|
32
|
+
async (context, request, response) => {
|
|
33
|
+
try {
|
|
34
|
+
const allParameters = {
|
|
35
|
+
...(context.request?.params || {}),
|
|
36
|
+
...(context.request?.query || {})
|
|
37
|
+
}
|
|
38
|
+
const parameters = parseParams({
|
|
39
|
+
query: allParameters,
|
|
40
|
+
spec: context.operation.parameters,
|
|
41
|
+
mock
|
|
42
|
+
})
|
|
43
|
+
const url = `${request.protocol}://${request.get('Host')}${request.originalUrl}`
|
|
62
44
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
45
|
+
const responseBody = await controller({
|
|
46
|
+
context,
|
|
47
|
+
request,
|
|
48
|
+
response,
|
|
49
|
+
parameters,
|
|
50
|
+
specification,
|
|
51
|
+
post: request.body,
|
|
52
|
+
url,
|
|
53
|
+
logger,
|
|
54
|
+
meta
|
|
55
|
+
})
|
|
56
|
+
logger.debug({
|
|
57
|
+
url,
|
|
58
|
+
parameters,
|
|
59
|
+
post: request.body,
|
|
60
|
+
response: responseBody
|
|
61
|
+
})
|
|
66
62
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
logger.warn(error)
|
|
71
|
-
}
|
|
63
|
+
return responseBody
|
|
64
|
+
} catch (error) {
|
|
65
|
+
const errorCodeStatus = getStatusByError(error)
|
|
72
66
|
|
|
73
|
-
|
|
67
|
+
if (errorCodeStatus >= 500) {
|
|
68
|
+
logger.error(error)
|
|
69
|
+
} else {
|
|
70
|
+
logger.warn(error)
|
|
71
|
+
}
|
|
74
72
|
|
|
75
|
-
|
|
76
|
-
return {
|
|
77
|
-
errors: [
|
|
78
|
-
{
|
|
79
|
-
message: error.message,
|
|
80
|
-
value: error.valueOf(),
|
|
81
|
-
type: error.constructor.name
|
|
82
|
-
}
|
|
83
|
-
],
|
|
84
|
-
status: errorCodeStatus,
|
|
85
|
-
timestamp: new Date(),
|
|
86
|
-
message: error.message
|
|
87
|
-
}
|
|
88
|
-
}
|
|
73
|
+
response.status(errorCodeStatus)
|
|
89
74
|
|
|
75
|
+
if (errorDetails) {
|
|
90
76
|
return {
|
|
77
|
+
errors: [
|
|
78
|
+
{
|
|
79
|
+
message: error.message,
|
|
80
|
+
value: error.valueOf(),
|
|
81
|
+
type: error.constructor.name
|
|
82
|
+
}
|
|
83
|
+
],
|
|
91
84
|
status: errorCodeStatus,
|
|
92
85
|
timestamp: new Date(),
|
|
93
86
|
message: error.message
|
|
94
87
|
}
|
|
95
88
|
}
|
|
89
|
+
|
|
90
|
+
return {
|
|
91
|
+
status: errorCodeStatus,
|
|
92
|
+
timestamp: new Date(),
|
|
93
|
+
message: error.message
|
|
94
|
+
}
|
|
96
95
|
}
|
|
96
|
+
}
|
package/src/router.js
CHANGED
|
@@ -82,7 +82,7 @@ export const setupRouter = ({
|
|
|
82
82
|
|
|
83
83
|
api.register('notImplemented', (context) => {
|
|
84
84
|
const { mock: mockImplementation }
|
|
85
|
-
|
|
85
|
+
= context.api.mockResponseForOperation(context.operation.operationId)
|
|
86
86
|
return mockImplementation
|
|
87
87
|
})
|
|
88
88
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-callback.d.ts","sourceRoot":"","sources":["../src/express-callback.js"],"names":[],"mappings":"AAqBO,qGARJ;IAAyB,UAAU;IACZ,aAAa,EAA5B,MAAM;IACW,YAAY,GAA7B,OAAO,YAAC;IACQ,MAAM,GAAtB,MAAM,YAAC;IACS,IAAI,GAApB,MAAM,YAAC;IACU,IAAI,GAArB,OAAO,YAAC;CAChB,
|
|
1
|
+
{"version":3,"file":"express-callback.d.ts","sourceRoot":"","sources":["../src/express-callback.js"],"names":[],"mappings":"AAqBO,qGARJ;IAAyB,UAAU;IACZ,aAAa,EAA5B,MAAM;IACW,YAAY,GAA7B,OAAO,YAAC;IACQ,MAAM,GAAtB,MAAM,YAAC;IACS,IAAI,GAApB,MAAM,YAAC;IACU,IAAI,GAArB,OAAO,YAAC;CAChB,YA4EE;sBA3FQ,OAAO,2BAA2B,EAAE,OAAO;uBAC3C,OAAO,2BAA2B,EAAE,QAAQ;sBAC5C,OAAO,iBAAiB,EAAE,OAAO;qBACjC,OAAO,UAAU,EAAE,MAAM"}
|