@rsdk/nats.kv 5.6.0-next.0 → 5.6.0-next.2

package/dist/nats-kv.module.js

@@ -53,10 +53,14 @@ let NatsKvModule = NatsKvModule_1 = class NatsKvModule {
         };
     }
     async onApplicationBootstrap() {
-        await this.watchKvService?.runWatches();
+        /**
+         * NOTE: не используем await, чтобы не блокировать запуск приложения.
+         * Если бакета нет, то приложение просто не пройдет readiness пробу.
+         */
+        this.watchKvService?.runWatches();
     }
     async onApplicationShutdown() {
-        await this.watchKvService?.stopWatches();
+        this.watchKvService?.stopWatches();
     }
 };
 exports.NatsKvModule = NatsKvModule;

package/dist/nats-kv.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"nats-kv.module.js","sourceRoot":"","sources":["../src/nats-kv.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,2CAAwC;AACxC,uCAA+C;AAC/C,mDAO2B;AAG3B,uDAAkD;AAClD,2CAAmD;AACnD,yDAAoD;AAM7C,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGM;IAA7B,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAExD,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,EAAiB;QACxD,MAAM,cAAc,GAAa;YAC/B,OAAO,EAAE,IAAA,gCAAoB,EAAC,cAAc,CAAC;YAC7C,QAAQ,EAAE,+BAAa;SACxB,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,qDAAuC;oBAChD,WAAW,EAAE,cAAc;wBACzB,CAAC,CAAC,IAAA,mCAAqB,EAAC,cAAc,CAAC;wBACvC,CAAC,CAAC,yCAA2B;iBAChC;gBACD;oBACE,OAAO,EAAE,qDAAuC;oBAChD,WAAW,EAAE,cAAc;wBACzB,CAAC,CAAC,IAAA,mCAAqB,EAAC,cAAc,CAAC;wBACvC,CAAC,CAAC,yCAA2B;iBAChC;gBACD;oBACE,OAAO,EAAE,iBAAiB;oBAC1B,UAAU,EAAE,GAAG,EAAE,CAAC,cAAc;iBACjC;gBACD,cAAc;aACf;YACD,OAAO,EAAE,CAAC,cAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,MAAM,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,CAAC;IAC3C,CAAC;CACF,CAAA;AA5CY,oCAAY;uBAAZ,YAAY;IAJxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sBAAe,CAAC;QAC1B,SAAS,EAAE,CAAC,+BAAa,EAAE,iCAAc,CAAC;KAC3C,CAAC;qCAI6C,iCAAc;GAHhD,YAAY,CA4CxB"}
+{"version":3,"file":"nats-kv.module.js","sourceRoot":"","sources":["../src/nats-kv.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,2CAAwC;AACxC,uCAA+C;AAC/C,mDAO2B;AAG3B,uDAAkD;AAClD,2CAAmD;AACnD,yDAAoD;AAM7C,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGM;IAA7B,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAExD,MAAM,CAAC,UAAU,CAAC,EAAE,cAAc,EAAiB;QACxD,MAAM,cAAc,GAAa;YAC/B,OAAO,EAAE,IAAA,gCAAoB,EAAC,cAAc,CAAC;YAC7C,QAAQ,EAAE,+BAAa;SACxB,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,qDAAuC;oBAChD,WAAW,EAAE,cAAc;wBACzB,CAAC,CAAC,IAAA,mCAAqB,EAAC,cAAc,CAAC;wBACvC,CAAC,CAAC,yCAA2B;iBAChC;gBACD;oBACE,OAAO,EAAE,qDAAuC;oBAChD,WAAW,EAAE,cAAc;wBACzB,CAAC,CAAC,IAAA,mCAAqB,EAAC,cAAc,CAAC;wBACvC,CAAC,CAAC,yCAA2B;iBAChC;gBACD;oBACE,OAAO,EAAE,iBAAiB;oBAC1B,UAAU,EAAE,GAAG,EAAE,CAAC,cAAc;iBACjC;gBACD,cAAc;aACf;YACD,OAAO,EAAE,CAAC,cAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B;;;WAGG;QACH,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,CAAC;IACrC,CAAC;CACF,CAAA;AAhDY,oCAAY;uBAAZ,YAAY;IAJxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,sBAAe,CAAC;QAC1B,SAAS,EAAE,CAAC,+BAAa,EAAE,iCAAc,CAAC;KAC3C,CAAC;qCAI6C,iCAAc;GAHhD,YAAY,CAgDxB"}

package/dist/watch-kv.decorator.d.ts

@@ -1,8 +1,10 @@
-import type { KvEntry } from 'nats';
+import type { KvEntry, KvWatchInclude } from 'nats';
 export type WatchConfig = {
     bucket: string;
     filter?: string;
     connectionName?: string;
+    domain?: string;
+    include?: KvWatchInclude;
 };
 export interface KvWatcher {
     onDelete(entry: KvEntry): Promise<void>;
@@ -13,6 +15,7 @@ export interface KvWatcher {
  * Key used to mark class as a watcher for key-value pairs.
  */
 export declare const WATCH_NATS_KV_KEY = "WATCH_NATS_KV";
+export declare const WatchKvMetadata: import("@nestjs/core").ReflectableDecorator<WatchConfig, WatchConfig>;
 /**
  * Decorator used to mark class as a watcher for key-value pairs.
  * Needs to be used in conjunction with the `KvWatcher` interface.
@@ -20,4 +23,4 @@ export declare const WATCH_NATS_KV_KEY = "WATCH_NATS_KV";
  * @param {WatchConfig} config - The configuration for watching key-value pairs.
  * @returns {void}
  */
-export declare const WatchKv: import("@nestjs/core").ReflectableDecorator<WatchConfig, WatchConfig>;
+export declare const WatchKv: (config: WatchConfig) => ClassDecorator;

package/dist/watch-kv.decorator.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WatchKv = exports.WATCH_NATS_KV_KEY = void 0;
+exports.WatchKv = exports.WatchKvMetadata = exports.WATCH_NATS_KV_KEY = void 0;
 const core_1 = require("@nestjs/core");
+const metadata_1 = require("@rsdk/metadata");
+const nats_common_1 = require("@rsdk/nats.common");
 /**
  * Key used to mark class as a watcher for key-value pairs.
  */
 exports.WATCH_NATS_KV_KEY = 'WATCH_NATS_KV';
+exports.WatchKvMetadata = core_1.Reflector.createDecorator({
+    key: exports.WATCH_NATS_KV_KEY,
+});
 /**
  * Decorator used to mark class as a watcher for key-value pairs.
  * Needs to be used in conjunction with the `KvWatcher` interface.
@@ -13,7 +18,17 @@ exports.WATCH_NATS_KV_KEY = 'WATCH_NATS_KV';
  * @param {WatchConfig} config - The configuration for watching key-value pairs.
  * @returns {void}
  */
-exports.WatchKv = core_1.Reflector.createDecorator({
-    key: exports.WATCH_NATS_KV_KEY,
-});
+const WatchKv = (config) => {
+    return (target) => {
+        (0, exports.WatchKvMetadata)(config)(target);
+        const streamName = `KV_${config.bucket}`;
+        const moduleDefinition = nats_common_1.NatsStreamIndicatorModuleGenerator.createClientModuleDefinition(target, {
+            streamName,
+            connectionName: config.connectionName,
+            domain: config.domain,
+        });
+        metadata_1.RsdkMetadata.setWithScope(target, metadata_1.PLATFORM_RAW_GLOBAL_METADATA_SCOPE, (0, nats_common_1.getStreamIndicatorKey)(streamName, config.connectionName, config.domain), moduleDefinition, true);
+    };
+};
+exports.WatchKv = WatchKv;
 //# sourceMappingURL=watch-kv.decorator.js.map

package/dist/watch-kv.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch-kv.decorator.js","sourceRoot":"","sources":["../src/watch-kv.decorator.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AAezC;;GAEG;AACU,QAAA,iBAAiB,GAAG,eAAe,CAAC;AAEjD;;;;;;GAMG;AACU,QAAA,OAAO,GAAG,gBAAS,CAAC,eAAe,CAAc;IAC5D,GAAG,EAAE,yBAAiB;CACvB,CAAC,CAAC"}
+{"version":3,"file":"watch-kv.decorator.js","sourceRoot":"","sources":["../src/watch-kv.decorator.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,6CAGwB;AACxB,mDAG2B;AAiB3B;;GAEG;AACU,QAAA,iBAAiB,GAAG,eAAe,CAAC;AAEpC,QAAA,eAAe,GAAG,gBAAS,CAAC,eAAe,CAAc;IACpE,GAAG,EAAE,yBAAiB;CACvB,CAAC,CAAC;AAEH;;;;;;GAMG;AACI,MAAM,OAAO,GAAG,CAAC,MAAmB,EAAkB,EAAE;IAC7D,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QAEhC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,gBAAgB,GACpB,gDAAkC,CAAC,4BAA4B,CAAC,MAAM,EAAE;YACtE,UAAU;YACV,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;QAEL,uBAAY,CAAC,YAAY,CACvB,MAAM,EACN,6CAAkC,EAClC,IAAA,mCAAqB,EAAC,UAAU,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,EACvE,gBAAgB,EAChB,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,OAAO,WAoBlB"}

package/dist/watch-kv.service.js

@@ -37,7 +37,8 @@ let WatchKvService = class WatchKvService {
     async runWatches() {
         const watchers = await this.discoverWatchers();
         await Promise.all(watchers.map(async ({ instance, metadata }) => {
-            await this.nats.waitForBucketExists(metadata.bucket, 5000);
+            this.logger.info('NatsKV watcher starting...', { metadata });
+            await this.nats.waitForBucketExists(metadata.bucket);
             await this.runWatch(metadata, instance);
             this.logger.info('NatsKV watcher started', { metadata });
         }));
@@ -68,7 +69,7 @@ let WatchKvService = class WatchKvService {
         const kv = await this.nats.bind({
             bucketName: config.bucket,
         });
-        this.watch(kv.getRawStorage(), { include: nats_1.KvWatchInclude.LastValue }, async (event) => {
+        this.watch(kv.getRawStorage(), { include: config.include ?? nats_1.KvWatchInclude.LastValue }, async (event) => {
             switch (event.operation) {
                 case 'PUT':
                     await watcher.onPut(event);
@@ -97,7 +98,7 @@ let WatchKvService = class WatchKvService {
             if (!clsRef) {
                 return acc;
             }
-            const metadata = this.discovery.getMetadataByDecorator(watch_kv_decorator_1.WatchKv, watcher);
+            const metadata = this.discovery.getMetadataByDecorator(watch_kv_decorator_1.WatchKvMetadata, watcher);
             if (metadata && metadata.connectionName === this.connectionName) {
                 acc.push({ instance: watcher.instance, metadata });
             }

package/dist/watch-kv.service.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.kv",
-  "version": "5.6.0-next.0",
+  "version": "5.6.0-next.2",
   "description": "Nats NestJS key-Value storage",
   "main": "dist/index.js",
   "license": "Apache License 2.0",
@@ -38,5 +38,5 @@
     "rxjs": "^7.8.1"
   },
   "nx": {},
-  "gitHead": "cecf86b3768fdf74e8d02434379258126410bea5"
+  "gitHead": "0b92c4eb882f52e929f25062c16f8a0936db402f"
 }

package/src/nats-kv.module.ts

@@ -62,10 +62,14 @@ export class NatsKvModule
   }
 
   async onApplicationBootstrap(): Promise<void> {
-    await this.watchKvService?.runWatches();
+    /**
+     * NOTE: не используем await, чтобы не блокировать запуск приложения.
+     * Если бакета нет, то приложение просто не пройдет readiness пробу.
+     */
+    this.watchKvService?.runWatches();
   }
 
   async onApplicationShutdown(): Promise<void> {
-    await this.watchKvService?.stopWatches();
+    this.watchKvService?.stopWatches();
   }
 }

package/src/watch-kv.decorator.ts

@@ -1,10 +1,20 @@
 import { Reflector } from '@nestjs/core';
-import type { KvEntry } from 'nats';
+import {
+  PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+  RsdkMetadata,
+} from '@rsdk/metadata';
+import {
+  getStreamIndicatorKey,
+  NatsStreamIndicatorModuleGenerator,
+} from '@rsdk/nats.common';
+import type { KvEntry, KvWatchInclude } from 'nats';
 
 export type WatchConfig = {
   bucket: string;
   filter?: string;
   connectionName?: string;
+  domain?: string;
+  include?: KvWatchInclude;
 };
 
 export interface KvWatcher {
@@ -18,6 +28,10 @@ export interface KvWatcher {
  */
 export const WATCH_NATS_KV_KEY = 'WATCH_NATS_KV';
 
+export const WatchKvMetadata = Reflector.createDecorator<WatchConfig>({
+  key: WATCH_NATS_KV_KEY,
+});
+
 /**
  * Decorator used to mark class as a watcher for key-value pairs.
  * Needs to be used in conjunction with the `KvWatcher` interface.
@@ -25,6 +39,24 @@ export const WATCH_NATS_KV_KEY = 'WATCH_NATS_KV';
  * @param {WatchConfig} config - The configuration for watching key-value pairs.
  * @returns {void}
  */
-export const WatchKv = Reflector.createDecorator<WatchConfig>({
-  key: WATCH_NATS_KV_KEY,
-});
+export const WatchKv = (config: WatchConfig): ClassDecorator => {
+  return (target) => {
+    WatchKvMetadata(config)(target);
+
+    const streamName = `KV_${config.bucket}`;
+    const moduleDefinition =
+      NatsStreamIndicatorModuleGenerator.createClientModuleDefinition(target, {
+        streamName,
+        connectionName: config.connectionName,
+        domain: config.domain,
+      });
+
+    RsdkMetadata.setWithScope(
+      target,
+      PLATFORM_RAW_GLOBAL_METADATA_SCOPE,
+      getStreamIndicatorKey(streamName, config.connectionName, config.domain),
+      moduleDefinition,
+      true,
+    );
+  };
+};

package/src/watch-kv.service.ts

@@ -7,7 +7,7 @@ import { KvWatchInclude } from 'nats';
 
 import { NatsKvService } from './nats-kv.service';
 import type { KvWatcher, WatchConfig } from './watch-kv.decorator';
-import { WatchKv } from './watch-kv.decorator';
+import { WatchKvMetadata } from './watch-kv.decorator';
 
 export class WatchKvService {
   constructor(
@@ -28,7 +28,8 @@ export class WatchKvService {
 
     await Promise.all(
       watchers.map(async ({ instance, metadata }) => {
-        await this.nats.waitForBucketExists(metadata.bucket, 5000);
+        this.logger.info('NatsKV watcher starting...', { metadata });
+        await this.nats.waitForBucketExists(metadata.bucket);
         await this.runWatch(metadata, instance);
         this.logger.info('NatsKV watcher started', { metadata });
       }),
@@ -73,7 +74,7 @@ export class WatchKvService {
 
     this.watch(
       kv.getRawStorage(),
-      { include: KvWatchInclude.LastValue },
+      { include: config.include ?? KvWatchInclude.LastValue },
       async (event) => {
         switch (event.operation) {
           case 'PUT':
@@ -108,7 +109,7 @@ export class WatchKvService {
         }
 
         const metadata = this.discovery.getMetadataByDecorator(
-          WatchKv,
+          WatchKvMetadata,
           watcher,
         );