@trojs/openapi-server 1.0.10 → 1.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@trojs/openapi-server",
     "description": "OpenAPI Server",
-    "version": "1.0.10",
+    "version": "1.1.0",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://trojs.org/"
@@ -24,6 +24,7 @@
         "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",
@@ -35,6 +36,7 @@
     "devDependencies": {
         "@hckrnews/eslint-config": "^3.0.0",
         "@types/express-serve-static-core": "^4.17.41",
+        "@types/node": "^20.14.9",
         "c8": "^10.0.0",
         "eslint": "^8.23.0",
         "eslint-config-standard": "^17.1.0",
@@ -60,6 +62,7 @@
     ],
     "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,5 +1,6 @@
 import getStatusByError from './error-status.js'
 import { parseParams } from './params.js'
+import { parseFormData } from './formdata.js'
 
 /**
  * @typedef {import('express-serve-static-core').Request} Request
@@ -41,6 +42,9 @@ 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,
@@ -50,7 +54,8 @@ export const makeExpressCallback = ({
         post: request.body,
         url,
         logger,
-        meta
+        meta,
+        files
       })
       logger.debug({
         url,

package/src/formdata.js

@@ -0,0 +1,19 @@
+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 []
+}

package/src/server.js

@@ -29,6 +29,7 @@ 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
@@ -39,6 +40,7 @@ const getOriginResourcePolicy = (origin) => ({
  * @property {string=} url
  * @property {Logger=} logger
  * @property {object=} meta
+ * @property {FormData[]=} files
  * @typedef {object} SentryConfig
  * @property {string=} dsn
  * @property {number=} tracesSampleRate