@lokative/messaging 1.1.5 → 1.1.7

package/dist/cjs/messaging.config.d.ts

@@ -1,14 +1,13 @@
 import type { Type } from '@nestjs/common';
-import type { MessagingTransport } from './transport.interface';
-export interface MessagingConfig {
+import type { MessagingTransport, SubscribeOptions } from './transport.interface';
+export interface MessagingConfig<TOptions extends Record<string, any> = Record<string, any>> {
     transport: Type<MessagingTransport>;
-    transportOptions?: Record<string, any>;
+    transportOptions?: TOptions;
     streams?: {
         name: string;
         subjects: string[];
     }[];
-    consumers?: {
-        group?: string;
+    consumers?: SubscribeOptions & {
         retry?: number;
         dlq?: boolean;
     };

package/dist/cjs/messaging.module.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModule } from "@nestjs/common";
 import { MessagingConfig } from "./messaging.config";
 export declare class MessagingModule {
-    static register(config: MessagingConfig): DynamicModule;
+    static register<TOptions extends Record<string, any> = Record<string, any>>(config: MessagingConfig<TOptions>): DynamicModule;
 }

package/dist/cjs/messaging.registry.js

@@ -45,8 +45,8 @@ let MessagingConsumerRegistry = class MessagingConsumerRegistry {
         }
     }
     async startConsumer(instance, handler, meta) {
-        const group = this.config.consumers?.group;
-        const sub = await this.transport.subscribe(meta.subject, { group });
+        const { retry, dlq, ...subscribeOpts } = this.config.consumers ?? {};
+        const sub = await this.transport.subscribe(meta.subject, subscribeOpts);
         for await (const msg of sub) {
             try {
                 await handler.call(instance, msg.data);

package/dist/cjs/transport.interface.d.ts

@@ -13,5 +13,7 @@ export interface MessagingTransport {
 }
 export interface SubscribeOptions {
     group?: string;
+    durable?: boolean;
+    startFrom?: 'first' | 'new';
 }
 export declare const MESSAGING_TRANSPORT = "MESSAGING_TRANSPORT";

package/dist/cjs/transports/kafka.transport.d.ts

@@ -8,7 +8,7 @@ export declare class KafkaTransport implements MessagingTransport {
     private config;
     private kafka;
     private producer;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<KafkaTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, options?: SubscribeOptions): Promise<Subscription>;

package/dist/cjs/transports/kafka.transport.js

@@ -42,7 +42,10 @@ let KafkaTransport = class KafkaTransport {
             groupId: options?.group ?? 'nest-consumer',
         });
         await consumer.connect();
-        await consumer.subscribe({ topic: subject, fromBeginning: false });
+        await consumer.subscribe({
+            topic: subject,
+            fromBeginning: options?.startFrom === 'first',
+        });
         const buffer = [];
         let waiting = null;
         await consumer.run({

package/dist/cjs/transports/nats.transport.d.ts

@@ -12,7 +12,7 @@ export declare class NatsTransport implements MessagingTransport {
     private nc;
     private js;
     private jsm;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<NatsTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, options?: SubscribeOptions): Promise<Subscription>;

package/dist/cjs/transports/nats.transport.js

@@ -34,11 +34,26 @@ let NatsTransport = class NatsTransport {
         await this.js.publish(subject, Buffer.from(JSON.stringify(payload)));
     }
     async subscribe(subject, options) {
-        const durable = options?.group ?? 'nest-consumer';
+        const group = options?.group ?? 'nest-consumer';
+        const isDurable = options?.durable !== false; // default: durable
+        const startFrom = options?.startFrom ?? 'new'; // default: new messages only
+        const safeSuffix = subject.replace(/[.*>]/g, '-');
         const opts = (0, nats_1.consumerOpts)();
-        opts.durable(durable);
+        if (isDurable) {
+            const durableName = `${group}-${safeSuffix}`;
+            opts.durable(durableName);
+            opts.deliverTo(`${durableName}-inbox`);
+        }
+        else {
+            opts.deliverTo(`_INBOX.${group}.${safeSuffix}`);
+        }
         opts.ackExplicit();
-        opts.deliverTo(durable);
+        if (startFrom === 'first') {
+            opts.deliverAll();
+        }
+        else {
+            opts.deliverNew();
+        }
         const sub = await this.js.subscribe(subject, opts);
         const iter = sub[Symbol.asyncIterator]();
         const iterator = {

package/dist/cjs/transports/redis.transport.d.ts

@@ -9,7 +9,7 @@ export declare class RedisTransport implements MessagingTransport {
     private config;
     private pub;
     private sub;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<RedisTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, _options?: SubscribeOptions): Promise<Subscription>;

package/dist/esm/messaging.config.d.ts

@@ -1,14 +1,13 @@
 import type { Type } from '@nestjs/common';
-import type { MessagingTransport } from './transport.interface';
-export interface MessagingConfig {
+import type { MessagingTransport, SubscribeOptions } from './transport.interface';
+export interface MessagingConfig<TOptions extends Record<string, any> = Record<string, any>> {
     transport: Type<MessagingTransport>;
-    transportOptions?: Record<string, any>;
+    transportOptions?: TOptions;
     streams?: {
         name: string;
         subjects: string[];
     }[];
-    consumers?: {
-        group?: string;
+    consumers?: SubscribeOptions & {
         retry?: number;
         dlq?: boolean;
     };

package/dist/esm/messaging.module.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModule } from "@nestjs/common";
 import { MessagingConfig } from "./messaging.config";
 export declare class MessagingModule {
-    static register(config: MessagingConfig): DynamicModule;
+    static register<TOptions extends Record<string, any> = Record<string, any>>(config: MessagingConfig<TOptions>): DynamicModule;
 }

package/dist/esm/messaging.registry.js

@@ -42,8 +42,8 @@ let MessagingConsumerRegistry = class MessagingConsumerRegistry {
         }
     }
     async startConsumer(instance, handler, meta) {
-        const group = this.config.consumers?.group;
-        const sub = await this.transport.subscribe(meta.subject, { group });
+        const { retry, dlq, ...subscribeOpts } = this.config.consumers ?? {};
+        const sub = await this.transport.subscribe(meta.subject, subscribeOpts);
         for await (const msg of sub) {
             try {
                 await handler.call(instance, msg.data);

package/dist/esm/transport.interface.d.ts

@@ -13,5 +13,7 @@ export interface MessagingTransport {
 }
 export interface SubscribeOptions {
     group?: string;
+    durable?: boolean;
+    startFrom?: 'first' | 'new';
 }
 export declare const MESSAGING_TRANSPORT = "MESSAGING_TRANSPORT";

package/dist/esm/transports/kafka.transport.d.ts

@@ -8,7 +8,7 @@ export declare class KafkaTransport implements MessagingTransport {
     private config;
     private kafka;
     private producer;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<KafkaTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, options?: SubscribeOptions): Promise<Subscription>;

package/dist/esm/transports/kafka.transport.js

@@ -39,7 +39,10 @@ let KafkaTransport = class KafkaTransport {
             groupId: options?.group ?? 'nest-consumer',
         });
         await consumer.connect();
-        await consumer.subscribe({ topic: subject, fromBeginning: false });
+        await consumer.subscribe({
+            topic: subject,
+            fromBeginning: options?.startFrom === 'first',
+        });
         const buffer = [];
         let waiting = null;
         await consumer.run({

package/dist/esm/transports/nats.transport.d.ts

@@ -12,7 +12,7 @@ export declare class NatsTransport implements MessagingTransport {
     private nc;
     private js;
     private jsm;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<NatsTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, options?: SubscribeOptions): Promise<Subscription>;

package/dist/esm/transports/nats.transport.js

@@ -31,11 +31,26 @@ let NatsTransport = class NatsTransport {
         await this.js.publish(subject, Buffer.from(JSON.stringify(payload)));
     }
     async subscribe(subject, options) {
-        const durable = options?.group ?? 'nest-consumer';
+        const group = options?.group ?? 'nest-consumer';
+        const isDurable = options?.durable !== false; // default: durable
+        const startFrom = options?.startFrom ?? 'new'; // default: new messages only
+        const safeSuffix = subject.replace(/[.*>]/g, '-');
         const opts = consumerOpts();
-        opts.durable(durable);
+        if (isDurable) {
+            const durableName = `${group}-${safeSuffix}`;
+            opts.durable(durableName);
+            opts.deliverTo(`${durableName}-inbox`);
+        }
+        else {
+            opts.deliverTo(`_INBOX.${group}.${safeSuffix}`);
+        }
         opts.ackExplicit();
-        opts.deliverTo(durable);
+        if (startFrom === 'first') {
+            opts.deliverAll();
+        }
+        else {
+            opts.deliverNew();
+        }
         const sub = await this.js.subscribe(subject, opts);
         const iter = sub[Symbol.asyncIterator]();
         const iterator = {

package/dist/esm/transports/redis.transport.d.ts

@@ -9,7 +9,7 @@ export declare class RedisTransport implements MessagingTransport {
     private config;
     private pub;
     private sub;
-    constructor(config: MessagingConfig);
+    constructor(config: MessagingConfig<RedisTransportOptions>);
     connect(): Promise<void>;
     publish(subject: string, payload: any): Promise<void>;
     subscribe(subject: string, _options?: SubscribeOptions): Promise<Subscription>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lokative/messaging",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",