@vitormnm/node-red-simple-opcua 1.4.3 → 1.6.2

package/server/lib/opcua-constants.js

@@ -1,109 +1,120 @@
-"use strict";
-
-const os = require("os");
-const opcua = require("node-opcua");
-
-const {
-    OPCUAServer,
-    Variant,
-    DataType,
-    StatusCodes,
-    SecurityPolicy,
-     VariantArrayType,
-    MessageSecurityMode,
-    UserTokenType,
-    coerceNodeId ,
-} = opcua;
-
-const DEFAULT_PORT = 4840;
-const DEFAULT_SERVER_NAME = "Node-RED OPC UA Server";
-const DEFAULT_NAMESPACE_URI = "urn:node-red:opc-ua-server";
-const DEFAULT_RESOURCE_PATH = "/";
-
-const SECURITY_POLICY_MAP = {
-    None: SecurityPolicy.None,
-    Basic128Rsa15: SecurityPolicy.Basic128Rsa15,
-    Basic256: SecurityPolicy.Basic256,
-    Basic256Sha256: SecurityPolicy.Basic256Sha256,
-    Aes128_Sha256_RsaOaep: SecurityPolicy.Aes128_Sha256_RsaOaep,
-    Aes256_Sha256_RsaPss: SecurityPolicy.Aes256_Sha256_RsaPss
-};
-
-const SECURITY_MODE_MAP = {
-    None: MessageSecurityMode.None,
-    Sign: MessageSecurityMode.Sign,
-    SignAndEncrypt: MessageSecurityMode.SignAndEncrypt
-};
-
-const DATA_TYPE_MAP = {
-    Int16: DataType.Int16,
-    UInt16: DataType.UInt16,
-    Int32: DataType.Int32,
-    UInt32: DataType.UInt32,
-    Float: DataType.Float,
-    Boolean: DataType.Boolean,
-    String: DataType.String,
-    ByteString : DataType.ByteString,
-    LocalizedText : DataType.LocalizedText
-};
-
-function normalizePort(port) {
-    const parsed = Number(port);
-    if (!Number.isInteger(parsed) || parsed <= 0) {
-        return DEFAULT_PORT;
-    }
-
-    return parsed;
-}
-
-function buildApplicationUri(serverName) {
-    const host = os.hostname() || "localhost";
-    return "urn:" + host + ":node-red:" + sanitizeUriSegment(serverName);
-}
-
-function sanitizeUriSegment(value) {
-    return String(value || "opc-ua-server")
-        .trim()
-        .replace(/\s+/g, "-")
-        .replace(/[^a-zA-Z0-9:_-]/g, "")
-        .toLowerCase();
-}
-
-function sanitizeNodeIdPath(path) {
-    return String(path || "")
-        .split(".")
-        .map((segment) => sanitizeNodeIdSegment(segment))
-        .filter((segment) => segment !== "")
-        .join(".");
-}
-
-function sanitizeNodeIdSegment(segment) {
-    const normalized = String(segment || "")
-        .trim()
-        .replace(/\s+/g, "_")
-        .replace(/[^a-zA-Z0-9._-]/g, "_");
-
-    return normalized || "item";
-}
-
-module.exports = {
-    OPCUAServer,
-    Variant,
-    DataType,
-    StatusCodes,
-    VariantArrayType,
-    SecurityPolicy,
-    MessageSecurityMode,
-    UserTokenType,
-    coerceNodeId,
-    DEFAULT_PORT,
-    DEFAULT_SERVER_NAME,
-    DEFAULT_NAMESPACE_URI,
-    DEFAULT_RESOURCE_PATH,
-    SECURITY_POLICY_MAP,
-    SECURITY_MODE_MAP,
-    DATA_TYPE_MAP,
-    normalizePort,
-    buildApplicationUri,
-    sanitizeNodeIdPath
-};
+"use strict";
+
+const os = require("os");
+const opcua = require("node-opcua");
+
+const {
+    OPCUAServer,
+    Variant,
+    DataType,
+    StatusCodes,
+    SecurityPolicy,
+     VariantArrayType,
+    MessageSecurityMode,
+    UserTokenType,
+    coerceNodeId ,
+    resolveNodeId,
+    PermissionType,
+    makeRoles,
+    WellKnownRoles,
+    OPCUACertificateManager,
+} = opcua;
+
+const DEFAULT_PORT = 4840;
+const DEFAULT_SERVER_NAME = "Node-RED OPC UA Server";
+const DEFAULT_NAMESPACE_URI = "urn:node-red:opc-ua-server";
+const DEFAULT_RESOURCE_PATH = "/";
+
+const SECURITY_POLICY_MAP = {
+    None: SecurityPolicy.None,
+    Basic128Rsa15: SecurityPolicy.Basic128Rsa15,
+    Basic256: SecurityPolicy.Basic256,
+    Basic256Sha256: SecurityPolicy.Basic256Sha256,
+    Aes128_Sha256_RsaOaep: SecurityPolicy.Aes128_Sha256_RsaOaep,
+    Aes256_Sha256_RsaPss: SecurityPolicy.Aes256_Sha256_RsaPss
+};
+
+const SECURITY_MODE_MAP = {
+    None: MessageSecurityMode.None,
+    Sign: MessageSecurityMode.Sign,
+    SignAndEncrypt: MessageSecurityMode.SignAndEncrypt
+};
+
+const DATA_TYPE_MAP = {
+    Int16: DataType.Int16,
+    UInt16: DataType.UInt16,
+    Int32: DataType.Int32,
+    UInt32: DataType.UInt32,
+    Int64: DataType.Int64,
+    Float: DataType.Float,
+    Boolean: DataType.Boolean,
+    String: DataType.String,
+    ByteString : DataType.ByteString,
+    LocalizedText : DataType.LocalizedText
+};
+
+function normalizePort(port) {
+    const parsed = Number(port);
+    if (!Number.isInteger(parsed) || parsed <= 0) {
+        return DEFAULT_PORT;
+    }
+
+    return parsed;
+}
+
+function buildApplicationUri(serverName) {
+    const host = os.hostname() || "localhost";
+    return "urn:" + host + ":node-red:" + sanitizeUriSegment(serverName);
+}
+
+function sanitizeUriSegment(value) {
+    return String(value || "opc-ua-server")
+        .trim()
+        .replace(/\s+/g, "-")
+        .replace(/[^a-zA-Z0-9:_-]/g, "")
+        .toLowerCase();
+}
+
+function sanitizeNodeIdPath(path) {
+    return String(path || "")
+        .split(".")
+        .map((segment) => sanitizeNodeIdSegment(segment))
+        .filter((segment) => segment !== "")
+        .join(".");
+}
+
+function sanitizeNodeIdSegment(segment) {
+    const normalized = String(segment || "")
+        .trim()
+        .replace(/\s+/g, "_")
+        .replace(/[^a-zA-Z0-9._-]/g, "_");
+
+    return normalized || "item";
+}
+
+module.exports = {
+    OPCUAServer,
+    Variant,
+    DataType,
+    OPCUACertificateManager,
+    StatusCodes,
+    VariantArrayType,
+    SecurityPolicy,
+    MessageSecurityMode,
+    UserTokenType,
+    coerceNodeId,
+    resolveNodeId,
+    PermissionType,
+    makeRoles,
+    WellKnownRoles,
+    DEFAULT_PORT,
+    DEFAULT_SERVER_NAME,
+    DEFAULT_NAMESPACE_URI,
+    DEFAULT_RESOURCE_PATH,
+    SECURITY_POLICY_MAP,
+    SECURITY_MODE_MAP,
+    DATA_TYPE_MAP,
+    normalizePort,
+    buildApplicationUri,
+    sanitizeNodeIdPath
+};

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

@@ -1,140 +1,140 @@
-"use strict";
-
-
-const registry = require("../opcua-server-registry");
-const { resolveRegisteredServer } = require("./server-node-utils");
-
-
-
-
-function eventsServer(node, rootNode, nodeId) {
-
-
-
-    // 🔥 ALTERADO: usar Map para garantir unicidade por nodeID
-    node.queue = {
-        read: new Map(),
-        write: new Map(),
-        alarm: new Map()
-    };
-
-    if (node.flushTimer) {
-        clearInterval(node.flushTimer);
-        node.flushTimer = null;
-    }
-
-
-    node.flushTimer = setInterval(() => {
-        flushQueue(node, nodeId);
-
-    }, rootNode.intervalMs);
-
-    ///rootNode.intervalMs
-    node.enqueueAccessEvent = function (event) {
-        if (!matchesServer(node.serverRef, event)) {
-
-        }
-
-        if (event.operation === "read") {
-            upsertEvent(node.queue.read, event);
-
-        }
-
-        if (event.operation === "write") {
-            upsertEvent(node.queue.write, event);
-        }
-
-        if (event.operation === "alarm") {
-            upsertEvent(node.queue.alarm, event);
-        }
-    };
-
-    registry.registerAccessListener(node.id, node);
-}
-
-
-
-
-
-function flushQueue(node, nodeId) {
-
-
-
-    // ALTERADO: usar size (Map)
-    if (!node.queue.read.size && !node.queue.write.size) {
-
-    }
-
-
-    const payload = {
-        serverRef: node.serverRef || "",
-        intervalMs: node.intervalMs,
-        timestamp: new Date().toISOString(),
-
-        // 🔥 ALTERADO: converter Map -> Array
-        read: Array.from(node.queue.read.values()),
-        write: Array.from(node.queue.write.values()),
-        alarm: Array.from(node.queue.alarm.values())
-    };
-
-    // ALTERADO: limpar Maps
-    node.queue.read.clear();
-    node.queue.write.clear();
-    node.queue.alarm.clear();
-
-    process.send({
-        type: "send",
-        data: {
-            payload,
-            opcua: {
-                server: payload.serverRef
-            }
-        },
-        nodeId: nodeId
-    });
-
-    process.send({
-        type: "status",
-        data: {
-            fill: "green",
-            shape: "dot",
-            text: "read " + payload.read.length + " write " + payload.write.length
-        },
-        nodeId: nodeId
-    });
-
-
-
-
-}
-
-
-function upsertEvent(map, event) {
-    const key = String(event.nodeID || "").trim();
-    if (!key) return;
-
-    map.set(key, event); // sobrescreve automaticamente
-}
-
-function matchesServer(serverRef, event) {
-    if (!serverRef) {
-        return true;
-    }
-
-    const normalizedRef = String(serverRef).trim();
-    return normalizedRef === String(event.serverId || "").trim()
-        || normalizedRef === String(event.serverNodeName || "").trim()
-        || normalizedRef === String(event.serverName || "").trim();
-}
-
-function normalizeInterval(value) {
-    const interval = Number(value);
-    if (!Number.isFinite(interval) || interval <= 0) {
-        return 500;
-    }
-
-    return Math.trunc(interval);
-}
-module.exports = {
-    "eventsServer": eventsServer
+"use strict";
+
+
+const registry = require("../opcua-server-registry");
+const { resolveRegisteredServer } = require("./server-node-utils");
+
+
+
+
+function eventsServer(node, rootNode, nodeId) {
+
+
+
+    // 🔥 ALTERADO: usar Map para garantir unicidade por nodeID
+    node.queue = {
+        read: new Map(),
+        write: new Map(),
+        alarm: new Map()
+    };
+
+    if (node.flushTimer) {
+        clearInterval(node.flushTimer);
+        node.flushTimer = null;
+    }
+
+
+    node.flushTimer = setInterval(() => {
+        flushQueue(node, nodeId);
+
+    }, rootNode.intervalMs);
+
+    ///rootNode.intervalMs
+    node.enqueueAccessEvent = function (event) {
+        if (!matchesServer(node.serverRef, event)) {
+
+        }
+
+        if (event.operation === "read") {
+            upsertEvent(node.queue.read, event);
+
+        }
+
+        if (event.operation === "write") {
+            upsertEvent(node.queue.write, event);
+        }
+
+        if (event.operation === "alarm") {
+            upsertEvent(node.queue.alarm, event);
+        }
+    };
+
+    registry.registerAccessListener(node.id, node);
+}
+
+
+
+
+
+function flushQueue(node, nodeId) {
+
+
+
+    // ALTERADO: usar size (Map)
+    if (!node.queue.read.size && !node.queue.write.size) {
+
+    }
+
+
+    const payload = {
+        serverRef: node.serverRef || "",
+        intervalMs: node.intervalMs,
+        timestamp: new Date().toISOString(),
+
+        // 🔥 ALTERADO: converter Map -> Array
+        read: Array.from(node.queue.read.values()),
+        write: Array.from(node.queue.write.values()),
+        alarm: Array.from(node.queue.alarm.values())
+    };
+
+    // ALTERADO: limpar Maps
+    node.queue.read.clear();
+    node.queue.write.clear();
+    node.queue.alarm.clear();
+
+    process.send({
+        type: "send",
+        data: {
+            payload,
+            opcua: {
+                server: payload.serverRef
+            }
+        },
+        nodeId: nodeId
+    });
+
+    process.send({
+        type: "status",
+        data: {
+            fill: "green",
+            shape: "dot",
+            text: "read " + payload.read.length + " write " + payload.write.length
+        },
+        nodeId: nodeId
+    });
+
+
+
+
+}
+
+
+function upsertEvent(map, event) {
+    const key = String(event.nodeID || "").trim();
+    if (!key) return;
+
+    map.set(key, event); // sobrescreve automaticamente
+}
+
+function matchesServer(serverRef, event) {
+    if (!serverRef) {
+        return true;
+    }
+
+    const normalizedRef = String(serverRef).trim();
+    return normalizedRef === String(event.serverId || "").trim()
+        || normalizedRef === String(event.serverNodeName || "").trim()
+        || normalizedRef === String(event.serverName || "").trim();
+}
+
+function normalizeInterval(value) {
+    const interval = Number(value);
+    if (!Number.isFinite(interval) || interval <= 0) {
+        return 500;
+    }
+
+    return Math.trunc(interval);
+}
+module.exports = {
+    "eventsServer": eventsServer
 }

package/server/lib/opcua-server-methods.js

@@ -113,6 +113,8 @@ class OpcUaServerMethods {
                 const eventId = inputArguments[0].value;
                 const comment = inputArguments[1].value;
                 
+                
+
                 const alarm = context.object;
                 // severity atual
                 const severity = alarm.severity.readValue().value.value;