node-red-contrib-uos-nats 0.2.8 → 0.2.10

package/lib/payloads.js

@@ -89,6 +89,8 @@ export function encodeWriteVariablesCommand(variables) {
         varT.timestamp = nowNs();
 
         // Encode value based on type
+        // Explicitly handle null/undefined by defaulting to safe empty values based on type
+        // This prevents "Field 6 must be set" error
         const val = v.value;
         if (typeof val === 'boolean') {
             const boolVal = new VariableValueBooleanT();
@@ -111,7 +113,17 @@ export function encodeWriteVariablesCommand(variables) {
             varT.value = strVal;
             varT.valueType = VariableValue.String;
         } else {
-            throw new Error(`Unsupported value type: ${typeof val}`);
+            // Fallback for objects/arrays: try stringify?
+            // Or just fail? The user reported "Unsupported value type: object" before.
+            // If it is an object (unexpected), we should probably fail or stringify.
+            try {
+                const strVal = new VariableValueStringT();
+                strVal.value = JSON.stringify(val);
+                varT.value = strVal;
+                varT.valueType = VariableValue.String;
+            } catch (e) {
+                throw new Error(`Unsupported value type: ${typeof val}`);
+            }
         }
 
         return varT;
@@ -229,6 +241,12 @@ function encodeVariableState(def, state) {
     } else {
         varT.timestamp = nowNs();
     }
+    // Field 6 (value) MUST be set if valueType is not NONE
+    // We default to String empty if value is null/undefined to satisfy schema if needed,
+    // or we must ensure valueType is handled correctly.
+    // However, for defining variables (initial state), value IS required properly.
+
+    // Explicitly handle null/undefined by defaulting to safe empty values based on type
     const value = state?.value;
     switch (def.dataType) {
         case 'INT64': {
@@ -254,10 +272,21 @@ function encodeVariableState(def, state) {
         }
         case 'STRING':
         default: {
-            const strVal = new VariableValueStringT();
-            strVal.value = (value !== null && value !== undefined) ? String(value) : '';
-            varT.value = strVal;
-            varT.valueType = VariableValue.String;
+            try {
+                const strVal = new VariableValueStringT();
+                const valStr = (value !== null && value !== undefined) ?
+                    (typeof value === 'object' ? JSON.stringify(value) : String(value))
+                    : '';
+                strVal.value = valStr;
+                varT.value = strVal;
+                varT.valueType = VariableValue.String;
+            } catch (e) {
+                // Last resort fallback
+                const strVal = new VariableValueStringT();
+                strVal.value = "";
+                varT.value = strVal;
+                varT.valueType = VariableValue.String;
+            }
             break;
         }
     }

package/nodes/datahub-input.html

@@ -12,7 +12,7 @@
     },
     inputs: 1,
     outputs: 1,
-    icon: "white/datahub-read.svg",
+    icon: "datahub-read.svg",
     label: function () {
       if (this.name) return this.name;
       return "DataHub - Read";

package/nodes/datahub-output.html

@@ -9,7 +9,7 @@
     },
     inputs: 1,
     outputs: 1,
-    icon: "white/datahub-provider.svg",
+    icon: "datahub-provider.svg",
     oneditprepare: function () { },
     label: function () {
       return this.name || `DataHub - Provider ${this.providerId || ''}`;

package/nodes/datahub-output.js

@@ -104,8 +104,13 @@ module.exports = function (RED) {
     const handleRead = async (payloads, msg) => {
       if (!msg.reply)
         return;
-      const snapshot = Array.from(stateMap.values());
-      const response = payloads.buildReadVariablesResponse(definitions, snapshot, fingerprint);
+
+      // Convert stateMap to ID-indexed Object for correct lookup in payloads.js
+      const stateObj = {};
+      for (const s of stateMap.values()) {
+        stateObj[s.id] = s;
+      }
+      const response = payloads.buildReadVariablesResponse(definitions, stateObj, fingerprint);
       await nc.publish(msg.reply, response);
     };
 
@@ -159,14 +164,20 @@ module.exports = function (RED) {
                 quality: 'GOOD',
               };
               states.push(state);
-              stateMap.set(def.id, 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, 100));
             }
-            const payload = payloadsMod.buildVariablesChangedEvent(definitions, states, fingerprint);
+            // Convert stateMap to Object for payload builder
+            const stateObj = {};
+            for (const s of stateMap.values()) {
+              stateObj[s.id] = s;
+            }
+            const payload = payloadsMod.buildVariablesChangedEvent(definitions, stateObj, fingerprint);
             await nc.publish(subjectsMod.varsChangedEvent(this.providerId), payload);
             send(msg);
             done();

package/nodes/datahub-write.html

@@ -11,7 +11,7 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: "white/datahub-write.svg",
+        icon: "datahub-write.svg",
         label: function () {
             return this.name || "DataHub - Write";
         },

package/package.json

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