@vitormnm/node-red-simple-opcua 1.6.3 → 1.8.0

package/client/opcua-client.js

@@ -15,6 +15,7 @@ const {
 
 const {
     browseNode: browseNodeWithSession,
+    browseRecursiveNode,
     ROOT_NODE_ID
 } = require("./lib/opcua-client-browser");
 
@@ -92,6 +93,9 @@ module.exports = function (RED) {
                 } else if (node.mode === "browse") {
                     payload = await executeBrowse(node, msg, session);
                     node.status({ fill: "green", shape: "dot", text: "browsed " + payload.length + " nodes" });
+                } else if (node.mode === "browseRecursive") {
+                    payload = await executeBrowseRecursive(node, msg, session);
+                    node.status({ fill: "green", shape: "dot", text: "browsed recursive " + payload.length + " nodes" });
                 } else if (node.mode === "method") {
                     //payload = await executeMethod(node, msg, session);
 
@@ -109,7 +113,88 @@ module.exports = function (RED) {
                 done();
             } catch (error) {
                 node.status({ fill: "red", shape: "ring", text: node.mode + " failed" });
-                done(error);
+                
+                let errorPayload;
+                try {
+                    if (node.mode === "read") {
+                        const items = itemsResolver.ensureClientItems(node, msg, "OPC UA read");
+                        errorPayload = items.map(item => ({
+                            name: resolveName(item, resolveNodeId(item)),
+                            nodeID: resolveNodeId(item),
+                            value: null,
+                            type: null,
+                            status: error.message || String(error),
+                            sourceTimestamp: null,
+                            serverTimestamp: null
+                        }));
+                    } else if (node.mode === "write") {
+                        const items = itemsResolver.ensureWriteItems(node, msg);
+                        errorPayload = items.map(item => ({
+                            name: item.name,
+                            nodeID: item.nodeID,
+                            value: item.value,
+                            type: item.type,
+                            status: error.message || String(error)
+                        }));
+                    } else if (node.mode === "browse" || node.mode === "browseRecursive") {
+                        const roots = normalizeBrowseRoots(node, msg ? msg.payload : undefined);
+                        errorPayload = roots.map(root => ({
+                            name: root.name,
+                            nodeID: root.nodeID,
+                            status: error.message || String(error),
+                            results: [],
+                            children: []
+                        }));
+                    } else if (node.mode === "method") {
+                        const items = itemsResolver.ensureMethodItems(node, msg);
+                        errorPayload = items.map(item => ({
+                            name: item.name,
+                            nodeID: item.nodeID,
+                            status: error.message || String(error),
+                            value: null
+                        }));
+                    } else if (node.mode === "subscription" || node.mode === "events") {
+                        const items = itemsResolver.ensureClientItems(node, msg, "OPC UA subscription");
+                        errorPayload = items.map(item => ({
+                            name: resolveName(item, resolveNodeId(item)),
+                            nodeID: resolveNodeId(item),
+                            value: null,
+                            type: null,
+                            status: error.message || String(error),
+                            sourceTimestamp: null,
+                            serverTimestamp: null
+                        }));
+                    } else {
+                        errorPayload = {
+                            status: "error",
+                            error: error.message || String(error)
+                        };
+                    }
+                } catch (payloadError) {
+                    errorPayload = {
+                        status: "error",
+                        error: error.message || String(error)
+                    };
+                }
+
+                const safeClone = {};
+                for (const key in msg) {
+                    if (msg.hasOwnProperty(key) && key !== "req" && key !== "res" && key !== "payload") {
+                        safeClone[key] = msg[key];
+                    }
+                }
+                safeClone.payload = msg.payload;
+
+                if (errorPayload && (Array.isArray(errorPayload) || typeof errorPayload === "object")) {
+                    errorPayload.msg = safeClone;
+                }
+
+                msg.payload = errorPayload;
+
+                node.error(error.message || String(error), msg);
+                if (done) {
+                    done();
+                }
             }
         });
 
@@ -134,6 +219,17 @@ module.exports = function (RED) {
         return payload;
     }
 
+    async function executeBrowseRecursive(node, msg, session) {
+        const roots = normalizeBrowseRoots(node, msg ? msg.payload : undefined);
+        const payload = [];
+
+        for (const root of roots) {
+            payload.push(await browseRecursiveNode(session, root));
+        }
+
+        return payload;
+    }
+
 
 
 

package/client/view/opcua-client.js

@@ -657,7 +657,7 @@
         }).fail(function (xhr) {
             var message = xhr && xhr.responseJSON && xhr.responseJSON.error
                 ? xhr.responseJSON.error
-                : "Falha ao navegar no servidor OPC UA.";
+                : "Failed to browse the OPC UA server.";
             browseState = null;
             container.html('<div class="opcua-tree-empty">' + escapeHtml(message) + '</div>');
             RED.notify(message, "error");
@@ -675,6 +675,7 @@
         contextMenuPath = path || "";
         $("#node-input-browse-context-refresh").toggle(!!item && !isVariable(item));
         $("#node-input-browse-context-copy-nodeid").toggle(!!nodeIdOf(item));
+        $("#node-input-browse-context-read-value").toggle(!!item && isVariable(item) && !!nodeIdOf(item));
         menu.css({ left: x + "px", top: y + "px" }).show();
     }
 
@@ -682,15 +683,15 @@
         var item = getItemAtPath(path);
         var nodeId = nodeIdOf(item);
         if (!nodeId) {
-            RED.notify("NodeID nao encontrado para o item selecionado.", "warning");
+            RED.notify("NodeID not found for the selected item.", "warning");
             return;
         }
 
         if (navigator.clipboard && typeof navigator.clipboard.writeText === "function") {
             navigator.clipboard.writeText(nodeId).then(function () {
-                RED.notify("NodeID copiado.", "success");
+                RED.notify("NodeID copied.", "success");
             }).catch(function () {
-                RED.notify("Falha ao copiar NodeID.", "error");
+                RED.notify("Failed to copy NodeID.", "error");
             });
             return;
         }
@@ -704,13 +705,48 @@
         input[0].select();
         try {
             document.execCommand("copy");
-            RED.notify("NodeID copiado.", "success");
+            RED.notify("NodeID copied.", "success");
         } catch (error) {
-            RED.notify("Falha ao copiar NodeID.", "error");
+            RED.notify("Failed to copy NodeID.", "error");
         }
         input.remove();
     }
 
+    function readValueFromPath(path) {
+        var item = getItemAtPath(path);
+        var nodeId = nodeIdOf(item);
+        if (!nodeId) {
+            RED.notify("NodeID not found for the selected item.", "warning");
+            return;
+        }
+
+        var connectionId = $("#node-input-connection").val();
+        if (!connectionId) {
+            RED.notify("Select an OPC UA connection before reading.", "warning");
+            return;
+        }
+
+        $.getJSON("opcua-client-config/" + encodeURIComponent(connectionId) + "/read", {
+            nodeId: nodeId
+        }).done(function (payload) {
+            if (payload && payload.error) {
+                RED.notify("Read failed: " + payload.error, "error");
+            } else if (payload) {
+                var valueText = (payload.valueEnumeration !== undefined && payload.valueEnumeration !== null)
+                    ? payload.valueEnumeration + " (" + payload.value + ")"
+                    : (payload.value !== undefined ? String(payload.value) : "undefined");
+                RED.notify("Variable value: " + valueText, "success");
+            } else {
+                RED.notify("No value returned from the server.", "warning");
+            }
+        }).fail(function (xhr) {
+            var message = xhr && xhr.responseJSON && xhr.responseJSON.error
+                ? xhr.responseJSON.error
+                : "Failed to read variable value.";
+            RED.notify(message, "error");
+        });
+    }
+
     function setBrowseSelectedPath(path) {
         browseSelectedPath = path || "";
         $(".opcua-tree-row").removeClass("is-selected");
@@ -759,20 +795,51 @@
         renderBrowseTree();
         var browseNodeId = item.nodeID || item.nodeId;
         loadBrowse(browseNodeId).done(function (payload) {
-
-            
-
-            item.browse = Array.isArray(payload.browse) ? payload.browse : [];
-            saveBrowseSession();
-            renderBrowseTree();
+            try {
+                if (!payload) {
+                    console.error("Browse returned empty payload for node " + browseNodeId);
+                    RED.notify("Browse returned empty payload.", "error");
+                    item.browse = [];
+                } else if (payload.error) {
+                    console.error("Browse returned error for node " + browseNodeId + ":", payload.error);
+                    RED.notify(payload.error, "error");
+                    item.browse = [];
+                } else {
+                    item.browse = Array.isArray(payload.browse) ? payload.browse : [];
+                }
+                saveBrowseSession();
+                renderBrowseTree();
+                triggerChildrenExpansion(item.browse, path);
+            } catch (err) {
+                console.error("Error handling browse payload for node " + browseNodeId + ":", err);
+                RED.notify("Error handling browse response: " + err.message, "error");
+                expansionState[path] = false;
+                saveBrowseSession();
+                renderBrowseTree();
+            }
         }).fail(function (xhr) {
             expansionState[path] = false;
             saveBrowseSession();
             renderBrowseTree();
             var message = xhr && xhr.responseJSON && xhr.responseJSON.error
                 ? xhr.responseJSON.error
-                : "Falha ao expandir o node.";
+                : "Failed to expand the node.";
             RED.notify(message, "error");
+            console.error("Browse request failed for node " + browseNodeId + ":", xhr);
+        });
+    }
+
+    function triggerChildrenExpansion(children, parentPath) {
+        if (!Array.isArray(children)) return;
+        children.forEach(function (child, index) {
+            var childPath = parentPath + ".browse." + index;
+            if (isExpanded(childPath, false)) {
+                if (!Array.isArray(child.browse)) {
+                    expandNode(childPath);
+                } else {
+                    triggerChildrenExpansion(child.browse, childPath);
+                }
+            }
         });
     }
 
@@ -1057,7 +1124,24 @@
         if ($(event.target).closest(".opcua-client-toggle-tree, .opcua-client-toggle-tag, .opcua-tree-actions, #node-input-browse-context-menu").length) {
             return;
         }
-        setBrowseSelectedPath($(this).attr("data-path"));
+        var path = $(this).attr("data-path");
+        setBrowseSelectedPath(path);
+
+        if (event.ctrlKey || event.metaKey) {
+            event.preventDefault();
+            if ($("#node-input-mode").val() === "method") {
+                var item = getItemAtPath(path);
+                if (item && item.nodeClass === "Method") {
+                    var parentPath = path.split(".");
+                    parentPath.splice(parentPath.length - 2, 2);
+                    parentPath = parentPath.join(".");
+                    var parentItem = getItemAtPath(parentPath);
+                    addMethodFromTree(item, parentItem);
+                    return;
+                }
+            }
+            toggleSelectedNode(path);
+        }
     });
 
     $(document).on("contextmenu", ".opcua-tree-row", function (event) {
@@ -1091,6 +1175,14 @@
         copyNodeIdFromPath(path);
     });
 
+    $(document).on("click", "#node-input-browse-context-read-value", function (event) {
+        event.preventDefault();
+        var highlightedPath = $(".opcua-tree-row.is-selected").first().attr("data-path") || "";
+        var path = contextMenuPath || browseSelectedPath || highlightedPath || "";
+        hideTreeContextMenu();
+        readValueFromPath(path);
+    });
+
     $(document).on("click", function (event) {
         if (!$(event.target).closest("#node-input-browse-context-menu").length) {
             hideTreeContextMenu();