@vitormnm/node-red-simple-opcua 1.3.2 → 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,