@trojs/openapi-server 1.9.1 → 1.11.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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/api.js +5 -2
  3. package/src/express-callback.js +11 -4
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@trojs/openapi-server",
3
3
  "description": "OpenAPI Server",
4
- "version": "1.9.1",
4
+ "version": "1.11.0",
5
5
  "author": {
6
6
  "name": "Pieter Wigboldus",
7
7
  "url": "https://trojs.org/"
package/src/api.js CHANGED
@@ -30,6 +30,7 @@ import { setupRouter } from './router.js'
30
30
  * @property {boolean=} apiDocs
31
31
  * @property {AjvOpts=} ajvOptions
32
32
  * @property {AjvCustomizer=} customizeAjv
33
+ * @property {any[]=} middleware
33
34
  */
34
35
 
35
36
  /**
@@ -58,7 +59,8 @@ export class Api {
58
59
  swagger,
59
60
  apiDocs,
60
61
  ajvOptions,
61
- customizeAjv
62
+ customizeAjv,
63
+ middleware = []
62
64
  }) {
63
65
  this.version = version
64
66
  this.specification = specification
@@ -75,6 +77,7 @@ export class Api {
75
77
  this.apiDocs = apiDocs ?? true
76
78
  this.ajvOptions = ajvOptions ?? { allErrors: false }
77
79
  this.customizeAjv = customizeAjv
80
+ this.middleware = middleware
78
81
  }
79
82
 
80
83
  setup () {
@@ -108,7 +111,7 @@ export class Api {
108
111
  customizeAjv: this.customizeAjv
109
112
  })
110
113
  api.init()
111
-
114
+ this.middleware.forEach((fn) => router.use(fn))
112
115
  router.use((request, response) =>
113
116
  api.handleRequest(request, request, response)
114
117
  )
package/src/express-callback.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { hrtime } from 'node:process'
1
2
  import getStatusByError from './error-status.js'
2
3
  import { parseParams } from './params.js'
3
4
 
@@ -17,11 +18,12 @@ import { parseParams } from './params.js'
17
18
  * @param {Logger=} params.logger
18
19
  * @param {object=} params.meta
19
20
  * @param {boolean=} params.mock
20
- * @param {Function=} params.log
21
+ * @param {Function=} params.preLog
22
+ * @param {Function=} params.postLog
21
23
  * @returns {Function}
22
24
  */
23
25
  export const makeExpressCallback
24
- = ({ controller, specification, errorDetails, logger, meta, mock, log }) =>
26
+ = ({ controller, specification, errorDetails, logger, meta, mock, preLog, postLog }) =>
25
27
  /**
26
28
  * Handle controller
27
29
  * @async
@@ -31,6 +33,7 @@ export const makeExpressCallback
31
33
  * @returns {Promise<any>}
32
34
  */
33
35
  async (context, request, response) => {
36
+ const startTime = hrtime()
34
37
  try {
35
38
  const allParameters = {
36
39
  ...(context.request?.params || {}),
@@ -53,10 +56,14 @@ export const makeExpressCallback
53
56
  logger,
54
57
  meta
55
58
  }
56
- if (log) {
57
- log(feedback)
59
+ if (preLog) {
60
+ preLog(feedback)
58
61
  }
59
62
  const responseBody = await controller(feedback)
63
+ const responseTime = hrtime(startTime)[1] / 1000000 // convert to milliseconds
64
+ if (postLog) {
65
+ postLog({ ...feedback, responseBody, responseTime })
66
+ }
60
67
  logger.debug({
61
68
  url,
62
69
  parameters,