@forklaunch/core 0.8.6 → 0.8.8

package/lib/src/http/index.d.mts

@@ -1,4 +1,5 @@
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
+import { CorsOptions } from 'cors';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
 import { LevelWithSilentOrString, LevelWithSilent, Logger } from 'pino';
 import { UnionToIntersection, MimeType, Prettify, ExclusiveRecord, RemoveTrailingSlash, MakePropertyOptionalIfChildrenOptional } from '@forklaunch/common';
@@ -491,6 +492,12 @@ interface ForklaunchResponse<BaseResponse, ResBodyMap extends Record<number, unk
      * @returns {Omit<ResHeaders, keyof ForklaunchResHeaders> & ForklaunchResHeaders} - The headers of the response.
      */
     getHeaders: () => Omit<ResHeaders, keyof ForklaunchResHeaders> & ForklaunchResHeaders;
+    /**
+     * Gets a header for the response.
+     * @param {string} key - The header key.
+     * @returns {string | string[] | undefined} The header value.
+     */
+    getHeader: (key: string) => string | string[] | undefined;
     /**
      * Sets a header for the response.
      * @param {string} key - The header key.
@@ -946,12 +953,17 @@ declare abstract class ForklaunchExpressLikeApplication<SV extends AnySchemaVali
     readonly internal: Server;
     readonly postEnrichMiddleware: RouterHandler[];
     readonly openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
+    readonly appOptions?: {
+        cors?: CorsOptions;
+    } | undefined;
     /**
      * Creates an instance of the Application class.
      *
      * @param {SV} schemaValidator - The schema validator.
      */
-    constructor(schemaValidator: SV, internal: Server, postEnrichMiddleware: RouterHandler[], openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>);
+    constructor(schemaValidator: SV, internal: Server, postEnrichMiddleware: RouterHandler[], openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, appOptions?: {
+        cors?: CorsOptions;
+    } | undefined);
     abstract listen(...args: unknown[]): void;
 }
 

package/lib/src/http/index.d.ts

@@ -1,4 +1,5 @@
 import { AnySchemaValidator, UnboxedObjectSchema, IdiomaticSchema, Schema } from '@forklaunch/validator';
+import { CorsOptions } from 'cors';
 import { Counter, Gauge, Histogram, UpDownCounter, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Span } from '@opentelemetry/api';
 import { LevelWithSilentOrString, LevelWithSilent, Logger } from 'pino';
 import { UnionToIntersection, MimeType, Prettify, ExclusiveRecord, RemoveTrailingSlash, MakePropertyOptionalIfChildrenOptional } from '@forklaunch/common';
@@ -491,6 +492,12 @@ interface ForklaunchResponse<BaseResponse, ResBodyMap extends Record<number, unk
      * @returns {Omit<ResHeaders, keyof ForklaunchResHeaders> & ForklaunchResHeaders} - The headers of the response.
      */
     getHeaders: () => Omit<ResHeaders, keyof ForklaunchResHeaders> & ForklaunchResHeaders;
+    /**
+     * Gets a header for the response.
+     * @param {string} key - The header key.
+     * @returns {string | string[] | undefined} The header value.
+     */
+    getHeader: (key: string) => string | string[] | undefined;
     /**
      * Sets a header for the response.
      * @param {string} key - The header key.
@@ -946,12 +953,17 @@ declare abstract class ForklaunchExpressLikeApplication<SV extends AnySchemaVali
     readonly internal: Server;
     readonly postEnrichMiddleware: RouterHandler[];
     readonly openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
+    readonly appOptions?: {
+        cors?: CorsOptions;
+    } | undefined;
     /**
      * Creates an instance of the Application class.
      *
      * @param {SV} schemaValidator - The schema validator.
      */
-    constructor(schemaValidator: SV, internal: Server, postEnrichMiddleware: RouterHandler[], openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>);
+    constructor(schemaValidator: SV, internal: Server, postEnrichMiddleware: RouterHandler[], openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, appOptions?: {
+        cors?: CorsOptions;
+    } | undefined);
     abstract listen(...args: unknown[]): void;
 }
 

package/lib/src/http/index.js

@@ -75,12 +75,19 @@ module.exports = __toCommonJS(http_exports);
 
 // src/http/middleware/request/cors.middleware.ts
 var import_cors = __toESM(require("cors"));
-function cors(req, res, next) {
-  if (req.method === "OPTIONS") {
-    res.cors = true;
-  }
-  (0, import_cors.default)()(req, res, next ?? (() => {
-  }));
+function cors(corsOptions) {
+  return (req, res, next) => {
+    if (req.method === "OPTIONS") {
+      res.cors = true;
+    }
+    if (!res.getHeader) {
+      res.getHeader = (key) => {
+        return res.getHeaders()[key];
+      };
+    }
+    (0, import_cors.default)(corsOptions)(req, res, next ?? (() => {
+    }));
+  };
 }
 
 // src/http/middleware/request/createContext.middleware.ts
@@ -288,13 +295,11 @@ async function parseRequestAuth(req, res, next) {
   next?.();
 }
 
-// src/services/getEnvVar.ts
-function getEnvVar(name) {
-  const value = process.env[name];
-  return value;
-}
+// src/http/middleware/request/enrichDetails.middleware.ts
+var import_common4 = require("@forklaunch/common");
 
 // src/http/telemetry/openTelemetryCollector.ts
+var import_common3 = 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");
@@ -488,24 +493,24 @@ var OpenTelemetryCollector = class {
     return this.metrics[metricId];
   }
 };
-import_dotenv.default.config({ path: getEnvVar("ENV_FILE_PATH") });
+import_dotenv.default.config({ path: (0, import_common3.getEnvVar)("ENV_FILE_PATH") });
 new import_sdk_node.NodeSDK({
   resource: (0, import_resources.resourceFromAttributes)({
-    [import_semantic_conventions2.ATTR_SERVICE_NAME]: getEnvVar("OTEL_SERVICE_NAME")
+    [import_semantic_conventions2.ATTR_SERVICE_NAME]: (0, import_common3.getEnvVar)("OTEL_SERVICE_NAME")
   }),
   traceExporter: new import_exporter_trace_otlp_http.OTLPTraceExporter({
-    url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
+    url: `${(0, import_common3.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: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
+      url: `${(0, import_common3.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: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
+        url: `${(0, import_common3.getEnvVar)("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
       })
     )
   ],
@@ -514,7 +519,7 @@ new import_sdk_node.NodeSDK({
       applyCustomAttributesOnSpan: (span, request) => {
         span.setAttribute(
           "service.name",
-          getEnvVar("OTEL_SERVICE_NAME") ?? "unknown"
+          (0, import_common3.getEnvVar)("OTEL_SERVICE_NAME") ?? "unknown"
         );
         if (isForklaunchRequest(request)) {
           span.setAttribute("api.name", request.contractDetails?.name);
@@ -525,10 +530,10 @@ new import_sdk_node.NodeSDK({
     new import_opentelemetry_instrumentation_hyper_express.HyperExpressInstrumentation()
   ]
 }).start();
-var httpRequestsTotalCounter = import_api3.metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
+var httpRequestsTotalCounter = import_api3.metrics.getMeter((0, import_common3.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
   description: "Number of HTTP requests"
 });
-var httpServerDurationHistogram = import_api3.metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
+var httpServerDurationHistogram = import_api3.metrics.getMeter((0, import_common3.getEnvVar)("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
   description: "Duration of HTTP server requests",
   unit: "s"
 });
@@ -547,7 +552,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]: getEnvVar("OTEL_SERVICE_NAME") || "unknown",
+        [import_semantic_conventions.ATTR_SERVICE_NAME]: (0, import_common4.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",
@@ -1365,7 +1370,7 @@ var ForklaunchExpressLikeApplication = class extends ForklaunchExpressLikeRouter
    *
    * @param {SV} schemaValidator - The schema validator.
    */
-  constructor(schemaValidator, internal, postEnrichMiddleware, openTelemetryCollector) {
+  constructor(schemaValidator, internal, postEnrichMiddleware, openTelemetryCollector, appOptions) {
     super(
       "/",
       schemaValidator,
@@ -1377,8 +1382,9 @@ var ForklaunchExpressLikeApplication = class extends ForklaunchExpressLikeRouter
     this.internal = internal;
     this.postEnrichMiddleware = postEnrichMiddleware;
     this.openTelemetryCollector = openTelemetryCollector;
+    this.appOptions = appOptions;
     this.internal.use(createContext(this.schemaValidator));
-    this.internal.use(cors);
+    this.internal.use(cors(this.appOptions?.cors ?? {}));
   }
 };
 
@@ -2504,23 +2510,18 @@ ${parseErrors.join("\n\n")}`
 }
 
 // src/http/middleware/response/enrichExpressLikeSend.middleware.ts
-var import_common4 = require("@forklaunch/common");
+var import_common6 = require("@forklaunch/common");
 var import_stream = require("stream");
 
 // src/http/telemetry/recordMetric.ts
+var import_common5 = require("@forklaunch/common");
 var import_semantic_conventions3 = require("@opentelemetry/semantic-conventions");
-
-// src/services/configInjector.ts
-var import_common3 = require("@forklaunch/common");
-var import_validator3 = require("@forklaunch/validator");
-
-// src/http/telemetry/recordMetric.ts
 function recordMetric(req, res) {
   if (res.metricRecorded) {
     return;
   }
   httpRequestsTotalCounter.add(1, {
-    [import_semantic_conventions3.ATTR_SERVICE_NAME]: getEnvVar("OTEL_SERVICE_NAME"),
+    [import_semantic_conventions3.ATTR_SERVICE_NAME]: (0, import_common5.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,
@@ -2558,8 +2559,8 @@ function enrichExpressLikeSend(instance, req, res, originalOperation, originalSe
         `attachment; filename="${data.name}"`
       );
     }
-    if ((0, import_common4.isNodeJsWriteableStream)(res)) {
-      import_stream.Readable.from((0, import_common4.readableStreamToAsyncIterable)(data.stream())).pipe(
+    if ((0, import_common6.isNodeJsWriteableStream)(res)) {
+      import_stream.Readable.from((0, import_common6.readableStreamToAsyncIterable)(data.stream())).pipe(
         res
       );
     } else {
@@ -2568,7 +2569,7 @@ function enrichExpressLikeSend(instance, req, res, originalOperation, originalSe
       originalSend.call(instance, "Not a NodeJS WritableStream");
       errorSent = true;
     }
-  } else if ((0, import_common4.isAsyncGenerator)(data)) {
+  } else if ((0, import_common6.isAsyncGenerator)(data)) {
     let firstPass = true;
     const transformer = new import_stream.Transform({
       objectMode: true,
@@ -2596,7 +2597,7 @@ ${res.locals.errorMessage}`;
         if (!errorSent) {
           let data2 = "";
           for (const [key, value] of Object.entries(chunk)) {
-            data2 += `${key}: ${typeof value === "string" ? value : (0, import_common4.safeStringify)(value)}
+            data2 += `${key}: ${typeof value === "string" ? value : (0, import_common6.safeStringify)(value)}
 `;
           }
           data2 += "\n";
@@ -2604,7 +2605,7 @@ ${res.locals.errorMessage}`;
         }
       }
     });
-    if ((0, import_common4.isNodeJsWriteableStream)(res)) {
+    if ((0, import_common6.isNodeJsWriteableStream)(res)) {
       import_stream.Readable.from(data).pipe(transformer).pipe(res);
     } else {
       res.type("text/plain");
@@ -2615,7 +2616,7 @@ ${res.locals.errorMessage}`;
   } else {
     const parserType = responseBodies?.[Number(res.statusCode)]?.parserType;
     res.bodyData = data;
-    if ((0, import_common4.isRecord)(data)) {
+    if ((0, import_common6.isRecord)(data)) {
       switch (parserType) {
         case "json":
           res.bodyData = "json" in data ? data.json : data;
@@ -2636,7 +2637,7 @@ ${res.locals.errorMessage}`;
           res.bodyData = data;
           break;
         default:
-          (0, import_common4.isNever)(parserType);
+          (0, import_common6.isNever)(parserType);
           res.bodyData = data;
           break;
       }