@avtechno/sfr 2.0.4 → 2.0.6

package/dist/observability/index.mjs

@@ -9,7 +9,7 @@ import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentation
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
-import { Resource } from "@opentelemetry/resources";
+import { resourceFromAttributes } from "@opentelemetry/resources";
 import otel_semantics from "@opentelemetry/semantic-conventions";
 import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
 import { init_metrics } from "./metrics.mjs";
@@ -75,7 +75,7 @@ export function init_observability(oas_cfg, options = {}) {
     if (config.port) {
         resource_attributes["sfr.port"] = String(config.port);
     }
-    const resource = new Resource(resource_attributes);
+    const resource = resourceFromAttributes(resource_attributes);
     // Configure exporters
     const trace_exporter = new OTLPTraceExporter({
         url: `${otlp_endpoint}/v1/traces`
@@ -98,7 +98,6 @@ export function init_observability(oas_cfg, options = {}) {
     sdk = new NodeSDK({
         resource,
         traceExporter: trace_exporter,
-        // @ts-expect-error - Type mismatch between SDK packages, but compatible at runtime
         metricReader: metric_reader,
         instrumentations
     });

package/dist/types/templates.d.mts

@@ -1,3 +1,3 @@
 export declare function REST<V, H, C>(struct: RESTHandlerDescriptor<V, H, C>): H & C;
 export declare function WS<V, H, C>(struct: WSHandlerDescriptor<V, H, C>): H & C;
-export declare function MQ<V, H, C>(struct: MQHandlerDescriptor<V, H, C>): H & C;
+export declare function MQ<V, H>(struct: MQHandlerDescriptor<V, H>): H;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avtechno/sfr",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "An opinionated way of writing services using ExpressJS.",
   "type": "module",
   "files": [

package/src/observability/index.mts

@@ -10,7 +10,7 @@ import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentation
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
-import { resourceFromAttributes, type Resource } from "@opentelemetry/resources";
+import { resourceFromAttributes } from "@opentelemetry/resources";
 import otel_semantics from "@opentelemetry/semantic-conventions";
 import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
 

package/src/templates.mts

@@ -41,10 +41,10 @@ export function WS<V, H, C>(struct : WSHandlerDescriptor<V, H, C>): H & C {
   return { validators, controllers, handlers, cfg } as H & C;
 }
 
-export function MQ<V, H, C>(struct : MQHandlerDescriptor<V, H, C>): H & C{
+export function MQ<V, H>(struct : MQHandlerDescriptor<V, H>): H{
   const validators  : RequestValidators     = struct.validators  || {};
   const controllers : RequestControllers    = struct.controllers || {};
-  const handlers    : MQRequestHandlers<C>  = struct.handlers    || {};
+  const handlers    : MQRequestHandlers     = struct.handlers    || {};
   const cfg         : SFRConfig             = struct.cfg         || {};
 
   //Bind controller injections to each controllers

package/src/types/index.d.ts

@@ -377,7 +377,7 @@ declare type WSDeclarationArtifact = DeclarationArtifact & {
 declare type MQNamespaceDeclaration = {
   [namespace: string]: DeclarationArtifact & {
     content: {
-      handlers: MQRequestHandlers<any>
+      handlers: MQRequestHandlers
     }
   }
 }
@@ -461,19 +461,19 @@ declare type PatternMQSet = {
   "Topic": BroadcastMQ;
 }
 
-declare type MQHandlerDescriptor<V, H, C> = {
+declare type MQHandlerDescriptor<V, H> = {
   cfg?: SFRConfig;
   validators: RequestValidators & V;
-  handlers: MQRequestHandlers<C> & H & ThisType<HandlerFacilities & C>;
-  controllers?: RequestControllers & C & ThisType<ControllerFacilities & C>;
+  handlers: MQRequestHandlers & H & ThisType<HandlerFacilities>;
+  controllers?: RequestControllers & ThisType<ControllerFacilities >;
 };
 
-declare type MQRequestHandlers<C> = {
-  "Point-to-Point"?: MQRequestHandlerMap & ThisType<{ mq: Omit<TargetedMQ, "type" | "reply"> } & C>;
-  "Fanout"?: MQRequestHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & C>;
-  "Request-Reply"?: MQRequestHandlerMap & ThisType<{ mq: Omit<TargetedMQ, "type"> } & C>;
-  "Direct"?: RoutingHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & C>;
-  "Topic"?: TopicHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & C>;
+declare type MQRequestHandlers = {
+  "Point-to-Point"?: MQRequestHandlerMap & ThisType<{ mq: Omit<TargetedMQ, "type" | "reply"> } & HandlerFacilities>;
+  "Fanout"?: MQRequestHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & HandlerFacilities>;
+  "Request-Reply"?: MQRequestHandlerMap & ThisType<{ mq: Omit<TargetedMQ, "type"> } & HandlerFacilities>;
+  "Direct"?: RoutingHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & HandlerFacilities>;
+  "Topic"?: TopicHandlerMap & ThisType<{ mq: Omit<BroadcastMQ, "type"> } & HandlerFacilities>;
 };
 
 declare type MQRequestHandlerMap = {