@trojs/openapi-server 1.16.0 → 1.18.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@trojs/openapi-server",
     "description": "OpenAPI Server",
-    "version": "1.16.0",
+    "version": "1.18.0",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://trojs.org/"
@@ -54,7 +54,7 @@
         "url": "https://github.com/trojs/openapi-server"
     },
     "engines": {
-        "node": ">= 20 < 21 || >= 22 < 23"
+        "node": ">= 20 < 21 || >= 22 < 23 || >= 24 < 25"
     },
     "keywords": [
         "openapi",

package/src/express-callback.js

@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 import { hrtime } from 'node:process'
 import getStatusByError from './error-status.js'
 import { parseParams } from './params.js'
@@ -45,6 +46,15 @@ export const makeExpressCallback
           mock
         })
         const url = `${request.protocol}://${request.get('Host')}${request.originalUrl}`
+
+        const ipHeader = request.headers?.['x-forwarded-for']
+        const ipString = Array.isArray(ipHeader) ? ipHeader[0] : ipHeader
+        const ip = ipString
+          ? ipString.split(',')[0].trim()
+          : (request.socket?.remoteAddress || request.ip || '-')
+        const { method } = request
+        const userAgent = request.headers?.['user-agent'] || request.get('user-agent') || '-'
+
         const feedback = {
           context,
           request,
@@ -68,7 +78,13 @@ export const makeExpressCallback
           url,
           parameters,
           post: request.body,
-          response: responseBody
+          response: responseBody,
+          method,
+          ip,
+          userAgent,
+          responseTime,
+          statusCode: response.statusCode || 200,
+          message: 'access'
         })
 
         return responseBody

package/src/server.js

@@ -4,6 +4,7 @@ import compression from 'compression'
 import helmet from 'helmet'
 import * as Sentry from '@sentry/node'
 import bodyParser from 'body-parser'
+import { hostname } from 'node:os'
 import { openAPI } from './openapi.js'
 import { Api } from './api.js'
 
@@ -53,6 +54,8 @@ const getOriginResourcePolicy = (origin) => ({
  * @property {number=} tracesSampleRate
  * @property {number=} profilesSampleRate
  * @property {string=} release
+ * @property {string=} environment
+ * @property {string=} serverName
  */
 
 /**
@@ -88,13 +91,15 @@ export const setupServer = async ({
   if (sentry) {
     Sentry.init({
       dsn: sentry.dsn,
+      environment: sentry.environment || process.env.NODE_ENV || 'production',
       integrations: [
         new Sentry.Integrations.Http({ tracing: true }),
         new Sentry.Integrations.Express({ app })
       ],
       tracesSampleRate: sentry.tracesSampleRate || 1.0,
       profilesSampleRate: sentry.profilesSampleRate || 1.0,
-      release: sentry.release
+      release: sentry.release || process.env.SOURCE_VERSION,
+      serverName: sentry.serverName || process.env.SERVER_NAME || hostname()
     })
 
     app.use(Sentry.Handlers.requestHandler())

package/types/express-callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express-callback.d.ts","sourceRoot":"","sources":["../src/express-callback.js"],"names":[],"mappings":"AAwBO,sHAVJ;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;IACU,MAAM,GAAxB,oBAAS;IACS,OAAO,GAAzB,oBAAS;CACjB,YAqFE;sBAtGQ,OAAO,2BAA2B,EAAE,OAAO;uBAC3C,OAAO,2BAA2B,EAAE,QAAQ;sBAC5C,OAAO,iBAAiB,EAAE,OAAO;qBACjC,OAAO,UAAU,EAAE,MAAM"}
+{"version":3,"file":"express-callback.d.ts","sourceRoot":"","sources":["../src/express-callback.js"],"names":[],"mappings":"AAyBO,sHAVJ;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;IACU,MAAM,GAAxB,oBAAS;IACS,OAAO,GAAzB,oBAAS;CACjB,YAoGE;sBArHQ,OAAO,2BAA2B,EAAE,OAAO;uBAC3C,OAAO,2BAA2B,EAAE,QAAQ;sBAC5C,OAAO,iBAAiB,EAAE,OAAO;qBACjC,OAAO,UAAU,EAAE,MAAM"}

package/types/server.d.ts

@@ -32,6 +32,8 @@ export type SentryConfig = {
     tracesSampleRate?: number | undefined;
     profilesSampleRate?: number | undefined;
     release?: string | undefined;
+    environment?: string | undefined;
+    serverName?: string | undefined;
 };
 import { openAPI } from './openapi.js';
 import { Api } from './api.js';

package/types/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.js"],"names":[],"mappings":"AAuEO,qHAVJ;IAA4B,IAAI,EAAxB,SAAS,EAAE;IACK,MAAM,GAAtB,MAAM,YAAC;IACS,YAAY,GAA5B,MAAM,YAAC;IACe,MAAM,GAA5B,YAAY,YAAC;IACG,SAAS,GAAzB,MAAM,YAAC;IACS,OAAO,GAAvB,MAAM,YAAC;IACQ,UAAU,GAAzB,GAAG,EAAE,YAAC;IACiB,eAAe,GAAtC,CAAA,MAAM,GAAC,MAAM,aAAC;CACtB,GAAU,OAAO,CAAC;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC,CA4DrC;sBAtGY,OAAO,2BAA2B,EAAE,OAAO;uBAC3C,OAAO,2BAA2B,EAAE,QAAQ;sBAC5C,OAAO,iBAAiB,EAAE,OAAO;wBACjC,OAAO,UAAU,EAAE,SAAS;qBAC5B,OAAO,UAAU,EAAE,MAAM;;uBAKxB,CAAC;cAED,OAAO,YAAC;cACR,OAAO,YAAC;eACR,QAAQ,YAAC;iBACT,MAAM,YAAC;oBACP,MAAM,YAAC;WACP,CAAC,YAAC;UACF,MAAM,YAAC;aACP,MAAM,YAAC;WACP,MAAM,YAAC;;;UAKP,MAAM,YAAC;uBACP,MAAM,YAAC;yBACP,MAAM,YAAC;cACP,MAAM,YAAC;;wBAhDG,cAAc;oBAClB,UAAU"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.js"],"names":[],"mappings":"AA0EO,qHAVJ;IAA4B,IAAI,EAAxB,SAAS,EAAE;IACK,MAAM,GAAtB,MAAM,YAAC;IACS,YAAY,GAA5B,MAAM,YAAC;IACe,MAAM,GAA5B,YAAY,YAAC;IACG,SAAS,GAAzB,MAAM,YAAC;IACS,OAAO,GAAvB,MAAM,YAAC;IACQ,UAAU,GAAzB,GAAG,EAAE,YAAC;IACiB,eAAe,GAAtC,CAAA,MAAM,GAAC,MAAM,aAAC;CACtB,GAAU,OAAO,CAAC;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC,CA8DrC;sBA1GY,OAAO,2BAA2B,EAAE,OAAO;uBAC3C,OAAO,2BAA2B,EAAE,QAAQ;sBAC5C,OAAO,iBAAiB,EAAE,OAAO;wBACjC,OAAO,UAAU,EAAE,SAAS;qBAC5B,OAAO,UAAU,EAAE,MAAM;;uBAKxB,CAAC;cAED,OAAO,YAAC;cACR,OAAO,YAAC;eACR,QAAQ,YAAC;iBACT,MAAM,YAAC;oBACP,MAAM,YAAC;WACP,CAAC,YAAC;UACF,MAAM,YAAC;aACP,MAAM,YAAC;WACP,MAAM,YAAC;;;UAKP,MAAM,YAAC;uBACP,MAAM,YAAC;yBACP,MAAM,YAAC;cACP,MAAM,YAAC;kBACP,MAAM,YAAC;iBACP,MAAM,YAAC;;wBAlDG,cAAc;oBAClB,UAAU"}