node-opcua-address-space 2.175.2 → 2.175.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.175.2",
+    "version": "2.175.6",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -21,48 +21,48 @@
         "@types/semver": "7.7.1",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space-base": "2.175.2",
-        "node-opcua-assert": "2.175.1",
-        "node-opcua-basic-types": "2.175.1",
-        "node-opcua-binary-stream": "2.175.1",
-        "node-opcua-client-dynamic-extension-object": "2.175.2",
+        "node-opcua-address-space-base": "2.175.6",
+        "node-opcua-assert": "2.175.6",
+        "node-opcua-basic-types": "2.175.6",
+        "node-opcua-binary-stream": "2.175.6",
+        "node-opcua-client-dynamic-extension-object": "2.175.6",
         "node-opcua-constants": "2.175.1",
-        "node-opcua-crypto": "5.3.6",
-        "node-opcua-data-access": "2.175.2",
-        "node-opcua-data-model": "2.175.1",
-        "node-opcua-data-value": "2.175.1",
-        "node-opcua-date-time": "2.175.1",
-        "node-opcua-debug": "2.175.1",
-        "node-opcua-enum": "2.175.1",
-        "node-opcua-extension-object": "2.175.1",
-        "node-opcua-factory": "2.175.1",
-        "node-opcua-nodeid": "2.175.1",
-        "node-opcua-nodeset-ua": "2.175.2",
-        "node-opcua-numeric-range": "2.175.1",
-        "node-opcua-object-registry": "2.175.1",
-        "node-opcua-pseudo-session": "2.175.2",
-        "node-opcua-service-browse": "2.175.2",
-        "node-opcua-service-call": "2.175.2",
-        "node-opcua-service-history": "2.175.2",
-        "node-opcua-service-translate-browse-path": "2.175.2",
-        "node-opcua-service-write": "2.175.2",
-        "node-opcua-status-code": "2.175.1",
-        "node-opcua-types": "2.175.2",
-        "node-opcua-utils": "2.175.1",
-        "node-opcua-variant": "2.175.1",
-        "node-opcua-xml2json": "2.175.2",
+        "node-opcua-crypto": "5.4.0",
+        "node-opcua-data-access": "2.175.6",
+        "node-opcua-data-model": "2.175.6",
+        "node-opcua-data-value": "2.175.6",
+        "node-opcua-date-time": "2.175.6",
+        "node-opcua-debug": "2.175.6",
+        "node-opcua-enum": "2.175.6",
+        "node-opcua-extension-object": "2.175.6",
+        "node-opcua-factory": "2.175.6",
+        "node-opcua-nodeid": "2.175.6",
+        "node-opcua-nodeset-ua": "2.175.6",
+        "node-opcua-numeric-range": "2.175.6",
+        "node-opcua-object-registry": "2.175.6",
+        "node-opcua-pseudo-session": "2.175.6",
+        "node-opcua-service-browse": "2.175.6",
+        "node-opcua-service-call": "2.175.6",
+        "node-opcua-service-history": "2.175.6",
+        "node-opcua-service-translate-browse-path": "2.175.6",
+        "node-opcua-service-write": "2.175.6",
+        "node-opcua-status-code": "2.175.6",
+        "node-opcua-types": "2.175.6",
+        "node-opcua-utils": "2.175.6",
+        "node-opcua-variant": "2.175.6",
+        "node-opcua-xml2json": "2.175.6",
         "semver": "^7.8.5",
         "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
         "humanize": "0.0.9",
-        "node-opcua-benchmarker": "2.175.1",
-        "node-opcua-leak-detector": "2.175.1",
-        "node-opcua-nodesets": "2.175.1",
-        "node-opcua-packet-analyzer": "2.175.1",
-        "node-opcua-schemas": "2.175.2",
-        "node-opcua-service-filter": "2.175.2",
+        "node-opcua-benchmarker": "2.175.6",
+        "node-opcua-leak-detector": "2.175.6",
+        "node-opcua-nodesets": "2.175.3",
+        "node-opcua-packet-analyzer": "2.175.6",
+        "node-opcua-schemas": "2.175.6",
+        "node-opcua-service-filter": "2.175.6",
         "node-opcua-test-fixtures": "2.175.1"
     },
     "author": "Etienne Rossignon",
@@ -80,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "4e2a73e5b96bdf3bd3a88709c813289038caf19b",
+    "gitHead": "e233d906138995583f42359831d1908e3cb005e7",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/load_nodeset2.ts

@@ -699,7 +699,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 valueRank,
                 arrayDimensions: valueRank <= 0 ? null : stringToUInt32Array(attrs.ArrayDimensions),
                 minimumSamplingInterval: attrs.MinimumSamplingInterval ? parseInt(attrs.MinimumSamplingInterval, 10) : 0,
-                historizing: false,
+                historizing: coerceBoolean(attrs.Historizing),
                 nodeId,
                 accessLevel: accessLevel,
                 userAccessLevel: accessLevel // convertAccessLevel(attrs.UserAccessLevel || attrs.AccessLevel);
@@ -822,6 +822,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 valueRank,
                 arrayDimensions: valueRank <= 0 ? null : stringToUInt32Array(attrs.ArrayDimensions),
                 minimumSamplingInterval: attrs.MinimumSamplingInterval ? parseInt(attrs.MinimumSamplingInterval, 10) : 0,
+                // UAVariableType has no Historizing attribute in the XSD: keep it false
                 historizing: false,
                 nodeId: convertToNodeId(attrs.NodeId) || null
             };

package/src/nodeset_tools/construct_namespace_dependency.ts

@@ -71,13 +71,15 @@ export function _recomputeRequiredModelsFromTypes(namespace: INamespace, cache?:
 
         const namespaceIndex = dataType.namespace;
         consider(namespaceIndex);
+        // mark the dataType as visited *before* exploring its fields: a structure may refer to
+        // itself (directly or through a cycle), and marking it afterwards would recurse forever
+        _visitedDataType.add(dataType.toString());
         if (dataTypeNode.isStructure()) {
             const definition = dataTypeNode.getStructureDefinition();
             for (const field of definition.fields || []) {
                 exploreDataTypeField(field);
             }
         }
-        _visitedDataType.add(dataType.toString());
     }
 
     function exploreExtensionObject(e: ExtensionObject) {

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -845,6 +845,13 @@ function dumpCommonAttributes(xw: XmlWriter, node: BaseNode) {
             xw.writeAttribute("MinimumSamplingInterval", minimumSamplingInterval);
         }
     }
+    // Historizing exists in the XSD on UAVariable only: UAVariableType is restricted to
+    // DataType/ValueRank/ArrayDimensions. UAVariableTypeImpl nevertheless owns a `historizing`
+    // property, so the node class must be tested here rather than the presence of the property.
+    // false being the default, the attribute is only emitted when it is set.
+    if (node.nodeClass === NodeClass.Variable && (node as UAVariable).historizing) {
+        xw.writeAttribute("Historizing", "true");
+    }
 }
 
 function dumpCommonElements(xw: XmlWriter, node: BaseNode) {

package/src/ua_variable_impl.ts

@@ -758,26 +758,23 @@ export class UAVariableImpl<T extends UAVariableEvents & ListenerSignature<T>
             dataValue.value = variant1;
 
             if (dataValue.value.dataType === DataType.ExtensionObject) {
+                // early, detailed diagnostics on a malformed extension object (the actual throw
+                // happens below in _internal_set_dataValue).
                 const valueIsCorrect = this.checkExtensionObjectIsCorrect(dataValue.value.value);
                 if (!valueIsCorrect) {
                     errorLog("setValueFromSource Invalid value !");
                     errorLog(this.toString());
                     errorLog(dataValue.toString());
-                    this.checkExtensionObjectIsCorrect(dataValue.value.value);
                 }
-                // ----------------------------------
-                if (this.$extensionObject || this.$$extensionObjectArray) {
-                    // we have an extension object already bound to this node
-                    // the client is asking us to replace the object entirely by a new one
-                    // const ext = dataValue.value.value;
-                    this._internal_set_dataValue(dataValue);
-                    return;
-                } else {
-                    this.$dataValue = dataValue;
-                }
-            } else {
-                this._internal_set_dataValue(dataValue);
             }
+            // Route every value - scalar or ExtensionObject - through _internal_set_dataValue.
+            // This guarantees the change is consistently propagated to observers (historian,
+            // monitored items) and, when the node is a bound extension object (or a bound
+            // sub-structure child), cascaded through the proxy field setters by the overridden
+            // _inner_replace_dataValue. Previously ExtensionObject values were special-cased with a
+            // silent "this.$dataValue = dataValue" assignment that skipped notification for plain
+            // (unbound) extension object variables and threw on bound sub-structure children.
+            this._internal_set_dataValue(dataValue);
         } catch (err) {
             errorLog("UAVariable#setValueFromString Error : ", this.browseName.toString(), this.nodeId.toString());
             errorLog((err as Error).message);