@rsdk/nats.transport 5.8.0-next.4 → 5.8.0-next.6

package/dist/jetstream/constants.d.ts

@@ -3,3 +3,4 @@ export declare const NATS_JETSTREAM_PROTOCOL = "nats-jetstream";
  * @deprecated use NATS_JETSTREAM_PROTOCOL instead
  */
 export declare const NATS_PROTOCOL = "nats-jetstream";
+export declare const DEFAULT_MAX_ACK_PENDING = 1000;

package/dist/jetstream/constants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NATS_PROTOCOL = exports.NATS_JETSTREAM_PROTOCOL = void 0;
+exports.DEFAULT_MAX_ACK_PENDING = exports.NATS_PROTOCOL = exports.NATS_JETSTREAM_PROTOCOL = void 0;
 exports.NATS_JETSTREAM_PROTOCOL = 'nats-jetstream';
 /**
  * @deprecated use NATS_JETSTREAM_PROTOCOL instead
  */
 exports.NATS_PROTOCOL = exports.NATS_JETSTREAM_PROTOCOL;
+exports.DEFAULT_MAX_ACK_PENDING = 1000;
 //# sourceMappingURL=constants.js.map

package/dist/jetstream/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/jetstream/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,gBAAgB,CAAC;AAExD;;GAEG;AACU,QAAA,aAAa,GAAG,+BAAuB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/jetstream/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,gBAAgB,CAAC;AAExD;;GAEG;AACU,QAAA,aAAa,GAAG,+BAAuB,CAAC;AAExC,QAAA,uBAAuB,GAAG,IAAI,CAAC"}

package/dist/jetstream/server.d.ts

@@ -14,7 +14,6 @@ export declare class NatsJetStreamServer extends Server implements CustomTranspo
     logger: import("@rsdk/logging").ILogger;
     readonly deserializer: EventsDeserializer<EventTypeWithOptions>;
     private nc?;
-    private jsm?;
     private readonly streams;
     private readonly normalizedApplicationName;
     private readonly autoUpdateConsumers;
@@ -58,20 +57,20 @@ export declare class NatsJetStreamServer extends Server implements CustomTranspo
      */
     private bindEventHandlers;
     /**
-     * Группирует обработчики по типу порядка (зависимые и независимые от порядка).
+     * Группирует обработчики в консьюмеры.
      *
      * @param {Array<[string, MessageHandler<any, any, any>]>} eventHandlers - Список обработчиков событий,
      * где каждый элемент представляет собой кортеж из метаданных и обработчика.
      *
-     * @returns {{
-     *   orderedConsumers: ConsumersMap,
-     *   unorderedConsumers: ConsumersMap
-     * }}
-     * Объект, содержащий две карты:
-     * - orderedConsumers: карта с зависимыми от порядка consumer'ами.
-     * - unorderedConsumers: карта с независимыми от порядка consumer'ами.
+     * @returns ConsumersMap
      */
-    private groupHandlersByOrderType;
+    private groupHandlersByConsumers;
+    private getStreamsAndOldConsumers;
+    private hasSubjectConflict;
+    private resolveConsumerConflicts;
+    private resolveConsumerConflictsWithPause;
+    private resolveConsumerConflictsWithoutPause;
+    private getUpdatedMinSeqs;
     /**
      * Получает информацию о консьюмере.
      * @param js - Клиент JetStream.
@@ -128,4 +127,5 @@ export declare class NatsJetStreamServer extends Server implements CustomTranspo
      * @returns Часть типа.
      */
     private getTypePart;
+    private isNatsVersionAtLeast;
 }

package/dist/jetstream/server.js

@@ -12,6 +12,7 @@ const lodash_1 = require("lodash");
 const nats_1 = require("nats");
 const rxjs_1 = require("rxjs");
 const events_deserializer_1 = require("../events.deserializer");
+const constants_1 = require("./constants");
 /**
  * Класс, реализующий сервер NATS JetStream.
  */
@@ -22,7 +23,6 @@ class NatsJetStreamServer extends microservices_1.Server {
     logger = logging_1.LoggerFactory.create(NatsJetStreamServer.name);
     deserializer = new events_deserializer_1.EventsDeserializer();
     nc;
-    jsm;
     streams = new Set();
     normalizedApplicationName;
     autoUpdateConsumers;
@@ -51,7 +51,6 @@ class NatsJetStreamServer extends microservices_1.Server {
             this.nc = await (0, nats_1.connect)(this.options.connectionOptions);
             this.options.connectionOptions.connectedHook?.(this.nc);
         }
-        this.jsm = await this.nc.jetstreamManager(this.options.jetStreamOptions);
         await this.bindEventHandlers();
         callback();
     }
@@ -117,51 +116,165 @@ class NatsJetStreamServer extends microservices_1.Server {
             throw new core_1.InternalException('Connection must be established');
         }
         const js = this.nc.jetstream(this.options.jetStreamOptions);
-        const { orderedConsumers, unorderedConsumers } = this.groupHandlersByOrderType(eventHandlers);
-        for (const [consumerName, consumer] of orderedConsumers) {
-            await this.createConsumer(js, `${consumerName}-ordered`, consumer, {
-                max_ack_pending: 1,
-            });
+        const jsm = await js.jetstreamManager();
+        const relevantConsumers = this.groupHandlersByConsumers(eventHandlers);
+        const relevantConsumerNames = new Set(relevantConsumers.keys());
+        const expectedSubjectsByConsumer = new Map();
+        const { streamsMap, oldConsumersByStreamMap } = await this.getStreamsAndOldConsumers(jsm);
+        /**
+         * Первая попытка создать без конфликта
+         */
+        for (const [relevantConsumerName, relevantConsumer] of relevantConsumers) {
+            const expectedSubjects = [
+                ...relevantConsumer.mapping.values(),
+            ].flatMap((e) => this.getEventSubjects(e.deserializer));
+            expectedSubjectsByConsumer.set(relevantConsumerName, expectedSubjects);
+            const oldConsumers = oldConsumersByStreamMap.get(relevantConsumer.streamName);
+            const conflictOldConsumer = [...oldConsumers.values()].find((oldConsumer) => this.hasSubjectConflict(oldConsumer, expectedSubjects));
+            const sameNameOldConsumer = oldConsumers.get(relevantConsumerName);
+            const canCreateDirectly = !conflictOldConsumer ||
+                (sameNameOldConsumer &&
+                    expectedSubjects.every((subject) => sameNameOldConsumer.config.filter_subjects?.includes(subject)));
+            /**
+             * Создаем, если нужных subject'ов нет в других консьюмерах,
+             * либо все нужные subject'ы присутствуют в консьюмере с актуальным названием
+             */
+            if (canCreateDirectly) {
+                this.logger.trace(`Create consumer without conflict`, {
+                    consumerName: relevantConsumerName,
+                });
+                await this.createConsumer(js, relevantConsumerName, relevantConsumer, {
+                    filter_subjects: expectedSubjects,
+                });
+                relevantConsumers.delete(relevantConsumerName);
+            }
         }
-        for (const [consumerName, consumer] of unorderedConsumers) {
-            await this.createConsumer(js, consumerName, consumer, {});
+        /**
+         * Решение конфликтов
+         */
+        for (const [consumerName, consumer] of relevantConsumers) {
+            const oldConsumers = oldConsumersByStreamMap.get(consumer.streamName);
+            const expectedSubjects = expectedSubjectsByConsumer.get(consumerName);
+            const { lowestLastAckSeq, lowestStartSeq } = await this.resolveConsumerConflicts(jsm, expectedSubjects, consumer, relevantConsumerNames, oldConsumers);
+            const isWorkQueue = streamsMap.get(consumer.streamName)?.config.retention ===
+                nats_1.RetentionPolicy.Workqueue;
+            const options = isWorkQueue || (!lowestLastAckSeq && !lowestStartSeq)
+                ? {
+                    deliver_policy: nats_1.DeliverPolicy.All,
+                }
+                : {
+                    opt_start_seq: Math.max(lowestLastAckSeq + 1, lowestStartSeq ?? 0),
+                    deliver_policy: nats_1.DeliverPolicy.StartSequence,
+                };
+            this.logger.trace(`Create consumer after conflicts resolving`, {
+                consumerName,
+            });
+            await this.createConsumer(js, consumerName, consumer, {
+                filter_subjects: expectedSubjects,
+                ...options,
+            });
         }
     }
     /**
-     * Группирует обработчики по типу порядка (зависимые и независимые от порядка).
+     * Группирует обработчики в консьюмеры.
      *
      * @param {Array<[string, MessageHandler<any, any, any>]>} eventHandlers - Список обработчиков событий,
      * где каждый элемент представляет собой кортеж из метаданных и обработчика.
      *
-     * @returns {{
-     *   orderedConsumers: ConsumersMap,
-     *   unorderedConsumers: ConsumersMap
-     * }}
-     * Объект, содержащий две карты:
-     * - orderedConsumers: карта с зависимыми от порядка consumer'ами.
-     * - unorderedConsumers: карта с независимыми от порядка consumer'ами.
+     * @returns ConsumersMap
      */
-    groupHandlersByOrderType(eventHandlers) {
-        const orderedConsumers = new Map();
-        const unorderedConsumers = new Map();
+    groupHandlersByConsumers(eventHandlers) {
+        const consumers = new Map();
         for (const [meta, handler] of eventHandlers) {
             const deserializer = this.deserializer.events.get(meta);
             const consumerName = this.getConsumerName(deserializer);
             const streamName = this.getStreamName(deserializer);
-            const targetMap = deserializer.options?.maxAckPending
-                ? orderedConsumers
-                : unorderedConsumers;
-            const aggregatedConsumer = targetMap.get(consumerName) ?? {
+            const aggregatedConsumer = consumers.get(consumerName) ?? {
                 streamName,
                 mapping: new Map(),
+                maxAckPending: deserializer.options?.maxAckPending ?? constants_1.DEFAULT_MAX_ACK_PENDING,
             };
             aggregatedConsumer.mapping.set(this.getTypePart(deserializer.type), {
                 deserializer,
                 handler,
             });
-            targetMap.set(consumerName, aggregatedConsumer);
+            consumers.set(consumerName, aggregatedConsumer);
+        }
+        return consumers;
+    }
+    async getStreamsAndOldConsumers(jsm) {
+        const streamsMap = new Map();
+        const oldConsumersByStreamMap = new Map();
+        await Promise.all(Array.from(this.streams.values()).map(async (streamName) => {
+            oldConsumersByStreamMap.set(streamName, new Map());
+            const oldConsumers = oldConsumersByStreamMap.get(streamName);
+            streamsMap.set(streamName, await jsm.streams.info(streamName));
+            for await (const consumer of jsm.consumers.list(streamName)) {
+                if (consumer.config.durable_name?.includes(this.normalizedApplicationName)) {
+                    oldConsumers.set(consumer.config.durable_name, consumer);
+                }
+            }
+        }));
+        return { streamsMap, oldConsumersByStreamMap };
+    }
+    hasSubjectConflict(consumer, expectedSubjects) {
+        const filterSubjects = consumer.config.filter_subjects;
+        const filterSubject = consumer.config.filter_subject;
+        return !!((!filterSubjects && !filterSubject) ||
+            (filterSubjects &&
+                filterSubjects.some((s) => expectedSubjects.includes(s))) ||
+            (filterSubject && expectedSubjects.includes(filterSubject)));
+    }
+    async resolveConsumerConflicts(jsm, expectedSubjects, consumer, relevantConsumerNames, oldConsumers) {
+        const conflictOldConsumers = [...oldConsumers.values()].filter((oldConsumer) => this.hasSubjectConflict(oldConsumer, expectedSubjects));
+        /**
+         * NOTE: пауза позволяет дождаться все pending ack'и и избежать race condition.
+         * Но пауза появилась только в nats-server версии 2.11.0.
+         */
+        return this.isNatsVersionAtLeast(this.nc.info.version, 2, 11, 0)
+            ? this.resolveConsumerConflictsWithPause(jsm, consumer, conflictOldConsumers, relevantConsumerNames)
+            : this.resolveConsumerConflictsWithoutPause(jsm, consumer, conflictOldConsumers, relevantConsumerNames);
+    }
+    async resolveConsumerConflictsWithPause(jsm, relevantConsumer, conflictOldConsumers, relevantConsumerNames) {
+        let lowestLastAckSeq = Infinity;
+        let lowestStartSeq = undefined;
+        for (const oldConsumer of conflictOldConsumers) {
+            const conflictDurableName = oldConsumer.config.durable_name;
+            this.logger.trace(`Pause conflict consumer`, { conflictDurableName });
+            await jsm.consumers.pause(relevantConsumer.streamName, conflictDurableName, new Date(Date.now() + 60000));
+            const oldConsumerInfoAfterPause = await jsm.consumers.info(relevantConsumer.streamName, conflictDurableName);
+            ({ lowestLastAckSeq, lowestStartSeq } = this.getUpdatedMinSeqs(oldConsumerInfoAfterPause, lowestLastAckSeq, lowestStartSeq));
+            if (relevantConsumerNames.has(conflictDurableName)) {
+                this.logger.trace(`Resume conflict consumer`, { conflictDurableName });
+                jsm.consumers.resume(relevantConsumer.streamName, conflictDurableName);
+            }
+            else {
+                this.logger.trace(`Delete conflict consumer`, { conflictDurableName });
+                jsm.consumers.delete(relevantConsumer.streamName, conflictDurableName);
+            }
+        }
+        return { lowestLastAckSeq, lowestStartSeq };
+    }
+    async resolveConsumerConflictsWithoutPause(jsm, relevantConsumer, conflictOldConsumers, relevantConsumerNames) {
+        let lowestLastAckSeq = Infinity;
+        let lowestStartSeq = undefined;
+        for (const oldConsumer of conflictOldConsumers) {
+            const conflictDurableName = oldConsumer.config.durable_name;
+            ({ lowestLastAckSeq, lowestStartSeq } = this.getUpdatedMinSeqs(oldConsumer, lowestLastAckSeq, lowestStartSeq));
+            if (!relevantConsumerNames.has(conflictDurableName)) {
+                this.logger.trace(`Delete conflict consumer`, { conflictDurableName });
+                await jsm.consumers.delete(relevantConsumer.streamName, conflictDurableName);
+            }
         }
-        return { orderedConsumers, unorderedConsumers };
+        return { lowestLastAckSeq, lowestStartSeq };
+    }
+    getUpdatedMinSeqs(oldConsumer, lowestLastAckSeq, lowestStartSeq) {
+        lowestLastAckSeq = Math.min(lowestLastAckSeq, oldConsumer.ack_floor.stream_seq);
+        const startSeq = oldConsumer.config.opt_start_seq;
+        if (startSeq !== undefined) {
+            lowestStartSeq = Math.min(lowestStartSeq ?? Infinity, startSeq);
+        }
+        return { lowestLastAckSeq, lowestStartSeq };
     }
     /**
      * Получает информацию о консьюмере.
@@ -180,7 +293,7 @@ class NatsJetStreamServer extends microservices_1.Server {
      * @param consumer - Информация о консьюмере.
      * @param options - Дополнительные параметры конфигурации консьюмера.
      */
-    async createConsumer(js, consumerName, { streamName, mapping }, options) {
+    async createConsumer(js, consumerName, { streamName, mapping, maxAckPending }, options) {
         try {
             await js.streams.get(streamName);
             this.logger.trace('Stream %s found', { streamName });
@@ -192,20 +305,19 @@ class NatsJetStreamServer extends microservices_1.Server {
             });
         }
         const jsm = await js.jetstreamManager();
-        const expectedSubjects = [...mapping.values()].flatMap((e) => this.getEventSubjects(e.deserializer));
         const ackPolicy = [...mapping.values()][0].deserializer.options?.ackPolicy;
         const consumer = (await this.getConsumer(js, streamName, consumerName).catch(() => null)) ??
             (await jsm.consumers
                 .add(streamName, (0, common_1.omitUndefined)({
                 ...options,
+                max_ack_pending: maxAckPending,
                 ack_policy: ackPolicy,
                 durable_name: consumerName,
-                filter_subjects: expectedSubjects,
             }))
                 .then(() => this.getConsumer(js, streamName, consumerName)));
         const info = await consumer.info();
         const receivedSubjects = info.config.filter_subjects;
-        await this.handleCorrectness(jsm, streamName, consumerName, expectedSubjects, receivedSubjects);
+        await this.handleCorrectness(jsm, streamName, consumerName, options.filter_subjects, receivedSubjects);
         this.handleEventMessages(consumer, mapping, consumerName);
     }
     /**
@@ -291,14 +403,14 @@ class NatsJetStreamServer extends microservices_1.Server {
      * @returns Имя консьюмера.
      */
     getConsumerName(contract) {
-        const arr = [
-            this.normalizedApplicationName,
-            this.getStreamName(contract),
-            'consumer',
-        ];
+        const arr = [];
         if (contract.options?.consumerName) {
-            arr.unshift(contract.options.consumerName);
+            arr.push(contract.options.consumerName);
         }
+        const maxAckPending = `${contract.options?.maxAckPending === -1
+            ? 'infinite'
+            : (contract.options?.maxAckPending ?? constants_1.DEFAULT_MAX_ACK_PENDING)}`;
+        arr.push(this.normalizedApplicationName, this.getStreamName(contract), 'maxAckPending', maxAckPending, 'ackPolicy', contract.options?.ackPolicy ?? nats_1.AckPolicy.None);
         return arr.join('-');
     }
     /**
@@ -307,7 +419,9 @@ class NatsJetStreamServer extends microservices_1.Server {
      * @returns Темы событий.
      */
     getEventSubjects(contract) {
-        return contract.options?.subjects ?? [];
+        return (contract.options?.subjects ?? [
+            (0, nats_common_1.getSubjectName)(contract.type, contract.options?.partition),
+        ]);
     }
     /**
      * Получает часть типа события.
@@ -317,6 +431,14 @@ class NatsJetStreamServer extends microservices_1.Server {
     getTypePart(eventType) {
         return (typeof eventType === 'string' ? eventType : eventType.$type).replaceAll('.', '-');
     }
+    isNatsVersionAtLeast(version, minMajor, minMinor, minPatch) {
+        const [major, minor, patch] = version.split('-')[0].split('.').map(Number);
+        if (major !== minMajor)
+            return major > minMajor;
+        if (minor !== minMinor)
+            return minor > minMinor;
+        return patch >= minPatch;
+    }
 }
 exports.NatsJetStreamServer = NatsJetStreamServer;
 //# sourceMappingURL=server.js.map

package/dist/jetstream/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/jetstream/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/jetstream/server.ts"],"names":[],"mappings":"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"}

package/dist/jetstream/types/consume.options.d.ts

@@ -5,4 +5,5 @@ export type ConsumeOptions = {
     maxAckPending?: number;
     consumerName?: string;
     ackPolicy?: AckPolicy;
+    partition?: string;
 };

package/dist/jetstream/types/consumer-info.type.d.ts

@@ -2,4 +2,5 @@ import type { Mapping } from './mapping.type';
 export type ConsumerInfo = {
     streamName: string;
     mapping: Mapping;
+    maxAckPending: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.transport",
-  "version": "5.8.0-next.4",
+  "version": "5.8.0-next.6",
   "description": "Nats NestJS Transport",
   "main": "dist/index.js",
   "license": "Apache License 2.0",
@@ -37,5 +37,5 @@
     "rxjs": "^7.1.0"
   },
   "nx": {},
-  "gitHead": "22b0461b366828fb376eb6a83d6194003822d7cd"
+  "gitHead": "317e239c10a0601b489b6a1347f8de88a730e8d8"
 }

package/src/jetstream/constants.ts

@@ -4,3 +4,5 @@ export const NATS_JETSTREAM_PROTOCOL = 'nats-jetstream';
  * @deprecated use NATS_JETSTREAM_PROTOCOL instead
  */
 export const NATS_PROTOCOL = NATS_JETSTREAM_PROTOCOL;
+
+export const DEFAULT_MAX_ACK_PENDING = 1000;

package/src/jetstream/server.ts

@@ -14,20 +14,27 @@ import { InternalException, NotFoundException } from '@rsdk/core';
 import type { EventType } from '@rsdk/events.common';
 import { isEventType, X_TYPE_HEADER } from '@rsdk/events.common';
 import { LoggerFactory } from '@rsdk/logging';
-import { getStreamName, isMessageType } from '@rsdk/nats.common';
+import {
+  getStreamName,
+  getSubjectName,
+  isMessageType,
+} from '@rsdk/nats.common';
 import { isEqual } from 'lodash';
 import type {
   Consumer,
   ConsumerConfig,
+  ConsumerInfo as NativeConsumerInfo,
   JetStreamClient,
   JetStreamManager,
   NatsConnection,
+  StreamInfo,
 } from 'nats';
-import { connect } from 'nats';
+import { AckPolicy, connect, DeliverPolicy, RetentionPolicy } from 'nats';
 import { connectable, isObservable, Subject } from 'rxjs';
 
 import { EventsDeserializer } from '../events.deserializer';
 
+import { DEFAULT_MAX_ACK_PENDING } from './constants';
 import type {
   ConsumerInfo,
   ConsumersMap,
@@ -48,7 +55,6 @@ export class NatsJetStreamServer
     new EventsDeserializer<EventTypeWithOptions>();
 
   private nc?: NatsConnection;
-  private jsm?: JetStreamManager;
   private readonly streams = new Set<string>();
 
   private readonly normalizedApplicationName: string;
@@ -89,7 +95,6 @@ export class NatsJetStreamServer
       this.nc = await connect(this.options.connectionOptions);
       this.options.connectionOptions!.connectedHook?.(this.nc);
     }
-    this.jsm = await this.nc.jetstreamManager(this.options.jetStreamOptions);
 
     await this.bindEventHandlers();
     callback();
@@ -181,64 +186,303 @@ export class NatsJetStreamServer
     if (!this.nc) {
       throw new InternalException('Connection must be established');
     }
+
     const js = this.nc.jetstream(this.options.jetStreamOptions);
+    const jsm = await js.jetstreamManager();
+    const relevantConsumers = this.groupHandlersByConsumers(eventHandlers);
+    const relevantConsumerNames = new Set<string>(relevantConsumers.keys());
+    const expectedSubjectsByConsumer = new Map<string, string[]>();
 
-    const { orderedConsumers, unorderedConsumers } =
-      this.groupHandlersByOrderType(eventHandlers);
+    const { streamsMap, oldConsumersByStreamMap } =
+      await this.getStreamsAndOldConsumers(jsm);
 
-    for (const [consumerName, consumer] of orderedConsumers) {
-      await this.createConsumer(js, `${consumerName}-ordered`, consumer, {
-        max_ack_pending: 1,
-      });
+    /**
+     * Первая попытка создать без конфликта
+     */
+    for (const [relevantConsumerName, relevantConsumer] of relevantConsumers) {
+      const expectedSubjects: string[] = [
+        ...relevantConsumer.mapping.values(),
+      ].flatMap((e) => this.getEventSubjects(e.deserializer));
+
+      expectedSubjectsByConsumer.set(relevantConsumerName, expectedSubjects);
+
+      const oldConsumers = oldConsumersByStreamMap.get(
+        relevantConsumer.streamName,
+      )!;
+
+      const conflictOldConsumer = [...oldConsumers.values()].find(
+        (oldConsumer) => this.hasSubjectConflict(oldConsumer, expectedSubjects),
+      );
+
+      const sameNameOldConsumer = oldConsumers.get(relevantConsumerName);
+      const canCreateDirectly =
+        !conflictOldConsumer ||
+        (sameNameOldConsumer &&
+          expectedSubjects.every((subject) =>
+            sameNameOldConsumer.config.filter_subjects?.includes(subject),
+          ));
+
+      /**
+       * Создаем, если нужных subject'ов нет в других консьюмерах,
+       * либо все нужные subject'ы присутствуют в консьюмере с актуальным названием
+       */
+      if (canCreateDirectly) {
+        this.logger.trace(`Create consumer without conflict`, {
+          consumerName: relevantConsumerName,
+        });
+
+        await this.createConsumer(js, relevantConsumerName, relevantConsumer, {
+          filter_subjects: expectedSubjects,
+        });
+        relevantConsumers.delete(relevantConsumerName);
+      }
     }
 
-    for (const [consumerName, consumer] of unorderedConsumers) {
-      await this.createConsumer(js, consumerName, consumer, {});
+    /**
+     * Решение конфликтов
+     */
+    for (const [consumerName, consumer] of relevantConsumers) {
+      const oldConsumers = oldConsumersByStreamMap.get(consumer.streamName)!;
+      const expectedSubjects = expectedSubjectsByConsumer.get(consumerName)!;
+
+      const { lowestLastAckSeq, lowestStartSeq } =
+        await this.resolveConsumerConflicts(
+          jsm,
+          expectedSubjects,
+          consumer,
+          relevantConsumerNames,
+          oldConsumers,
+        );
+
+      const isWorkQueue =
+        streamsMap.get(consumer.streamName)?.config.retention ===
+        RetentionPolicy.Workqueue;
+
+      const options =
+        isWorkQueue || (!lowestLastAckSeq && !lowestStartSeq)
+          ? {
+              deliver_policy: DeliverPolicy.All,
+            }
+          : {
+              opt_start_seq: Math.max(
+                lowestLastAckSeq + 1,
+                lowestStartSeq ?? 0,
+              ),
+              deliver_policy: DeliverPolicy.StartSequence,
+            };
+
+      this.logger.trace(`Create consumer after conflicts resolving`, {
+        consumerName,
+      });
+
+      await this.createConsumer(js, consumerName, consumer, {
+        filter_subjects: expectedSubjects,
+        ...options,
+      });
     }
   }
 
   /**
-   * Группирует обработчики по типу порядка (зависимые и независимые от порядка).
+   * Группирует обработчики в консьюмеры.
    *
    * @param {Array<[string, MessageHandler<any, any, any>]>} eventHandlers - Список обработчиков событий,
    * где каждый элемент представляет собой кортеж из метаданных и обработчика.
    *
-   * @returns {{
-   *   orderedConsumers: ConsumersMap,
-   *   unorderedConsumers: ConsumersMap
-   * }}
-   * Объект, содержащий две карты:
-   * - orderedConsumers: карта с зависимыми от порядка consumer'ами.
-   * - unorderedConsumers: карта с независимыми от порядка consumer'ами.
+   * @returns ConsumersMap
    */
-  private groupHandlersByOrderType(
+  private groupHandlersByConsumers(
     eventHandlers: [string, MessageHandler<any, any, any>][],
-  ): { orderedConsumers: ConsumersMap; unorderedConsumers: ConsumersMap } {
-    const orderedConsumers: ConsumersMap = new Map();
-    const unorderedConsumers: ConsumersMap = new Map();
+  ): ConsumersMap {
+    const consumers: ConsumersMap = new Map();
 
     for (const [meta, handler] of eventHandlers) {
       const deserializer = this.deserializer.events.get(meta)!;
       const consumerName = this.getConsumerName(deserializer);
       const streamName = this.getStreamName(deserializer);
 
-      const targetMap = deserializer.options?.maxAckPending
-        ? orderedConsumers
-        : unorderedConsumers;
-
-      const aggregatedConsumer = targetMap.get(consumerName) ?? {
+      const aggregatedConsumer = consumers.get(consumerName) ?? {
         streamName,
         mapping: new Map() as Mapping,
+        maxAckPending:
+          deserializer.options?.maxAckPending ?? DEFAULT_MAX_ACK_PENDING,
       };
 
       aggregatedConsumer.mapping.set(this.getTypePart(deserializer.type), {
         deserializer,
         handler,
       });
-      targetMap.set(consumerName, aggregatedConsumer);
+      consumers.set(consumerName, aggregatedConsumer);
+    }
+
+    return consumers;
+  }
+
+  private async getStreamsAndOldConsumers(jsm: JetStreamManager): Promise<{
+    streamsMap: Map<string, StreamInfo>;
+    oldConsumersByStreamMap: Map<string, Map<string, NativeConsumerInfo>>;
+  }> {
+    const streamsMap = new Map<string, StreamInfo>();
+    const oldConsumersByStreamMap = new Map<
+      string,
+      Map<string, NativeConsumerInfo>
+    >();
+
+    await Promise.all(
+      Array.from(this.streams.values()).map(async (streamName) => {
+        oldConsumersByStreamMap.set(streamName, new Map());
+        const oldConsumers = oldConsumersByStreamMap.get(streamName)!;
+
+        streamsMap.set(streamName, await jsm.streams.info(streamName));
+
+        for await (const consumer of jsm.consumers.list(streamName)) {
+          if (
+            consumer.config.durable_name?.includes(
+              this.normalizedApplicationName,
+            )
+          ) {
+            oldConsumers.set(consumer.config.durable_name, consumer);
+          }
+        }
+      }),
+    );
+
+    return { streamsMap, oldConsumersByStreamMap };
+  }
+
+  private hasSubjectConflict(
+    consumer: NativeConsumerInfo,
+    expectedSubjects: string[],
+  ): boolean {
+    const filterSubjects = consumer.config.filter_subjects;
+    const filterSubject = consumer.config.filter_subject;
+
+    return !!(
+      (!filterSubjects && !filterSubject) ||
+      (filterSubjects &&
+        filterSubjects.some((s) => expectedSubjects.includes(s))) ||
+      (filterSubject && expectedSubjects.includes(filterSubject))
+    );
+  }
+
+  private async resolveConsumerConflicts(
+    jsm: JetStreamManager,
+    expectedSubjects: string[],
+    consumer: ConsumerInfo,
+    relevantConsumerNames: Set<string>,
+    oldConsumers: Map<string, NativeConsumerInfo>,
+  ): Promise<{ lowestLastAckSeq: number; lowestStartSeq: number | undefined }> {
+    const conflictOldConsumers = [...oldConsumers.values()].filter(
+      (oldConsumer) => this.hasSubjectConflict(oldConsumer, expectedSubjects),
+    );
+
+    /**
+     * NOTE: пауза позволяет дождаться все pending ack'и и избежать race condition.
+     * Но пауза появилась только в nats-server версии 2.11.0.
+     */
+    return this.isNatsVersionAtLeast(this.nc!.info!.version, 2, 11, 0)
+      ? this.resolveConsumerConflictsWithPause(
+          jsm,
+          consumer,
+          conflictOldConsumers,
+          relevantConsumerNames,
+        )
+      : this.resolveConsumerConflictsWithoutPause(
+          jsm,
+          consumer,
+          conflictOldConsumers,
+          relevantConsumerNames,
+        );
+  }
+
+  private async resolveConsumerConflictsWithPause(
+    jsm: JetStreamManager,
+    relevantConsumer: ConsumerInfo,
+    conflictOldConsumers: NativeConsumerInfo[],
+    relevantConsumerNames: Set<string>,
+  ): Promise<{ lowestLastAckSeq: number; lowestStartSeq: number | undefined }> {
+    let lowestLastAckSeq = Infinity;
+    let lowestStartSeq: number | undefined = undefined;
+
+    for (const oldConsumer of conflictOldConsumers) {
+      const conflictDurableName = oldConsumer.config.durable_name!;
+
+      this.logger.trace(`Pause conflict consumer`, { conflictDurableName });
+
+      await jsm.consumers.pause(
+        relevantConsumer.streamName,
+        conflictDurableName,
+        new Date(Date.now() + 60000),
+      );
+
+      const oldConsumerInfoAfterPause = await jsm.consumers.info(
+        relevantConsumer.streamName,
+        conflictDurableName,
+      );
+
+      ({ lowestLastAckSeq, lowestStartSeq } = this.getUpdatedMinSeqs(
+        oldConsumerInfoAfterPause,
+        lowestLastAckSeq,
+        lowestStartSeq,
+      ));
+
+      if (relevantConsumerNames.has(conflictDurableName)) {
+        this.logger.trace(`Resume conflict consumer`, { conflictDurableName });
+        jsm.consumers.resume(relevantConsumer.streamName, conflictDurableName);
+      } else {
+        this.logger.trace(`Delete conflict consumer`, { conflictDurableName });
+        jsm.consumers.delete(relevantConsumer.streamName, conflictDurableName);
+      }
+    }
+
+    return { lowestLastAckSeq, lowestStartSeq };
+  }
+
+  private async resolveConsumerConflictsWithoutPause(
+    jsm: JetStreamManager,
+    relevantConsumer: ConsumerInfo,
+    conflictOldConsumers: NativeConsumerInfo[],
+    relevantConsumerNames: Set<string>,
+  ): Promise<{ lowestLastAckSeq: number; lowestStartSeq: number | undefined }> {
+    let lowestLastAckSeq = Infinity;
+    let lowestStartSeq: number | undefined = undefined;
+
+    for (const oldConsumer of conflictOldConsumers) {
+      const conflictDurableName = oldConsumer.config.durable_name!;
+
+      ({ lowestLastAckSeq, lowestStartSeq } = this.getUpdatedMinSeqs(
+        oldConsumer,
+        lowestLastAckSeq,
+        lowestStartSeq,
+      ));
+
+      if (!relevantConsumerNames.has(conflictDurableName)) {
+        this.logger.trace(`Delete conflict consumer`, { conflictDurableName });
+        await jsm.consumers.delete(
+          relevantConsumer.streamName,
+          conflictDurableName,
+        );
+      }
+    }
+
+    return { lowestLastAckSeq, lowestStartSeq };
+  }
+
+  private getUpdatedMinSeqs(
+    oldConsumer: NativeConsumerInfo,
+    lowestLastAckSeq: number,
+    lowestStartSeq: number | undefined,
+  ): { lowestLastAckSeq: number; lowestStartSeq: number | undefined } {
+    lowestLastAckSeq = Math.min(
+      lowestLastAckSeq,
+      oldConsumer.ack_floor.stream_seq,
+    );
+
+    const startSeq = oldConsumer.config.opt_start_seq;
+    if (startSeq !== undefined) {
+      lowestStartSeq = Math.min(lowestStartSeq ?? Infinity, startSeq);
     }
 
-    return { orderedConsumers, unorderedConsumers };
+    return { lowestLastAckSeq, lowestStartSeq };
   }
 
   /**
@@ -266,8 +510,8 @@ export class NatsJetStreamServer
   private async createConsumer(
     js: JetStreamClient,
     consumerName: string,
-    { streamName, mapping }: ConsumerInfo,
-    options: Partial<ConsumerConfig>,
+    { streamName, mapping, maxAckPending }: ConsumerInfo,
+    options: Partial<ConsumerConfig> & { filter_subjects: string[] },
   ): Promise<void> {
     try {
       await js.streams.get(streamName);
@@ -280,9 +524,7 @@ export class NatsJetStreamServer
     }
 
     const jsm = await js.jetstreamManager();
-    const expectedSubjects: string[] = [...mapping.values()].flatMap((e) =>
-      this.getEventSubjects(e.deserializer),
-    );
+
     const ackPolicy = [...mapping.values()][0].deserializer.options?.ackPolicy;
 
     const consumer: Consumer =
@@ -294,9 +536,9 @@ export class NatsJetStreamServer
           streamName,
           omitUndefined({
             ...options,
+            max_ack_pending: maxAckPending,
             ack_policy: ackPolicy,
             durable_name: consumerName,
-            filter_subjects: expectedSubjects,
           }),
         )
         .then(() => this.getConsumer(js, streamName, consumerName)));
@@ -308,7 +550,7 @@ export class NatsJetStreamServer
       jsm,
       streamName,
       consumerName,
-      expectedSubjects,
+      options.filter_subjects,
       receivedSubjects,
     );
 
@@ -417,16 +659,27 @@ export class NatsJetStreamServer
    * @returns Имя консьюмера.
    */
   private getConsumerName(contract: EventTypeWithOptions): string {
-    const arr = [
-      this.normalizedApplicationName,
-      this.getStreamName(contract),
-      'consumer',
-    ];
+    const arr: string[] = [];
 
     if (contract.options?.consumerName) {
-      arr.unshift(contract.options.consumerName);
+      arr.push(contract.options.consumerName);
     }
 
+    const maxAckPending = `${
+      contract.options?.maxAckPending === -1
+        ? 'infinite'
+        : (contract.options?.maxAckPending ?? DEFAULT_MAX_ACK_PENDING)
+    }`;
+
+    arr.push(
+      this.normalizedApplicationName,
+      this.getStreamName(contract),
+      'maxAckPending',
+      maxAckPending,
+      'ackPolicy',
+      contract.options?.ackPolicy ?? AckPolicy.None,
+    );
+
     return arr.join('-');
   }
 
@@ -436,7 +689,11 @@ export class NatsJetStreamServer
    * @returns Темы событий.
    */
   private getEventSubjects(contract: EventTypeWithOptions): string[] {
-    return contract.options?.subjects ?? [];
+    return (
+      contract.options?.subjects ?? [
+        getSubjectName(contract.type, contract.options?.partition),
+      ]
+    );
   }
 
   /**
@@ -449,4 +706,16 @@ export class NatsJetStreamServer
       typeof eventType === 'string' ? eventType : eventType.$type
     ).replaceAll('.', '-');
   }
+
+  private isNatsVersionAtLeast(
+    version: string,
+    minMajor: number,
+    minMinor: number,
+    minPatch: number,
+  ): boolean {
+    const [major, minor, patch] = version.split('-')[0].split('.').map(Number);
+    if (major !== minMajor) return major > minMajor;
+    if (minor !== minMinor) return minor > minMinor;
+    return patch >= minPatch;
+  }
 }

package/src/jetstream/types/consume.options.ts

@@ -6,4 +6,5 @@ export type ConsumeOptions = {
   maxAckPending?: number;
   consumerName?: string;
   ackPolicy?: AckPolicy;
+  partition?: string;
 };

package/src/jetstream/types/consumer-info.type.ts

@@ -3,4 +3,5 @@ import type { Mapping } from './mapping.type';
 export type ConsumerInfo = {
   streamName: string;
   mapping: Mapping;
+  maxAckPending: number;
 };