node-opcua-address-space 2.123.0 → 2.125.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.123.0",
+    "version": "2.125.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -16,57 +16,57 @@
         "c": "mocha --version"
     },
     "dependencies": {
-        "@types/lodash": "4.14.202",
+        "@types/lodash": "4.17.4",
         "@types/semver": "^7.5.8",
         "async": "^3.2.5",
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.123.0",
+        "node-opcua-address-space-base": "2.125.0",
         "node-opcua-assert": "2.120.0",
-        "node-opcua-basic-types": "2.121.0",
-        "node-opcua-binary-stream": "2.120.0",
-        "node-opcua-client-dynamic-extension-object": "2.123.0",
-        "node-opcua-constants": "2.121.0",
+        "node-opcua-basic-types": "2.125.0",
+        "node-opcua-binary-stream": "2.125.0",
+        "node-opcua-client-dynamic-extension-object": "2.125.0",
+        "node-opcua-constants": "2.125.0",
         "node-opcua-crypto": "4.8.0",
-        "node-opcua-data-access": "2.123.0",
-        "node-opcua-data-model": "2.121.0",
-        "node-opcua-data-value": "2.121.0",
-        "node-opcua-date-time": "2.121.0",
-        "node-opcua-debug": "2.121.0",
-        "node-opcua-enum": "2.120.0",
-        "node-opcua-extension-object": "2.121.0",
-        "node-opcua-factory": "2.121.0",
-        "node-opcua-nodeid": "2.121.0",
-        "node-opcua-nodeset-ua": "2.123.0",
-        "node-opcua-numeric-range": "2.121.0",
-        "node-opcua-object-registry": "2.121.0",
-        "node-opcua-pseudo-session": "2.123.0",
-        "node-opcua-service-browse": "2.123.0",
-        "node-opcua-service-call": "2.123.0",
-        "node-opcua-service-history": "2.123.0",
-        "node-opcua-service-translate-browse-path": "2.123.0",
-        "node-opcua-service-write": "2.123.0",
-        "node-opcua-status-code": "2.121.0",
-        "node-opcua-types": "2.123.0",
-        "node-opcua-utils": "2.120.0",
-        "node-opcua-variant": "2.121.0",
-        "node-opcua-xml2json": "2.123.0",
-        "semver": "^7.6.0",
+        "node-opcua-data-access": "2.125.0",
+        "node-opcua-data-model": "2.125.0",
+        "node-opcua-data-value": "2.125.0",
+        "node-opcua-date-time": "2.125.0",
+        "node-opcua-debug": "2.125.0",
+        "node-opcua-enum": "2.125.0",
+        "node-opcua-extension-object": "2.125.0",
+        "node-opcua-factory": "2.125.0",
+        "node-opcua-nodeid": "2.125.0",
+        "node-opcua-nodeset-ua": "2.125.0",
+        "node-opcua-numeric-range": "2.125.0",
+        "node-opcua-object-registry": "2.125.0",
+        "node-opcua-pseudo-session": "2.125.0",
+        "node-opcua-service-browse": "2.125.0",
+        "node-opcua-service-call": "2.125.0",
+        "node-opcua-service-history": "2.125.0",
+        "node-opcua-service-translate-browse-path": "2.125.0",
+        "node-opcua-service-write": "2.125.0",
+        "node-opcua-status-code": "2.125.0",
+        "node-opcua-types": "2.125.0",
+        "node-opcua-utils": "2.125.0",
+        "node-opcua-variant": "2.125.0",
+        "node-opcua-xml2json": "2.125.0",
+        "semver": "^7.6.2",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.1",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
-        "mocha": "^10.3.0",
-        "node-opcua-benchmarker": "2.120.0",
-        "node-opcua-leak-detector": "2.121.0",
+        "mocha": "^10.4.0",
+        "node-opcua-benchmarker": "2.125.0",
+        "node-opcua-leak-detector": "2.125.0",
         "node-opcua-nodesets": "2.121.0",
-        "node-opcua-packet-analyzer": "2.121.0",
-        "node-opcua-service-filter": "2.123.0",
-        "node-opcua-test-fixtures": "2.123.0",
+        "node-opcua-packet-analyzer": "2.125.0",
+        "node-opcua-service-filter": "2.125.0",
+        "node-opcua-test-fixtures": "2.125.0",
         "should": "^13.2.3",
-        "sinon": "^17.0.1",
+        "sinon": "^18.0.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "64b4575687f6a8130e06fa78b6f61b6eeaa05e74",
+    "gitHead": "a0e0a2f1045e6e402dd4619c625c90008f0617ed",
     "files": [
         "dist",
         "distHelpers",

package/src/address_space.ts

@@ -344,7 +344,9 @@ export class AddressSpace implements AddressSpacePrivate {
                 }
             }
         }
-        return resolveNodeId(nodeId);
+        const namespaceArray: string[] = this.getNamespaceArray().map((a)=>a.namespaceUri);
+
+        return resolveNodeId(nodeId, { namespaceArray });
     }
 
     /**
@@ -488,9 +490,9 @@ export class AddressSpace implements AddressSpacePrivate {
         if (!(dataTypeNode instanceof UADataTypeImpl)) {
             throw new Error(
                 "we are expecting an UADataType here :  " +
-                    _orig_dataTypeNode.toString() +
-                    " should not refer to a  " +
-                    (dataTypeNode as BaseNode).browseName.name
+                _orig_dataTypeNode.toString() +
+                " should not refer to a  " +
+                (dataTypeNode as BaseNode).browseName.name
             );
         }
 
@@ -783,18 +785,18 @@ export class AddressSpace implements AddressSpacePrivate {
                         // tslint:disable:no-console
                         errorLog(
                             chalk.red("ERROR : AddressSpace#constructEventData(eventType,options) " + "cannot find property ") +
-                                self.browseName.toString() +
-                                " => " +
-                                chalk.cyan(lowerName)
+                            self.browseName.toString() +
+                            " => " +
+                            chalk.cyan(lowerName)
                         );
                     } else {
                         errorLog(
                             chalk.yellow(
                                 "Warning : AddressSpace#constructEventData(eventType,options)" + " cannot find property "
                             ) +
-                                self.browseName.toString() +
-                                " => " +
-                                chalk.cyan(lowerName)
+                            self.browseName.toString() +
+                            " => " +
+                            chalk.cyan(lowerName)
                         );
                     }
                 }
@@ -811,11 +813,11 @@ export class AddressSpace implements AddressSpacePrivate {
                 if (!alreadyVisited(k)) {
                     warningLog(
                         "constructEventData:  cannot find property '" +
-                            k +
-                            "' in [ " +
-                            Object.keys(visitedProperties).join(", ") +
-                            "] when filling " +
-                            eventTypeNode.browseName.toString()
+                        k +
+                        "' in [ " +
+                        Object.keys(visitedProperties).join(", ") +
+                        "] when filling " +
+                        eventTypeNode.browseName.toString()
                     );
                 }
             });
@@ -1237,15 +1239,12 @@ export class AddressSpace implements AddressSpacePrivate {
         this._modelChangeTransactionCounter = this._modelChangeTransactionCounter || 0;
 
         function beginModelChange(this: AddressSpace) {
-            /* jshint validthis:true */
-            assert(this);
             this._modelChanges = this._modelChanges || [];
             assert(this._modelChangeTransactionCounter >= 0);
             this._modelChangeTransactionCounter += 1;
         }
 
         function endModelChange(this: AddressSpace) {
-            /* jshint validthis:true */
             this._modelChangeTransactionCounter -= 1;
 
             if (this._modelChangeTransactionCounter === 0) {

package/src/address_space_change_event_tools.ts

@@ -21,10 +21,9 @@ const verbFlags = new Enum({
     NodeDeleted: 0x02,
 
     //                         ReferenceAdded   2         Indicates a Reference has been added. The affected Node may
-    ReferenceAdded: 0x04,
-
     //                                                    be either a SourceNode or TargetNode. Note that an added
     //                                                    bidirectional Reference is reflected by two ChangeStructures.
+    ReferenceAdded: 0x04,
     //                         ReferenceDeleted 3         Indicates a Reference has been deleted. The affected Node may
     //                                                    be either a SourceNode or TargetNode. Note that a deleted
     //                                                    bidirectional Reference is reflected by two ChangeStructures.
@@ -105,7 +104,7 @@ export function _handle_model_change_event(node: BaseNodeImpl): void {
 
     const containingFolders = node.findReferencesExAsObject("Organizes", BrowseDirection.Inverse);
 
-    let typeDefinitionNodeId: NodeId  | null = null;
+    let typeDefinitionNodeId: NodeId | null = null;
     if (node.nodeClass === NodeClass.Object || node.nodeClass === NodeClass.Variable) {
         typeDefinitionNodeId = node.typeDefinitionObj.nodeId;
     }
@@ -150,7 +149,7 @@ export function _handle_delete_node_model_change_event(node: BaseNode): void {
         return addressSpace.findNode(r.nodeId)! as BaseNode;
     });
 
-    const versionableNodes = parentNodes.filter((n: BaseNode) => !!n?.nodeVersion);
+    const versionableNodes = parentNodes.filter((n: BaseNode) => !!n?.getChildByName("NodeVersion", 0));
 
     if (versionableNodes.length >= 1 || !!node.nodeVersion) {
         addressSpace.modelChangeTransaction(() => {

package/src/namespace_impl.ts

@@ -7,7 +7,7 @@ import chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { coerceInt64 } from "node-opcua-basic-types";
 import { AxisScaleEnumeration } from "node-opcua-data-access";
-import { AccessRestrictionsFlag, coerceLocalizedText, QualifiedNameLike } from "node-opcua-data-model";
+import { AccessRestrictionsFlag, coerceLocalizedText, coerceQualifiedName, QualifiedNameLike } from "node-opcua-data-model";
 import { QualifiedName } from "node-opcua-data-model";
 import { BrowseDirection } from "node-opcua-data-model";
 import { NodeClass } from "node-opcua-data-model";
@@ -1655,7 +1655,15 @@ export class NamespaceImpl implements NamespacePrivate {
         assert(node.nodeId instanceof NodeId, "Expecting a NodeId");
         // istanbul ignore next
         if (node.nodeId.namespace !== this.index) {
-            throw new Error("node must belongs to this namespace");
+            throw new Error(
+                "node must belong to this namespace : " +
+                    node.nodeId.toString() +
+                    "  " +
+                    " node.browseName = " +
+                    node.browseName.toString() +
+                    " this.index = " +
+                    this.index
+            );
         }
         assert(node.nodeId.namespace === this.index, "node must belongs to this namespace");
         assert(Object.prototype.hasOwnProperty.call(node, "browseName"), "Node must have a browseName");
@@ -2000,7 +2008,8 @@ export class NamespaceImpl implements NamespacePrivate {
             // a getter has been specified and no options.minimumSamplingInterval has been specified
             warningLog(
                 "[NODE-OPCUA-W30",
-                "namespace#addVariable a getter has been specified and minimumSamplingInterval is missing.\nMinimumSamplingInterval has been adjusted to 1000 ms\nvariable = "+ options?.browseName?.toString()
+                "namespace#addVariable a getter has been specified and minimumSamplingInterval is missing.\nMinimumSamplingInterval has been adjusted to 1000 ms\nvariable = " +
+                    options?.browseName?.toString()
             );
             options.minimumSamplingInterval = 1000;
         }
@@ -2225,12 +2234,14 @@ function _create_node_version_if_needed(node: BaseNode, options: { nodeVersion:
         if (node.getChildByName("NodeVersion")) {
             return; // already exists
         }
-        const namespace = node.addressSpace.getOwnNamespace();
+
+        const namespace = node.namespace;
         const nodeVersion = namespace.addVariable({
-            browseName: "NodeVersion",
-            dataType: "String",
+            browseName: coerceQualifiedName({ name: "NodeVersion", namespaceIndex: 0 }),
+            dataType: DataType.String,
             propertyOf: node
         });
+        
         const initialValue = typeof options.nodeVersion === "string" ? options.nodeVersion : "0";
         nodeVersion.setValueFromSource({ dataType: "String", value: initialValue });
     }

package/src/ua_variable_impl.ts

@@ -403,14 +403,30 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         if (this._timestamped_get_func) {
             if (this._timestamped_get_func.length === 0) {
                 const dataValueOrPromise = (this._timestamped_get_func as VariableDataValueGetterSync)();
-                if (!Object.prototype.hasOwnProperty.call(dataValueOrPromise, "then")) {
+                if (!Object.prototype.hasOwnProperty.call(dataValueOrPromise.constructor.prototype, "then")) {
                     if (dataValueOrPromise !== this.$dataValue) {
+                        // we may have a problem here if we use a getter that returns a dataValue that is a ExtensionObject
+                        if (dataValueOrPromise.value?.dataType === DataType.ExtensionObject) {
+                            // eslint-disable-next-line max-depth
+                            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(dataValueOrPromise);
+                                return dataValueOrPromise;
+                            }
+                        }
+
                         // TO DO : is this necessary ? this may interfere with current use of $dataValue
                         this.$dataValue = dataValueOrPromise as DataValue;
-                        this.verifyVariantCompatibility(this.$dataValue.value);
+                        if (this.$dataValue.statusCode.isGoodish()) {
+                            this.verifyVariantCompatibility(this.$dataValue.value);
+                        } 
                     }
                 } else {
-                    errorLog("Unsupported: _timestamped_get_func returns a Promise !");
+                    errorLog(
+                        "[NODE-OPCUA-E28] Unsupported: _timestamped_get_func returns a Promise ! , when the uaVariable has an async getter. Fix your application code."
+                    );
                 }
             }
         }
@@ -2099,7 +2115,7 @@ function _Variable_bind_with_simple_get(this: UAVariableImpl, options: GetterOpt
                 !this.$dataValue.statusCode.isGoodish() ||
                 !sameVariant(this.$dataValue.value, value as Variant)
             ) {
-                // rebuilding artificially timestamps with current clock as they are not provided 
+                // rebuilding artificially timestamps with current clock as they are not provided
                 // by the underlying getter function
                 const { timestamp: sourceTimestamp, picoseconds: sourcePicoseconds } = getCurrentClock();
                 const serverTimestamp = sourceTimestamp;

package/src/ua_variable_impl_ext_obj.ts

@@ -108,7 +108,7 @@ export function _touchValue(property: UAVariableImpl, now: PreciseClock): void {
     property.$dataValue.sourcePicoseconds = now.picoseconds;
     property.$dataValue.serverTimestamp = now.timestamp;
     property.$dataValue.serverPicoseconds = now.picoseconds;
-    property.$dataValue.statusCode = StatusCodes.Good;
+    // don't change statusCode ! property.$dataValue.statusCode = StatusCodes.Good;
     if (property.listenerCount("value_changed") > 0) {
         property.emit("value_changed", property.$dataValue.clone());
     }