node-opcua-address-space 2.93.0 → 2.95.0

package/src/address_space_change_event_tools.ts

@@ -3,7 +3,7 @@
  */
 import * as chalk from "chalk";
 
-import { UAReference, BaseNode, UAObject, UAVariable } from "node-opcua-address-space-base";
+import { UAReference, BaseNode, UAObject, UAVariable, UAObjectType, UAVariableType } from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import { BrowseDirection, NodeClass } from "node-opcua-data-model";
 import { Enum, EnumItem } from "node-opcua-enum";
@@ -101,40 +101,42 @@ try {
 export function _handle_model_change_event(node: BaseNodeImpl): void {
     const addressSpace = node.addressSpace as AddressSpacePrivate;
     //
-    const parent = node.parent!;
+    const parents = node.parent ? [node.parent] : [];
 
-    if (parent && (parent as BaseNode).nodeVersion) {
-        addressSpace.modelChangeTransaction(() => {
-            let typeDefinitionNodeId = null;
-
-            if (node.nodeClass === NodeClass.Object || node.nodeClass === NodeClass.Variable) {
-                typeDefinitionNodeId = node.typeDefinitionObj.nodeId;
-            }
-
-            const modelChange1 = new ModelChangeStructureDataType({
-                affected: node.nodeId,
-                affectedType: typeDefinitionNodeId,
-                verb: makeVerb("NodeAdded")
-            });
-            addressSpace._collectModelChange(null, modelChange1);
-
-            const modelChangeSrc = new ModelChangeStructureDataType({
-                affected: parent.nodeId,
-                affectedType: null,
-                verb: makeVerb("ReferenceAdded")
-            });
-            addressSpace._collectModelChange(null, modelChangeSrc);
+    const containingFolders = node.findReferencesExAsObject("Organizes", BrowseDirection.Inverse);
 
-            // bidirectional
-            if ((node as BaseNode).nodeVersion) {
-                const modelChangeTgt = new ModelChangeStructureDataType({
+    let typeDefinitionNodeId: NodeId  | null = null;
+    if (node.nodeClass === NodeClass.Object || node.nodeClass === NodeClass.Variable) {
+        typeDefinitionNodeId = node.typeDefinitionObj.nodeId;
+    }
+    for (const parent of [...parents, ...containingFolders]) {
+        if (parent && (parent as BaseNode).nodeVersion) {
+            addressSpace.modelChangeTransaction(() => {
+                const modelChange1 = new ModelChangeStructureDataType({
                     affected: node.nodeId,
                     affectedType: typeDefinitionNodeId,
+                    verb: makeVerb("NodeAdded")
+                });
+                addressSpace._collectModelChange(null, modelChange1);
+
+                const modelChangeSrc = new ModelChangeStructureDataType({
+                    affected: parent.nodeId,
+                    affectedType: null,
                     verb: makeVerb("ReferenceAdded")
                 });
-                addressSpace._collectModelChange(null, modelChangeTgt);
-            }
-        });
+                addressSpace._collectModelChange(null, modelChangeSrc);
+
+                // bidirectional
+                if ((node as BaseNode).nodeVersion) {
+                    const modelChangeTgt = new ModelChangeStructureDataType({
+                        affected: node.nodeId,
+                        affectedType: typeDefinitionNodeId,
+                        verb: makeVerb("ReferenceAdded")
+                    });
+                    addressSpace._collectModelChange(null, modelChangeTgt);
+                }
+            });
+        }
     }
 }
 

package/src/namespace_impl.ts

@@ -670,7 +670,7 @@ export class NamespaceImpl implements NamespacePrivate {
 
             node.install_extra_properties();
 
-            _handle_node_version(node, options);
+            _create_node_version_if_needed(node, options);
 
             _handle_model_change_event(node as BaseNodeImpl);
         });
@@ -2209,12 +2209,16 @@ export function isNonEmptyQualifiedName(browseName?: null | string | QualifiedNa
     return browseName.name!.length > 0;
 }
 
-function _handle_node_version(node: BaseNode, options: any) {
+function _create_node_version_if_needed(node: BaseNode, options: {nodeVersion: boolean}) {
     assert(options);
     if (options.nodeVersion) {
         assert(node.nodeClass === NodeClass.Variable || node.nodeClass === NodeClass.Object);
-
-        const nodeVersion = node.addressSpace.getOwnNamespace().addVariable({
+        // istanbul ignore next
+        if (node.getChildByName("NodeVersion"))  {
+            return; // already exists
+        }
+        const namespace  = node.addressSpace.getOwnNamespace();
+        const nodeVersion = namespace.addVariable({
             browseName: "NodeVersion",
             dataType: "String",
             propertyOf: node

package/src/ua_variable_impl.ts

@@ -446,7 +446,7 @@
 
         /**
          *
-         *
+         * 
          * from OPC.UA.Spec 1.02 part 4
          *  5.10.2.4 StatusCodes
          *  Table 51 defines values for the operation level statusCode contained in the DataValue structure of
@@ -454,22 +454,22 @@
          *
          * Table 51 Read Operation Level Result Codes
          *
-         *  Symbolic Id                 Description
-         *
-         *  BadNodeIdInvalid            The syntax of the node id is not valid.
-         *  BadNodeIdUnknown            The node id refers to a node that does not exist in the server address space.
-         *  BadAttributeIdInvalid       BadAttributeIdInvalid The attribute is not supported for the specified node.
-         *  BadIndexRangeInvalid        The syntax of the index range parameter is invalid.
-         *  BadIndexRangeNoData         No data exists within the range of indexes specified.
-         *  BadDataEncodingInvalid      The data encoding is invalid.
-         *                              This result is used if no dataEncoding can be applied because an Attribute other
-         *                              than Value was requested or the DataType of the Value Attribute is not a subtype
-         *                              of the Structure DataType.
-         *  BadDataEncodingUnsupported  The server does not support the requested data encoding for the node.
-         *                              This result is used if a dataEncoding can be applied but the passed data encoding
-         *                              is not known to the Server.
-         *  BadNotReadable              The access level does not allow reading or subscribing to the Node.
-         *  BadUserAccessDenied         User does not have permission to perform the requested operation. (table 165)
+         * | Symbolic Id                 | Description
+         * |-----------------------------|---------------------------------------------------------------------------------------------|
+         * |BadNodeIdInvalid             | The syntax of the node id is not valid.|
+         * |BadNodeIdUnknown            |The node id refers to a node that does not exist in the server address space.|
+         * |BadAttributeIdInvalid      | BadAttributeIdInvalid The attribute is not supported for the specified node.|
+         * |BadIndexRangeInvalid       | The syntax of the index range parameter is invalid.|
+         * |BadIndexRangeNoData        | No data exists within the range of indexes specified.|
+         * |BadDataEncodingInvalid     | The data encoding is invalid.|
+         * |                           | This result is used if no dataEncoding can be applied because an Attribute other|
+         * |                           | than Value was requested or the DataType of the Value Attribute is not a subtype|
+         * |                           | of the Structure DataType.|
+         * |BadDataEncodingUnsupported | The server does not support the requested data encoding for the node. |
+         * |                           | This result is used if a dataEncoding can be applied but the passed data encoding |
+         * |                           | is not known to the Server. |
+         * |BadNotReadable             | The access level does not allow reading or subscribing to the Node.|
+         * |BadUserAccessDenied        | User does not have permission to perform the requested operation. (table 165)|
          */
         public readValue(
             context?: ISessionContext | null,
@@ -589,7 +589,7 @@
             }
 
             if (this.$dataValue.serverTimestamp && oldestDate.getTime() <= this.$dataValue.serverTimestamp!.getTime()) {
-                const dataValue = this.readValue();
+                const dataValue = this.readValue().clone();
                 dataValue.serverTimestamp = oldestDate;
                 dataValue.serverPicoseconds = 0;
                 return callback(null, dataValue);
@@ -606,7 +606,7 @@
                         );
                         dataValue = { statusCode: StatusCodes.BadNoDataAvailable };
                     }
-                    if (dataValue !== this.$dataValue) {
+                    if (dataValue && dataValue !== this.$dataValue) {
                         this._internal_set_dataValue(coerceDataValue(dataValue), null);
                     }
                     callback(err, this.$dataValue);

package/test_helpers/mock_session.ts

@@ -1,4 +1,4 @@
-import { ContinuationData, IContinuationPointInfo, IContinuationPointManager } from "node-opcua-address-space-base";
+import { ContinuationData, IContinuationPointInfo, IContinuationPointManager, ISessionBase } from "node-opcua-address-space-base";
 import { DataValue } from "node-opcua-data-value";
 import { NodeId } from "node-opcua-nodeid";
 import { ReferenceDescription } from "node-opcua-service-browse";
@@ -26,7 +26,7 @@ export class MockContinuationPointManager implements IContinuationPointManager {
     }
 }
 
-export const mockSession = {
+export const mockSession: ISessionBase = {
     getSessionId() {
         return new NodeId();
     },