@rsdk/nats.common 5.4.0-next.3 → 5.4.0-next.4

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.4.0-next.4](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.3...v5.4.0-next.4) (2024-11-27)
+
+### Bug Fixes
+
+* export kv/os injection token functions + inject nats config ([#308](https://github.com/R-Vision/rsdk/issues/308)) ([d12e88c](https://github.com/R-Vision/rsdk/commit/d12e88c86bc922df94a9784f29443d8938cc57db))
+
 ## [5.4.0-next.3](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.2...v5.4.0-next.3) (2024-11-25)
 
 **Note:** Version bump only for package @rsdk/nats.common

package/dist/client/client.constants.d.ts

@@ -1,6 +1,8 @@
 export declare const NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE = "NATS_CLIENT_FOR_PACKAGE";
 export declare const NATS_JET_STREAM_INJECTION_TOKEN_FOR_PACKAGE = "NATS_JET_STREAM_FOR_PACKAGE";
+export declare const NATS_CONFIG_INJECTION_TOKEN: unique symbol;
 export declare const NATS_CLIENT_INJECTION_TOKEN: unique symbol;
 export declare const NATS_JETSTREAM_CLIENT_INJECTION_TOKEN: unique symbol;
+export declare const createNatsConfigToken: (name: string) => string;
 export declare const createNatsClientToken: (name: string) => string;
 export declare const createNatsJetStreamToken: (name: string) => string;

package/dist/client/client.constants.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNatsJetStreamToken = exports.createNatsClientToken = exports.NATS_JETSTREAM_CLIENT_INJECTION_TOKEN = exports.NATS_CLIENT_INJECTION_TOKEN = exports.NATS_JET_STREAM_INJECTION_TOKEN_FOR_PACKAGE = exports.NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE = void 0;
+exports.createNatsJetStreamToken = exports.createNatsClientToken = exports.createNatsConfigToken = exports.NATS_JETSTREAM_CLIENT_INJECTION_TOKEN = exports.NATS_CLIENT_INJECTION_TOKEN = exports.NATS_CONFIG_INJECTION_TOKEN = exports.NATS_JET_STREAM_INJECTION_TOKEN_FOR_PACKAGE = exports.NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE = void 0;
 exports.NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE = 'NATS_CLIENT_FOR_PACKAGE';
 exports.NATS_JET_STREAM_INJECTION_TOKEN_FOR_PACKAGE = 'NATS_JET_STREAM_FOR_PACKAGE';
+exports.NATS_CONFIG_INJECTION_TOKEN = Symbol('NatsConfig');
 exports.NATS_CLIENT_INJECTION_TOKEN = Symbol('NatsClient');
 exports.NATS_JETSTREAM_CLIENT_INJECTION_TOKEN = Symbol('NatsJetStreamClient');
+const createNatsConfigToken = (name) => `NATS_CONFIG_${name.toUpperCase()}`;
+exports.createNatsConfigToken = createNatsConfigToken;
 const createNatsClientToken = (name) => `NATS_CLIENT_${name.toUpperCase()}`;
 exports.createNatsClientToken = createNatsClientToken;
 const createNatsJetStreamToken = (name) => `NATS_JET_STREAM_${name.toUpperCase()}`;

package/dist/client/client.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.constants.js","sourceRoot":"","sources":["../../src/client/client.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uCAAuC,GAClD,yBAAyB,CAAC;AACf,QAAA,2CAA2C,GACtD,6BAA6B,CAAC;AAEnB,QAAA,2BAA2B,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACnD,QAAA,qCAAqC,GAAG,MAAM,CACzD,qBAAqB,CACtB,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC5D,eAAe,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;AADzB,QAAA,qBAAqB,yBACI;AAE/B,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC/D,mBAAmB,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;AAD7B,QAAA,wBAAwB,4BACK"}
+{"version":3,"file":"client.constants.js","sourceRoot":"","sources":["../../src/client/client.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uCAAuC,GAClD,yBAAyB,CAAC;AACf,QAAA,2CAA2C,GACtD,6BAA6B,CAAC;AAEnB,QAAA,2BAA2B,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACnD,QAAA,2BAA2B,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACnD,QAAA,qCAAqC,GAAG,MAAM,CACzD,qBAAqB,CACtB,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC5D,eAAe,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;AADzB,QAAA,qBAAqB,yBACI;AAE/B,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC5D,eAAe,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;AADzB,QAAA,qBAAqB,yBACI;AAE/B,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAU,EAAE,CAC/D,mBAAmB,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;AAD7B,QAAA,wBAAwB,4BACK"}

package/dist/client/client.decorators.d.ts

@@ -1,2 +1,3 @@
+export declare const InjectNatsConfig: (connectionName?: string) => ParameterDecorator;
 export declare const InjectNatsClient: (connectionName?: string) => ParameterDecorator;
 export declare const InjectNatsJetStreamClient: (connectionName?: string) => ParameterDecorator;

package/dist/client/client.decorators.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectNatsJetStreamClient = exports.InjectNatsClient = void 0;
+exports.InjectNatsJetStreamClient = exports.InjectNatsClient = exports.InjectNatsConfig = void 0;
 const common_1 = require("@nestjs/common");
 const client_constants_1 = require("./client.constants");
+const InjectNatsConfig = (connectionName) => (0, common_1.Inject)(connectionName
+    ? (0, client_constants_1.createNatsConfigToken)(connectionName)
+    : client_constants_1.NATS_CONFIG_INJECTION_TOKEN);
+exports.InjectNatsConfig = InjectNatsConfig;
 const InjectNatsClient = (connectionName) => (0, common_1.Inject)(connectionName
     ? (0, client_constants_1.createNatsClientToken)(connectionName)
     : client_constants_1.NATS_CLIENT_INJECTION_TOKEN);

package/dist/client/client.decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.decorators.js","sourceRoot":"","sources":["../../src/client/client.decorators.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,yDAK4B;AAErB,MAAM,gBAAgB,GAAG,CAAC,cAAuB,EAAsB,EAAE,CAC9E,IAAA,eAAM,EACJ,cAAc;IACZ,CAAC,CAAC,IAAA,wCAAqB,EAAC,cAAc,CAAC;IACvC,CAAC,CAAC,8CAA2B,CAChC,CAAC;AALS,QAAA,gBAAgB,oBAKzB;AAEG,MAAM,yBAAyB,GAAG,CACvC,cAAuB,EACH,EAAE,CACtB,IAAA,eAAM,EACJ,cAAc;IACZ,CAAC,CAAC,IAAA,2CAAwB,EAAC,cAAc,CAAC;IAC1C,CAAC,CAAC,wDAAqC,CAC1C,CAAC;AAPS,QAAA,yBAAyB,6BAOlC"}
+{"version":3,"file":"client.decorators.js","sourceRoot":"","sources":["../../src/client/client.decorators.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,yDAO4B;AAErB,MAAM,gBAAgB,GAAG,CAAC,cAAuB,EAAsB,EAAE,CAC9E,IAAA,eAAM,EACJ,cAAc;IACZ,CAAC,CAAC,IAAA,wCAAqB,EAAC,cAAc,CAAC;IACvC,CAAC,CAAC,8CAA2B,CAChC,CAAC;AALS,QAAA,gBAAgB,oBAKzB;AAEG,MAAM,gBAAgB,GAAG,CAAC,cAAuB,EAAsB,EAAE,CAC9E,IAAA,eAAM,EACJ,cAAc;IACZ,CAAC,CAAC,IAAA,wCAAqB,EAAC,cAAc,CAAC;IACvC,CAAC,CAAC,8CAA2B,CAChC,CAAC;AALS,QAAA,gBAAgB,oBAKzB;AAEG,MAAM,yBAAyB,GAAG,CACvC,cAAuB,EACH,EAAE,CACtB,IAAA,eAAM,EACJ,cAAc;IACZ,CAAC,CAAC,IAAA,2CAAwB,EAAC,cAAc,CAAC;IAC1C,CAAC,CAAC,wDAAqC,CAC1C,CAAC;AAPS,QAAA,yBAAyB,6BAOlC"}

package/dist/client/client.module.d.ts

@@ -4,6 +4,6 @@ import { DefaultNatsConfig } from './client.config';
 export declare class NatsClientModule {
     static forRoot(connections?: {
         connectionName: string;
-        config: Constructor<DefaultNatsConfig>;
+        configConstructor: Constructor<DefaultNatsConfig>;
     }[]): DynamicModule;
 }

package/dist/client/client.module.js

@@ -18,12 +18,20 @@ let NatsClientModule = NatsClientModule_1 = class NatsClientModule {
     static forRoot(connections) {
         const providers = [];
         if (connections) {
-            for (const { connectionName, config } of connections) {
-                providers.push((0, client_provider_1.createNatsProvider)(config, (0, client_constants_1.createNatsClientToken)(connectionName)), (0, jetstream_client_provider_1.createNatsJetStreamProvider)((0, client_constants_1.createNatsClientToken)(connectionName), (0, client_constants_1.createNatsJetStreamToken)(connectionName)));
+            for (const { connectionName, configConstructor } of connections) {
+                providers.push((0, client_provider_1.createNatsProvider)(configConstructor, (0, client_constants_1.createNatsClientToken)(connectionName)), (0, jetstream_client_provider_1.createNatsJetStreamProvider)((0, client_constants_1.createNatsClientToken)(connectionName), (0, client_constants_1.createNatsJetStreamToken)(connectionName)), {
+                    provide: (0, client_constants_1.createNatsConfigToken)(connectionName),
+                    inject: [configConstructor],
+                    useFactory: (config) => config,
+                });
             }
         }
         else {
-            providers.push((0, client_provider_1.createNatsProvider)(client_config_1.DefaultNatsConfig, client_constants_1.NATS_CLIENT_INJECTION_TOKEN), (0, jetstream_client_provider_1.createNatsJetStreamProvider)(client_constants_1.NATS_CLIENT_INJECTION_TOKEN, client_constants_1.NATS_JETSTREAM_CLIENT_INJECTION_TOKEN));
+            providers.push((0, client_provider_1.createNatsProvider)(client_config_1.DefaultNatsConfig, client_constants_1.NATS_CLIENT_INJECTION_TOKEN), (0, jetstream_client_provider_1.createNatsJetStreamProvider)(client_constants_1.NATS_CLIENT_INJECTION_TOKEN, client_constants_1.NATS_JETSTREAM_CLIENT_INJECTION_TOKEN), {
+                provide: client_constants_1.NATS_CONFIG_INJECTION_TOKEN,
+                inject: [client_config_1.DefaultNatsConfig],
+                useFactory: (config) => config,
+            });
         }
         return {
             module: NatsClientModule_1,

package/dist/client/client.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.module.js","sourceRoot":"","sources":["../../src/client/client.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAgD;AAGhD,mDAAoD;AACpD,yDAK4B;AAC5B,uDAAuD;AACvD,2EAA0E;AAC1E,qDAAiD;AAO1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CACZ,WAGG;QAEH,MAAM,SAAS,GAAe,EAAE,CAAC;QAEjC,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;gBACrD,SAAS,CAAC,IAAI,CACZ,IAAA,oCAAkB,EAAC,MAAM,EAAE,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC,EACjE,IAAA,uDAA2B,EACzB,IAAA,wCAAqB,EAAC,cAAc,CAAC,EACrC,IAAA,2CAAwB,EAAC,cAAc,CAAC,CACzC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CACZ,IAAA,oCAAkB,EAAC,iCAAiB,EAAE,8CAA2B,CAAC,EAClE,IAAA,uDAA2B,EACzB,8CAA2B,EAC3B,wDAAqC,CACtC,CACF,CAAC;QACJ,CAAC;QAED,OAAO;YACL,MAAM,EAAE,kBAAgB;YACxB,SAAS;YACT,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;CACF,CAAA;AAnCY,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KACzB,CAAC;GACW,gBAAgB,CAmC5B"}
+{"version":3,"file":"client.module.js","sourceRoot":"","sources":["../../src/client/client.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAgD;AAGhD,mDAAoD;AACpD,yDAO4B;AAC5B,uDAAuD;AACvD,2EAA0E;AAC1E,qDAAiD;AAO1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CACZ,WAGG;QAEH,MAAM,SAAS,GAAe,EAAE,CAAC;QAEjC,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,IAAI,WAAW,EAAE,CAAC;gBAChE,SAAS,CAAC,IAAI,CACZ,IAAA,oCAAkB,EAChB,iBAAiB,EACjB,IAAA,wCAAqB,EAAC,cAAc,CAAC,CACtC,EACD,IAAA,uDAA2B,EACzB,IAAA,wCAAqB,EAAC,cAAc,CAAC,EACrC,IAAA,2CAAwB,EAAC,cAAc,CAAC,CACzC,EACD;oBACE,OAAO,EAAE,IAAA,wCAAqB,EAAC,cAAc,CAAC;oBAC9C,MAAM,EAAE,CAAC,iBAAiB,CAAC;oBAC3B,UAAU,EAAE,CAAC,MAAyB,EAAE,EAAE,CAAC,MAAM;iBAClD,CACF,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CACZ,IAAA,oCAAkB,EAAC,iCAAiB,EAAE,8CAA2B,CAAC,EAClE,IAAA,uDAA2B,EACzB,8CAA2B,EAC3B,wDAAqC,CACtC,EACD;gBACE,OAAO,EAAE,8CAA2B;gBACpC,MAAM,EAAE,CAAC,iCAAiB,CAAC;gBAC3B,UAAU,EAAE,CAAC,MAAyB,EAAE,EAAE,CAAC,MAAM;aAClD,CACF,CAAC;QACJ,CAAC;QAED,OAAO;YACL,MAAM,EAAE,kBAAgB;YACxB,SAAS;YACT,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;CACF,CAAA;AAhDY,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,8BAAa,CAAC;QAC1B,OAAO,EAAE,CAAC,8BAAa,CAAC;KACzB,CAAC;GACW,gBAAgB,CAgD5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.common",
-  "version": "5.4.0-next.3",
+  "version": "5.4.0-next.4",
   "description": "Common functionality for nats consumers and producers",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -27,5 +27,5 @@
     "lodash": "^4.17.21",
     "protobufjs": "^7.2.3"
   },
-  "gitHead": "8b755915540bab9a033e50b22fc0223e6a23f6be"
+  "gitHead": "6f7d6802d4dc34620f3c0e8c8ec73887df36a647"
 }

package/src/client/client.constants.ts

@@ -3,11 +3,15 @@ export const NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE =
 export const NATS_JET_STREAM_INJECTION_TOKEN_FOR_PACKAGE =
   'NATS_JET_STREAM_FOR_PACKAGE';
 
+export const NATS_CONFIG_INJECTION_TOKEN = Symbol('NatsConfig');
 export const NATS_CLIENT_INJECTION_TOKEN = Symbol('NatsClient');
 export const NATS_JETSTREAM_CLIENT_INJECTION_TOKEN = Symbol(
   'NatsJetStreamClient',
 );
 
+export const createNatsConfigToken = (name: string): string =>
+  `NATS_CONFIG_${name.toUpperCase()}`;
+
 export const createNatsClientToken = (name: string): string =>
   `NATS_CLIENT_${name.toUpperCase()}`;
 

package/src/client/client.decorators.ts

@@ -2,11 +2,20 @@ import { Inject } from '@nestjs/common';
 
 import {
   createNatsClientToken,
+  createNatsConfigToken,
   createNatsJetStreamToken,
   NATS_CLIENT_INJECTION_TOKEN,
+  NATS_CONFIG_INJECTION_TOKEN,
   NATS_JETSTREAM_CLIENT_INJECTION_TOKEN,
 } from './client.constants';
 
+export const InjectNatsConfig = (connectionName?: string): ParameterDecorator =>
+  Inject(
+    connectionName
+      ? createNatsConfigToken(connectionName)
+      : NATS_CONFIG_INJECTION_TOKEN,
+  );
+
 export const InjectNatsClient = (connectionName?: string): ParameterDecorator =>
   Inject(
     connectionName

package/src/client/client.module.ts

@@ -5,8 +5,10 @@ import type { Constructor } from '@rsdk/common';
 import { DefaultNatsConfig } from './client.config';
 import {
   createNatsClientToken,
+  createNatsConfigToken,
   createNatsJetStreamToken,
   NATS_CLIENT_INJECTION_TOKEN,
+  NATS_CONFIG_INJECTION_TOKEN,
   NATS_JETSTREAM_CLIENT_INJECTION_TOKEN,
 } from './client.constants';
 import { createNatsProvider } from './client.provider';
@@ -22,19 +24,27 @@ export class NatsClientModule {
   static forRoot(
     connections?: {
       connectionName: string;
-      config: Constructor<DefaultNatsConfig>;
+      configConstructor: Constructor<DefaultNatsConfig>;
     }[],
   ): DynamicModule {
     const providers: Provider[] = [];
 
     if (connections) {
-      for (const { connectionName, config } of connections) {
+      for (const { connectionName, configConstructor } of connections) {
         providers.push(
-          createNatsProvider(config, createNatsClientToken(connectionName)),
+          createNatsProvider(
+            configConstructor,
+            createNatsClientToken(connectionName),
+          ),
           createNatsJetStreamProvider(
             createNatsClientToken(connectionName),
             createNatsJetStreamToken(connectionName),
           ),
+          {
+            provide: createNatsConfigToken(connectionName),
+            inject: [configConstructor],
+            useFactory: (config: DefaultNatsConfig) => config,
+          },
         );
       }
     } else {
@@ -44,6 +54,11 @@ export class NatsClientModule {
           NATS_CLIENT_INJECTION_TOKEN,
           NATS_JETSTREAM_CLIENT_INJECTION_TOKEN,
         ),
+        {
+          provide: NATS_CONFIG_INJECTION_TOKEN,
+          inject: [DefaultNatsConfig],
+          useFactory: (config: DefaultNatsConfig) => config,
+        },
       );
     }