@hahnpro/flow-sdk 9.2.0 → 9.4.0

package/dist/FlowApplication.js

@@ -4,6 +4,7 @@ exports.FlowApplication = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
 const hpc_api_1 = require("@hahnpro/hpc-api");
+const jetstream_1 = require("@nats-io/jetstream");
 const cloudevents_1 = require("cloudevents");
 const lodash_1 = require("lodash");
 const object_sizeof_1 = tslib_1.__importDefault(require("object-sizeof"));
@@ -177,15 +178,15 @@ class FlowApplication {
                 return;
             }
             try {
-                const message = event.format();
-                if ((0, object_sizeof_1.default)(message) > MAX_EVENT_SIZE_BYTES) {
-                    message.data = (0, utils_1.truncate)(message.data);
+                const formatedEvent = event.format();
+                if ((0, object_sizeof_1.default)(formatedEvent) > MAX_EVENT_SIZE_BYTES) {
+                    formatedEvent.data = (0, utils_1.truncate)(formatedEvent.data);
                 }
                 const natsEvent = {
                     source: `hpc/flow-application`,
                     type: `${nats_1.natsFlowsPrefixFlowDeployment}.flowlogs`,
                     subject: `${this.context.deploymentId}`,
-                    data: message,
+                    data: formatedEvent,
                 };
                 await (0, nats_1.publishNatsEvent)(this.logger, this.natsConnection, natsEvent);
                 return true;
@@ -250,11 +251,11 @@ class FlowApplication {
     getProperties() {
         return this.contextManager.getProperties();
     }
-    async consumeNatsMessagesOfConsumer(consumer, consumerOptions) {
+    async consumeNatsMessagesOfConsumer(consumer, consumeOptions) {
         if (this.natsMessageIterator) {
             await this.natsMessageIterator.close();
         }
-        this.natsMessageIterator = await consumer.consume(consumerOptions);
+        this.natsMessageIterator = await consumer.consume(consumeOptions);
         for await (const msg of this.natsMessageIterator) {
             try {
                 let event;
@@ -313,9 +314,23 @@ class FlowApplication {
                     ...nats_1.defaultConsumerConfig,
                     name: `flow-deployment-${this.context.deploymentId}`,
                     filter_subject: `${nats_1.natsFlowsPrefixFlowDeployment}.${this.context.deploymentId}.*`,
+                    inactive_threshold: 10 * 60 * 1_000_000_000,
                 };
                 const consumer = await (0, nats_1.getOrCreateConsumer)(this.logger, this._natsConnection, nats_1.FLOWS_STREAM_NAME, consumerOptions.name, consumerOptions);
-                this.consumeNatsMessagesOfConsumer(consumer, consumerOptions);
+                const handleNatsStatus = async () => {
+                    try {
+                        this.logger.debug('ConsumerService: Reconnected to Nats and re-creating non-durable consumers');
+                        await (0, nats_1.getOrCreateConsumer)(this.logger, this._natsConnection, nats_1.FLOWS_STREAM_NAME, consumerOptions.name, consumerOptions);
+                        this.consumeNatsMessagesOfConsumer(consumer, { expires: 10 * 1_000_000_000 });
+                    }
+                    catch (e) {
+                        this.logger.error('NATS Status-AsyncIterator is not available, cannot listen. Due to error:');
+                        this.logger.error(e);
+                        (0, nats_1.natsEventListener)(this._natsConnection, this.logger, handleNatsStatus);
+                    }
+                };
+                (0, nats_1.natsEventListener)(this._natsConnection, this.logger, handleNatsStatus);
+                this.consumeNatsMessagesOfConsumer(consumer, { expires: 10 * 1_000_000_000 });
             }
             catch (e) {
                 await logErrorAndExit(`Could not set up consumer for deployment messages exchanges: ${e}`);
@@ -438,8 +453,18 @@ class FlowApplication {
             if (this.amqpConnection) {
                 await this.amqpConnection.close();
             }
-            if (this.natsConnection && !this._natsConnection.isClosed()) {
-                await this._natsConnection?.drain();
+            if (this._natsConnection && !this._natsConnection.isClosed()) {
+                await (0, jetstream_1.jetstreamManager)(this._natsConnection).then((jsm) => {
+                    jsm.consumers
+                        .delete(nats_1.FLOWS_STREAM_NAME, `flow-deployment-${this.context.deploymentId}`)
+                        .then(() => {
+                        this.logger.error(`Deleted consumer for flow deployment ${this.context.deploymentId}`);
+                    })
+                        .catch((err) => {
+                        this.logger.error(`Could not delete consumer for flow deployment ${this.context.deploymentId}: ${err.message}`);
+                    });
+                });
+                await this._natsConnection.drain();
             }
             await this.natsMessageIterator?.close();
             await this._natsConnection?.close();

package/dist/FlowLogger.js

@@ -36,7 +36,13 @@ class FlowLogger {
     }
     publish(message, level, options) {
         if (this.publishEvent) {
-            const event = new FlowEvent_1.FlowEvent(this.metadata, message, `flow.log.${level}`);
+            const data = message?.message
+                ? message
+                : {
+                    ...message,
+                    message: typeof message === 'string' ? message : JSON.stringify(message),
+                };
+            const event = new FlowEvent_1.FlowEvent(this.metadata, data, `flow.log.${level}`);
             this.publishEvent(event);
         }
         switch (level) {

package/dist/nats.d.ts

@@ -7,5 +7,6 @@ export declare const natsFlowsPrefixFlowDeployment = "fs.flowdeployment";
 export declare const defaultConsumerConfig: ConsumerConfig;
 export declare const FLOWS_STREAM_NAME = "flows";
 export declare function getOrCreateConsumer(logger: Logger, natsConnection: NatsConnection, streamName: string, consumerName: string, options: Partial<ConsumerConfig>): Promise<Consumer>;
+export declare function natsEventListener(nc: NatsConnection, logger: Logger, reconnectHandler: () => void): Promise<void>;
 export declare function publishNatsEvent<T>(logger: Logger, nc: NatsConnection, event: NatsEvent<T>, subject?: string): Promise<PubAck>;
 export declare function createNatsConnection(config: ConnectionOptions): Promise<NatsConnection>;

package/dist/nats.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FLOWS_STREAM_NAME = exports.defaultConsumerConfig = exports.natsFlowsPrefixFlowDeployment = void 0;
 exports.getOrCreateConsumer = getOrCreateConsumer;
+exports.natsEventListener = natsEventListener;
 exports.publishNatsEvent = publishNatsEvent;
 exports.createNatsConnection = createNatsConnection;
 const transport_node_1 = require("@nats-io/transport-node");
@@ -51,6 +52,18 @@ async function getOrCreateConsumer(logger, natsConnection, streamName, consumerN
     }
     return await (0, jetstream_1.jetstream)(natsConnection).consumers.get(streamName, consumerName);
 }
+async function natsEventListener(nc, logger, reconnectHandler) {
+    const statusAsyncIterator = nc?.status();
+    if (!statusAsyncIterator) {
+        logger.error('NATS Status-AsyncIterator is not available, cannot listen for events to re-create consumers at reconnects');
+        return;
+    }
+    for await (const status of statusAsyncIterator) {
+        if (status.type === 'reconnect') {
+            reconnectHandler();
+        }
+    }
+}
 async function publishNatsEvent(logger, nc, event, subject) {
     if (!nc || nc.isClosed()) {
         return;
@@ -70,7 +83,7 @@ async function publishNatsEvent(logger, nc, event, subject) {
 async function createNatsConnection(config) {
     const servers = config?.servers ?? process.env.NATS_SERVERS?.split(',') ?? [];
     const reconnect = config?.reconnect ?? (process.env.NATS_RECONNECT ?? 'true') === 'true';
-    let maxReconnectAttempts = config?.maxReconnectAttempts ?? parseInt(process.env.NATS_MAX_RECONNECT_ATTEMPTS ?? '10', 10);
+    let maxReconnectAttempts = config?.maxReconnectAttempts ?? parseInt(process.env.NATS_MAX_RECONNECT_ATTEMPTS ?? '-1', 10);
     if (isNaN(maxReconnectAttempts)) {
         maxReconnectAttempts = 10;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-sdk",
-  "version": "9.2.0",
+  "version": "9.4.0",
   "description": "SDK for building Flow Modules",
   "license": "MIT",
   "author": {
@@ -24,10 +24,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@hahnpro/hpc-api": "2025.2.15",
-    "@nats-io/jetstream": "3.0.2",
-    "@nats-io/nats-core": "3.0.2",
-    "@nats-io/transport-node": "3.0.2",
+    "@hahnpro/hpc-api": "2025.3.1",
+    "@nats-io/jetstream": "3.1.0",
+    "@nats-io/nats-core": "3.1.0",
+    "@nats-io/transport-node": "3.1.0",
     "amqp-connection-manager": "4.1.14",
     "amqplib": "0.10.8",
     "class-transformer": "0.5.1",
@@ -44,9 +44,9 @@
     "@types/amqplib": "0.10.7",
     "@types/jest": "30.0.0",
     "@types/lodash": "4.17.20",
-    "@types/node": "22.16.0",
+    "@types/node": "22.16.5",
     "class-validator-jsonschema": "5.0.2",
-    "jest": "30.0.3",
+    "jest": "30.0.5",
     "typescript": "5.8.3"
   },
   "peerDependencies": {