@lad-tech/nsc-toolkit 1.28.0 → 1.28.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-# [1.28.0](https://github.com/lad-tech/nsc-toolkit/compare/v1.27.0...v1.28.0) (2025-05-12)
+## [1.28.1](https://github.com/lad-tech/nsc-toolkit/compare/v1.28.0...v1.28.1) (2025-07-01)
 
 
-### Features
+### Bug Fixes
 
-* Async event traces and tags ([#145](https://github.com/lad-tech/nsc-toolkit/issues/145)) ([02c3560](https://github.com/lad-tech/nsc-toolkit/commit/02c356051d295d528c4cc7758b2a310d37074424))
+* Meter for batch consumer ([#147](https://github.com/lad-tech/nsc-toolkit/issues/147)) ([94a20b3](https://github.com/lad-tech/nsc-toolkit/commit/94a20b3b70caee64ac7a26998bc1019193c13516))

package/dist/Client.js

@@ -51,6 +51,7 @@ class Client extends Root_1.Root {
     async startBatchWatch(fetcher, listener, eventName) {
         while (true) {
             const batch = [];
+            const baggages = [];
             const events = await fetcher.fetch();
             for await (const event of events) {
                 let data;
@@ -64,9 +65,19 @@ class Client extends Root_1.Root {
                 message.ack = event.ack.bind(event);
                 message.nak = event.nak.bind(event);
                 batch.push(message);
+                let baggage;
+                if (event.headers) {
+                    baggage = this.getBaggageFromNATSHeader(event.headers);
+                    if (baggage) {
+                        baggages.push(baggage);
+                    }
+                }
+                message.meter = new Meter_1.Meter(eventName, baggage);
+            }
+            if (batch.length > 0) {
+                const meter = new Meter_1.Meter(eventName, undefined, baggages);
+                listener.emit(eventName, batch, meter);
             }
-            if (batch.length > 0)
-                listener.emit(eventName, batch);
         }
     }
     getListener(serviceNameFrom, options) {

package/dist/Meter.js

@@ -4,15 +4,34 @@ exports.Meter = void 0;
 const interfaces_1 = require("./interfaces");
 const opentelemetry = require("@opentelemetry/api");
 const Root_1 = require("./Root");
+const node_crypto_1 = require("node:crypto");
 class Meter extends Root_1.Root {
-    constructor(name, baggage) {
+    constructor(name, baggage, links) {
         super();
         this.name = name;
         this.baggage = baggage;
+        this.links = links;
+        this.SPAN_ID_BYTE_LENGTH = 8;
     }
     start() {
         const tracer = opentelemetry.trace.getTracer('');
-        this.span = tracer.startSpan(this.name, { kind: opentelemetry.SpanKind.CONSUMER }, this.getContext(this.baggage));
+        const links = [];
+        if (this.links && this.links.length) {
+            this.links.forEach(link => {
+                links.push({
+                    context: { traceId: link.traceId, spanId: link.spanId, traceFlags: link.traceFlags },
+                });
+            });
+        }
+        if (!this.baggage && links.length) {
+            this.baggage = {
+                traceId: links[0].context.traceId,
+                spanId: (0, node_crypto_1.randomBytes)(this.SPAN_ID_BYTE_LENGTH).toString('hex'),
+                traceFlags: links[0].context.traceFlags,
+            };
+        }
+        const linksOption = links.length ? { links } : {};
+        this.span = tracer.startSpan(this.name, { kind: opentelemetry.SpanKind.CONSUMER, ...linksOption }, this.getContext(this.baggage));
     }
     end(error) {
         if (!this.span) {

package/dist/types/Meter.d.ts

@@ -3,8 +3,10 @@ import { Root } from './Root';
 export declare class Meter extends Root implements EventMeter {
     private name;
     private baggage?;
+    private links?;
     private span?;
-    constructor(name: string, baggage?: Baggage | undefined);
+    private readonly SPAN_ID_BYTE_LENGTH;
+    constructor(name: string, baggage?: Baggage | undefined, links?: Baggage[] | undefined);
     start(): void;
     end(error?: Error): void;
     measure<T extends (...args: any[]) => any>(func: T, arg: Parameters<T>, context: unknown, tag?: Tag): ReturnType<T>;

package/dist/types/interfaces.d.ts

@@ -138,7 +138,7 @@ export interface Listener<E extends Emitter> {
     off<A extends keyof E>(action: A, handler: E[A]): void;
 }
 export interface ListenerBatch<E extends Emitter> {
-    on<A extends keyof E>(action: A, handler: (params: Array<Parameters<E[A]>[0]>) => void): void;
+    on<A extends keyof E>(action: A, handler: (params: Array<Parameters<E[A]>[0]>, meter: EventMeter) => void): void;
     off<A extends keyof E>(action: A, handler: (params: Array<Parameters<E[A]>[0]>) => void): void;
 }
 export interface HttpSettings {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lad-tech/nsc-toolkit",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "description": "Toolkit for create microservices around NATS",
   "main": "dist/index.js",
   "types": "./dist/types/index.d.ts",