@forklaunch/core 0.11.7 → 0.12.1

package/lib/http/index.mjs

@@ -257,7 +257,8 @@ async function parseRequestAuth(req, res, next) {
 }
 
 // src/http/middleware/request/createContext.middleware.ts
-import { trace } from "@opentelemetry/api";
+import { getEnvVar } from "@forklaunch/common";
+import { context, trace } from "@opentelemetry/api";
 import { v4 } from "uuid";
 
 // src/http/telemetry/constants.ts
@@ -282,20 +283,24 @@ function createContext(schemaValidator) {
     req.context = {
       correlationId
     };
-    const span = trace.getActiveSpan();
+    const span = trace.getSpan(context.active());
     if (span != null) {
       req.context.span = span;
       req.context.span?.setAttribute(ATTR_CORRELATION_ID, correlationId);
+      req.context.span?.setAttribute(
+        ATTR_SERVICE_NAME,
+        getEnvVar("OTEL_SERVICE_NAME")
+      );
     }
     next?.();
   };
 }
 
 // src/http/middleware/request/enrichDetails.middleware.ts
-import { getEnvVar as getEnvVar2 } from "@forklaunch/common";
+import { getEnvVar as getEnvVar3 } from "@forklaunch/common";
 
 // src/http/telemetry/openTelemetryCollector.ts
-import { getEnvVar } from "@forklaunch/common";
+import { getEnvVar as getEnvVar2 } from "@forklaunch/common";
 import { HyperExpressInstrumentation } from "@forklaunch/opentelemetry-instrumentation-hyper-express";
 import {
   metrics
@@ -321,7 +326,7 @@ function isForklaunchRequest(request) {
 }
 
 // src/http/telemetry/pinoLogger.ts
-import { isNever as isNever2, safeStringify } from "@forklaunch/common";
+import { isNever as isNever2 } from "@forklaunch/common";
 import { trace as trace2 } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
 import pino from "pino";
@@ -357,6 +362,21 @@ function mapSeverity(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;
@@ -387,7 +407,7 @@ var PinoLogger = class _PinoLogger {
         return false;
       }
       return true;
-    }).map(safeStringify);
+    });
     const activeSpan = trace2.getActiveSpan();
     if (activeSpan) {
       const activeSpanContext = activeSpan.spanContext();
@@ -405,7 +425,7 @@ var PinoLogger = class _PinoLogger {
       "correlation.id": "none",
       ...meta2
     };
-    this.pinoLogger[level](...filteredArgs);
+    this.pinoLogger[level](...normalizeLogArgs(filteredArgs));
     logs.getLogger(process.env.OTEL_SERVICE_NAME ?? "unknown").emit({
       severityText: level,
       severityNumber: mapSeverity(level),
@@ -493,24 +513,24 @@ var OpenTelemetryCollector = class {
     return this.metrics[metricId];
   }
 };
-dotenv.config({ path: getEnvVar("DOTENV_FILE_PATH") });
+dotenv.config({ path: getEnvVar2("DOTENV_FILE_PATH") });
 new NodeSDK({
   resource: resourceFromAttributes({
-    [ATTR_SERVICE_NAME2]: getEnvVar("OTEL_SERVICE_NAME")
+    [ATTR_SERVICE_NAME2]: getEnvVar2("OTEL_SERVICE_NAME")
   }),
   traceExporter: new OTLPTraceExporter({
-    url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
+    url: `${getEnvVar2("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
   }),
   metricReader: new PeriodicExportingMetricReader({
     exporter: new OTLPMetricExporter({
-      url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
+      url: `${getEnvVar2("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
     }),
     exportIntervalMillis: 5e3
   }),
   logRecordProcessors: [
     new BatchLogRecordProcessor(
       new OTLPLogExporter({
-        url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
+        url: `${getEnvVar2("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
       })
     )
   ],
@@ -518,11 +538,12 @@ new NodeSDK({
     new HttpInstrumentation({
       applyCustomAttributesOnSpan: (span, request) => {
         span.setAttribute(
-          "service.name",
-          getEnvVar("OTEL_SERVICE_NAME") ?? "unknown"
+          ATTR_SERVICE_NAME2,
+          getEnvVar2("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);
         }
       }
     }),
@@ -530,10 +551,10 @@ new NodeSDK({
     new HyperExpressInstrumentation()
   ]
 }).start();
-var httpRequestsTotalCounter = metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
+var httpRequestsTotalCounter = metrics.getMeter(getEnvVar2("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
   description: "Number of HTTP requests"
 });
-var httpServerDurationHistogram = metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
+var httpServerDurationHistogram = metrics.getMeter(getEnvVar2("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
   description: "Duration of HTTP server requests",
   unit: "s"
 });
@@ -552,7 +573,7 @@ function enrichDetails(path, contractDetails, requestSchema, responseSchemas, op
       const [seconds, nanoseconds] = process.hrtime(startTime);
       const durationMs = seconds + nanoseconds / 1e9;
       httpServerDurationHistogram.record(durationMs, {
-        [ATTR_SERVICE_NAME]: getEnvVar2("OTEL_SERVICE_NAME") || "unknown",
+        [ATTR_SERVICE_NAME]: getEnvVar3("OTEL_SERVICE_NAME") || "unknown",
         [ATTR_API_NAME]: req.contractDetails?.name || "unknown",
         [ATTR_HTTP_REQUEST_METHOD]: req.method,
         [ATTR_HTTP_ROUTE]: req.originalPath || "unknown",
@@ -2653,7 +2674,7 @@ var getCodeForStatus = (status) => {
 var httpStatusCodes_default = HTTPStatuses;
 
 // src/http/mcpGenerator/mcpGenerator.ts
-import { isNever as isNever3, isRecord as isRecord3, safeStringify as safeStringify2 } from "@forklaunch/common";
+import { isNever as isNever3, isRecord as isRecord3, safeStringify } from "@forklaunch/common";
 import { string, ZodSchemaValidator } from "@forklaunch/validator/zod";
 import { FastMCP } from "fastmcp";
 
@@ -2665,8 +2686,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(
@@ -2704,7 +2726,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 ZodSchemaValidator)) {
     throw new Error(
       "Schema validator must be an instance of ZodSchemaValidator"
@@ -2715,7 +2737,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) {
@@ -2778,7 +2808,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
           if (discriminatedBody) {
             switch (discriminatedBody.parserType) {
               case "json": {
-                parsedBody = safeStringify2(body);
+                parsedBody = safeStringify(body);
                 break;
               }
               case "text": {
@@ -2810,7 +2840,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
                   parsedBody = new URLSearchParams(
                     Object.entries(body).map(([key, value]) => [
                       key,
-                      safeStringify2(value)
+                      safeStringify(value)
                     ])
                   );
                 } else {
@@ -2820,7 +2850,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
               }
               default: {
                 isNever3(discriminatedBody.parserType);
-                parsedBody = safeStringify2(body);
+                parsedBody = safeStringify(body);
                 break;
               }
             }
@@ -2829,7 +2859,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
             const queryString = new URLSearchParams(
               Object.entries(query).map(([key, value]) => [
                 key,
-                safeStringify2(value)
+                safeStringify(value)
               ])
             ).toString();
             url += queryString ? `?${queryString}` : "";
@@ -2862,7 +2892,7 @@ function generateMcpServer(schemaValidator, protocol, host, port, version, route
                 content: [
                   {
                     type: "text",
-                    text: safeStringify2(await response.json())
+                    text: safeStringify(await response.json())
                   }
                 ]
               };
@@ -2955,7 +2985,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(
@@ -3017,12 +3047,12 @@ import {
   isNodeJsWriteableStream,
   isRecord as isRecord4,
   readableStreamToAsyncIterable,
-  safeStringify as safeStringify3
+  safeStringify as safeStringify2
 } from "@forklaunch/common";
 import { Readable, Transform } from "stream";
 
 // src/http/telemetry/recordMetric.ts
-import { getEnvVar as getEnvVar3 } from "@forklaunch/common";
+import { getEnvVar as getEnvVar4 } from "@forklaunch/common";
 import {
   ATTR_HTTP_REQUEST_METHOD as ATTR_HTTP_REQUEST_METHOD3,
   ATTR_HTTP_RESPONSE_STATUS_CODE as ATTR_HTTP_RESPONSE_STATUS_CODE3,
@@ -3034,7 +3064,7 @@ function recordMetric(req, res) {
     return;
   }
   httpRequestsTotalCounter.add(1, {
-    [ATTR_SERVICE_NAME3]: getEnvVar3("OTEL_SERVICE_NAME"),
+    [ATTR_SERVICE_NAME3]: getEnvVar4("OTEL_SERVICE_NAME"),
     [ATTR_API_NAME]: req.contractDetails?.name,
     [ATTR_CORRELATION_ID]: req.context.correlationId,
     [ATTR_HTTP_REQUEST_METHOD3]: req.method,
@@ -3122,7 +3152,7 @@ ${res.locals.errorMessage}`;
         if (!errorSent) {
           let data2 = "";
           for (const [key, value] of Object.entries(chunk)) {
-            data2 += `${key}: ${typeof value === "string" ? value : safeStringify3(value)}
+            data2 += `${key}: ${typeof value === "string" ? value : safeStringify2(value)}
 `;
           }
           data2 += "\n";
@@ -3209,7 +3239,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",
@@ -3222,10 +3252,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]
@@ -3244,10 +3274,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
         }
@@ -3396,7 +3427,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]: {}
   };
@@ -3406,7 +3437,15 @@ 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 = openApiCompliantPath(
@@ -3501,9 +3540,8 @@ function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, ot
     });
   });
   return generateOpenApiDocument(
-    protocol,
-    host,
-    port,
+    serverUrls,
+    serverDescriptions,
     versionedTags,
     versionedPaths,
     versionedSecuritySchemes,
@@ -3512,7 +3550,7 @@ function generateOpenApiSpecs(schemaValidator, protocol, host, port, routers, ot
 }
 
 // src/http/sdk/sdkClient.ts
-import { hashString, safeStringify as safeStringify4, toRecord as toRecord2 } from "@forklaunch/common";
+import { hashString, safeStringify as safeStringify3, toRecord as toRecord2 } from "@forklaunch/common";
 
 // src/http/guards/isSdkRouter.ts
 function isSdkRouter(value) {
@@ -3524,12 +3562,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(hashString(safeStringify4(value)))) {
+      if (routerUniquenessCache.has(hashString(safeStringify3(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(hashString(safeStringify4(value)));
+      routerUniquenessCache.add(hashString(safeStringify3(value)));
       const currentPath = runningPath ? [runningPath, key].join(".") : key;
       if (isSdkRouter(value)) {
         Object.entries(value.sdkPaths).forEach(([routePath, sdkKey]) => {