node-red-contrib-uos-nats 0.2.19 → 0.2.21

package/nodes/datahub-output.js

@@ -120,6 +120,7 @@ module.exports = function (RED) {
         const [payloads, subjects] = await loadModules();
         nc = await connection.acquire();
         await sendDefinitionUpdate(payloads, subjects);
+        // Listen for Variable READ requests
         sub = nc.subscribe(subjects.readVariablesQuery(this.providerId), {
           callback: (err, msg) => {
             if (err) {
@@ -129,6 +130,26 @@ module.exports = function (RED) {
             handleRead(payloads, msg).catch((error) => this.warn(error.message));
           },
         });
+
+        // Listen for Definition READ requests (Discovery)
+        const defSub = nc.subscribe(subjects.readProviderDefinitionQuery(this.providerId), {
+          callback: (err, msg) => {
+            if (err) {
+              this.warn(`Def request error: ${err.message}`);
+              return;
+            }
+            if (!msg.reply) return;
+
+            // Send known definition
+            const { payload } = payloads.buildProviderDefinitionEvent(definitions);
+            nc.publish(msg.reply, payload);
+          }
+        });
+
+        // Track the subscription to close it later if needed (though existing code only tracks 'sub')
+        // Ideally we should track both or use a subscription manager, but for now let's hope 'sub' isn't the only one closed.
+        // Actually, looking at close(), it likely calls connection.release(). NATS connection close cleans up subs.
+
         this.status({ fill: 'green', shape: 'dot', text: 'ready' });
 
         this.on('input', async (msg, send, done) => {

package/nodes/datahub-write.html

@@ -16,22 +16,116 @@
             return this.name || "DataHub - Write";
         },
         paletteLabel: "DataHub - Write",
-        oneditprepare: function () {
-            // Validate: at least one of ID or Key required
-            const validateVar = () => {
-                const hasId = $('#node-input-variableId').val();
-                const hasKey = $('#node-input-variableKey').val();
-                if (!hasId && !hasKey) {
-                    $('#var-validation-error').show();
-                    return false;
-                } else {
-                    $('#var-validation-error').hide();
-                    return true;
-                }
-            };
-
-            $('#node-input-variableId, #node-input-variableKey').on('change keyup', validateVar);
-        },
+        // Search Button Handler
+        $('#node-config-lookup-var').click(function () {
+            const configId = $('#node-input-connection').val();
+            const providerId = $('#node-input-providerId').val();
+
+            if (!configId || configId === '_ADD_') {
+                RED.notify("Please select a valid Configuration Node first.", "error");
+                return;
+            }
+            if (!providerId) {
+                RED.notify("Please enter a Provider ID to search.", "error");
+                return;
+            }
+
+            const notification = RED.notify("Searching variables... please wait...", "info");
+
+            $.getJSON('datahub-nats/variables/' + configId + '/' + providerId, function (data) {
+                notification.close();
+
+                // Build table
+                let rows = "";
+                data.sort((a, b) => a.key.localeCompare(b.key));
+
+                data.forEach(v => {
+                    rows += `<tr class="node-dialog-var-row" style="cursor:pointer;" data-id="${v.id}" data-key="${v.key}">
+                            <td>${v.id}</td>
+                            <td>${v.key}</td>
+                            <td>${v.dataType}</td>
+                            <td>${v.access}</td>
+                        </tr>`;
+                });
+
+                const dialogHtml = `
+                        <div id="node-lookup-var-dialog" title="Select Variable">
+                            <input type="text" id="node-lookup-var-search" placeholder="Filter variables..." style="width:100%; margin-bottom:10px;">
+                            <div style="height:300px; overflow-y:scroll; border:1px solid #ccc;">
+                                <table class="table table-hover" style="width:100%">
+                                    <thead>
+                                        <tr>
+                                            <th>ID</th>
+                                            <th>Key</th>
+                                            <th>Type</th>
+                                            <th>Access</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="node-lookup-var-list">
+                                        ${rows}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    `;
+
+                // Show Dialog (using jquery-ui which Node-RED has)
+                const $dialog = $(dialogHtml).appendTo("body");
+
+                // Filter Logic
+                $('#node-lookup-var-search').on('keyup', function () {
+                    const val = $(this).val().toLowerCase();
+                    $("#node-lookup-var-list tr").filter(function () {
+                        $(this).toggle($(this).text().toLowerCase().indexOf(val) > -1)
+                    });
+                });
+
+                // Row Click Logic
+                $('.node-dialog-var-row').click(function () {
+                    const id = $(this).data('id');
+                    const key = $(this).data('key');
+
+                    $('#node-input-variableId').val(id);
+                    $('#node-input-variableKey').val(key);
+
+                    $dialog.dialog('close');
+                    $dialog.remove();
+                });
+
+                $dialog.dialog({
+                    modal: true,
+                    autoOpen: true,
+                    width: 600,
+                    title: `Variables for ${providerId}`,
+                    buttons: {
+                        "Cancel": function () {
+                            $(this).dialog("close");
+                            $(this).remove();
+                        }
+                    }
+                });
+
+            }).fail(function (jqxhr) {
+                notification.close();
+                RED.notify("Search failed: " + jqxhr.responseText, "error");
+            });
+        });
+
+        // Validate: at least one of ID or Key required
+        const validateVar = () => {
+            const hasId = $('#node-input-variableId').val();
+            const hasKey = $('#node-input-variableKey').val();
+            if (!hasId && !hasKey) {
+                $('#var-validation-error').show();
+                return false;
+            } else {
+                $('#var-validation-error').hide();
+                return true;
+            }
+        };
+
+        $('#node-input-variableId, #node-input-variableKey').on('change keyup', validateVar);
+    },
         oneditsave: function () {
             // Loose validation - server side will check
         }
@@ -61,7 +155,10 @@
 
     <div class="form-row">
         <label for="node-input-variableKey"><i class="fa fa-key"></i> Variable Key</label>
-        <input type="text" id="node-input-variableKey" placeholder="e.g. machine.temp (optional)">
+        <div style="display:inline-block; position:relative; width:70%;">
+            <input type="text" id="node-input-variableKey" placeholder="e.g. machine.temp (optional)" style="width:100%;">
+            <a id="node-config-lookup-var" class="btn" style="position:absolute; right:-40px; top:0;"><i class="fa fa-search"></i></a>
+        </div>
     </div>
 
     <div id="var-validation-error" class="form-tips" style="display:none; color:#c00;">

package/nodes/datahub-write.js

@@ -176,4 +176,70 @@ module.exports = function (RED) {
     }
 
     RED.nodes.registerType('datahub-write', DataHubWriteNode);
+
+    // Admin API to fetch variables
+    RED.httpAdmin.get('/datahub-nats/variables/:id/:provider', RED.auth.needsPermission('datahub-write.read'), async function (req, res) {
+        const configNodeId = req.params.id;
+        const providerId = req.params.provider;
+
+        if (!configNodeId || !providerId) {
+            return res.status(400).send('Missing config ID or Provider ID');
+        }
+
+        const configNode = RED.nodes.getNode(configNodeId);
+        if (!configNode) {
+            return res.status(404).send('Config node not found');
+        }
+
+        try {
+            // We need a temporary connection or use the existing one if active?
+            // Config node has acquire(), but that might be for runtime nodes.
+            // For Admin API, we ideally want to just "use" the active connection if possible,
+            // or create a temp one. `acquire()` is designed for nodes. 
+            // Let's try to use acquire() but release immediately.
+
+            const nc = await configNode.acquire();
+            if (!nc) {
+                return res.status(503).send('NATS connection not ready');
+            }
+
+            try {
+                // Dynamically import payloads to ensure we have the encoder
+                // We can't easily use import() here if it's CJS module, but we can try 
+                // reusing the logic if possible or just manual encoding if simple.
+                // Actually, `payloadModuleUrl` is available in scope.
+                const payloads = await import(payloadModuleUrl);
+
+                const query = payloads.buildReadProviderDefinitionQuery();
+                const subject = `v1.loc.${providerId}.def.qry.read`; // Hardcoded subject pattern from rules
+
+                // Request with timeout
+                const response = await nc.request(subject, query, { timeout: 3000 });
+                const definition = payloads.decodeProviderDefinition(response.data);
+
+                if (!definition) {
+                    return res.status(404).send('No definition returned');
+                }
+
+                // Return simple JSON list
+                const vars = definition.variables.map(v => ({
+                    id: v.id,
+                    key: v.key,
+                    dataType: v.dataType,
+                    access: v.access
+                }));
+
+                res.json(vars);
+
+            } catch (err) {
+                res.status(500).send(`Query failed: ${err.message}`);
+                // If timeout, it means provider didn't answer
+            } finally {
+                configNode.release();
+            }
+
+        } catch (err) {
+            res.status(500).send(`Internal error: ${err.message}`);
+        }
+    });
 };

package/package.json

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