node-opcua-address-space 2.92.0 → 2.94.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.92.0",
+    "version": "2.94.0",
     "description": "pure nodejs OPCUA SDK - module -address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -84,5 +84,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "6ee0f52395af2c1f4f03518e675dc3f6edb7a455"
+    "gitHead": "c3a1d978ab5a0af8addb53750e2652adcdcd160d"
 }

package/source/index.ts

@@ -19,7 +19,6 @@ export * from "./interfaces/data_access/ua_two_state_discrete_ex";
 export * from "./interfaces/data_access/ua_y_array_item_ex";
 export * from "./interfaces/extension_object_constructor";
 
-
 export * from "./interfaces/alarms_and_conditions/condition_info_i";
 export * from "./interfaces/alarms_and_conditions/condition_snapshot";
 export * from "./interfaces/alarms_and_conditions/instantiate_alarm_condition_options";
@@ -41,7 +40,7 @@ export * from "./interfaces/alarms_and_conditions/ua_non_exclusive_limit_alarm_e
 export { promoteToMultiStateDiscrete } from "../src/data_access/ua_multistate_discrete_impl";
 export { promoteToMultiStateValueDiscrete } from "../src/data_access/ua_multistate_value_discrete_impl";
 export { promoteToTwoStateDiscrete } from "../src/data_access/ua_two_state_discrete_impl";
-
+export { validateDataType } from "../src/data_access/ua_multistate_value_discrete_impl";
 
 export * from "./ua_root_folder";
 export * from "./session_context";
@@ -73,4 +72,4 @@ export * from "./set_namespace_meta_data";
 
 export * from "node-opcua-address-space-base";
 export * from "node-opcua-nodeset-ua";
-export * from "../src/nodeset_tools/construct_namespace_dependency";
+export * from "../src/nodeset_tools/construct_namespace_dependency";

package/source/pseudo_session.ts

@@ -122,6 +122,9 @@ export function innerBrowseNext(
         );
     callback!(null, results);
 }
+
+const $addressSpace = Symbol("addressSpace");
+const $context = Symbol("context");
 /**
  * Pseudo session is an helper object that exposes the same async methods
  * than the ClientSession. It can be used on a server address space.
@@ -136,13 +139,13 @@ export class PseudoSession implements IBasicSession {
     public requestedMaxReferencesPerNode = 0;
     public maxBrowseContinuationPoints = 0; // 0=no limits
     private _sessionId: NodeId = new NodeId(NodeIdType.GUID, randomGuid());
-    private readonly addressSpace: IAddressSpace;
+    private readonly [$addressSpace]: IAddressSpace;
     private readonly continuationPointManager: ContinuationPointManager;
-    private readonly context: ISessionContext;
+    private readonly [$context]: ISessionContext;
 
     constructor(addressSpace: IAddressSpace, context?: ISessionContext) {
-        this.addressSpace = addressSpace;
-        this.context = context || SessionContext.defaultContext;
+        this[$addressSpace] = addressSpace;
+        this[$context] = context || SessionContext.defaultContext;
         this.continuationPointManager = new ContinuationPointManager();
     }
 
@@ -166,7 +169,7 @@ export class PseudoSession implements IBasicSession {
                 browseDescription.referenceTypeId = resolveNodeId(browseDescription.referenceTypeId!);
                 const _browseDescription = coerceBrowseDescription(browseDescription);
                 const nodeId = resolveNodeId(_browseDescription.nodeId);
-                const r = this.addressSpace.browseSingleNode(nodeId, _browseDescription, this.context);
+                const r = this[$addressSpace].browseSingleNode(nodeId, _browseDescription, this[$context]);
                 results.push(r);
             }
             callack(null, results);
@@ -176,7 +179,7 @@ export class PseudoSession implements IBasicSession {
             innerBrowse(
                 {
                     browseAll,
-                    context: this.context,
+                    context: this[$context],
                     continuationPointManager: this.continuationPointManager,
                     requestedMaxReferencesPerNode: this.requestedMaxReferencesPerNode,
                     maxBrowseContinuationPoints: this.maxBrowseContinuationPoints
@@ -197,13 +200,13 @@ export class PseudoSession implements IBasicSession {
             nodesToRead = [nodesToRead as ReadValueIdOptions];
         }
         const _nodesToRead = nodesToRead as ReadValueIdOptions[];
-        const context = this.context;
+        const context = this[$context];
 
         setImmediate(() => {
             async.map(
                 _nodesToRead,
                 (nodeToRead: ReadValueIdOptions, innerCallback: any) => {
-                    const obj = this.addressSpace.findNode(nodeToRead.nodeId!);
+                    const obj = this[$addressSpace].findNode(nodeToRead.nodeId!);
                     if (!obj || obj.nodeClass !== NodeClass.Variable || nodeToRead.attributeId !== AttributeIds.Value) {
                         return innerCallback();
                     }
@@ -218,11 +221,11 @@ export class PseudoSession implements IBasicSession {
                         const attributeId = nodeToRead.attributeId!;
                         const indexRange = nodeToRead.indexRange;
                         const dataEncoding = nodeToRead.dataEncoding;
-                        const obj = this.addressSpace.findNode(nodeId);
+                        const obj = this[$addressSpace].findNode(nodeId);
                         if (!obj) {
                             return new DataValue({ statusCode: StatusCodes.BadNodeIdUnknown });
                         }
-                        const context = this.context;
+                        const context = this[$context];
                         const dataValue = obj.readAttribute(context, attributeId, indexRange, dataEncoding);
                         return dataValue;
                     });
@@ -288,8 +291,8 @@ export class PseudoSession implements IBasicSession {
                 const callMethodRequest = new CallMethodRequest(methodToCall);
 
                 callMethodHelper(
-                    this.context,
-                    this.addressSpace,
+                    this[$context],
+                    this[$addressSpace],
                     callMethodRequest,
                     (err: Error | null, result?: CallMethodResultOptions) => {
                         let callMethodResult: CallMethodResult;
@@ -327,7 +330,7 @@ export class PseudoSession implements IBasicSession {
             browsePaths = [browsePaths as BrowsePath];
         }
         const browsePathResults = (browsePaths as BrowsePath[]).map((browsePath: BrowsePath) => {
-            return this.addressSpace.browsePath(browsePath);
+            return this[$addressSpace].browsePath(browsePath);
         });
         callback!(null, isArray ? browsePathResults : browsePathResults[0]);
     }
@@ -338,14 +341,14 @@ export class PseudoSession implements IBasicSession {
     public write(nodesToWrite: WriteValueOptions[] | WriteValueOptions, callback?: ResponseCallback<any>): any {
         const isArray = nodesToWrite instanceof Array;
         const _nodesToWrite: WriteValueOptions[] = !isArray ? [nodesToWrite] : nodesToWrite;
-        const context = this.context;
+        const context = this[$context];
         setImmediate(() => {
             const statusCodesPromises = _nodesToWrite.map((nodeToWrite: WriteValueOptions) => {
                 assert(!!nodeToWrite.nodeId, "expecting a nodeId");
                 assert(!!nodeToWrite.attributeId, "expecting a attributeId");
 
                 const nodeId = nodeToWrite.nodeId!;
-                const obj = this.addressSpace.findNode(nodeId);
+                const obj = this[$addressSpace].findNode(nodeId);
                 if (!obj) {
                     return StatusCodes.BadNodeIdUnknown;
                 }

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/data_access/ua_multistate_value_discrete_impl.ts

@@ -172,23 +172,8 @@ export class UAMultiStateValueDiscreteImpl<T, DT extends DataType>
         // this includes signed and unsigned integers from 8 to 64 Bit length.
 
         // istanbul ignore next
-        if (
-            typeof this.dataType.value !== "number" ||
-            [
-                DataType.UInt64,
-                DataType.Int64,
-                DataType.UInt32,
-                DataType.Int32,
-                DataType.UInt16,
-                DataType.Int16,
-                DataType.Byte,
-                DataType.Byte,
-                DataType.SByte,
-                26 /*Number*/
-            ].indexOf(this.dataType.value as number) <= 0
-        ) {
-            throw new Error("Invalid DataType in UAMultiStateValueDiscrete =>" + this.dataType.toString());
-        }
+        validateDataType(this.dataType.value);
+
         // find the enum value type
         install_synchronization(this);
     }
@@ -298,3 +283,22 @@ export function _addMultiStateValueDiscrete<T, DT extends DataType>(
     assert(variable.valueAsText.browseName.toString() === "ValueAsText");
     return variable;
 }
+
+export function validateDataType(dataTypeValue: any): void {
+    const validTypes = [
+        DataType.UInt64,
+        DataType.Int64,
+        DataType.UInt32,
+        DataType.Int32,
+        DataType.UInt16,
+        DataType.Int16,
+        DataType.Byte,
+        DataType.Byte,
+        DataType.SByte,
+        26 /*Number*/
+    ];
+
+    if (typeof dataTypeValue !== "number" || validTypes.indexOf(dataTypeValue) < 0) {
+        throw new Error(`Invalid DataType in UAMultiStateValueDiscrete => ${dataTypeValue.toString()}`);
+    }
+}

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);
         });
@@ -1487,7 +1487,7 @@ export class NamespaceImpl implements NamespacePrivate {
         assert(typeof toState === "string");
         assert(isFinite(transitionNumber));
 
-        const fromStateNode = _component.getComponentByName(fromState, _component.nodeId.namespace);
+        const fromStateNode = _component.getComponentByName(fromState);
 
         // istanbul ignore next
         if (!fromStateNode) {
@@ -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);