node-red-contrib-uos-nats 1.2.4 → 1.3.0

package/nodes/datahub-input.html

@@ -62,8 +62,9 @@
       const $hiddenManual = $('#node-input-manualVariables');
 
       // Styles
-      const rowStyle = "display:grid; grid-template-columns: 30px 60px 1fr; align-items:center; padding:4px 0; border-bottom:1px solid #eee; font-family:'Helvetica Neue', Arial, sans-serif; font-size:12px;";
-      const idStyle = "background:#eee; color:#555; padding:1px 4px; border-radius:3px; font-family:monospace; text-align:center; font-size:11px;";
+      // Adjusted: ID column removed per user request (Key is main identifier)
+      const rowStyle = "display:grid; grid-template-columns: 30px 1fr; align-items:center; padding:4px 0; border-bottom:1px solid #eee; font-family:'Helvetica Neue', Arial, sans-serif; font-size:12px;";
+      // const idStyle = ... (removed)
       const keyStyle = "overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-left:10px;";
 
       let currentVariables = []; // Stores {id, key, accessType, etc.}
@@ -93,7 +94,7 @@
         const selectedMap = getSelectedMap();
 
         vars.forEach(v => {
-          // Robust ID handling: verify v.id exists (try 'id' and 'Id')
+          // Robust ID handling
           let rawId = (v.id !== undefined && v.id !== null) ? v.id : v.Id;
           const safeId = (rawId !== undefined && rawId !== null) ? rawId : 'ERR';
           const isSelected = selectedMap.has(v.key);
@@ -104,13 +105,15 @@
           const cb = $('<input type="checkbox" class="var-checkbox">')
             .prop('checked', isSelected)
             .data('key', v.key)
-            .data('id', safeId);
+            .data('id', safeId); // ID strictly stored in data attribute
           cbContainer.append(cb);
 
-          const idBadge = $('<div>').append($('<span>', { style: idStyle }).text(safeId));
+          // ID Column Removed from View
+          // const idBadge = ...
+
           const label = $('<div>', { style: keyStyle, title: v.key }).text(v.key);
 
-          row.append(cbContainer).append(idBadge).append(label);
+          row.append(cbContainer).append(label); // No ID badge
           $listContainer.append(row);
         });
       };

package/nodes/datahub-write.html

@@ -29,8 +29,9 @@
             const $inputKey = $('#node-input-variableKey');
 
             // Styles matching Read Node exactly
-            const rowStyle = "display:grid; grid-template-columns: 30px 60px 1fr; align-items:center; padding:4px 0; border-bottom:1px solid #eee; font-family:'Helvetica Neue', Arial, sans-serif; font-size:12px; cursor:pointer;";
-            const idStyle = "background:#eee; color:#555; padding:1px 4px; border-radius:3px; font-family:monospace; text-align:center; font-size:11px;";
+            // Adjusted: ID column removed
+            const rowStyle = "display:grid; grid-template-columns: 30px 1fr; align-items:center; padding:4px 0; border-bottom:1px solid #eee; font-family:'Helvetica Neue', Arial, sans-serif; font-size:12px; cursor:pointer;";
+            // const idStyle = ...
             const keyStyle = "overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-left:10px;";
 
             // Removed iconStyle, using checkbox instead
@@ -60,12 +61,12 @@
 
                     cbContainer.append(cb);
 
-                    // ID
-                    const idCol = $('<div>', { style: 'text-align:center;' }).append($('<span>', { style: idStyle }).text(safeId));
+                    // ID - HIDDEN
+                    // const idCol = $('<div>', { style: 'text-align:center;' }).append($('<span>', { style: idStyle }).text(safeId));
                     // Key
                     const keyCol = $('<div>', { style: keyStyle, title: v.key }).text(v.key);
 
-                    row.append(cbContainer).append(idCol).append(keyCol);
+                    row.append(cbContainer).append(keyCol); // No ID Col
 
                     // Click Handler (Row or Checkbox)
                     const selectRow = () => {

package/nodes/datahub-write.js

@@ -106,13 +106,36 @@ module.exports = function (RED) {
         // Validate: either ID or Key required
         // Relaxed validation for Batch Mode (handled in Input)
 
-        // If ID provided and valid, use it
-        if (this.variableId && !isNaN(this.variableId)) {
+        // If Key is provided, we should ALWAYS resolve it to ensure ID is fresh (Auto-Healing)
+        // If only ID is provided (legacy), we trust it.
+        if (this.variableKey) {
+            // Trigger background resolution
+            node.status({ fill: 'yellow', shape: 'dot', text: 'resolving...' });
+            resolveVariableKey(await configNode.acquire(), this.providerId, this.variableKey, node, node.payloads)
+                .then(resolved => {
+                    node.resolvedId = resolved.id;
+                    node.resolvedDataType = resolved.dataType;
+                    node.resolvedFingerprint = resolved.fingerprint;
+
+                    if (node.variableId && node.variableId !== resolved.id) {
+                        node.warn(`Auto-Healed ID for '${this.variableKey}': Configured=${node.variableId}, Resolved=${resolved.id}`);
+                    }
+                    node.status({ fill: 'green', shape: 'ring', text: 'ready' });
+                })
+                .catch(err => {
+                    node.warn(`ID Resolution failed for '${this.variableKey}': ${err.message}. Using configured ID: ${this.variableId}`);
+                    // Fallback to configured ID if resolution failed
+                    if (this.variableId && !isNaN(this.variableId)) {
+                        node.resolvedId = this.variableId;
+                        node.status({ fill: 'green', shape: 'ring', text: 'ready (fallback)' });
+                    } else {
+                        node.status({ fill: 'red', shape: 'dot', text: 'resolution failed' });
+                    }
+                });
+        } else if (this.variableId && !isNaN(this.variableId)) {
+            // Legacy/Manual Mode without Key
             this.resolvedId = this.variableId;
             node.status({ fill: 'green', shape: 'ring', text: 'ready' });
-        } else if (this.variableKey) {
-            // Key provided - will resolve on first message
-            node.status({ fill: 'yellow', shape: 'ring', text: 'key needs resolution' });
         }
 
         // Load payloads module dynamically

package/package.json

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