node-red-contrib-uos-nats 0.2.25 → 0.2.29

package/lib/payloads.js

@@ -49,15 +49,19 @@ export function buildReadVariablesResponse(defs, states, fingerprint) {
     }
 
     // Calculate baseTimestamp from the first available state, if any
+    // Calculate baseTimestamp from the first available state, if any, or use now
     let baseTimestamp = null;
     const firstState = Object.values(states)[0];
-    if (firstState) {
-        // In a real implementation we might want the oldest or newest, 
-        // but here we just take one if available, or leave it null as per previous logic.
-        // Actually, VariableListT constructor takes null fine.
+    if (firstState && firstState.timestamp) {
+        const totalNs = BigInt(firstState.timestamp);
+        const secs = totalNs / 1_000_000_000n;
+        const nanos = Number(totalNs % 1_000_000_000n);
+        baseTimestamp = new TimestampT(secs, nanos);
+    } else {
+        baseTimestamp = nowNs();
     }
 
-    const varList = new VariableListT(fingerprint, null, variables);
+    const varList = new VariableListT(fingerprint, baseTimestamp, variables);
 
     const response = new ReadVariablesQueryResponseT();
     response.variables = varList;
@@ -101,7 +105,8 @@ export function encodeWriteVariablesCommand(variables) {
     // variables: [{id: number, value: any}, ...]
     // variables: [{id: number, value: any}, ...]
     // VariableListT constructor: fingerprint, baseTimestamp, items
-    const varList = new VariableListT(BigInt(0), null, []);
+    // VariableListT constructor: fingerprint, baseTimestamp, items
+    const varList = new VariableListT(BigInt(0), nowNs(), []);
     varList.items = variables.map(v => {
         const varT = new VariableT();
         varT.id = v.id;
@@ -252,7 +257,19 @@ function buildVariableList(defs, states, fingerprint) {
         if (!state) continue;
         variables.push(encodeVariableState(def, state));
     }
-    const list = new VariableListT(fingerprint, null, variables);
+    // Always provide a baseTimestamp to satisfy strict schema requirements
+    // Use the timestamp of the first variable or now()
+    let baseTimestamp = nowNs();
+    const firstId = Object.keys(states)[0];
+    if (firstId && states[firstId] && states[firstId].timestamp) {
+        const totalNs = BigInt(states[firstId].timestamp);
+        const secs = totalNs / 1_000_000_000n;
+        const nanos = Number(totalNs % 1_000_000_000n);
+        baseTimestamp = new TimestampT(secs, nanos);
+    }
+
+    const list = new VariableListT(fingerprint, baseTimestamp, variables);
+    // console.log(`[Payloads] Built VariableList with baseTimestamp: ${baseTimestamp ? 'SET' : 'NULL'}`);
     return list;
 }
 function encodeVariableState(def, state) {

package/nodes/datahub-write.js

@@ -56,6 +56,7 @@ module.exports = function (RED) {
     function DataHubWriteNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
+        // console.log('DataHub Write Node initialized');
 
         // Get config node
         const configNode = RED.nodes.getNode(config.connection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-uos-nats",
-  "version": "0.2.25",
+  "version": "0.2.29",
   "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",