@trojs/openapi-server 1.1.0 → 1.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@trojs/openapi-server",
     "description": "OpenAPI Server",
-    "version": "1.1.0",
+    "version": "1.2.1",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://trojs.org/"
@@ -24,7 +24,6 @@
         "src/error-status.js",
         "src/types.js",
         "src/params.js",
-        "src/formdata.js",
         "src/express-callback.js",
         "src/operation-ids.js",
         "src/handlers/not-found.js",
@@ -62,7 +61,6 @@
     ],
     "dependencies": {
         "@sentry/node": "^7.112.1",
-        "@trojs/formdata-parser": "^0.2.0",
         "ajv-formats": "^3.0.0",
         "body-parser": "^1.20.2",
         "compression": "^1.7.4",

package/src/express-callback.js

@@ -1,6 +1,5 @@
 import getStatusByError from './error-status.js'
 import { parseParams } from './params.js'
-import { parseFormData } from './formdata.js'
 
 /**
  * @typedef {import('express-serve-static-core').Request} Request
@@ -42,9 +41,6 @@ export const makeExpressCallback = ({
       })
       const url = `${request.protocol}://${request.get('Host')}${request.originalUrl}`
 
-      // @ts-ignore
-      const data = request?._readableState?.buffer
-      const files = parseFormData(data, request.headers)
       const responseBody = await controller({
         context,
         request,
@@ -54,8 +50,7 @@ export const makeExpressCallback = ({
         post: request.body,
         url,
         logger,
-        meta,
-        files
+        meta
       })
       logger.debug({
         url,
@@ -68,7 +63,11 @@ export const makeExpressCallback = ({
     } catch (error) {
       const errorCodeStatus = getStatusByError(error)
 
-      logger.error(error)
+      if (errorCodeStatus >= 500) {
+        logger.error(error)
+      } else {
+        logger.warn(error)
+      }
 
       response.status(errorCodeStatus)
 

package/src/server.js

@@ -29,7 +29,6 @@ const getOriginResourcePolicy = (origin) => ({
  * @typedef {import('./api.js').ApiSchema} ApiSchema
  * @typedef {import('./api.js').Logger} Logger
  * @typedef {import('express').Express} Express
- * @typedef {import('@trojs/formdata-parser').FormData} FormData
  * @typedef {object} Controller
  * @property {Context=} context
  * @property {Request=} request
@@ -40,7 +39,6 @@ const getOriginResourcePolicy = (origin) => ({
  * @property {string=} url
  * @property {Logger=} logger
  * @property {object=} meta
- * @property {FormData[]=} files
  * @typedef {object} SentryConfig
  * @property {string=} dsn
  * @property {number=} tracesSampleRate
@@ -58,9 +56,10 @@ const getOriginResourcePolicy = (origin) => ({
  * @param {SentryConfig=} params.sentry
  * @param {string=} params.poweredBy
  * @param {string=} params.version
+ * @param {any[]=} params.middleware
  * @returns {Promise<{ app: Express }>}
  */
-export const setupServer = async ({ apis, origin = '*', staticFolder, sentry, poweredBy = 'TroJS', version = '1.0.0' }) => {
+export const setupServer = async ({ apis, origin = '*', staticFolder, sentry, poweredBy = 'TroJS', version = '1.0.0', middleware = [] }) => {
   const corsOptions = {
     origin
   }
@@ -86,6 +85,7 @@ export const setupServer = async ({ apis, origin = '*', staticFolder, sentry, po
   app.use(compression())
   app.use(helmet(getOriginResourcePolicy(origin)))
   app.use(express.json())
+  middleware.forEach((fn) => app.use(fn))
   app.use(bodyParser.urlencoded({ extended: false }))
   app.use((_request, response, next) => {
     response.setHeader('X-Powered-By', poweredBy)

package/src/formdata.js

@@ -1,19 +0,0 @@
-import formDataParser from '@trojs/formdata-parser'
-
-/**
- * @typedef {import('@trojs/formdata-parser').FormData} FormData
- * @typedef {import('node:http').IncomingHttpHeaders} IncomingHttpHeaders
- *
- * Parse form data
- * @param {Buffer|string} data
- * @param {IncomingHttpHeaders} headers
- * @returns {FormData[]}
- */
-export const parseFormData = (data, headers) => {
-  const contentType = headers?.['content-type']
-  if (contentType?.startsWith('multipart/form-data') && data) {
-    const dataString = data.toString('utf8')
-    return formDataParser(dataString, contentType)
-  }
-  return []
-}