@lad-tech/nsc-toolkit 1.24.0 → 1.26.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-# [1.24.0](https://github.com/lad-tech/nsc-toolkit/compare/v1.23.3...v1.24.0) (2024-11-08)
+# [1.26.0](https://github.com/lad-tech/nsc-toolkit/compare/v1.25.0...v1.26.0) (2025-01-14)
 
 
 ### Features
 
-* Uniq key for event ([#133](https://github.com/lad-tech/nsc-toolkit/issues/133)) ([ff69a67](https://github.com/lad-tech/nsc-toolkit/commit/ff69a67b464f64e9eebb44e2c65bb626c30b68ea))
+* add rollup support ([#138](https://github.com/lad-tech/nsc-toolkit/issues/138)) ([423d1a8](https://github.com/lad-tech/nsc-toolkit/commit/423d1a86b4fb37b97a9cb9af8e4871b1e62caa76))

package/dist/Service.js

@@ -30,12 +30,20 @@ class Service extends Root_1.Root {
          * de-duplication within the configured Duplicate Window
          */
         this.UNIQ_ID_HEADER = 'Nats-Msg-Id';
+        /**
+         * Nats-Rollup header indicating all prior messages should be purged
+         */
+        this.ROLLUP_HEADER = 'Nats-Rollup';
+        /**
+         * Roll-up only same subject message in the stream
+         */
+        this.ROLLUP_STRATEGY = 'sub';
         this.serviceName = options.name;
         this.logger.setLocation(this.serviceName);
         if (options.events) {
             const events = Object.keys(options.events.list);
             this.emitter = events.reduce((result, eventName) => {
-                result[eventName] = ((params, uniqId) => {
+                result[eventName] = ((params, uniqId, rollupId) => {
                     var _a, _b, _c;
                     const subject = [options.name];
                     const eventOptions = (_a = options.events) === null || _a === void 0 ? void 0 : _a.list[eventName];
@@ -52,6 +60,11 @@ class Service extends Root_1.Root {
                         settings = { headers: (0, nats_1.headers)() };
                         settings.headers.append(this.UNIQ_ID_HEADER, uniqId);
                     }
+                    if (rollupId) {
+                        settings = settings !== null && settings !== void 0 ? settings : { headers: (0, nats_1.headers)() };
+                        settings.headers.append(this.ROLLUP_HEADER, this.ROLLUP_STRATEGY);
+                        subject.push(rollupId);
+                    }
                     this.broker.publish(subject.join('.'), this.buildMessage(params), settings);
                 });
                 return result;

package/dist/StreamBatchMsgFetcher.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StreamBatchMsgFetcher = void 0;
+class StreamBatchMsgFetcher {
+    constructor(consumer, options) {
+        this.consumer = consumer;
+        this.options = options;
+    }
+    async fetch(size, expires) {
+        return await this.consumer.fetch({
+            max_messages: size !== null && size !== void 0 ? size : this.options.batchSize,
+            expires: expires !== null && expires !== void 0 ? expires : this.options.batchTimeout,
+        });
+    }
+}
+exports.StreamBatchMsgFetcher = StreamBatchMsgFetcher;
+//# sourceMappingURL=StreamBatchMsgFetcher.js.map

package/dist/StreamManager.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StreamManager = void 0;
 const nats_1 = require("nats");
 const Root_1 = require("./Root");
-const StreamFetcher_1 = require("./StreamFetcher");
+const StreamBatchMsgFetcher_1 = require("./StreamBatchMsgFetcher");
 const types_1 = require("nats/lib/jetstream/types");
+const StreamSingleMsgFetcher_1 = require("./StreamSingleMsgFetcher");
 class StreamManager extends Root_1.Root {
     constructor(param) {
         super(param.broker, param.outputFormatter);
@@ -64,7 +65,7 @@ class StreamManager extends Root_1.Root {
     async createConsumer(serviceNameFrom, eventName, setting) {
         const consumerName = this.capitalizeFirstLetter(serviceNameFrom) + this.capitalizeFirstLetter(eventName);
         const prefix = this.param.options.prefix;
-        const subject = `${this.param.serviceName}.${prefix}.${eventName}`;
+        const subject = `${this.param.serviceName}.${prefix}.${eventName}.*`;
         if (!this.jsm) {
             this.jsm = await this.param.broker.jetstreamManager();
         }
@@ -76,9 +77,6 @@ class StreamManager extends Root_1.Root {
             .ackExplicit()
             .filterSubject(subject)
             .maxAckPending((setting === null || setting === void 0 ? void 0 : setting.maxPending) || 10);
-        if (!isPullConsumer) {
-            options.deliverTo((0, nats_1.createInbox)());
-        }
         if (isPullConsumer) {
             if (setting.maxPullRequestExpires) {
                 options.maxPullRequestExpires(setting.maxPullRequestExpires);
@@ -115,13 +113,17 @@ class StreamManager extends Root_1.Root {
             if (!isConsumerExist) {
                 await this.jsm.consumers.add(streamName, { ...options.config, filter_subject: subject });
             }
+            else {
+                await this.jsm.consumers.update(streamName, consumerName, { ...options.config, filter_subject: subject });
+            }
         }
+        const consumer = await this.broker.jetstream().consumers.get(streamName, consumerName);
         return isPullConsumer
-            ? new StreamFetcher_1.StreamFetcher(this.broker.jetstream(), streamName, consumerName, {
+            ? new StreamBatchMsgFetcher_1.StreamBatchMsgFetcher(consumer, {
                 batchSize: setting.maxPullRequestBatch,
                 batchTimeout: setting.maxPullRequestExpires,
             })
-            : this.broker.jetstream().subscribe(subject, options);
+            : new StreamSingleMsgFetcher_1.StreamSingleMsgFetcher(consumer);
     }
     getStreamName(eventName) {
         const serviceName = this.capitalizeFirstLetter(this.param.serviceName);

package/dist/StreamOptions/BufferToJsonTransform.js

@@ -29,6 +29,6 @@ class BufferToJsonTransform extends stream_1.Transform {
 }
 exports.BufferToJsonTransform = BufferToJsonTransform;
 BufferToJsonTransform.errors = {
-    CONVERSION_ERROR: 'Не удалось преобразовать данные',
+    CONVERSION_ERROR: 'Failed to convert data',
 };
 //# sourceMappingURL=BufferToJsonTransform.js.map

package/dist/StreamSingleMsgFetcher.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StreamSingleMsgFetcher = void 0;
+class StreamSingleMsgFetcher {
+    constructor(consumer) {
+        this.consumer = consumer;
+        this.done = false;
+    }
+    [Symbol.asyncIterator]() {
+        const done = {
+            value: this.msg,
+            done: true,
+        };
+        return {
+            next: async () => {
+                const msg = await this.consumer.next();
+                if (msg) {
+                    this.msg = msg;
+                    return {
+                        value: this.msg,
+                        done: this.done,
+                    };
+                }
+                return done;
+            },
+        };
+    }
+    unsubscribe() {
+        this.done = true;
+    }
+}
+exports.StreamSingleMsgFetcher = StreamSingleMsgFetcher;
+//# sourceMappingURL=StreamSingleMsgFetcher.js.map

package/dist/types/Service.d.ts

@@ -16,6 +16,14 @@ export declare class Service<E extends Emitter = Emitter> extends Root {
      * de-duplication within the configured Duplicate Window
      */
     private readonly UNIQ_ID_HEADER;
+    /**
+     * Nats-Rollup header indicating all prior messages should be purged
+     */
+    private readonly ROLLUP_HEADER;
+    /**
+     * Roll-up only same subject message in the stream
+     */
+    private readonly ROLLUP_STRATEGY;
     constructor(options: ServiceOptions<E>);
     /**
      * Create global Tracer

package/dist/types/StreamBatchMsgFetcher.d.ts

@@ -0,0 +1,13 @@
+import { Consumer, ConsumerMessages } from 'nats';
+interface BatcherOptions {
+    batchSize?: number;
+    batchTimeout?: number;
+    noWait?: boolean;
+}
+export declare class StreamBatchMsgFetcher {
+    private consumer;
+    private options;
+    constructor(consumer: Consumer, options: BatcherOptions);
+    fetch(size?: number, expires?: number): Promise<ConsumerMessages>;
+}
+export {};

package/dist/types/StreamManager.d.ts

@@ -1,7 +1,8 @@
 import { StreamManagerParam, GetListenerOptions, GetBatchListenerOptions } from '.';
-import { JetStreamSubscription, Subscription } from 'nats';
+import { Subscription } from 'nats';
 import { Root } from './Root';
-import { StreamFetcher } from './StreamFetcher';
+import { StreamBatchMsgFetcher } from './StreamBatchMsgFetcher';
+import { StreamSingleMsgFetcher } from './StreamSingleMsgFetcher';
 export declare class StreamManager extends Root {
     private param;
     private readonly STAR_WILDCARD;
@@ -13,10 +14,10 @@ export declare class StreamManager extends Root {
     private jsm?;
     constructor(param: StreamManagerParam);
     static isPullConsumerOptions(setting?: GetListenerOptions | GetBatchListenerOptions): setting is GetBatchListenerOptions;
-    static isStreamFetcher(consumer?: JetStreamSubscription | StreamFetcher | Subscription): consumer is StreamFetcher;
+    static isStreamFetcher(consumer?: StreamSingleMsgFetcher | StreamBatchMsgFetcher | Subscription): consumer is StreamBatchMsgFetcher;
     createStreams(): Promise<void>;
-    createConsumer(serviceNameFrom: string, eventName: string, setting?: GetListenerOptions): Promise<JetStreamSubscription>;
-    createConsumer(serviceNameFrom: string, eventName: string, setting?: GetBatchListenerOptions): Promise<StreamFetcher>;
+    createConsumer(serviceNameFrom: string, eventName: string, setting?: GetListenerOptions): Promise<StreamSingleMsgFetcher>;
+    createConsumer(serviceNameFrom: string, eventName: string, setting?: GetBatchListenerOptions): Promise<StreamBatchMsgFetcher>;
     private getStreamName;
     private isNotFoundStreamError;
     private buildPrefixForStreamName;

package/dist/types/StreamSingleMsgFetcher.d.ts

@@ -0,0 +1,14 @@
+import { Consumer, JsMsg } from 'nats';
+export declare class StreamSingleMsgFetcher {
+    private consumer;
+    private done;
+    private msg;
+    constructor(consumer: Consumer);
+    [Symbol.asyncIterator](): {
+        next: () => Promise<{
+            value: JsMsg;
+            done: boolean;
+        }>;
+    };
+    unsubscribe(): void;
+}

package/package.json

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

package/dist/StreamFetcher.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamFetcher = void 0;
-class StreamFetcher {
-    constructor(jsClient, streamName, consumerName, options) {
-        this.jsClient = jsClient;
-        this.streamName = streamName;
-        this.consumerName = consumerName;
-        this.options = options;
-    }
-    async fetch(size, expires) {
-        const consumer = await this.jsClient.consumers.get(this.streamName, this.consumerName);
-        return await consumer.fetch({
-            max_messages: size !== null && size !== void 0 ? size : this.options.batchSize,
-            expires: expires !== null && expires !== void 0 ? expires : this.options.batchTimeout,
-        });
-    }
-}
-exports.StreamFetcher = StreamFetcher;
-//# sourceMappingURL=StreamFetcher.js.map

package/dist/types/StreamFetcher.d.ts

@@ -1,15 +0,0 @@
-import { ConsumerMessages, JetStreamClient } from 'nats';
-interface BatcherOptions {
-    batchSize?: number;
-    batchTimeout?: number;
-    noWait?: boolean;
-}
-export declare class StreamFetcher {
-    private jsClient;
-    private streamName;
-    private consumerName;
-    private options;
-    constructor(jsClient: JetStreamClient, streamName: string, consumerName: string, options: BatcherOptions);
-    fetch(size?: number, expires?: number): Promise<ConsumerMessages>;
-}
-export {};