node-red-contrib-uos-nats 0.2.46 → 0.2.48

package/lib/payloads.js

@@ -115,14 +115,43 @@ export function encodeWriteVariablesCommand(variables) {
 
         // 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') {
+        let targetType = v.dataType; // Optional known type from definition
+
+        // If targetType is provided, force specific flatbuffer encoding
+        if (targetType) {
+            targetType = String(targetType).toUpperCase();
+            if (targetType === 'BOOLEAN') {
+                const boolVal = new VariableValueBooleanT();
+                boolVal.value = Boolean(val);
+                varT.value = boolVal;
+                varT.valueType = VariableValue.Boolean;
+            } else if (targetType === 'INT64') {
+                const intVal = new VariableValueInt64T();
+                intVal.value = BigInt(parseInt(val) || 0); // Ensure BigInt
+                varT.value = intVal;
+                varT.valueType = VariableValue.Int64;
+            } else if (targetType === 'FLOAT64') {
+                const floatVal = new VariableValueFloat64T();
+                floatVal.value = Number(val);
+                varT.value = floatVal;
+                varT.valueType = VariableValue.Float64;
+            } else {
+                // STRING or default
+                const strVal = new VariableValueStringT();
+                strVal.value = (typeof val === 'object') ? JSON.stringify(val) : String(val);
+                varT.value = strVal;
+                varT.valueType = VariableValue.String;
+            }
+        }
+        // Fallback: Infer from value (Risk: Int sent as Float or vice versa)
+        else if (typeof val === 'boolean') {
             const boolVal = new VariableValueBooleanT();
             boolVal.value = val;
             varT.value = boolVal;
             varT.valueType = VariableValue.Boolean;
         } else if (Number.isInteger(val)) {
+
             const intVal = new VariableValueInt64T();
             intVal.value = BigInt(val);
             varT.value = intVal;

package/nodes/datahub-output.js

@@ -65,11 +65,10 @@ module.exports = function (RED) {
     }
     // Retrieve configuration node
     this.providerId = (config.providerId || 'nodered').trim();
-    const uosConfig = RED.nodes.getNode(config.uosConfig);
-    this.definitions = config.definitions || [];
+    // this.definitions = config.definitions || [];
 
     const defMap = new Map();
-    // const definitions = []; // This line is effectively replaced by this.definitions
+    const definitions = [];
     const stateMap = new Map();
     let nextId = 100;
     let fingerprint = 0;
@@ -92,7 +91,7 @@ module.exports = function (RED) {
       stateMap.set(def.id, {
         id: def.id,
         value: defaultValue(dataType),
-        timestampNs: Date.now() * 1_000_000,
+        timestamp: BigInt(Date.now()) * 1_000_000n,
         quality: 'GOOD',
       });
       return { def, created: true };
@@ -139,7 +138,7 @@ module.exports = function (RED) {
       const stateObj = {};
       const nowNs = Date.now() * 1_000_000;
       for (const s of stateMap.values()) {
-        s.timestampNs = nowNs; // Force refresh timestamp
+        s.timestamp = BigInt(Date.now()) * 1_000_000n; // Force refresh timestamp
         stateObj[s.id] = s;
       }
       try {
@@ -153,6 +152,7 @@ module.exports = function (RED) {
         console.log(`[DataHub Output] Packet HEX (${payload.length} bytes): ${hex}`);
 
         await nc.publish(subject, payload);
+        await nc.flush(); // Ensure NATS accepts the packet (catches Permission Errors)
         console.log(`[DataHub Output] Heartbeat sent. State count: ${Object.keys(stateObj).length}`);
       } catch (err) {
         this.warn(`Heartbeat error: ${err.message}`);
@@ -263,7 +263,7 @@ module.exports = function (RED) {
               const state = {
                 id: def.id,
                 value,
-                timestampNs: Date.now() * 1_000_000,
+                timestamp: BigInt(Date.now()) * 1_000_000n,
                 quality: 'GOOD',
               };
               // states.push(state); // No longer pushing to a temporary 'states' array

package/nodes/datahub-write.js

@@ -17,20 +17,36 @@ module.exports = function (RED) {
             const variable = cached.definition.variables.find(v => v.key === key);
             if (variable) {
                 node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id} (cached)`);
-                return variable.id;
+                // Return full object including type
+                return { id: variable.id, dataType: variable.dataType };
             }
         }
 
         // Query provider definition
+        let definition = null;
         try {
             const query = payloads.buildReadProviderDefinitionQuery();
-            const subject = `v1.loc.registry.providers.${providerId}.def.qry.read`;
 
-            const response = await nc.request(subject, query, { timeout: 3000 });
-            const definition = payloads.decodeProviderDefinition(response.data);
+            // Strategy 1: Direct Query (v1.loc.<provider>.def.qry.read)
+            // This is required for providers like Node-RED itself or simple Python scripts
+            const directSubject = `v1.loc.${providerId}.def.qry.read`;
+            try {
+                const response = await nc.request(directSubject, query, { timeout: 1000 });
+                definition = payloads.decodeProviderDefinition(response.data);
+            } catch (err) {
+                node.debug && node.debug(`Direct Query failed: ${err.message}`);
+            }
+
+            // Strategy 2: Registry Query (v1.loc.registry.providers.<provider>.def.qry.read)
+            // Fallback for managed providers
+            if (!definition) {
+                const registrySubject = `v1.loc.registry.providers.${providerId}.def.qry.read`;
+                const response = await nc.request(registrySubject, query, { timeout: 2000 });
+                definition = payloads.decodeProviderDefinition(response.data);
+            }
 
             if (!definition) {
-                throw new Error(`Provider ${providerId} not found or no definition returned`);
+                throw new Error(`Provider ${providerId} not found (tried Direct & Registry)`);
             }
 
             // Cache the definition
@@ -45,8 +61,8 @@ module.exports = function (RED) {
                 throw new Error(`Variable key '${key}' not found in provider ${providerId}`);
             }
 
-            node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id}`);
-            return variable.id;
+            node.debug && node.debug(`Key '${key}' resolved to ID ${variable.id} (Type: ${variable.dataType})`);
+            return { id: variable.id, dataType: variable.dataType };
 
         } catch (err) {
             throw new Error(`Failed to resolve key '${key}': ${err.message}`);
@@ -71,6 +87,7 @@ module.exports = function (RED) {
         this.variableId = config.variableId ? parseInt(config.variableId, 10) : null;
         this.variableKey = config.variableKey?.trim();
         this.resolvedId = null; // Cached resolved ID
+        this.resolvedDataType = null; // Cached Data Type for strict writing
         this.payloads = null; // Will be loaded dynamically
 
         if (!this.providerId) {
@@ -131,10 +148,16 @@ module.exports = function (RED) {
 
                 // Resolve variable ID if needed
                 let varId = node.resolvedId;
+                let varType = node.resolvedDataType;
+
                 if (!varId && node.variableKey) {
                     node.status({ fill: 'yellow', shape: 'dot', text: 'resolving key...' });
-                    varId = await resolveVariableKey(nc, node.providerId, node.variableKey, node, node.payloads);
-                    node.resolvedId = varId; // Cache for future messages
+                    const resolved = await resolveVariableKey(nc, node.providerId, node.variableKey, node, node.payloads);
+                    varId = resolved.id;
+                    varType = resolved.dataType; // Store resolved type
+
+                    node.resolvedId = varId;
+                    node.resolvedDataType = varType;
                     node.status({ fill: 'green', shape: 'ring', text: 'ready' });
                 }
 
@@ -142,7 +165,8 @@ module.exports = function (RED) {
                 const writeCommand = node.payloads.encodeWriteVariablesCommand([
                     {
                         id: varId,
-                        value: value
+                        value: value,
+                        dataType: varType // Pass dataType for strict encoding
                     }
                 ]);
 

package/package.json

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