@forklaunch/core 0.11.7 → 0.12.1

package/lib/http/index.d.mts

@@ -1,6 +1,6 @@
 import { ParsedQs } from 'qs';
 export { ParsedQs } from 'qs';
-import { UnionToIntersection, StringWithoutSlash, Prettify, SanitizePathSlashes, MakePropertyOptionalIfChildrenOptional, PrettyCamelCase, TypeSafeFunction, EmptyObject } from '@forklaunch/common';
+import { UnionToIntersection, TypeSafeFunction, StringWithoutSlash, Prettify, SanitizePathSlashes, MakePropertyOptionalIfChildrenOptional, PrettyCamelCase, EmptyObject } from '@forklaunch/common';
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
 import { CorsOptions } from 'cors';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
@@ -224,7 +224,7 @@ type TypedRequestBody<SV extends AnySchemaValidator> = {
     [K in keyof (ExclusiveSchemaCatchall<SV> & ExclusiveRequestBodyBase<SV>)]?: K extends keyof UnknownBody<SV> ? UnknownBody<SV>[K] : undefined;
 };
 type TypedBody<SV extends AnySchemaValidator> = JsonBody<SV> | TextBody<SV> | FileBody<SV> | MultipartForm<SV> | UrlEncodedForm<SV> | UnknownBody<SV>;
-type Body<SV extends AnySchemaValidator> = TypedRequestBody<SV> | (ExclusiveRequestBodyBase<SV> & SV['_ValidSchemaObject']) | (ExclusiveRequestBodyBase<SV> & UnboxedObjectSchema<SV>) | (ExclusiveRequestBodyBase<SV> & SV['string']) | (ExclusiveRequestBodyBase<SV> & SV['number']) | (ExclusiveRequestBodyBase<SV> & SV['boolean']) | (ExclusiveRequestBodyBase<SV> & SV['date']) | (ExclusiveRequestBodyBase<SV> & SV['array']) | (ExclusiveRequestBodyBase<SV> & SV['file']);
+type Body<SV extends AnySchemaValidator> = TypedRequestBody<SV> | (ExclusiveRequestBodyBase<SV> & SV['_ValidSchemaObject']) | (ExclusiveRequestBodyBase<SV> & UnboxedObjectSchema<SV>) | (ExclusiveRequestBodyBase<SV> & SV['string']) | (ExclusiveRequestBodyBase<SV> & SV['number']) | (ExclusiveRequestBodyBase<SV> & SV['boolean']) | (ExclusiveRequestBodyBase<SV> & SV['date']) | (ExclusiveRequestBodyBase<SV> & SV['array']) | (ExclusiveRequestBodyBase<SV> & SV['file']) | (ExclusiveRequestBodyBase<SV> & SV['any']) | (ExclusiveRequestBodyBase<SV> & SV['unknown']) | (ExclusiveRequestBodyBase<SV> & SV['binary']) | (ExclusiveRequestBodyBase<SV> & (SV['type'] extends TypeSafeFunction ? ReturnType<SV['type']> : never));
 type BasicAuthMethods = {
     readonly basic: {
         readonly login: (username: string, password: string) => boolean;
@@ -1661,7 +1661,7 @@ declare const getCodeForStatus: (status: string) => null | StatusCode;
  * @param {ForklaunchRouter<SV>[]} routers - The routers to include in the server.
  * @returns {McpServer} - The generated ModelContextProtocol server.
  */
-declare function generateMcpServer<T extends Record<string, unknown> | undefined = Record<string, unknown> | undefined>(schemaValidator: ZodSchemaValidator, protocol: 'http' | 'https', host: string, port: number, version: `${number}.${number}.${number}`, routers: ForklaunchRouter<ZodSchemaValidator>[], options?: ConstructorParameters<typeof FastMCP<T>>[0], contentTypeMap?: Record<string, string>): FastMCP<T>;
+declare function generateMcpServer<T extends Record<string, unknown> | undefined = Record<string, unknown> | undefined>(schemaValidator: ZodSchemaValidator, protocol: 'http' | 'https', host: string, port: number, version: `${number}.${number}.${number}`, application: ForklaunchRouter<ZodSchemaValidator>, options?: ConstructorParameters<typeof FastMCP<T>>[0], contentTypeMap?: Record<string, string>): FastMCP<T>;
 
 /**
  * Enhances the Express-like `send` method with additional logic for response handling and validation.
@@ -1701,7 +1701,7 @@ declare const OPENAPI_DEFAULT_VERSION: unique symbol;
  * @param {ForklaunchRouter<SV>[]} routers - The routers to include in the Swagger document.
  * @returns {OpenAPIObject} - The generated Swagger document.
  */
-declare function generateOpenApiSpecs<SV extends AnySchemaValidator>(schemaValidator: SV, protocol: 'http' | 'https', host: string, port: string | number, routers: ForklaunchRouter<SV>[], otherServers?: {
+declare function generateOpenApiSpecs<SV extends AnySchemaValidator>(schemaValidator: SV, serverUrls: string[], serverDescriptions: string[], application: ForklaunchRouter<SV>, otherServers?: {
     url: string;
     description: string;
 }[]): Record<string | symbol, OpenAPIObject>;

package/lib/http/index.d.ts

@@ -1,6 +1,6 @@
 import { ParsedQs } from 'qs';
 export { ParsedQs } from 'qs';
-import { UnionToIntersection, StringWithoutSlash, Prettify, SanitizePathSlashes, MakePropertyOptionalIfChildrenOptional, PrettyCamelCase, TypeSafeFunction, EmptyObject } from '@forklaunch/common';
+import { UnionToIntersection, TypeSafeFunction, StringWithoutSlash, Prettify, SanitizePathSlashes, MakePropertyOptionalIfChildrenOptional, PrettyCamelCase, EmptyObject } from '@forklaunch/common';
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
 import { CorsOptions } from 'cors';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
@@ -224,7 +224,7 @@ type TypedRequestBody<SV extends AnySchemaValidator> = {
     [K in keyof (ExclusiveSchemaCatchall<SV> & ExclusiveRequestBodyBase<SV>)]?: K extends keyof UnknownBody<SV> ? UnknownBody<SV>[K] : undefined;
 };
 type TypedBody<SV extends AnySchemaValidator> = JsonBody<SV> | TextBody<SV> | FileBody<SV> | MultipartForm<SV> | UrlEncodedForm<SV> | UnknownBody<SV>;
-type Body<SV extends AnySchemaValidator> = TypedRequestBody<SV> | (ExclusiveRequestBodyBase<SV> & SV['_ValidSchemaObject']) | (ExclusiveRequestBodyBase<SV> & UnboxedObjectSchema<SV>) | (ExclusiveRequestBodyBase<SV> & SV['string']) | (ExclusiveRequestBodyBase<SV> & SV['number']) | (ExclusiveRequestBodyBase<SV> & SV['boolean']) | (ExclusiveRequestBodyBase<SV> & SV['date']) | (ExclusiveRequestBodyBase<SV> & SV['array']) | (ExclusiveRequestBodyBase<SV> & SV['file']);
+type Body<SV extends AnySchemaValidator> = TypedRequestBody<SV> | (ExclusiveRequestBodyBase<SV> & SV['_ValidSchemaObject']) | (ExclusiveRequestBodyBase<SV> & UnboxedObjectSchema<SV>) | (ExclusiveRequestBodyBase<SV> & SV['string']) | (ExclusiveRequestBodyBase<SV> & SV['number']) | (ExclusiveRequestBodyBase<SV> & SV['boolean']) | (ExclusiveRequestBodyBase<SV> & SV['date']) | (ExclusiveRequestBodyBase<SV> & SV['array']) | (ExclusiveRequestBodyBase<SV> & SV['file']) | (ExclusiveRequestBodyBase<SV> & SV['any']) | (ExclusiveRequestBodyBase<SV> & SV['unknown']) | (ExclusiveRequestBodyBase<SV> & SV['binary']) | (ExclusiveRequestBodyBase<SV> & (SV['type'] extends TypeSafeFunction ? ReturnType<SV['type']> : never));
 type BasicAuthMethods = {
     readonly basic: {
         readonly login: (username: string, password: string) => boolean;
@@ -1661,7 +1661,7 @@ declare const getCodeForStatus: (status: string) => null | StatusCode;
  * @param {ForklaunchRouter<SV>[]} routers - The routers to include in the server.
  * @returns {McpServer} - The generated ModelContextProtocol server.
  */
-declare function generateMcpServer<T extends Record<string, unknown> | undefined = Record<string, unknown> | undefined>(schemaValidator: ZodSchemaValidator, protocol: 'http' | 'https', host: string, port: number, version: `${number}.${number}.${number}`, routers: ForklaunchRouter<ZodSchemaValidator>[], options?: ConstructorParameters<typeof FastMCP<T>>[0], contentTypeMap?: Record<string, string>): FastMCP<T>;
+declare function generateMcpServer<T extends Record<string, unknown> | undefined = Record<string, unknown> | undefined>(schemaValidator: ZodSchemaValidator, protocol: 'http' | 'https', host: string, port: number, version: `${number}.${number}.${number}`, application: ForklaunchRouter<ZodSchemaValidator>, options?: ConstructorParameters<typeof FastMCP<T>>[0], contentTypeMap?: Record<string, string>): FastMCP<T>;
 
 /**
  * Enhances the Express-like `send` method with additional logic for response handling and validation.
@@ -1701,7 +1701,7 @@ declare const OPENAPI_DEFAULT_VERSION: unique symbol;
  * @param {ForklaunchRouter<SV>[]} routers - The routers to include in the Swagger document.
  * @returns {OpenAPIObject} - The generated Swagger document.
  */
-declare function generateOpenApiSpecs<SV extends AnySchemaValidator>(schemaValidator: SV, protocol: 'http' | 'https', host: string, port: string | number, routers: ForklaunchRouter<SV>[], otherServers?: {
+declare function generateOpenApiSpecs<SV extends AnySchemaValidator>(schemaValidator: SV, serverUrls: string[], serverDescriptions: string[], application: ForklaunchRouter<SV>, otherServers?: {
     url: string;
     description: string;
 }[]): Record<string | symbol, OpenAPIObject>;

package/lib/http/index.js

@@ -100,7 +100,7 @@ function cors(corsOptions) {
 }
 
 // src/http/router/expressLikeRouter.ts
-var import_common7 = require("@forklaunch/common");
+var import_common8 = require("@forklaunch/common");
 
 // src/http/guards/hasVersionedSchema.ts
 function hasVersionedSchema(contractDetails) {
@@ -332,6 +332,7 @@ async function parseRequestAuth(req, res, next) {
 }
 
 // src/http/middleware/request/createContext.middleware.ts
+var import_common3 = require("@forklaunch/common");
 var import_api = require("@opentelemetry/api");
 var import_uuid = require("uuid");
 
@@ -352,20 +353,24 @@ function createContext(schemaValidator) {
     req.context = {
       correlationId
     };
-    const span = import_api.trace.getActiveSpan();
+    const span = import_api.trace.getSpan(import_api.context.active());
     if (span != null) {
       req.context.span = span;
       req.context.span?.setAttribute(ATTR_CORRELATION_ID, correlationId);
+      req.context.span?.setAttribute(
+        import_semantic_conventions.ATTR_SERVICE_NAME,
+        (0, import_common3.getEnvVar)("OTEL_SERVICE_NAME")
+      );
     }
     next?.();
   };
 }
 
 // src/http/middleware/request/enrichDetails.middleware.ts
-var import_common5 = require("@forklaunch/common");
+var import_common6 = require("@forklaunch/common");
 
 // src/http/telemetry/openTelemetryCollector.ts
-var import_common4 = require("@forklaunch/common");
+var import_common5 = require("@forklaunch/common");
 var import_opentelemetry_instrumentation_hyper_express = require("@forklaunch/opentelemetry-instrumentation-hyper-express");
 var import_api3 = require("@opentelemetry/api");
 var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
@@ -387,7 +392,7 @@ function isForklaunchRequest(request) {
 }
 
 // src/http/telemetry/pinoLogger.ts
-var import_common3 = require("@forklaunch/common");
+var import_common4 = require("@forklaunch/common");
 var import_api2 = require("@opentelemetry/api");
 var import_api_logs = require("@opentelemetry/api-logs");
 var import_pino = __toESM(require("pino"));
@@ -419,10 +424,25 @@ function mapSeverity(level) {
     case "fatal":
       return 21;
     default:
-      (0, import_common3.isNever)(level);
+      (0, import_common4.isNever)(level);
       return 0;
   }
 }
+function normalizeLogArgs(args) {
+  let message = "";
+  const metaObjects = [];
+  for (const arg of args) {
+    if (typeof arg === "string" && message === "") {
+      message = arg;
+    } else if (arg && typeof arg === "object" && !Array.isArray(arg)) {
+      metaObjects.push(arg);
+    } else {
+      message += ` ${String(arg)}`;
+    }
+  }
+  const metadata = Object.assign({}, ...metaObjects);
+  return [metadata, message.trim()];
+}
 var PinoLogger = class _PinoLogger {
   pinoLogger;
   meta;
@@ -453,7 +473,7 @@ var PinoLogger = class _PinoLogger {
         return false;
       }
       return true;
-    }).map(import_common3.safeStringify);
+    });
     const activeSpan = import_api2.trace.getActiveSpan();
     if (activeSpan) {
       const activeSpanContext = activeSpan.spanContext();
@@ -471,7 +491,7 @@ var PinoLogger = class _PinoLogger {
       "correlation.id": "none",
       ...meta2
     };
-    this.pinoLogger[level](...filteredArgs);
+    this.pinoLogger[level](...normalizeLogArgs(filteredArgs));
     import_api_logs.logs.getLogger(process.env.OTEL_SERVICE_NAME ?? "unknown").emit({
       severityText: level,
       severityNumber: mapSeverity(level),
@@ -559,24 +579,24 @@ var OpenTelemetryCollector = class {
     return this.metrics[metricId];
   }
 };
-import_dotenv.default.config({ path: (0, import_common4.getEnvVar)("DOTENV_FILE_PATH") });
+import_dotenv.default.config({ path: (0, import_common5.getEnvVar)("DOTENV_FILE_PATH") });
 new import_sdk_node.NodeSDK({
   resource: (0, import_resources.resourceFromAttributes)({
-    [import_semantic_conventions2.ATTR_SERVICE_NAME]: (0, import_common4.getEnvVar)("OTEL_SERVICE_NAME")
+    [import_semantic_conventions2.ATTR_SERVICE_NAME]: (0, import_common5.getEnvVar)("OTEL_SERVICE_NAME")
   }),
   traceExporter: new import_exporter_trace_otlp_http.OTLPTraceExporter({
-    url: `${(0, import_common4.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
+    url: `${(0, import_common5.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
   }),
   metricReader: new import_sdk_metrics.PeriodicExportingMetricReader({
     exporter: new import_exporter_metrics_otlp_http.OTLPMetricExporter({
-      url: `${(0, import_common4.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
+      url: `${(0, import_common5.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
     }),
     exportIntervalMillis: 5e3
   }),
   logRecordProcessors: [
     new import_sdk_logs.BatchLogRecordProcessor(
       new import_exporter_logs_otlp_http.OTLPLogExporter({
-        url: `${(0, import_common4.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
+        url: `${(0, import_common5.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
       })
     )
   ],
@@ -584,11 +604,12 @@ new import_sdk_node.NodeSDK({
     new import_instrumentation_http.HttpInstrumentation({
       applyCustomAttributesOnSpan: (span, request) => {
         span.setAttribute(
-          "service.name",
-          (0, import_common4.getEnvVar)("OTEL_SERVICE_NAME") ?? "unknown"
+          import_semantic_conventions2.ATTR_SERVICE_NAME,
+          (0, import_common5.getEnvVar)("OTEL_SERVICE_NAME") ?? "unknown"
         );
         if (isForklaunchRequest(request)) {
-          span.setAttribute("api.name", request.contractDetails?.name);
+          span.setAttribute(ATTR_API_NAME, request.contractDetails?.name);
+          span.setAttribute(ATTR_CORRELATION_ID, request.context.correlationId);
         }
       }
     }),
@@ -596,10 +617,10 @@ new import_sdk_node.NodeSDK({
     new import_opentelemetry_instrumentation_hyper_express.HyperExpressInstrumentation()
   ]
 }).start();
-var httpRequestsTotalCounter = import_api3.metrics.getMeter((0, import_common4.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
+var httpRequestsTotalCounter = import_api3.metrics.getMeter((0, import_common5.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
   description: "Number of HTTP requests"
 });
-var httpServerDurationHistogram = import_api3.metrics.getMeter((0, import_common4.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
+var httpServerDurationHistogram = import_api3.metrics.getMeter((0, import_common5.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
   description: "Duration of HTTP server requests",
   unit: "s"
 });
@@ -618,7 +639,7 @@ function enrichDetails(path, contractDetails, requestSchema, responseSchemas, op
       const [seconds, nanoseconds] = process.hrtime(startTime);
       const durationMs = seconds + nanoseconds / 1e9;
       httpServerDurationHistogram.record(durationMs, {
-        [import_semantic_conventions.ATTR_SERVICE_NAME]: (0, import_common5.getEnvVar)("OTEL_SERVICE_NAME") || "unknown",
+        [import_semantic_conventions.ATTR_SERVICE_NAME]: (0, import_common6.getEnvVar)("OTEL_SERVICE_NAME") || "unknown",
         [ATTR_API_NAME]: req.contractDetails?.name || "unknown",
         [import_semantic_conventions.ATTR_HTTP_REQUEST_METHOD]: req.method,
         [import_semantic_conventions.ATTR_HTTP_ROUTE]: req.originalPath || "unknown",
@@ -630,7 +651,7 @@ function enrichDetails(path, contractDetails, requestSchema, responseSchemas, op
 }
 
 // src/http/middleware/request/parse.middleware.ts
-var import_common6 = require("@forklaunch/common");
+var import_common7 = require("@forklaunch/common");
 var import_validator = require("@forklaunch/validator");
 
 // src/http/guards/hasSend.ts
@@ -656,7 +677,7 @@ function parse(req, res, next) {
   let parsedRequest;
   let collectedParseErrors;
   if (req.contractDetails.versions) {
-    if ((0, import_common6.isRecord)(req.requestSchema)) {
+    if ((0, import_common7.isRecord)(req.requestSchema)) {
       let runningParseErrors = "";
       matchedVersions = [];
       Object.entries(req.requestSchema).forEach(([version, schema]) => {
@@ -1045,13 +1066,13 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
             versionedContractDetails,
             contractDetails.params
           );
-          if ((0, import_common7.isRecord)(requestSchema)) {
+          if ((0, import_common8.isRecord)(requestSchema)) {
             requestSchema = {
               ...requestSchema,
               [version]: versionedRequestSchema
             };
           }
-          if ((0, import_common7.isRecord)(responseSchemas)) {
+          if ((0, import_common8.isRecord)(responseSchemas)) {
             responseSchemas = {
               ...responseSchemas,
               [version]: versionedResponseSchemas
@@ -1238,8 +1259,8 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
           ...resolvedMiddlewares,
           this.#parseAndRunControllerHandler(controllerHandler)
         );
-        (0, import_common7.toRecord)(this._fetchMap)[(0, import_common7.sanitizePathSlashes)(`${this.basePath}${path}`)] = {
-          ...this._fetchMap[(0, import_common7.sanitizePathSlashes)(`${this.basePath}${path}`)] ?? {},
+        (0, import_common8.toRecord)(this._fetchMap)[(0, import_common8.sanitizePathSlashes)(`${this.basePath}${path}`)] = {
+          ...this._fetchMap[(0, import_common8.sanitizePathSlashes)(`${this.basePath}${path}`)] ?? {},
           [method.toUpperCase()]: contractDetails.versions ? Object.fromEntries(
             Object.keys(contractDetails.versions).map((version) => [
               version,
@@ -1247,7 +1268,7 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
             ])
           ) : this.#localParamRequest(handlers, controllerHandler)
         };
-        (0, import_common7.toRecord)(this.sdk)[(0, import_common7.toPrettyCamelCase)(contractDetails.name)] = contractDetails.versions ? Object.fromEntries(
+        (0, import_common8.toRecord)(this.sdk)[(0, import_common8.toPrettyCamelCase)(contractDetails.name)] = contractDetails.versions ? Object.fromEntries(
           Object.keys(contractDetails.versions).map((version) => [
             version,
             (req) => this.#localParamRequest(
@@ -1346,10 +1367,10 @@ var ForklaunchExpressLikeRouter = class _ForklaunchExpressLikeRouter {
   }
   addRouterToSdk(router) {
     Object.entries(router._fetchMap).map(
-      ([key, value]) => (0, import_common7.toRecord)(this._fetchMap)[(0, import_common7.sanitizePathSlashes)(`${this.basePath}${key}`)] = value
+      ([key, value]) => (0, import_common8.toRecord)(this._fetchMap)[(0, import_common8.sanitizePathSlashes)(`${this.basePath}${key}`)] = value
     );
-    const existingSdk = this.sdk[router.sdkName ?? (0, import_common7.toPrettyCamelCase)(router.basePath)];
-    (0, import_common7.toRecord)(this.sdk)[router.sdkName ?? (0, import_common7.toPrettyCamelCase)(router.basePath)] = {
+    const existingSdk = this.sdk[router.sdkName ?? (0, import_common8.toPrettyCamelCase)(router.basePath)];
+    (0, import_common8.toRecord)(this.sdk)[router.sdkName ?? (0, import_common8.toPrettyCamelCase)(router.basePath)] = {
       ...typeof existingSdk === "object" ? existingSdk : {},
       ...router.sdk
     };
@@ -2717,7 +2738,7 @@ var getCodeForStatus = (status) => {
 var httpStatusCodes_default = HTTPStatuses;
 
 // src/http/mcpGenerator/mcpGenerator.ts
-var import_common8 = require("@forklaunch/common");
+var import_common9 = require("@forklaunch/common");
 var import_zod = require("@forklaunch/validator/zod");
 var import_fastmcp = require("fastmcp");
 
@@ -2729,8 +2750,9 @@ function isUnionable(schema) {
 // src/http/router/unpackRouters.ts
 function unpackRouters(routers, recursiveBasePath = []) {
   return routers.reduce((acc, router) => {
+    const fullPath = [...recursiveBasePath, router.basePath].join("");
     acc.push({
-      fullPath: [...recursiveBasePath, router.basePath].join(""),
+      fullPath,
       router
     });
     acc.push(
@@ -2768,7 +2790,7 @@ function generateInputSchema(schemaValidator, body, params, query, requestHeader
     } : {}
   });
 }
-function generateMcpServer(schemaValidator, protocol, host, port, version, routers, options2, contentTypeMap) {
+function generateMcpServer(schemaValidator, protocol, host, port, version, application, options2, contentTypeMap) {
   if (!(schemaValidator instanceof import_zod.ZodSchemaValidator)) {
     throw new Error(
       "Schema validator must be an instance of ZodSchemaValidator"
@@ -2779,7 +2801,15 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
     name: options2?.name ?? "mcp-server",
     version
   });
-  unpackRouters(routers).forEach(({ fullPath, router }) => {
+  [
+    {
+      fullPath: application.basePath === "/" ? "" : application.basePath,
+      router: application
+    },
+    ...unpackRouters(application.routers, [
+      application.basePath === "/" ? "" : application.basePath
+    ])
+  ].forEach(({ fullPath, router }) => {
     router.routes.forEach((route) => {
       const inputSchemas = [];
       if (route.contractDetails.versions) {
@@ -2842,7 +2872,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
           if (discriminatedBody) {
             switch (discriminatedBody.parserType) {
               case "json": {
-                parsedBody = (0, import_common8.safeStringify)(body);
+                parsedBody = (0, import_common9.safeStringify)(body);
                 break;
               }
               case "text": {
@@ -2855,7 +2885,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
               }
               case "multipart": {
                 const formData = new FormData();
-                if ((0, import_common8.isRecord)(body)) {
+                if ((0, import_common9.isRecord)(body)) {
                   for (const key in body) {
                     if (typeof body[key] === "string" || body[key] instanceof Blob) {
                       formData.append(key, body[key]);
@@ -2870,11 +2900,11 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
                 break;
               }
               case "urlEncoded": {
-                if ((0, import_common8.isRecord)(body)) {
+                if ((0, import_common9.isRecord)(body)) {
                   parsedBody = new URLSearchParams(
                     Object.entries(body).map(([key, value]) => [
                       key,
-                      (0, import_common8.safeStringify)(value)
+                      (0, import_common9.safeStringify)(value)
                     ])
                   );
                 } else {
@@ -2883,8 +2913,8 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
                 break;
               }
               default: {
-                (0, import_common8.isNever)(discriminatedBody.parserType);
-                parsedBody = (0, import_common8.safeStringify)(body);
+                (0, import_common9.isNever)(discriminatedBody.parserType);
+                parsedBody = (0, import_common9.safeStringify)(body);
                 break;
               }
             }
@@ -2893,7 +2923,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
             const queryString = new URLSearchParams(
               Object.entries(query).map(([key, value]) => [
                 key,
-                (0, import_common8.safeStringify)(value)
+                (0, import_common9.safeStringify)(value)
               ])
             ).toString();
             url += queryString ? `?${queryString}` : "";
@@ -2926,7 +2956,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
                 content: [
                   {
                     type: "text",
-                    text: (0, import_common8.safeStringify)(await response.json())
+                    text: (0, import_common9.safeStringify)(await response.json())
                   }
                 ]
               };
@@ -3017,7 +3047,7 @@ function parse2(req, res, next) {
   }
   const statusCode = Number(res.statusCode);
   const parsedResponse = schemaValidator.parse(
-    responses?.[statusCode],
+    [400, 401, 404, 403, 500].includes(statusCode) ? schemaValidator.union([schemaValidator.string, responses?.[statusCode]]) : responses?.[statusCode],
     res.bodyData
   );
   const parsedHeaders = schemaValidator.parse(
@@ -3073,18 +3103,18 @@ ${parseErrors.join("\n\n")}`
 }
 
 // src/http/middleware/response/enrichExpressLikeSend.middleware.ts
-var import_common10 = require("@forklaunch/common");
+var import_common11 = require("@forklaunch/common");
 var import_stream = require("stream");
 
 // src/http/telemetry/recordMetric.ts
-var import_common9 = require("@forklaunch/common");
+var import_common10 = require("@forklaunch/common");
 var import_semantic_conventions3 = require("@opentelemetry/semantic-conventions");
 function recordMetric(req, res) {
   if (res.metricRecorded) {
     return;
   }
   httpRequestsTotalCounter.add(1, {
-    [import_semantic_conventions3.ATTR_SERVICE_NAME]: (0, import_common9.getEnvVar)("OTEL_SERVICE_NAME"),
+    [import_semantic_conventions3.ATTR_SERVICE_NAME]: (0, import_common10.getEnvVar)("OTEL_SERVICE_NAME"),
     [ATTR_API_NAME]: req.contractDetails?.name,
     [ATTR_CORRELATION_ID]: req.context.correlationId,
     [import_semantic_conventions3.ATTR_HTTP_REQUEST_METHOD]: req.method,
@@ -3134,8 +3164,8 @@ function enrichExpressLikeSend(instance, req, res, originalOperation, originalSe
         `attachment; filename="${data.name}"`
       );
     }
-    if ((0, import_common10.isNodeJsWriteableStream)(res)) {
-      import_stream.Readable.from((0, import_common10.readableStreamToAsyncIterable)(data.stream())).pipe(
+    if ((0, import_common11.isNodeJsWriteableStream)(res)) {
+      import_stream.Readable.from((0, import_common11.readableStreamToAsyncIterable)(data.stream())).pipe(
         res
       );
     } else {
@@ -3144,7 +3174,7 @@ function enrichExpressLikeSend(instance, req, res, originalOperation, originalSe
       originalSend.call(instance, "Not a NodeJS WritableStream");
       errorSent = true;
     }
-  } else if ((0, import_common10.isAsyncGenerator)(data)) {
+  } else if ((0, import_common11.isAsyncGenerator)(data)) {
     let firstPass = true;
     const transformer = new import_stream.Transform({
       objectMode: true,
@@ -3172,7 +3202,7 @@ ${res.locals.errorMessage}`;
         if (!errorSent) {
           let data2 = "";
           for (const [key, value] of Object.entries(chunk)) {
-            data2 += `${key}: ${typeof value === "string" ? value : (0, import_common10.safeStringify)(value)}
+            data2 += `${key}: ${typeof value === "string" ? value : (0, import_common11.safeStringify)(value)}
 `;
           }
           data2 += "\n";
@@ -3180,7 +3210,7 @@ ${res.locals.errorMessage}`;
         }
       }
     });
-    if ((0, import_common10.isNodeJsWriteableStream)(res)) {
+    if ((0, import_common11.isNodeJsWriteableStream)(res)) {
       import_stream.Readable.from(data).pipe(transformer).pipe(res);
     } else {
       res.type("text/plain");
@@ -3191,7 +3221,7 @@ ${res.locals.errorMessage}`;
   } else {
     const parserType = responseBodies?.[Number(res.statusCode)]?.parserType;
     res.bodyData = data;
-    if ((0, import_common10.isRecord)(data)) {
+    if ((0, import_common11.isRecord)(data)) {
       switch (parserType) {
         case "json":
           res.bodyData = "json" in data ? data.json : data;
@@ -3212,7 +3242,7 @@ ${res.locals.errorMessage}`;
           res.bodyData = data;
           break;
         default:
-          (0, import_common10.isNever)(parserType);
+          (0, import_common11.isNever)(parserType);
           res.bodyData = data;
           break;
       }
@@ -3248,7 +3278,7 @@ ${res.locals.errorMessage}`;
 }
 
 // src/http/openApiV3Generator/openApiV3Generator.ts
-var import_common11 = require("@forklaunch/common");
+var import_common12 = require("@forklaunch/common");
 var OPENAPI_DEFAULT_VERSION = Symbol("default");
 function toUpperCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
@@ -3259,7 +3289,7 @@ function transformBasePath(basePath) {
   }
   return `/${basePath}`;
 }
-function generateOpenApiDocument(protocol, host, port, versionedTags, versionedPaths, versionedSecuritySchemes, otherServers) {
+function generateOpenApiDocument(serverUrls, serverDescriptions, versionedTags, versionedPaths, versionedSecuritySchemes, otherServers) {
   return {
     [OPENAPI_DEFAULT_VERSION]: {
       openapi: "3.1.0",
@@ -3272,10 +3302,10 @@ function generateOpenApiDocument(protocol, host, port, versionedTags, versionedP
       },
       tags: versionedTags[OPENAPI_DEFAULT_VERSION],
       servers: [
-        {
-          url: `${protocol}://${host}:${port}`,
-          description: "Main Server"
-        },
+        ...serverUrls.map((url, index) => ({
+          url,
+          description: serverDescriptions?.[index]
+        })),
         ...otherServers || []
       ],
       paths: versionedPaths[OPENAPI_DEFAULT_VERSION]
@@ -3294,10 +3324,11 @@ function generateOpenApiDocument(protocol, host, port, versionedTags, versionedP
           },
           tags: versionedTags[version],
           servers: [
-            {
-              url: `${protocol}://${host}:${port}`,
-              description: "Main Server"
-            }
+            ...serverUrls.map((url, index) => ({
+              url,
+              description: serverDescriptions?.[index]
+            })),
+            ...otherServers || []
           ],
           paths
         }
@@ -3446,7 +3477,7 @@ function generateOperationObject(schemaValidator, path, method, controllerName,
   }
   return operationObject;
 }
-function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, otherServers) {
+function generateOpenApiSpecs(schemaValidator, serverUrls, serverDescriptions, application, otherServers) {
   const versionedPaths = {
     [OPENAPI_DEFAULT_VERSION]: {}
   };
@@ -3456,10 +3487,18 @@ function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, ot
   const versionedSecuritySchemes = {
     [OPENAPI_DEFAULT_VERSION]: {}
   };
-  unpackRouters(routers).forEach(({ fullPath, router }) => {
+  [
+    {
+      fullPath: application.basePath === "/" ? "" : application.basePath,
+      router: application
+    },
+    ...unpackRouters(application.routers, [
+      application.basePath === "/" ? "" : application.basePath
+    ])
+  ].forEach(({ fullPath, router }) => {
     const controllerName = transformBasePath(fullPath);
     router.routes.forEach((route) => {
-      const openApiPath = (0, import_common11.openApiCompliantPath)(
+      const openApiPath = (0, import_common12.openApiCompliantPath)(
         `${fullPath}${route.path === "/" ? "" : route.path}`
       );
       const { name, summary, params, versions, auth } = route.contractDetails;
@@ -3551,9 +3590,8 @@ function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, ot
     });
   });
   return generateOpenApiDocument(
-    protocol,
-    host,
-    port,
+    serverUrls,
+    serverDescriptions,
     versionedTags,
     versionedPaths,
     versionedSecuritySchemes,
@@ -3562,7 +3600,7 @@ function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, ot
 }
 
 // src/http/sdk/sdkClient.ts
-var import_common12 = require("@forklaunch/common");
+var import_common13 = require("@forklaunch/common");
 
 // src/http/guards/isSdkRouter.ts
 function isSdkRouter(value) {
@@ -3574,12 +3612,12 @@ function mapToSdk(schemaValidator, routerMap, runningPath = void 0) {
   const routerUniquenessCache = /* @__PURE__ */ new Set();
   return Object.fromEntries(
     Object.entries(routerMap).map(([key, value]) => {
-      if (routerUniquenessCache.has((0, import_common12.hashString)((0, import_common12.safeStringify)(value)))) {
+      if (routerUniquenessCache.has((0, import_common13.hashString)((0, import_common13.safeStringify)(value)))) {
         throw new Error(
           `SdkClient: Cannot use the same router pointer twice. Please clone the duplicate router with .clone() or only use the router once.`
         );
       }
-      routerUniquenessCache.add((0, import_common12.hashString)((0, import_common12.safeStringify)(value)));
+      routerUniquenessCache.add((0, import_common13.hashString)((0, import_common13.safeStringify)(value)));
       const currentPath = runningPath ? [runningPath, key].join(".") : key;
       if (isSdkRouter(value)) {
         Object.entries(value.sdkPaths).forEach(([routePath, sdkKey]) => {
@@ -3628,7 +3666,7 @@ function mapToFetch(schemaValidator, routerMap) {
   return (path, ...reqInit) => {
     const method = reqInit[0]?.method;
     const version = reqInit[0] != null && "version" in reqInit[0] ? reqInit[0].version : void 0;
-    return (version ? (0, import_common12.toRecord)((0, import_common12.toRecord)(flattenedFetchMap[path])[method ?? "GET"])[version] : (0, import_common12.toRecord)(flattenedFetchMap[path])[method ?? "GET"])(path, reqInit[0]);
+    return (version ? (0, import_common13.toRecord)((0, import_common13.toRecord)(flattenedFetchMap[path])[method ?? "GET"])[version] : (0, import_common13.toRecord)(flattenedFetchMap[path])[method ?? "GET"])(path, reqInit[0]);
   };
 }
 function sdkClient(schemaValidator, routerMap) {
@@ -3640,7 +3678,7 @@ function sdkClient(schemaValidator, routerMap) {
 }
 
 // src/http/sdk/sdkRouter.ts
-var import_common13 = require("@forklaunch/common");
+var import_common14 = require("@forklaunch/common");
 function sdkRouter(schemaValidator, controller, router) {
   const controllerSdkPaths = [];
   const mappedSdk = Object.fromEntries(
@@ -3650,7 +3688,7 @@ function sdkRouter(schemaValidator, controller, router) {
       router.sdkPaths[sdkPath] = key;
       return [
         key,
-        router.sdk[(0, import_common13.toPrettyCamelCase)(value.contractDetails.name)]
+        router.sdk[(0, import_common14.toPrettyCamelCase)(value.contractDetails.name)]
       ];
     })
   );