node-opcua-address-space 2.76.2 → 2.78.0

package/src/ua_data_type_impl.ts

@@ -16,12 +16,11 @@ import {
     EnumDefinition,
     EnumFieldOptions,
     StructureDefinition,
-    StructureField,
     StructureFieldOptions,
     StructureType
 } from "node-opcua-types";
 import { DataType } from "node-opcua-variant";
-import { UAObject, ISessionContext, UADataType, UAVariable, BaseNode, CreateDataTypeOptions } from "node-opcua-address-space-base";
+import { UAObject, ISessionContext, UADataType, UAVariable, BaseNode } from "node-opcua-address-space-base";
 import { DataTypeIds } from "node-opcua-constants";
 import { IStructuredTypeSchema } from "node-opcua-factory";
 
@@ -124,11 +123,15 @@ export class UADataTypeImpl extends BaseNodeImpl implements UADataType {
                 break;
             case AttributeIds.DataTypeDefinition:
                 {
-                    const _definition = this._getDefinition()?.clone();
-                    if (_definition !== null) {
-                        options.value = { dataType: DataType.ExtensionObject, value: _definition };
-                    } else {
+                    if (this.namespace.$emulateVersion103) {
                         options.statusCode = StatusCodes.BadAttributeIdInvalid;
+                    } else {
+                        const _definition = this._getDefinition()?.clone();
+                        if (_definition !== null) {
+                            options.value = { dataType: DataType.ExtensionObject, value: _definition };
+                        } else {
+                            options.statusCode = StatusCodes.BadAttributeIdInvalid;
+                        }
                     }
                 }
                 break;
@@ -414,6 +417,7 @@ function makeEnumDefinition(definitionFields: EnumFieldOptions[]) {
         }))
     });
 }
+
 function makeStructureDefinition(
     name: string,
     baseDataType: NodeId,
@@ -464,4 +468,4 @@ function lockReadOnlyWithWriteDetection<T>(obj: T): T {
     }
     return obj;
 }
-*/
+*/

package/src/ua_object_impl.ts

@@ -30,11 +30,14 @@ import {
     defaultCloneExtraInfo,
     EventNotifierFlags
 } from "node-opcua-address-space-base";
+import { make_errorLog } from "node-opcua-debug";
 
 import { BaseNodeImpl, InternalBaseNodeOptions } from "./base_node_impl";
 import { _clone, ToStringBuilder, UAObject_toString } from "./base_node_private";
 import { apply_condition_refresh, ConditionRefreshCache } from "./apply_condition_refresh";
 
+const errorLog = make_errorLog(__filename);
+
 export class UAObjectImpl extends BaseNodeImpl implements UAObject {
     private _eventNotifier: EventNotifierFlags;
     public readonly nodeClass = NodeClass.Object;
@@ -44,6 +47,14 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
     public readonly symbolicName: string | null;
 
     get typeDefinitionObj(): UAObjectType {
+        // istanbul ignore next
+        if (super.typeDefinitionObj.nodeClass !== NodeClass.ObjectType) {
+            const msg = `Invalid type definition node class , expecting a ObjectType got ${
+                NodeClass[super.typeDefinitionObj.nodeClass]
+            }\n${this.browseName.toString()} ${this.nodeId.toString()}`;
+            errorLog(msg);
+            throw new Error(msg);
+        }
         return super.typeDefinitionObj as UAObjectType;
     }
 
@@ -79,7 +90,6 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
     }
 
     public clone(options: CloneOptions, optionalFilter?: CloneFilter, extraInfo?: CloneExtraInfo): UAObject {
-        options = options || {};
         options = {
             ...options,
             eventNotifier: this.eventNotifier,
@@ -156,7 +166,7 @@ export class UAObjectImpl extends BaseNodeImpl implements UAObject {
         // coerce EventType
         eventTypeNode = addressSpace.findEventType(eventType as UAEventType) as UAEventType;
         const baseEventType = addressSpace.findEventType("BaseEventType")!;
-   
+
         data.$eventDataSource = eventTypeNode;
         data.sourceNode = data.sourceNode || { dataType: DataType.NodeId, value: this.nodeId };
 

package/src/ua_variable_impl.ts

@@ -17,7 +17,8 @@ import {
     GetFunc,
     SetFunc,
     VariableDataValueGetterSync,
-    VariableDataValueSetterWithCallback} from "node-opcua-address-space-base";
+    VariableDataValueSetterWithCallback
+} from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
 import {
     isValidDataEncoding,
@@ -309,6 +310,12 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
     public __waiting_callbacks?: any[];
 
     get typeDefinitionObj(): UAVariableType {
+        // istanbul ignore next
+        if (super.typeDefinitionObj && super.typeDefinitionObj.nodeClass !== NodeClass.VariableType) {
+            throw new Error(
+                "Invalid type definition node class , expecting a VariableType got " + NodeClass[super.typeDefinitionObj.nodeClass]
+            );
+        }
         return super.typeDefinitionObj as UAVariableType;
     }
     get typeDefinition(): NodeId {
@@ -1325,7 +1332,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 // let's coerce this scalar into an 1-element array if it is a valid extension object
                 if (checkExtensionObjectIsCorrectScalar.call(this, extObj)) {
                     warningLog(
-                        `checkExtensionObjectIsCorrect : expecting a array but got a scalar (value rank of ${this.browseName.toString()} is 1)`
+                        `warning: checkExtensionObjectIsCorrect : expecting a array but got a scalar (value rank of '${this.browseName.toString()}' is 1)\nautomatic conversion from scalar to array with 1 element is taking place.`
                     );
                     extObj = [extObj];
                 } else {

package/src/ua_variable_impl_ext_obj.ts

@@ -279,7 +279,7 @@ export function _installExtensionObjectBindingOnProperties(
         }
 
         const camelCaseName = lowerFirstLetter(field.name!);
-        assert(Object.prototype.hasOwnProperty.call(variableNode.$extensionObject, camelCaseName));
+        // assert(Object.prototype.hasOwnProperty.call(variableNode.$extensionObject, camelCaseName));
 
         if (variableNode.$extensionObject[camelCaseName] !== undefined && basicDataType === DataType.ExtensionObject) {
             propertyNode.bindExtensionObject(variableNode.$extensionObject[camelCaseName], { ...options, force: true });

package/test_helpers/get_mini_address_space.ts

@@ -29,7 +29,7 @@ export function getMiniAddressSpace(...args: any[]): any {
     const serverNamespace = addressSpace.registerNamespace("http://MYNAMESPACE");
     assert(serverNamespace.index === 1);
 
-    generateAddressSpace(addressSpace, get_mini_nodeset_filename(), (err?: Error) => {
+    generateAddressSpace(addressSpace, get_mini_nodeset_filename(), {}, (err?: Error) => {
         // istanbul ignore next
         if (err) {
             // tslint:disable:no-console

package/test_helpers/test_fixtures/mini.Node.Set2.xml

@@ -426,6 +426,35 @@
         </References>
         <InverseName>MayBeEffectedBy</InverseName>
     </UAReferenceType>
+
+    <UADataType NodeId="i=95" BrowseName="AccessRestrictionType">
+        <DisplayName>AccessRestrictionType</DisplayName>
+        <References>
+          <Reference ReferenceType="HasProperty">i=15035</Reference>
+          <Reference ReferenceType="HasSubtype" IsForward="false">i=5</Reference>
+        </References>
+        <Definition Name="AccessRestrictionType" IsOptionSet="true">
+          <Field Name="SigningRequired" Value="0" />
+          <Field Name="EncryptionRequired" Value="1" />
+          <Field Name="SessionRequired" Value="2" />
+          <Field Name="ApplyRestrictionsToBrowse" Value="3" />
+        </Definition>
+      </UADataType>
+
+      
+    <UADataType NodeId="i=96" BrowseName="RolePermissionType">
+        <DisplayName>RolePermissionType</DisplayName>
+        <Documentation>https://reference.opcfoundation.org/v104/Core/docs/Part3/5.2.9</Documentation>
+        <References>
+          <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+        <Definition Name="RolePermissionType">
+          <Field Name="RoleId" DataType="i=17" />
+          <Field Name="Permissions" DataType="i=94" />
+        </Definition>
+      </UADataType>
+
+      
     <UAReferenceType NodeId="i=117" BrowseName="HasSubStateMachine">
         <DisplayName>HasSubStateMachine</DisplayName>
         <Description>The type for a reference to a substate for a state.</Description>

package/test_helpers/test_fixtures/nodeset_no_aliases.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd">
+    <NamespaceUris>
+        <Uri>http://A</Uri>
+    </NamespaceUris>
+    <Models>
+        <Model ModelUri="http://A" PublicationDate="2021-01-01T00:00:00Z" Version="1.00">
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.03" PublicationDate="2013-12-02T00:00:00Z" />
+        </Model>
+    </Models>
+    <UAVariable DataType="UInt64" ParentNodeId="ns=0;i=2253" NodeId="ns=1;i=1000" BrowseName="1:VariableWithUInt64" AccessLevel="3">
+        <DisplayName>NominalParts</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:UInt64>1234567890</uax:UInt64>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="Int64" ParentNodeId="ns=0;i=2253" NodeId="ns=1;i=1001" BrowseName="1:VariableWithInt64" AccessLevel="3">
+        <DisplayName>NominalParts</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:Int64>-1234567890</uax:Int64>
+        </Value>
+    </UAVariable>
+</UANodeSet>

package/test_helpers/test_fixtures/nodeset_no_aliases_with_aliases.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd">
+    <NamespaceUris>
+        <Uri>http://A</Uri>
+    </NamespaceUris>
+    <Models>
+        <Model ModelUri="http://A" PublicationDate="2021-01-01T00:00:00Z" Version="1.00">
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.03" PublicationDate="2013-12-02T00:00:00Z" />
+        </Model>
+    </Models>
+    <Aliases></Aliases>
+    <UAVariable DataType="UInt64" ParentNodeId="ns=0;i=2253" NodeId="ns=1;i=1000" BrowseName="1:VariableWithUInt64" AccessLevel="3">
+        <DisplayName>NominalParts</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:UInt64>1234567890</uax:UInt64>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="Int64" ParentNodeId="ns=0;i=2253" NodeId="ns=1;i=1001" BrowseName="1:VariableWithInt64" AccessLevel="3">
+        <DisplayName>NominalParts</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:Int64>-1234567890</uax:Int64>
+        </Value>
+    </UAVariable>
+</UANodeSet>