@rsdk/nats.common 5.4.0 → 5.6.0-next.0

package/CHANGELOG.md

@@ -3,10 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.4.0](https://github.com/R-Vision/rsdk/compare/v5.3.0...v5.4.0) (2024-12-15)
-
-**Note:** Version bump only for package @rsdk/nats.common
-
 ## [5.4.0-rc.0](https://github.com/R-Vision/rsdk/compare/v5.4.0-next.11...v5.4.0-rc.0) (2024-12-12)
 
 **Note:** Version bump only for package @rsdk/nats.common

package/dist/client/client.indicator.d.ts

@@ -0,0 +1,8 @@
+import type { HealthIndicator } from '@rsdk/core';
+import { CheckResult } from '@rsdk/core';
+import type { NatsConnection } from 'nats';
+export declare class NatsClientIndicator implements HealthIndicator {
+    private readonly connection;
+    constructor(connection: NatsConnection);
+    check(): Promise<CheckResult>;
+}

package/dist/client/client.indicator.js

@@ -0,0 +1,41 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NatsClientIndicator = void 0;
+const common_1 = require("@nestjs/common");
+const core_1 = require("@rsdk/core");
+const client_constants_1 = require("./client.constants");
+let NatsClientIndicator = class NatsClientIndicator {
+    connection;
+    constructor(connection) {
+        this.connection = connection;
+    }
+    async check() {
+        try {
+            const rtt = await this.connection.rtt();
+            return core_1.CheckResult.up({ rtt });
+        }
+        catch (error) {
+            return core_1.CheckResult.down({
+                error: error.message,
+            });
+        }
+    }
+};
+exports.NatsClientIndicator = NatsClientIndicator;
+exports.NatsClientIndicator = NatsClientIndicator = __decorate([
+    __param(0, (0, common_1.Inject)(client_constants_1.NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE)),
+    __metadata("design:paramtypes", [Object])
+], NatsClientIndicator);
+//# sourceMappingURL=client.indicator.js.map

package/dist/client/client.indicator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.indicator.js","sourceRoot":"","sources":["../../src/client/client.indicator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AAExC,qCAAyC;AAGzC,yDAA6E;AAE7E,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAGX;IAFnB,YAEmB,UAA0B;QAA1B,eAAU,GAAV,UAAU,CAAgB;IAC1C,CAAC;IAEJ,KAAK,CAAC,KAAK;QACT,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YAExC,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,kBAAW,CAAC,IAAI,CAAC;gBACtB,KAAK,EAAG,KAAe,CAAC,OAAO;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;AAjBY,kDAAmB;8BAAnB,mBAAmB;IAE3B,WAAA,IAAA,eAAM,EAAC,0DAAuC,CAAC,CAAA;;GAFvC,mBAAmB,CAiB/B"}

package/dist/client/client.indicator.provider.d.ts

@@ -0,0 +1,3 @@
+import type { Constructor } from '@rsdk/common';
+import type { HealthIndicator } from '@rsdk/core';
+export declare const createNatsClientIndicatorProvider: (connectionName?: string) => Constructor<HealthIndicator>;

package/dist/client/client.indicator.provider.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNatsClientIndicatorProvider = void 0;
+const core_1 = require("@rsdk/core");
+const client_indicator_1 = require("./client.indicator");
+const createNatsClientIndicatorProvider = (connectionName) => {
+    const DynamicNatsClientIndicator = class extends client_indicator_1.NatsClientIndicator {
+        constructor(connection) {
+            super(connection);
+        }
+    };
+    (0, core_1.Indicator)(`nats_connection${connectionName ? `_${connectionName}` : ''}`)(DynamicNatsClientIndicator);
+    return DynamicNatsClientIndicator;
+};
+exports.createNatsClientIndicatorProvider = createNatsClientIndicatorProvider;
+//# sourceMappingURL=client.indicator.provider.js.map

package/dist/client/client.indicator.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.indicator.provider.js","sourceRoot":"","sources":["../../src/client/client.indicator.provider.ts"],"names":[],"mappings":";;;AAEA,qCAAuC;AAGvC,yDAAyD;AAElD,MAAM,iCAAiC,GAAG,CAC/C,cAAuB,EACO,EAAE;IAChC,MAAM,0BAA0B,GAAG,KAAM,SAAQ,sCAAmB;QAClE,YAAY,UAA0B;YACpC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpB,CAAC;KACF,CAAC;IAEF,IAAA,gBAAS,EAAC,kBAAkB,cAAc,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACvE,0BAA0B,CAC3B,CAAC;IAEF,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAdW,QAAA,iCAAiC,qCAc5C"}

package/dist/client/client.module.js

@@ -11,6 +11,7 @@ exports.NatsClientModule = void 0;
 const common_1 = require("@nestjs/common");
 const client_config_1 = require("./client.config");
 const client_constants_1 = require("./client.constants");
+const client_indicator_provider_1 = require("./client.indicator.provider");
 const client_provider_1 = require("./client.provider");
 const jetstream_client_provider_1 = require("./jetstream-client.provider");
 const topics_service_1 = require("./topics.service");
@@ -25,7 +26,7 @@ let NatsClientModule = NatsClientModule_1 = class NatsClientModule {
             natsClientToken = (0, client_constants_1.createNatsClientToken)(connectionName);
             natsJetStreamToken = (0, client_constants_1.createNatsJetStreamToken)(connectionName);
         }
-        const providers = [
+        const exportProviders = [
             (0, client_provider_1.createNatsProvider)(configConstructor, natsClientToken),
             (0, jetstream_client_provider_1.createNatsJetStreamProvider)(natsClientToken, natsJetStreamToken, jetstreamOptions),
             {
@@ -37,8 +38,15 @@ let NatsClientModule = NatsClientModule_1 = class NatsClientModule {
         return {
             module: NatsClientModule_1,
             global: true,
-            providers,
-            exports: providers,
+            providers: [
+                {
+                    provide: client_constants_1.NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE,
+                    useExisting: natsClientToken,
+                },
+                (0, client_indicator_provider_1.createNatsClientIndicatorProvider)(connectionName),
+                ...exportProviders,
+            ],
+            exports: exportProviders,
         };
     }
 };

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;AAEhD,mDAAoD;AACpD,yDAO4B;AAC5B,uDAAuD;AACvD,2EAA0E;AAE1E,qDAAiD;AAO1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CAAC,EACb,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GACF;QACd,iBAAiB,GAAG,iBAAiB,IAAI,iCAAiB,CAAC;QAE3D,IAAI,eAAe,GAAoB,8CAA2B,CAAC;QACnE,IAAI,eAAe,GAAoB,8CAA2B,CAAC;QACnE,IAAI,kBAAkB,GACpB,wDAAqC,CAAC;QAExC,IAAI,cAAc,EAAE,CAAC;YACnB,eAAe,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC;YACxD,eAAe,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC;YACxD,kBAAkB,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,SAAS,GAAe;YAC5B,IAAA,oCAAkB,EAAC,iBAAiB,EAAE,eAAe,CAAC;YACtD,IAAA,uDAA2B,EACzB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,CACjB;YACD;gBACE,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,CAAC,iBAAiB,CAAC;gBAC3B,UAAU,EAAE,CAAC,MAAyB,EAAE,EAAE,CAAC,MAAM;aAClD;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,kBAAgB;YACxB,MAAM,EAAE,IAAI;YACZ,SAAS;YACT,OAAO,EAAE,SAAS;SACnB,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,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,CAwC5B"}
+{"version":3,"file":"client.module.js","sourceRoot":"","sources":["../../src/client/client.module.ts"],"names":[],"mappings":";;;;;;;;;;AACA,2CAAgD;AAEhD,mDAAoD;AACpD,yDAQ4B;AAC5B,2EAAgF;AAChF,uDAAuD;AACvD,2EAA0E;AAE1E,qDAAiD;AAO1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CAAC,EACb,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GACF;QACd,iBAAiB,GAAG,iBAAiB,IAAI,iCAAiB,CAAC;QAE3D,IAAI,eAAe,GAAoB,8CAA2B,CAAC;QACnE,IAAI,eAAe,GAAoB,8CAA2B,CAAC;QACnE,IAAI,kBAAkB,GACpB,wDAAqC,CAAC;QAExC,IAAI,cAAc,EAAE,CAAC;YACnB,eAAe,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC;YACxD,eAAe,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC;YACxD,kBAAkB,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,eAAe,GAAe;YAClC,IAAA,oCAAkB,EAAC,iBAAiB,EAAE,eAAe,CAAC;YACtD,IAAA,uDAA2B,EACzB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,CACjB;YACD;gBACE,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,CAAC,iBAAiB,CAAC;gBAC3B,UAAU,EAAE,CAAC,MAAyB,EAAE,EAAE,CAAC,MAAM;aAClD;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,kBAAgB;YACxB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,0DAAuC;oBAChD,WAAW,EAAE,eAAe;iBAC7B;gBACD,IAAA,6DAAiC,EAAC,cAAc,CAAC;gBACjD,GAAG,eAAe;aACnB;YACD,OAAO,EAAE,eAAe;SACzB,CAAC;IACJ,CAAC;CACF,CAAA;AA/CY,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,CA+C5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.common",
-  "version": "5.4.0",
+  "version": "5.6.0-next.0",
   "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": "042109a747dbe31c009f6c1f230596f79c064328"
+  "gitHead": "cecf86b3768fdf74e8d02434379258126410bea5"
 }

package/src/client/client.indicator.provider.ts

@@ -0,0 +1,22 @@
+import type { Constructor } from '@rsdk/common';
+import type { HealthIndicator } from '@rsdk/core';
+import { Indicator } from '@rsdk/core';
+import type { NatsConnection } from 'nats';
+
+import { NatsClientIndicator } from './client.indicator';
+
+export const createNatsClientIndicatorProvider = (
+  connectionName?: string,
+): Constructor<HealthIndicator> => {
+  const DynamicNatsClientIndicator = class extends NatsClientIndicator {
+    constructor(connection: NatsConnection) {
+      super(connection);
+    }
+  };
+
+  Indicator(`nats_connection${connectionName ? `_${connectionName}` : ''}`)(
+    DynamicNatsClientIndicator,
+  );
+
+  return DynamicNatsClientIndicator;
+};

package/src/client/client.indicator.ts

@@ -0,0 +1,25 @@
+import { Inject } from '@nestjs/common';
+import type { HealthIndicator } from '@rsdk/core';
+import { CheckResult } from '@rsdk/core';
+import type { NatsConnection } from 'nats';
+
+import { NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE } from './client.constants';
+
+export class NatsClientIndicator implements HealthIndicator {
+  constructor(
+    @Inject(NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE)
+    private readonly connection: NatsConnection,
+  ) {}
+
+  async check(): Promise<CheckResult> {
+    try {
+      const rtt = await this.connection.rtt();
+
+      return CheckResult.up({ rtt });
+    } catch (error: unknown) {
+      return CheckResult.down({
+        error: (error as Error).message,
+      });
+    }
+  }
+}

package/src/client/client.module.ts

@@ -7,9 +7,11 @@ import {
   createNatsConfigToken,
   createNatsJetStreamToken,
   NATS_CLIENT_INJECTION_TOKEN,
+  NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE,
   NATS_CONFIG_INJECTION_TOKEN,
   NATS_JETSTREAM_CLIENT_INJECTION_TOKEN,
 } from './client.constants';
+import { createNatsClientIndicatorProvider } from './client.indicator.provider';
 import { createNatsProvider } from './client.provider';
 import { createNatsJetStreamProvider } from './jetstream-client.provider';
 import type { ModuleOptions } from './module-options.interface';
@@ -39,7 +41,7 @@ export class NatsClientModule {
       natsJetStreamToken = createNatsJetStreamToken(connectionName);
     }
 
-    const providers: Provider[] = [
+    const exportProviders: Provider[] = [
       createNatsProvider(configConstructor, natsClientToken),
       createNatsJetStreamProvider(
         natsClientToken,
@@ -56,8 +58,15 @@ export class NatsClientModule {
     return {
       module: NatsClientModule,
       global: true,
-      providers,
-      exports: providers,
+      providers: [
+        {
+          provide: NATS_CLIENT_INJECTION_TOKEN_FOR_PACKAGE,
+          useExisting: natsClientToken,
+        },
+        createNatsClientIndicatorProvider(connectionName),
+        ...exportProviders,
+      ],
+      exports: exportProviders,
     };
   }
 }