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

package/client/lib/opcua-client-write-service.js

@@ -1,147 +1,147 @@
-"use strict";
-
-const { AttributeIds, DataType, coerceNodeId } = require("node-opcua");
-const {
-    buildVariantFromItem,
-    normalizeTypeName,
-    resolveNodeId,
-    statusCodeToString
-} = require("../opcua-client-utils");
-
-// Máximo de tags por chamada session.write (ajuste conforme limite do servidor)
-const WRITE_BATCH_SIZE = 100;
-
-// Batches em paralelo simultâneos
-const CONCURRENCY = 5;
-
-// Cede o event loop a cada N itens para não travar o Node-RED
-const YIELD_EVERY = 50;
-
-class OpcUaClientWriteService {
-    async execute(node, msg, session, itemsResolver) {
-        const items = itemsResolver.ensureWriteItems(node, msg);
-    
-        // 1. Resolve variantes (tipo + valor) — consulta servidor só para quem não tem tipo explícito
-        const variants = await resolveVariants(session, items);
-
-        // 2. Escreve todos os nós em batches paralelos
-        const statusCodes = await writeBatches(session, items, variants);
-
-        // 3. Monta resultados — statusCode Good já confirma a escrita, sem round-trip extra
-        return buildResults(items, variants, statusCodes);
-    }
-}
-
-// ─── Resolução de tipos ──────────────────────────────────────────────────────
-
-async function resolveVariants(session, items) {
-    // Separa quais itens precisam consultar o tipo no servidor
-    const needsLookup = items
-        .map((item, index) => ({ item, index }))
-        .filter(({ item }) => !normalizeTypeName(item.type));
-
-    // Busca tipos desconhecidos em paralelo
-    const resolvedTypes = new Map();
-
-    await mapConcurrent(needsLookup, CONCURRENCY * 2, async ({ item, index }) => {
-        try {
-            const builtInType = await session.getBuiltInDataType(coerceNodeId(resolveNodeId(item)));
-            resolvedTypes.set(index, DataType[builtInType]);
-        } catch {
-            resolvedTypes.set(index, "String");
-        }
-    });
-
-    return items.map((item, index) => {
-        const typeName = normalizeTypeName(item.type) || resolvedTypes.get(index) || "String";
-        return buildVariantFromItem(item, typeName);
-    });
-}
-
-// ─── Escrita em batches paralelos ────────────────────────────────────────────
-
-async function writeBatches(session, items, variants) {
-    const allStatusCodes = new Array(items.length);
-
-    // Divide em batches de WRITE_BATCH_SIZE
-    const batches = [];
-    for (let i = 0; i < items.length; i += WRITE_BATCH_SIZE) {
-        batches.push({ start: i, end: Math.min(i + WRITE_BATCH_SIZE, items.length) });
-    }
-
-    let processed = 0;
-
-    await mapConcurrent(batches, CONCURRENCY, async ({ start, end }) => {
-        const nodesToWrite = items.slice(start, end).map((item, i) => ({
-            nodeId: coerceNodeId(resolveNodeId(item)),
-            attributeId: AttributeIds.Value,
-            value: { value: variants[start + i] }
-        }));
-
-        try {
-            const statusCodes = await session.write(nodesToWrite);
-            statusCodes.forEach((sc, i) => {
-                allStatusCodes[start + i] = sc;
-            });
-        } catch (batchError) {
-            // Se o batch falhar por completo, marca todos com erro
-            for (let i = start; i < end; i++) {
-                allStatusCodes[i] = { name: batchError.message, value: -1 };
-            }
-        }
-
-        // Cede o event loop a cada YIELD_EVERY itens para não travar o Node-RED
-        processed += end - start;
-        if (processed % YIELD_EVERY === 0) {
-            await yieldEventLoop();
-        }
-    });
-
-    return allStatusCodes;
-}
-
-// ─── Montagem dos resultados ─────────────────────────────────────────────────
-
-function buildResults(items, variants, statusCodes) {
-    return items.map((item, index) => {
-        const nodeId = resolveNodeId(item);
-        const sc = statusCodes[index];
-        const scName = sc && sc.name ? sc.name : "Good";
-        const typeName = DataType[variants[index].dataType] || null;
-
-        return {
-            name: item.name || nodeId,
-            nodeID: nodeId,
-            value: variants[index].value,
-            type: typeName,
-            status: scName,
-            sourceTimestamp: null,
-            serverTimestamp: null
-        };
-    });
-}
-
-// ─── Utilitários ─────────────────────────────────────────────────────────────
-
-async function mapConcurrent(items, concurrency, fn) {
-    let index = 0;
-
-    async function worker() {
-        while (index < items.length) {
-            const i = index++;
-            await fn(items[i], i);
-        }
-    }
-
-    await Promise.all(
-        Array.from({ length: Math.min(concurrency, items.length) }, worker)
-    );
-}
-
-function yieldEventLoop() {
-    return new Promise(resolve => setImmediate(resolve));
-}
-
-module.exports = {
-    OpcUaClientWriteService
+"use strict";
+
+const { AttributeIds, DataType, coerceNodeId } = require("node-opcua");
+const {
+    buildVariantFromItem,
+    normalizeTypeName,
+    resolveNodeId,
+    statusCodeToString
+} = require("../opcua-client-utils");
+
+// Máximo de tags por chamada session.write (ajuste conforme limite do servidor)
+const WRITE_BATCH_SIZE = 100;
+
+// Batches em paralelo simultâneos
+const CONCURRENCY = 5;
+
+// Cede o event loop a cada N itens para não travar o Node-RED
+const YIELD_EVERY = 50;
+
+class OpcUaClientWriteService {
+    async execute(node, msg, session, itemsResolver) {
+        const items = itemsResolver.ensureWriteItems(node, msg);
+    
+        // 1. Resolve variantes (tipo + valor) — consulta servidor só para quem não tem tipo explícito
+        const variants = await resolveVariants(session, items);
+
+        // 2. Escreve todos os nós em batches paralelos
+        const statusCodes = await writeBatches(session, items, variants);
+
+        // 3. Monta resultados — statusCode Good já confirma a escrita, sem round-trip extra
+        return buildResults(items, variants, statusCodes);
+    }
+}
+
+// ─── Resolução de tipos ──────────────────────────────────────────────────────
+
+async function resolveVariants(session, items) {
+    // Separa quais itens precisam consultar o tipo no servidor
+    const needsLookup = items
+        .map((item, index) => ({ item, index }))
+        .filter(({ item }) => !normalizeTypeName(item.type));
+
+    // Busca tipos desconhecidos em paralelo
+    const resolvedTypes = new Map();
+
+    await mapConcurrent(needsLookup, CONCURRENCY * 2, async ({ item, index }) => {
+        try {
+            const builtInType = await session.getBuiltInDataType(coerceNodeId(resolveNodeId(item)));
+            resolvedTypes.set(index, DataType[builtInType]);
+        } catch {
+            resolvedTypes.set(index, "String");
+        }
+    });
+
+    return items.map((item, index) => {
+        const typeName = normalizeTypeName(item.type) || resolvedTypes.get(index) || "String";
+        return buildVariantFromItem(item, typeName);
+    });
+}
+
+// ─── Escrita em batches paralelos ────────────────────────────────────────────
+
+async function writeBatches(session, items, variants) {
+    const allStatusCodes = new Array(items.length);
+
+    // Divide em batches de WRITE_BATCH_SIZE
+    const batches = [];
+    for (let i = 0; i < items.length; i += WRITE_BATCH_SIZE) {
+        batches.push({ start: i, end: Math.min(i + WRITE_BATCH_SIZE, items.length) });
+    }
+
+    let processed = 0;
+
+    await mapConcurrent(batches, CONCURRENCY, async ({ start, end }) => {
+        const nodesToWrite = items.slice(start, end).map((item, i) => ({
+            nodeId: coerceNodeId(resolveNodeId(item)),
+            attributeId: AttributeIds.Value,
+            value: { value: variants[start + i] }
+        }));
+
+        try {
+            const statusCodes = await session.write(nodesToWrite);
+            statusCodes.forEach((sc, i) => {
+                allStatusCodes[start + i] = sc;
+            });
+        } catch (batchError) {
+            // Se o batch falhar por completo, marca todos com erro
+            for (let i = start; i < end; i++) {
+                allStatusCodes[i] = { name: batchError.message, value: -1 };
+            }
+        }
+
+        // Cede o event loop a cada YIELD_EVERY itens para não travar o Node-RED
+        processed += end - start;
+        if (processed % YIELD_EVERY === 0) {
+            await yieldEventLoop();
+        }
+    });
+
+    return allStatusCodes;
+}
+
+// ─── Montagem dos resultados ─────────────────────────────────────────────────
+
+function buildResults(items, variants, statusCodes) {
+    return items.map((item, index) => {
+        const nodeId = resolveNodeId(item);
+        const sc = statusCodes[index];
+        const scName = sc && sc.name ? sc.name : "Good";
+        const typeName = DataType[variants[index].dataType] || null;
+
+        return {
+            name: item.name || nodeId,
+            nodeID: nodeId,
+            value: variants[index].value,
+            type: typeName,
+            status: scName,
+            sourceTimestamp: null,
+            serverTimestamp: null
+        };
+    });
+}
+
+// ─── Utilitários ─────────────────────────────────────────────────────────────
+
+async function mapConcurrent(items, concurrency, fn) {
+    let index = 0;
+
+    async function worker() {
+        while (index < items.length) {
+            const i = index++;
+            await fn(items[i], i);
+        }
+    }
+
+    await Promise.all(
+        Array.from({ length: Math.min(concurrency, items.length) }, worker)
+    );
+}
+
+function yieldEventLoop() {
+    return new Promise(resolve => setImmediate(resolve));
+}
+
+module.exports = {
+    OpcUaClientWriteService
 };

package/client/opcua-client-config.html

@@ -1,80 +1,80 @@
-<script type="text/javascript">
-    (function () {
-        function toggleCredentials() {
-            var authType = $("#node-config-input-authType").val();
-            $(".opcua-client-auth-row").toggle(authType === "username");
-        }
-
-        RED.nodes.registerType("opcua-client-config", {
-            category: "config",
-            defaults: {
-                name: { value: "" },
-                endpoint: { value: "opc.tcp://localhost:4840", required: true },
-                securityPolicy: { value: "None", required: true },
-                securityMode: { value: "None", required: true },
-                authType: { value: "anonymous", required: true }
-            },
-            credentials: {
-                username: { type: "text" },
-                password: { type: "password" }
-            },
-            label: function () {
-                return this.name || this.endpoint || "opcua-client-config";
-            },
-            oneditprepare: function () {
-                $("#node-config-input-authType").on("change", toggleCredentials);
-                toggleCredentials();
-            }
-        });
-    })();
-</script>
-
-<script type="text/html" data-template-name="opcua-client-config">
-    <div class="form-row">
-        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-config-input-name" placeholder="OPC UA Client">
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-endpoint"><i class="fa fa-plug"></i> Endpoint</label>
-        <input type="text" id="node-config-input-endpoint" placeholder="opc.tcp://localhost:4840">
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-securityPolicy"><i class="fa fa-lock"></i> Security Policy</label>
-        <select id="node-config-input-securityPolicy">
-            <option value="None">None</option>
-            <option value="Basic128Rsa15">Basic128Rsa15</option>
-            <option value="Basic256">Basic256</option>
-            <option value="Basic256Sha256">Basic256Sha256</option>
-            <option value="Aes128_Sha256_RsaOaep">Aes128_Sha256_RsaOaep</option>
-            <option value="Aes256_Sha256_RsaPss">Aes256_Sha256_RsaPss</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-securityMode"><i class="fa fa-shield"></i> Security Mode</label>
-        <select id="node-config-input-securityMode">
-            <option value="None">None</option>
-            <option value="Sign">Sign</option>
-            <option value="SignAndEncrypt">SignAndEncrypt</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-authType"><i class="fa fa-user"></i> Auth</label>
-        <select id="node-config-input-authType">
-            <option value="anonymous">Anonymous</option>
-            <option value="username">Username/Password</option>
-        </select>
-    </div>
-    <div class="form-row opcua-client-auth-row">
-        <label for="node-config-input-username"><i class="fa fa-user-circle"></i> Username</label>
-        <input type="text" id="node-config-input-username">
-    </div>
-    <div class="form-row opcua-client-auth-row">
-        <label for="node-config-input-password"><i class="fa fa-key"></i> Password</label>
-        <input type="password" id="node-config-input-password">
-    </div>
-</script>
-
-<script type="text/html" data-help-name="opcua-client-config">
-    <p>Shared OPC UA client connection for read, write and method nodes.</p>
-    <p>This is a Node-RED configuration node, using <code>category: "config"</code> and the <code>node-config-input-*</code> field pattern described in the official docs.</p>
-</script>
+<script type="text/javascript">
+    (function () {
+        function toggleCredentials() {
+            var authType = $("#node-config-input-authType").val();
+            $(".opcua-client-auth-row").toggle(authType === "username");
+        }
+
+        RED.nodes.registerType("opcua-client-config", {
+            category: "config",
+            defaults: {
+                name: { value: "" },
+                endpoint: { value: "opc.tcp://localhost:4840", required: true },
+                securityPolicy: { value: "None", required: true },
+                securityMode: { value: "None", required: true },
+                authType: { value: "anonymous", required: true }
+            },
+            credentials: {
+                username: { type: "text" },
+                password: { type: "password" }
+            },
+            label: function () {
+                return this.name || this.endpoint || "opcua-client-config";
+            },
+            oneditprepare: function () {
+                $("#node-config-input-authType").on("change", toggleCredentials);
+                toggleCredentials();
+            }
+        });
+    })();
+</script>
+
+<script type="text/html" data-template-name="opcua-client-config">
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-config-input-name" placeholder="OPC UA Client">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-endpoint"><i class="fa fa-plug"></i> Endpoint</label>
+        <input type="text" id="node-config-input-endpoint" placeholder="opc.tcp://localhost:4840">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-securityPolicy"><i class="fa fa-lock"></i> Security Policy</label>
+        <select id="node-config-input-securityPolicy">
+            <option value="None">None</option>
+            <option value="Basic128Rsa15">Basic128Rsa15</option>
+            <option value="Basic256">Basic256</option>
+            <option value="Basic256Sha256">Basic256Sha256</option>
+            <option value="Aes128_Sha256_RsaOaep">Aes128_Sha256_RsaOaep</option>
+            <option value="Aes256_Sha256_RsaPss">Aes256_Sha256_RsaPss</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-securityMode"><i class="fa fa-shield"></i> Security Mode</label>
+        <select id="node-config-input-securityMode">
+            <option value="None">None</option>
+            <option value="Sign">Sign</option>
+            <option value="SignAndEncrypt">SignAndEncrypt</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-authType"><i class="fa fa-user"></i> Auth</label>
+        <select id="node-config-input-authType">
+            <option value="anonymous">Anonymous</option>
+            <option value="username">Username/Password</option>
+        </select>
+    </div>
+    <div class="form-row opcua-client-auth-row">
+        <label for="node-config-input-username"><i class="fa fa-user-circle"></i> Username</label>
+        <input type="text" id="node-config-input-username">
+    </div>
+    <div class="form-row opcua-client-auth-row">
+        <label for="node-config-input-password"><i class="fa fa-key"></i> Password</label>
+        <input type="password" id="node-config-input-password">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="opcua-client-config">
+    <p>Shared OPC UA client connection for read, write and method nodes.</p>
+    <p>This is a Node-RED configuration node, using <code>category: "config"</code> and the <code>node-config-input-*</code> field pattern described in the official docs.</p>
+</script>