@vitormnm/node-red-simple-opcua 1.4.0 → 1.4.1

package/server/lib/opcua-server-runtime-child.js

@@ -214,6 +214,8 @@ class OpcUaServerProcess {
             msg.payload = result.payload;
             this.assignReadMetadata(msg, identifierType, result.identifiers);
 
+            
+
             if (result.identifiers.length === 1) {
                 msg.topic = result.identifiers[0];
             }
@@ -306,49 +308,137 @@ class OpcUaServerProcess {
     }
 
 
-
     writeFromPayload(msg, nodeId) {
         try {
-            var writtenPaths = null
-            const payload = msg ? msg.payload : undefined;
+            let writtenPaths = null;
+            let payload = msg ? msg.payload : undefined;
+
             const target = msg && msg.opcuaServerIo ? msg.opcuaServerIo : {};
             const identifierType = this.resolveIdentifierType(target);
 
+            // Buffer serializado pelo IPC
+            if (
+                payload &&
+                typeof payload === "object" &&
+                payload.type === "Buffer" &&
+                Array.isArray(payload.data)
+            ) {
+                payload = Buffer.from(payload.data);
+            }
 
+            const dataType =
+                target.dataType ||
+                target.type ||
+                target.builtInType ||
+                "";
+
+            const isByteString =
+                typeof dataType === "string" &&
+                dataType.toLowerCase() === "bytestring";
+
+
+
+            // Buffer ou Uint8Array
+            if (Buffer.isBuffer(payload) || payload instanceof Uint8Array) {
+
+                const identifier = this.resolveIdentifier(target);
+
+                this.node.writeValue(
+                    identifierType,
+                    identifier,
+                    Buffer.isBuffer(payload)
+                        ? payload
+                        : Buffer.from(payload)
+                );
+
+                writtenPaths = [identifier];
+            }
+
+            // Array de números
+            else if (
+                Array.isArray(payload) &&
+                payload.every(item => typeof item === "number")
+            ) {
+
+                const identifier = this.resolveIdentifier(target);
+
+                this.node.writeValue(
+                    identifierType,
+                    identifier,
+                    isByteString
+                        ? Buffer.from(payload)
+                        : payload
+                );
+
+                writtenPaths = [identifier];
+            }
+
+            // Array de objetos
+            else if (Array.isArray(payload)) {
 
-            if (Array.isArray(payload)) {
                 if (!payload.length) {
                     throw new Error("msg.payload array does not contain any items");
                 }
 
-                payload.forEach((item) => {
+                payload.forEach(item => {
                     this.writePayloadItem(identifierType, item);
                 });
 
-                writtenPaths = payload.map((item) => this.resolvePayloadItemIdentifier(item));
-            } else if (payload && typeof payload === "object" && !Array.isArray(payload)) {
+                writtenPaths = payload.map(item =>
+                    this.resolvePayloadItemIdentifier(item)
+                );
+            }
+
+            // Objeto { path: value }
+            else if (
+                payload &&
+                typeof payload === "object" &&
+                !Array.isArray(payload)
+            ) {
 
                 const identifiers = Object.keys(payload);
+
                 if (!identifiers.length) {
-                    throw new Error("msg.payload object does not contain any " + this.getIdentifierLabel(identifierType));
+                    throw new Error(
+                        "msg.payload object does not contain any " +
+                        this.getIdentifierLabel(identifierType)
+                    );
                 }
 
-                identifiers.forEach((identifier) => {
-                    this.node.writeValue(identifierType, identifier, payload[identifier]);
+                identifiers.forEach(identifier => {
+                    this.node.writeValue(
+                        identifierType,
+                        identifier,
+                        payload[identifier]
+                    );
                 });
 
                 writtenPaths = identifiers;
-            } else {
+            }
+
+            // Valor simples
+            else {
 
                 const identifier = this.resolveIdentifier(target);
-                this.node.writeValue(identifierType, identifier, payload);
 
+                this.node.writeValue(
+                    identifierType,
+                    identifier,
+                    payload
+                );
 
-                writtenPaths = [identifier]
+                writtenPaths = [identifier];
             }
 
             msg.opcua = msg.opcua || {};
-            this.assignWriteMetadata(msg, identifierType, writtenPaths);
+
+            this.assignWriteMetadata(
+                msg,
+                identifierType,
+                writtenPaths
+            );
+
+          
             if (writtenPaths.length === 1) {
                 msg.topic = writtenPaths[0];
             }
@@ -356,7 +446,7 @@ class OpcUaServerProcess {
             process.send({
                 type: "send",
                 data: msg,
-                nodeId: nodeId
+                nodeId
             });
 
             process.send({
@@ -364,28 +454,29 @@ class OpcUaServerProcess {
                 data: {
                     fill: "green",
                     shape: "dot",
-                    text: writtenPaths.length > 1 ? "write " + writtenPaths.length + " tags" : "write " + writtenPaths[0]
+                    text:
+                        writtenPaths.length > 1
+                            ? `write ${writtenPaths.length} tags`
+                            : `write ${writtenPaths[0]}`
                 },
-                nodeId: nodeId
+                nodeId
             });
 
-
         } catch (error) {
 
             process.send({
                 type: "error",
-                data: { fill: "red", shape: "ring", text: "failed write" },
+                data: {
+                    fill: "red",
+                    shape: "ring",
+                    text: "failed write"
+                },
                 error: error.message,
-                nodeId: nodeId
+                nodeId
             });
         }
-
-
-
-        //return [path];
     }
 
-
     resolveIdentifierType(target) {
         return target && target.identifierType === "nodeId" ? "nodeId" : "path";
     }
@@ -726,4 +817,4 @@ process.on("unhandledRejection", (reason) => {
         data: "Unhandled Rejection: " + (reason?.message || reason),
         nodeId: nodeId
     });
-});
+});

package/server/opcua-server-io.html

@@ -98,7 +98,7 @@
             },
             inputs: 1,
             outputs: 1,
-            icon: "bridge.svg",
+            icon: "opcua.svg",
             label: function () {
                 return this.name || this.methodName || this.tagPath || this.tagNodeId || "opcua-server-io";
             },

package/server/opcua-server-io.js

@@ -12,10 +12,19 @@ module.exports = function (RED) {
         }
     });
 
+
+    const path = require("path");
+
+
+
+
+
+
     function OpcUaServerIoNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
 
+
         node.name = (config.name || "").trim();
         node.serverRef = (config.serverRef || "").trim();
         node.mode = config.mode || "read";
@@ -106,6 +115,20 @@ module.exports = function (RED) {
         });
     }
 
+    function restoreBuffers(value) {
+        // Formato exato que o Node.js IPC gera ao serializar um Buffer
+        if (
+            value !== null &&
+            typeof value === "object" &&
+            value.type === "Buffer" &&
+            Array.isArray(value.data)
+        ) {
+            return Buffer.from(value.data);
+        }
+
+        return value;
+    }
+
     function onMessage(msg, node) {
         if (msg.nodeId == node.id) {
 
@@ -115,7 +138,13 @@ module.exports = function (RED) {
             }
 
             if (msg.type === "send") {
-                node.send(msg.data);
+                const data = msg.data;
+
+                if (data && data.payload !== undefined) {
+                    data.payload = restoreBuffers(data.payload);
+                }
+
+                node.send(data);
             }
 
             if (msg.type === "error") {
@@ -132,7 +161,7 @@ module.exports = function (RED) {
                 });
 
                 node.send({
-                    topic : msg.data.nodeId,
+                    topic: msg.data.nodeId,
                     payload: msg.data.inputArguments,
                     opcua: {
                         server: msg.data.serverName,

package/server/opcua-server.html

@@ -238,11 +238,37 @@
         color: var(--red-ui-list-item-color-selected, inherit);
     }
 
-    .opcua-tree-indent { flex: 0 0 auto; width: 14px; }
-    .opcua-tree-twisty { width: 16px; text-align: center; color: #777; flex: 0 0 16px; }
-    .opcua-tree-icon { width: 14px; text-align: center; color: #777; flex: 0 0 14px; }
-    .opcua-tree-label { flex: 1 1 auto; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-    .opcua-tree-type { color: #777; font-size: 11px; flex: 0 0 auto; }
+    .opcua-tree-indent {
+        flex: 0 0 auto;
+        width: 14px;
+    }
+
+    .opcua-tree-twisty {
+        width: 16px;
+        text-align: center;
+        color: #777;
+        flex: 0 0 16px;
+    }
+
+    .opcua-tree-icon {
+        width: 14px;
+        text-align: center;
+        color: #777;
+        flex: 0 0 14px;
+    }
+
+    .opcua-tree-label {
+        flex: 1 1 auto;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .opcua-tree-type {
+        color: #777;
+        font-size: 11px;
+        flex: 0 0 auto;
+    }
 
     .opcua-tree-context-menu {
         position: fixed;
@@ -251,7 +277,7 @@
         border: 1px solid var(--red-ui-form-input-border-color, #d9d9d9);
         border-radius: 4px;
         background: var(--red-ui-form-input-background, #fff);
-        box-shadow: 0 6px 18px rgba(0,0,0,0.18);
+        box-shadow: 0 6px 18px rgba(0, 0, 0, 0.18);
         overflow: hidden;
     }
 
@@ -503,7 +529,9 @@
             margin-left: 0;
         }
 
-        .opcua-tree-layout { grid-template-columns: 1fr; }
+        .opcua-tree-layout {
+            grid-template-columns: 1fr;
+        }
 
         .opcua-tree-header {
             align-items: flex-start;
@@ -644,7 +672,7 @@
             };
         }
 
-                function normalizeBranch(branch) {
+        function normalizeBranch(branch) {
             branch = branch || {};
             return {
                 name: branch.name ? String(branch.name) : "",
@@ -745,7 +773,7 @@
             var cv = String(currentValue || "");
             var opts = "";
             var noneSelected = (cv === "") ? " selected" : "";
-            opts += "<option value=\"\""  + noneSelected + ">\u2014 none \u2014</option>";
+            opts += "<option value=\"\"" + noneSelected + ">\u2014 none \u2014</option>";
             names.forEach(function (n) {
                 var esc = n.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
                 var sel = (n === cv) ? " selected" : "";
@@ -770,8 +798,8 @@
             var tokens = pathToTokens(path);
             var current = editorState;
             var parts = [];
-          //  var preservedCollections = { alarms: true, methods: true, objectsTypes: true };
-              var preservedCollections = { alarms: true, methods: true};
+            //  var preservedCollections = { alarms: true, methods: true, objectsTypes: true };
+            var preservedCollections = { alarms: true, methods: true };
 
             tokens.forEach(function (token) {
                 if (/^\d+$/.test(token)) {
@@ -787,7 +815,7 @@
             return parts.join(".");
         }
 
-        
+
         function nodeIdSuffixFromValue(nodeId, defaultSuffix) {
             var raw = String(nodeId || "").trim();
             if (!raw) return defaultSuffix;
@@ -1059,9 +1087,9 @@
                         ? (parentPath + ".objectsTypes")
                         : kind === "alarm"
                             ? (parentPath + ".alarms")
-                        : kind === "method"
-                            ? (parentPath + ".methods")
-                        : (parentPath + ".objects");
+                            : kind === "method"
+                                ? (parentPath + ".methods")
+                                : (parentPath + ".objects");
             var target = getAtPath(editorState, branchTargetPath);
             if (!Array.isArray(target)) return;
             if (kind === "variable") {
@@ -1197,7 +1225,7 @@
                 panel.append('<div class="form-row"><label>objectsType</label>' + buildObjectTypeSelect("opcua-detail-objectstype", item.objectsType || "") + '</div>');
             }
             if (nodeClass === "Variable") {
-                panel.append('<div class="form-row"><label>dataType</label><select id="opcua-detail-type"><option value="Int16">Int16</option><option value="Int32">Int32</option><option value="Float">Float</option><option value="Boolean">Boolean</option><option value="String">String</option></select></div>');
+                panel.append('<div class="form-row"><label>dataType</label><select id="opcua-detail-type"><option value="Int16">Int16</option><option value="Int32">Int32</option><option value="Float">Float</option><option value="Boolean">Boolean</option><option value="String">String</option><option value="ByteString">ByteString</option></select></div>');
                 panel.append('<div class="form-row"><label>Value</label><input type="text" id="opcua-detail-value"></div>');
                 panel.append('<div class="form-row"><label>Access</label><select id="opcua-detail-access"><option value="readwrite">readwrite</option><option value="readonly">readonly</option></select></div>');
             }
@@ -1239,7 +1267,7 @@
                 });
                 panel.append('<div class="form-row"><label></label><a href="#" class="editor-button editor-button-small" id="opcua-method-add-output"><i class="fa fa-plus"></i> Add output</a></div>');
             }
-                        if (nodeClass === "Alarm") {
+            if (nodeClass === "Alarm") {
                 panel.append('<div class="form-row"><label>alarmType</label><select id="opcua-detail-alarm-type"><option value="levelAlarm">levelAlarm</option><option value="digitalAlarm">digitalAlarm</option></select></div>');
                 panel.append('<div class="form-row"><label>variablePath</label><input type="text" id="opcua-detail-variable-nodeid"></div>');
                 panel.append('<div class="form-row"><label>severity</label><input type="number" id="opcua-detail-severity"></div>');
@@ -1423,7 +1451,7 @@
 
         $(document).on("input", "#opcua-detail-displayname", function () { updateNode(selectedPath, { displayName: $(this).val() }); });
 
-                $(document).on("input", "#opcua-detail-name", function () { updateNode(selectedPath, { name: $(this).val() }); });
+        $(document).on("input", "#opcua-detail-name", function () { updateNode(selectedPath, { name: $(this).val() }); });
         $(document).on("change", "#opcua-detail-namespace", function () {
             var nextNamespaceId = normalizeNamespaceId($(this).val());
             var item = getAtPath(editorState, selectedPath);
@@ -1527,7 +1555,9 @@
                     }
                 }
             },
-            inputs: 1, outputs: 0, icon: "bridge.svg",
+            inputs: 1,
+            outputs: 0,
+            icon: "opcua.svg",
             label: function () { return this.name || this.serverName || "opc-ua-server"; },
             oneditprepare: function () {
                 var node = this;

package/server/opcua-server.js

@@ -9,6 +9,8 @@ module.exports = function (RED) {
     const path = require("path");
 
 
+    
+
 
 
 
@@ -16,9 +18,11 @@ module.exports = function (RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         const parser = new OpcUaServerConfigParser(node);
-        
+
         const settings = parser.parseNodeConfig(config, this.credentials || {});
 
+
+
         node.name = settings.name;
         node.serverName = settings.serverName;
         node.server = null;
@@ -58,7 +62,7 @@ module.exports = function (RED) {
         });
 
 
-        
+
         child.send({
             type: "createServer",
             config: config,
@@ -70,7 +74,7 @@ module.exports = function (RED) {
         child.on("message", (msg) => {
             if (msg.nodeId == node.id) {
                 if (msg.type === "status") {
-                    
+
                     node.status(msg.data); // aqui sim usa o node
                 }
 

package/object.json

@@ -1,65 +0,0 @@
-{
-    "objects": [],
-    "folders": [
-        {
-            "name": "site",
-            "folders": [
-                {
-                    "name": "line1",
-                    "folders": [],
-                    "objects": [
-                        {
-                            "name": "motor",
-                            "folders": [],
-                            "objects": [],
-                            "variables": [
-                                {
-                                    "name": "speed",
-                                    "type": "Float",
-                                    "value": "",
-                                    "access": "readonly",
-                                    "description": "",
-                                    "displayName": ""
-                                }
-                            ],
-                            "method": [
-                                {
-                                    "name": "cmd_on",
-                                    "description": "",
-                                    "displayName": "",
-                                    "inputs": [
-                                        {
-                                            "name": "sp_speed",
-                                            "type": "Float",
-                                            "displayName": ""
-                                        },
-                                        {
-                                            "name": "cmd_on",
-                                            "type": "Boolean",
-                                            "displayName": ""
-                                        }
-                                    ],
-                                    "outputs": [
-                                        {
-                                            "name": "sts_spped",
-                                            "type": "Float",
-                                            "displayName": ""
-                                        },
-                                        {
-                                            "name": "sts_motor",
-                                            "type": "Boolean",
-                                            "displayName": ""
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ],
-                    "variables": []
-                }
-            ],
-            "objects": [],
-            "variables": []
-        }
-    ]
-}