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

package/client/opcua-client-utils.js

@@ -102,9 +102,69 @@ function coerceValue(value, typeName) {
         case "UInt32":
             return Number.parseInt(value, 10);
 
-        case "Int64":
-        case "UInt64":
-            return BigInt(value);
+        case "Int64": {
+            const minVal = -9223372036854775808n;
+            const maxVal = 9223372036854775807n;
+            let bigintVal;
+            if (Array.isArray(value) && value.length === 2) {
+                const h = BigInt(value[0]);
+                const l = BigInt(value[1]);
+                const signMask = 1n << 31n;
+                const shiftHigh = 1n << 32n;
+                if ((h & signMask) === signMask) {
+                    bigintVal = (h & ~signMask) * shiftHigh + l - 0x8000000000000000n;
+                } else {
+                    bigintVal = h * shiftHigh + l;
+                }
+            } else {
+                try {
+                    bigintVal = BigInt(value);
+                } catch (e) {
+                    const parsed = Number(value);
+                    if (Number.isFinite(parsed)) {
+                        bigintVal = BigInt(Math.trunc(parsed));
+                    } else {
+                        bigintVal = 0n;
+                    }
+                }
+            }
+            if (bigintVal < minVal) bigintVal = minVal;
+            else if (bigintVal > maxVal) bigintVal = maxVal;
+
+            const mask = 0xFFFFFFFFFFFFFFFFn;
+            const unsignedVal = bigintVal & mask;
+            const high = Number(unsignedVal >> 32n);
+            const low = Number(unsignedVal & 0xFFFFFFFFn);
+            return [high, low];
+        }
+        case "UInt64": {
+            const minVal = 0n;
+            const maxVal = 18446744073709551615n;
+            let bigintVal;
+            if (Array.isArray(value) && value.length === 2) {
+                const h = BigInt(value[0]);
+                const l = BigInt(value[1]);
+                const shiftHigh = 1n << 32n;
+                bigintVal = h * shiftHigh + l;
+            } else {
+                try {
+                    bigintVal = BigInt(value);
+                } catch (e) {
+                    const parsed = Number(value);
+                    if (Number.isFinite(parsed)) {
+                        bigintVal = BigInt(Math.trunc(parsed));
+                    } else {
+                        bigintVal = 0n;
+                    }
+                }
+            }
+            if (bigintVal < minVal) bigintVal = minVal;
+            else if (bigintVal > maxVal) bigintVal = maxVal;
+
+            const high = Number(bigintVal >> 32n);
+            const low = Number(bigintVal & 0xFFFFFFFFn);
+            return [high, low];
+        }
 
         case "Float":
         case "Double":
@@ -218,12 +278,49 @@ function variantTypeToName(variant) {
     return DataType[variant.dataType] || String(variant.dataType);
 }
 
+function decode64BitValue(value, isUnsigned) {
+    if (Array.isArray(value) && value.length === 2 && typeof value[0] === "number" && typeof value[1] === "number") {
+        const h = BigInt(value[0]);
+        const l = BigInt(value[1]);
+        const shiftHigh = 1n << 32n;
+        let bigintVal;
+        if (!isUnsigned) {
+            const signMask = 1n << 31n;
+            if ((h & signMask) === signMask) {
+                bigintVal = (h & ~signMask) * shiftHigh + l - 0x8000000000000000n;
+            } else {
+                bigintVal = h * shiftHigh + l;
+            }
+        } else {
+            bigintVal = h * shiftHigh + l;
+        }
+
+        const num = Number(bigintVal);
+        return num;
+    }
+    return value;
+}
+
+function resolve64BitValue(value, isUnsigned) {
+    if (Array.isArray(value)) {
+        if (value.length === 2 && typeof value[0] === "number" && typeof value[1] === "number") {
+            return decode64BitValue(value, isUnsigned);
+        }
+        return value.map((val) => resolve64BitValue(val, isUnsigned));
+    }
+    return value;
+}
+
 function dataValueToItemResult(item, dataValue) {
     const variant = dataValue && dataValue.value ? dataValue.value : null;
+    let val = variant ? variant.value : null;
+    if (variant && (variant.dataType === DataType.Int64 || variant.dataType === DataType.UInt64)) {
+        val = resolve64BitValue(val, variant.dataType === DataType.UInt64);
+    }
     return {
         name: resolveName(item, resolveNodeId(item)),
         nodeID: resolveNodeId(item),
-        value: variant ? variant.value : null,
+        value: val,
         type: variantTypeToName(variant),
         status: statusCodeToString(dataValue && dataValue.statusCode),
         sourceTimestamp: timestampToIso(dataValue && dataValue.sourceTimestamp),
@@ -242,18 +339,20 @@ async function dataValueToItemResultEvent(item, eventFields, session) {
 
     const eventTypeName = dv.value.value.name;
 
+    
+
     return {
-        eventId: eventFields[0].value,
-        eventType: eventFields[1].value,
-        eventTypeName: eventTypeName,
-        sourceNode: eventFields[2].value.toString(),
-        sourceName: eventFields[3].value,
-        message: eventFields[4].value?.text,
-        severity: eventFields[5].value,
-        active: eventFields[6].value?.text, // Active / Inactive
-        AckedState: eventFields[7].value?.text, // Active / Inactive
-        ConfirmedState: eventFields[8].value?.text, // Active / Inactive
-        time: eventFields[9].value
+        eventId: eventFields[0]?.value ?? null,
+        eventType: eventFields[1]?.value ?? null,
+        sourceNode: eventFields[2]?.value?.toString() ?? null,
+        sourceName: eventFields[3]?.value ?? null,
+        message: eventFields[4]?.value?.text ?? null,
+        severity: eventFields[5]?.value ?? null,
+        active: eventFields[6]?.value?.text ?? null, // Active / Inactive
+        AckedState: eventFields[7]?.value?.text ?? null, // Active / Inactive
+        ConfirmedState: eventFields[8]?.value?.text ?? null,  // Active / Inactive
+        time: eventFields[9]?.value ?? null,
+        conditionId: eventFields[10]?.value?.toString() ?? null
     };
 }
 
@@ -270,13 +369,19 @@ function callResultToItemResult(item, callResult, argumentDefinition) {
         name: resolveName(item, methodId),
         nodeID: methodId,
         status: statusCodeToString(callResult.statusCode),
-        outputs: outputArguments.map((variant, index) => ({
-            name: outputDefinitions[index] && outputDefinitions[index].name
-                ? String(outputDefinitions[index].name)
-                : "output" + (index + 1),
-            type: variantTypeToName(variant),
-            value: variant ? variant.value : null
-        }))
+        outputs: outputArguments.map((variant, index) => {
+            let val = variant ? variant.value : null;
+            if (variant && (variant.dataType === DataType.Int64 || variant.dataType === DataType.UInt64)) {
+                val = resolve64BitValue(val, variant.dataType === DataType.UInt64);
+            }
+            return {
+                name: outputDefinitions[index] && outputDefinitions[index].name
+                    ? String(outputDefinitions[index].name)
+                    : "output" + (index + 1),
+                type: variantTypeToName(variant),
+                value: val
+            };
+        })
     };
 }
 
@@ -363,6 +468,95 @@ async function getMethodArgumentDefinition(session, methodNodeId, cache) {
     return definition;
 }
 
+async function enrichItemResultWithEnumeration(result, session, cache, nodeId) {
+    if (result.type !== "Int32" && result.type !== "Enumeration") {
+        return result;
+    }
+    
+    if (typeof result.value !== "number" || !Number.isInteger(result.value)) {
+        return result;
+    }
+
+    try {
+        const cacheKeyType = "dt:" + nodeId;
+        let dtNodeId = cache ? cache.get(cacheKeyType) : undefined;
+        if (dtNodeId === undefined) {
+            const dv = await session.read({
+                nodeId: nodeId,
+                attributeId: AttributeIds.DataType
+            });
+            if (dv.statusCode.isGood()) {
+                dtNodeId = dv.value.value;
+                if (cache) cache.set(cacheKeyType, dtNodeId);
+            } else {
+                if (cache) cache.set(cacheKeyType, null);
+            }
+        }
+        
+        if (!dtNodeId) return result;
+        
+        const cacheKeyStrings = "enumStrings:" + dtNodeId.toString();
+        let enumStrings = cache ? cache.get(cacheKeyStrings) : undefined;
+        
+        if (enumStrings === undefined) {
+            const browseResult = await session.browse({
+                nodeId: dtNodeId,
+                referenceTypeId: "HasProperty",
+                browseDirection: BrowseDirection.Forward,
+                includeSubtypes: true,
+                resultMask: 63
+            });
+            
+            const enumStringsRef = browseResult.references ? browseResult.references.find(r => r.browseName.name === "EnumStrings") : null;
+            const enumValuesRef = browseResult.references ? browseResult.references.find(r => r.browseName.name === "EnumValues") : null;
+
+            if (enumStringsRef) {
+                const dataValue = await session.read({
+                    nodeId: enumStringsRef.nodeId,
+                    attributeId: AttributeIds.Value
+                });
+                if (dataValue.statusCode.isGood() && dataValue.value.value) {
+                    enumStrings = dataValue.value.value.map(lt => lt.text);
+                    if (cache) cache.set(cacheKeyStrings, enumStrings);
+                } else {
+                    if (cache) cache.set(cacheKeyStrings, null);
+                }
+            } else if (enumValuesRef) {
+                const dataValue = await session.read({
+                    nodeId: enumValuesRef.nodeId,
+                    attributeId: AttributeIds.Value
+                });
+                if (dataValue.statusCode.isGood() && dataValue.value.value) {
+                    const map = {};
+                    dataValue.value.value.forEach(ev => {
+                        let val;
+                        if (Array.isArray(ev.value) && ev.value.length === 2) {
+                            val = ev.value[1]; // low part of Int64
+                        } else {
+                            val = Number(ev.value);
+                        }
+                        map[val] = ev.displayName.text;
+                    });
+                    enumStrings = map;
+                    if (cache) cache.set(cacheKeyStrings, enumStrings);
+                } else {
+                    if (cache) cache.set(cacheKeyStrings, null);
+                }
+            } else {
+                if (cache) cache.set(cacheKeyStrings, null);
+            }
+        }
+        
+        if (enumStrings && enumStrings[result.value] !== undefined) {
+            result.valueEnumeration = enumStrings[result.value];
+        }
+    } catch (e) {
+        console.error("Error in enrichItemResultWithEnumeration:", e);
+    }
+    
+    return result;
+}
+
 module.exports = {
     AttributeIds,
     coerceNodeId,
@@ -373,6 +567,7 @@ module.exports = {
     callResultToItemResult,
     dataValueToItemResult,
     dataValueToItemResultEvent,
+    enrichItemResultWithEnumeration,
     ensureArrayPayload,
     getMethodArgumentDefinition,
     inferTypeName,

package/client/opcua-client.html

@@ -1,141 +1,141 @@
-<link rel="stylesheet" type="text/css" href="opcua-client-resource/style.css">
-
-<script type="text/javascript" src="opcua-client-resource/script.js"></script>
-
-<script type="text/html" data-template-name="opcua-client">
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="opcua-client">
-    </div>
-    <div class="form-row">
-        <label for="node-input-connection"><i class="fa fa-server"></i> Connection</label>
-        <input type="text" id="node-input-connection">
-    </div>
-    <div class="form-row">
-        <label for="node-input-mode"><i class="fa fa-exchange"></i> Mode</label>
-        <select id="node-input-mode">
-            <option value="read">Read</option>
-            <option value="write">Write</option>
-            <option value="browse">Browse</option>
-            <option value="method">Method</option>
-              <option value="getSubscriptionId">getSubscriptionId</option>
-            <option value="subscription">Subscription</option>
-             <option value="events">Events</option>
-        </select>
-    </div>
-
-    <div class="form-row opcua-client-selection-row">
-        <label for="node-input-selectedItems"><i class="fa fa-code"></i> JSON</label>
-        <input type="text" id="node-input-selectedItems" class="opcua-client-json" style="width: 70%;">
-    </div>
-    <div id="node-input-browse-modal" class="opcua-tree-modal" style="display:none;">
-        <div class="opcua-tree-modal__dialog">
-            <div class="opcua-tree-modal__header">
-                <div class="opcua-tree-modal__title"><i class="fa fa-sitemap"></i> OPC UA Browse Tree</div>
-                <a href="#" id="node-input-close-browse-modal" class="editor-button editor-button-small"><i class="fa fa-times"></i> Close</a>
-            </div>
-            <div class="opcua-tree-modal__toolbar">
-                <a href="#" id="node-input-browse-root" class="editor-button editor-button-small"><i class="fa fa-search"></i> Browse Root</a>
-                <div class="opcua-tree-search">
-                    <i class="fa fa-search"></i>
-                    <input type="text" id="node-input-browse-search" placeholder="Search for items already explored">
-                    <a href="#" id="node-input-browse-search-clear" class="editor-button editor-button-small" style="display:none;"><i class="fa fa-times"></i></a>
-                </div>
-            </div>
-            <div class="opcua-tree-modal__body">
-                <div id="node-input-browse-tree" class="opcua-tree-editor"></div>
-            </div>
-        </div>
-        <div id="node-input-browse-context-menu" class="opcua-tree-context-menu" style="display:none;">
-            <a href="#" id="node-input-browse-context-refresh"><i class="fa fa-refresh"></i> Refresh node</a>
-            <a href="#" id="node-input-browse-context-copy-nodeid"><i class="fa fa-copy"></i> Copy NodeID</a>
-        </div>
-    </div>
-
-    <div class="form-row opcua-client-selection-row">
-        <label style="width:auto;"><i class="fa fa-sitemap"></i> Browse Tree</label>
-        <a href="#" id="node-input-open-browse-modal" class="editor-button">
-            <i class="fa fa-expand"></i> Open browse tree
-        </a>
-    </div>
-
-    <div class="form-row opcua-client-subscription-row">
-        <label for="node-input-samplingInterval"><i class="fa fa-clock-o"></i> Sampling</label>
-        <input type="text" id="node-input-samplingInterval" placeholder="250">
-    </div>
-    <div class="form-row opcua-client-subscription-row">
-        <label for="node-input-publishingInterval"><i class="fa fa-clock-o"></i> Publishing</label>
-        <input type="text" id="node-input-publishingInterval" placeholder="250">
-    </div>
-
-    <div class="form-row opcua-client-selection-row" style="margin-bottom:0;">
-        <label style="width:auto;"><i class="fa fa-tags"></i> Selected items</label>
-    </div>
-    <div class="form-row opcua-client-selection-row">
-        <label style="width:auto;"></label>
-        <div id="node-input-selected-tags" class="opcua-client-tag-box"></div>
-    </div>
-
-</script>
-
-<script type="text/html" data-help-name="opcua-client">
-    <p>Unified OPC UA client node for read, write, browse and subscription using a shared client configuration node.</p>
-
-    <h3>Modes</h3>
-    <p><b>Read</b>: reads one or more variable values.</p>
-    <p><b>Write</b>: writes one or more variable values.</p>
-    <p><b>Browse</b>: browses one or more OPC UA nodes and returns their children.</p>
-    <p><b>Method</b>: calls one or more OPC UA methods.</p>
-    <p><b>Subscription</b>: subscribes to one or more variable values and emits one message per change.</p>
-
-    <h3>Read</h3>
-    <p><b>Input</b> <code>msg.payload</code>:</p>
-    <pre><code>[
-  {
-    "name": "status",
-    "nodeID": "ns=2;s=Factory.Line1.Motor1.status"
-  }
-]</code></pre>
-    <p>If <code>msg.payload</code> is not an array and <code>NodeId</code> is configured, the node reads that configured node.</p>
-
-    <h3>Write</h3>
-    <p><b>Input</b> <code>msg.payload</code>:</p>
-    <pre><code>[
-  {
-    "name": "speed",
-    "nodeID": "ns=2;s=Factory.Line1.Motor1.speed",
-    "value": 25.5,
-    "type": "Float"
-  }
-]</code></pre>
-
-    <h3>Browse</h3>
-    <p>If <code>msg.payload</code> is not an array and <code>NodeId</code> is configured, the node browses that configured node.</p>
-    <p>If <code>msg.payload = []</code>, the node browses the OPC UA <code>RootFolder</code>.</p>
-
-    <h3>Method</h3>
-    <p><code>nodeID</code> and <code>objectId</code> are accepted explicitly. For backward compatibility, <code>nodeID</code> is also accepted as the method id.</p>
-    <p><b>Input</b> <code>msg.payload</code>:</p>
-    <pre><code>[
-    {
-        "name": "method1",
-        "nodeID": "ns=2;s=motor.method1",
-        "inputs": [
-            {
-                "name": "input1",
-                "type": "Int32",
-                "value": 1
-            },
-            {
-                "name": "input2",
-                "type": "Int32",
-                "value": 1
-            }
-        ]
-    },
-
- 
-]</code></pre>
-    <h3>Subscription</h3>
-    <p>In subscription mode the node emits one message per value change.</p>
+<link rel="stylesheet" type="text/css" href="opcua-client-resource/style.css">
+
+<script type="text/javascript" src="opcua-client-resource/script.js"></script>
+
+<script type="text/html" data-template-name="opcua-client">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="opcua-client">
+    </div>
+    <div class="form-row">
+        <label for="node-input-connection"><i class="fa fa-server"></i> Connection</label>
+        <input type="text" id="node-input-connection">
+    </div>
+    <div class="form-row">
+        <label for="node-input-mode"><i class="fa fa-exchange"></i> Mode</label>
+        <select id="node-input-mode">
+            <option value="read">Read</option>
+            <option value="write">Write</option>
+            <option value="browse">Browse</option>
+            <option value="method">Method</option>
+              <option value="getSubscriptionId">getSubscriptionId</option>
+            <option value="subscription">Subscription</option>
+             <option value="events">Events</option>
+        </select>
+    </div>
+
+    <div class="form-row opcua-client-selection-row">
+        <label for="node-input-selectedItems"><i class="fa fa-code"></i> JSON</label>
+        <input type="text" id="node-input-selectedItems" class="opcua-client-json" style="width: 70%;">
+    </div>
+    <div id="node-input-browse-modal" class="opcua-tree-modal" style="display:none;">
+        <div class="opcua-tree-modal__dialog">
+            <div class="opcua-tree-modal__header">
+                <div class="opcua-tree-modal__title"><i class="fa fa-sitemap"></i> OPC UA Browse Tree</div>
+                <a href="#" id="node-input-close-browse-modal" class="editor-button editor-button-small"><i class="fa fa-times"></i> Close</a>
+            </div>
+            <div class="opcua-tree-modal__toolbar">
+                <a href="#" id="node-input-browse-root" class="editor-button editor-button-small"><i class="fa fa-search"></i> Browse Root</a>
+                <div class="opcua-tree-search">
+                    <i class="fa fa-search"></i>
+                    <input type="text" id="node-input-browse-search" placeholder="Search for items already explored">
+                    <a href="#" id="node-input-browse-search-clear" class="editor-button editor-button-small" style="display:none;"><i class="fa fa-times"></i></a>
+                </div>
+            </div>
+            <div class="opcua-tree-modal__body">
+                <div id="node-input-browse-tree" class="opcua-tree-editor"></div>
+            </div>
+        </div>
+        <div id="node-input-browse-context-menu" class="opcua-tree-context-menu" style="display:none;">
+            <a href="#" id="node-input-browse-context-refresh"><i class="fa fa-refresh"></i> Refresh node</a>
+            <a href="#" id="node-input-browse-context-copy-nodeid"><i class="fa fa-copy"></i> Copy NodeID</a>
+        </div>
+    </div>
+
+    <div class="form-row opcua-client-selection-row">
+        <label style="width:auto;"><i class="fa fa-sitemap"></i> Browse Tree</label>
+        <a href="#" id="node-input-open-browse-modal" class="editor-button">
+            <i class="fa fa-expand"></i> Open browse tree
+        </a>
+    </div>
+
+    <div class="form-row opcua-client-subscription-row">
+        <label for="node-input-samplingInterval"><i class="fa fa-clock-o"></i> Sampling</label>
+        <input type="text" id="node-input-samplingInterval" placeholder="250">
+    </div>
+    <div class="form-row opcua-client-subscription-row">
+        <label for="node-input-publishingInterval"><i class="fa fa-clock-o"></i> Publishing</label>
+        <input type="text" id="node-input-publishingInterval" placeholder="250">
+    </div>
+
+    <div class="form-row opcua-client-selection-row" style="margin-bottom:0;">
+        <label style="width:auto;"><i class="fa fa-tags"></i> Selected items</label>
+    </div>
+    <div class="form-row opcua-client-selection-row">
+        <label style="width:auto;"></label>
+        <div id="node-input-selected-tags" class="opcua-client-tag-box"></div>
+    </div>
+
+</script>
+
+<script type="text/html" data-help-name="opcua-client">
+    <p>Unified OPC UA client node for read, write, browse and subscription using a shared client configuration node.</p>
+
+    <h3>Modes</h3>
+    <p><b>Read</b>: reads one or more variable values.</p>
+    <p><b>Write</b>: writes one or more variable values.</p>
+    <p><b>Browse</b>: browses one or more OPC UA nodes and returns their children.</p>
+    <p><b>Method</b>: calls one or more OPC UA methods.</p>
+    <p><b>Subscription</b>: subscribes to one or more variable values and emits one message per change.</p>
+
+    <h3>Read</h3>
+    <p><b>Input</b> <code>msg.payload</code>:</p>
+    <pre><code>[
+  {
+    "name": "status",
+    "nodeID": "ns=2;s=Factory.Line1.Motor1.status"
+  }
+]</code></pre>
+    <p>If <code>msg.payload</code> is not an array and <code>NodeId</code> is configured, the node reads that configured node.</p>
+
+    <h3>Write</h3>
+    <p><b>Input</b> <code>msg.payload</code>:</p>
+    <pre><code>[
+  {
+    "name": "speed",
+    "nodeID": "ns=2;s=Factory.Line1.Motor1.speed",
+    "value": 25.5,
+    "type": "Float"
+  }
+]</code></pre>
+
+    <h3>Browse</h3>
+    <p>If <code>msg.payload</code> is not an array and <code>NodeId</code> is configured, the node browses that configured node.</p>
+    <p>If <code>msg.payload = []</code>, the node browses the OPC UA <code>RootFolder</code>.</p>
+
+    <h3>Method</h3>
+    <p><code>nodeID</code> and <code>objectId</code> are accepted explicitly. For backward compatibility, <code>nodeID</code> is also accepted as the method id.</p>
+    <p><b>Input</b> <code>msg.payload</code>:</p>
+    <pre><code>[
+    {
+        "name": "method1",
+        "nodeID": "ns=2;s=motor.method1",
+        "inputs": [
+            {
+                "name": "input1",
+                "type": "Int32",
+                "value": 1
+            },
+            {
+                "name": "input2",
+                "type": "Int32",
+                "value": 1
+            }
+        ]
+    },
+
+ 
+]</code></pre>
+    <h3>Subscription</h3>
+    <p>In subscription mode the node emits one message per value change.</p>
 </script>