node-red-contrib-uos-nats 0.2.34 → 0.2.36

package/nodes/datahub-output.js

@@ -96,9 +96,11 @@ module.exports = function (RED) {
     };
 
     const sendDefinitionUpdate = async (payloads, subjects) => {
+      console.log(`[DataHub Output] Publishing definition with ${definitions.length} vars...`);
       const { payload, fingerprint: fp } = payloads.buildProviderDefinitionEvent(definitions);
       fingerprint = fp;
       await nc.publish(subjects.providerDefinitionChanged(this.providerId), payload);
+      console.log(`[DataHub Output] Definition published. FP: ${fp}`);
     };
 
     const handleRead = async (payloads, msg) => {
@@ -114,12 +116,48 @@ module.exports = function (RED) {
       await nc.publish(msg.reply, response);
     };
 
+    // Store loaded modules for heartbeat
+    let loadedPayloads = null;
+    let loadedSubjects = null;
+
+    const sendValuesUpdate = async () => {
+      if (!nc || nc.isClosed()) return;
+      if (!loadedPayloads || !loadedSubjects) return;
+
+      // If we have no definitions yet, nothing to send
+      if (definitions.length === 0) return;
+
+      const stateObj = {};
+      for (const s of stateMap.values()) {
+        stateObj[s.id] = s;
+      }
+      try {
+        const payload = loadedPayloads.buildVariablesChangedEvent(definitions, stateObj, fingerprint);
+        await nc.publish(loadedSubjects.varsChangedEvent(this.providerId), payload);
+        // console.log(`[DataHub Output] Heartbeat sent. State count: ${Object.keys(stateObj).length}`);
+      } catch (err) {
+        this.warn(`Heartbeat error: ${err.message}`);
+      }
+    };
+
+    const valueHeartbeat = setInterval(() => {
+      sendValuesUpdate();
+    }, 1000); // 1.0s interval matches Python SDK
+
     const start = async () => {
       try {
+        console.log('[DataHub Output] Starting...');
         this.status({ fill: 'yellow', shape: 'ring', text: 'connecting…' });
         const [payloads, subjects] = await loadModules();
+        console.log('[DataHub Output] Modules loaded.');
+        loadedPayloads = payloads;
+        loadedSubjects = subjects;
+
         nc = await connection.acquire();
+        console.log('[DataHub Output] NATS acquired.');
+
         await sendDefinitionUpdate(payloads, subjects);
+
         // Listen for Variable READ requests
         sub = nc.subscribe(subjects.readVariablesQuery(this.providerId), {
           callback: (err, msg) => {
@@ -130,6 +168,7 @@ module.exports = function (RED) {
             handleRead(payloads, msg).catch((error) => this.warn(error.message));
           },
         });
+        console.log('[DataHub Output] Subscribed to Read Query.');
 
         // Listen for Definition READ requests (Discovery)
         // SKIPPED: Permission Violation on v1.loc.<id>.def.qry.read
@@ -191,7 +230,6 @@ module.exports = function (RED) {
               return;
             }
 
-            const [payloadsMod, subjectsMod] = await loadModules();
             let definitionsChanged = false;
             const states = [];
 
@@ -209,26 +247,19 @@ module.exports = function (RED) {
                 timestampNs: Date.now() * 1_000_000,
                 quality: 'GOOD',
               };
-              states.push(state);
               // states.push(state); // No longer pushing to a temporary 'states' array
               stateMap.set(def.id, state); // Update the global stateMap
             });
+
             if (definitionsChanged) {
-              await sendDefinitionUpdate(payloadsMod, subjectsMod);
-              // Give Data Hub a moment to process the new definition before sending values
-              await new Promise(r => setTimeout(r, 500));
-            }
-            // Convert stateMap to Object for payload builder
-            const stateObj = {};
-            for (const s of stateMap.values()) {
-              stateObj[s.id] = s;
-            }
-            try {
-              const payload = payloadsMod.buildVariablesChangedEvent(definitions, stateObj, fingerprint);
-              await nc.publish(subjectsMod.varsChangedEvent(this.providerId), payload);
-            } catch (err) {
-              this.error(`[v0.2.15] Encoding Error: ${err.message}. State: ${JSON.stringify(stateObj)}`);
+              // If definition changed, we MUST publish definition first
+              await sendDefinitionUpdate(loadedPayloads, loadedSubjects);
+              await new Promise(r => setTimeout(r, 200));
             }
+
+            // Publish values immediately on input (don't wait for heartbeat)
+            await sendValuesUpdate();
+
             send(msg);
             done();
           }
@@ -247,6 +278,7 @@ module.exports = function (RED) {
 
     this.on('close', async (done) => {
       try {
+        if (valueHeartbeat) clearInterval(valueHeartbeat);
         if (sub) {
           await sub.drain();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "description": "Node-RED nodes for Weidmüller u-OS Data Hub. Read, write, and provide variables via NATS protocol with OAuth2 authentication. Features: Variable Key resolution, custom icons, example flows, and provider definition caching.",
   "author": {
     "name": "IoTUeli",