node-opcua-address-space 2.81.0 → 2.83.0

package/src/ua_variable_impl.ts

@@ -348,23 +348,39 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
 
         this.semantic_version = 0;
     }
-
-    private checkPermissionAndAccessLevelPrivate(
+    private checkAccessLevelPrivate(
+        _context: ISessionContext,
+        accessLevel: AccessLevelFlag): boolean {
+        if (this.userAccessLevel === undefined) {
+            return true;
+        }
+        return (this.userAccessLevel & accessLevel) === accessLevel;
+    }
+    private checkPermissionPrivate(
         context: ISessionContext,
         permission: PermissionType,
-        accessLevel: AccessLevelFlag
-    ) {
+    ): boolean {
+        if (!context) return true;
         assert(context instanceof SessionContext);
         if (context.checkPermission) {
-            assert(context.checkPermission instanceof Function);
+            if (!(context.checkPermission instanceof Function)) {
+                errorLog("context checkPermission is not a function");
+                return false;
+            }
             if (!context.checkPermission(this, permission)) {
                 return false;
             }
         }
-        if (this.userAccessLevel === undefined) {
-            return true;
+        return true;
+    }
+    private checkPermissionAndAccessLevelPrivate(
+        context: ISessionContext,
+        permission: PermissionType,
+        accessLevel: AccessLevelFlag): boolean {
+        if (!this.checkPermissionPrivate(context, permission)) {
+            return false;
         }
-        return (this.userAccessLevel & accessLevel) === accessLevel;
+        return this.checkAccessLevelPrivate(context, accessLevel);
     }
 
     public isReadable(context: ISessionContext): boolean {
@@ -375,7 +391,10 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         if (!this.isReadable(context)) {
             return false;
         }
-        return this.checkPermissionAndAccessLevelPrivate(context, PermissionType.Read, AccessLevelFlag.CurrentRead);
+        if (!this.checkPermissionPrivate(context, PermissionType.Read)) {
+            return false;
+        }
+        return this.checkAccessLevelPrivate(context, AccessLevelFlag.CurrentRead);
     }
 
     public isWritable(context: ISessionContext): boolean {
@@ -451,9 +470,12 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         if (!this.isReadable(context)) {
             return new DataValue({ statusCode: StatusCodes.BadNotReadable });
         }
-        if (!this.isUserReadable(context)) {
+        if (!this.checkPermissionPrivate(context, PermissionType.Read)) {
             return new DataValue({ statusCode: StatusCodes.BadUserAccessDenied });
         }
+        if (!this.isUserReadable(context)) {
+            return new DataValue({ statusCode: StatusCodes.BadNotReadable });
+        }
         if (!isValidDataEncoding(dataEncoding)) {
             return new DataValue({ statusCode: StatusCodes.BadDataEncodingInvalid });
         }
@@ -484,10 +506,10 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         ) {
             debugLog(
                 chalk.red(" Warning:  UAVariable#readValue ") +
-                    chalk.cyan(this.browseName.toString()) +
-                    " (" +
-                    chalk.yellow(this.nodeId.toString()) +
-                    ") exists but dataValue has not been defined"
+                chalk.cyan(this.browseName.toString()) +
+                " (" +
+                chalk.yellow(this.nodeId.toString()) +
+                ") exists but dataValue has not been defined"
             );
         }
         return dataValue;
@@ -689,9 +711,9 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 if (variant.dataType === null || variant.dataType === undefined) {
                     throw new Error(
                         "Variant must provide a valid dataType : variant = " +
-                            variant.toString() +
-                            " this.dataType= " +
-                            this.dataType.toString()
+                        variant.toString() +
+                        " this.dataType= " +
+                        this.dataType.toString()
                     );
                 }
                 if (
@@ -700,9 +722,9 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 ) {
                     throw new Error(
                         "Variant must provide a valid Boolean : variant = " +
-                            variant.toString() +
-                            " this.dataType= " +
-                            this.dataType.toString()
+                        variant.toString() +
+                        " this.dataType= " +
+                        this.dataType.toString()
                     );
                 }
                 if (
@@ -713,9 +735,9 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 ) {
                     throw new Error(
                         "Variant must provide a valid LocalizedText : variant = " +
-                            variant.toString() +
-                            " this.dataType= " +
-                            this.dataType.toString()
+                        variant.toString() +
+                        " this.dataType= " +
+                        this.dataType.toString()
                     );
                 }
             }
@@ -870,8 +892,13 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         if (!this.isWritable(context)) {
             return callback!(null, StatusCodes.BadNotWritable);
         }
+        if (!this.checkPermissionPrivate(context, PermissionType.Write)) {
+            return new DataValue({ statusCode: StatusCodes.BadUserAccessDenied });
+        }
+
+
         if (!this.isUserWritable(context)) {
-            return callback!(null, StatusCodes.BadUserAccessDenied);
+            return callback!(null, StatusCodes.BadWriteNotSupported);
         }
 
         // adjust special case
@@ -997,9 +1024,14 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 if (writeValue.value!.value.dataType !== DataType.Boolean) {
                     return callback(null, StatusCodes.BadTypeMismatch);
                 }
-                if (!this.canUserWriteHistorizingAttribute(context)) {
+                if (!this.checkPermissionPrivate(context, PermissionType.WriteHistorizing)) {
                     return callback(null, StatusCodes.BadUserAccessDenied);
                 }
+
+                if (!this.canUserWriteHistorizingAttribute(context)) {
+                    return callback(null, StatusCodes.BadHistoryOperationUnsupported);
+                }
+
                 // if the variable has no historizing in place reject
                 if (!this.getChildByName("HA Configuration")) {
                     return callback(null, StatusCodes.BadNotSupported);
@@ -1227,11 +1259,16 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
                 const dataValue = new DataValue({ statusCode: StatusCodes.BadNotReadable });
                 innerCallback(null, dataValue);
             };
-        } else if (!this.isUserReadable(context)) {
+        } else if (!this.checkPermissionPrivate(context, PermissionType.Read)) {
             func = (innerCallback: (err: Error | null, dataValue: DataValue) => void) => {
                 const dataValue = new DataValue({ statusCode: StatusCodes.BadUserAccessDenied });
                 innerCallback(null, dataValue);
             };
+        } else if (!this.isUserReadable(context)) {
+            func = (innerCallback: (err: Error | null, dataValue: DataValue) => void) => {
+                const dataValue = new DataValue({ statusCode: StatusCodes.BadNotReadable });
+                innerCallback(null, dataValue);
+            };
         } else {
             func = typeof this.refreshFunc === "function" ? this.asyncRefresh.bind(this, new Date()) : readImmediate;
         }
@@ -1560,12 +1597,19 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
         continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ): void {
-        if (!this.canUserReadHistory(context)) {
+
+        if (!this.checkPermissionPrivate(context, PermissionType.ReadHistory)) {
             const result = new HistoryReadResult({
                 statusCode: StatusCodes.BadUserAccessDenied
             });
             callback(null, result);
         }
+        if (!this.canUserReadHistory(context)) {
+            const result = new HistoryReadResult({
+                statusCode: StatusCodes.BadHistoryOperationUnsupported
+            });
+            callback(null, result);
+        }
         const result = new HistoryReadResult({
             statusCode: StatusCodes.BadHistoryOperationUnsupported
         });
@@ -1634,8 +1678,7 @@ export class UAVariableImpl extends BaseNodeImpl implements UAVariable {
             const nbElements = dataValue.value.dimensions.reduce((acc, x) => acc * x, 1);
             if (dataValue.value.value.length !== 0 && dataValue.value.value.length !== nbElements) {
                 throw new Error(
-                    `Internal Error: matrix dimension doesn't match the number of element in the array : ${dataValue.toString()} "\n expecting ${nbElements} elements but got ${
-                        dataValue.value.value.length
+                    `Internal Error: matrix dimension doesn't match the number of element in the array : ${dataValue.toString()} "\n expecting ${nbElements} elements but got ${dataValue.value.value.length
                     }`
                 );
             }
@@ -1984,7 +2027,7 @@ function _Variable_bind_with_timestamped_get(
             errorLog(
                 chalk.red(" Bind variable error: "),
                 " the timestamped_get function must return a DataValue or a Promise<DataValue>" +
-                    "\n value_check.constructor.name ",
+                "\n value_check.constructor.name ",
                 dataValue_verify ? dataValue_verify.constructor.name : "null"
             );
 
@@ -2179,7 +2222,7 @@ export interface UAVariableImplT<T, DT extends DataType> extends UAVariableImpl,
     writeValue(context: ISessionContext, dataValue: DataValueT<T, DT>, callback: StatusCodeCallback): void;
     writeValue(context: ISessionContext, dataValue: DataValueT<T, DT>, indexRange?: NumericRange | null): Promise<StatusCode>;
 }
-export class UAVariableImplT<T, DT extends DataType> extends UAVariableImpl {}
+export class UAVariableImplT<T, DT extends DataType> extends UAVariableImpl { }
 // x TO DO
 // require("./data_access/ua_variable_data_access");
 // require("./historical_access/ua_variable_history");

package/test_helpers/test_fixtures/dataType_with_union.xml

@@ -1 +1,90 @@
-// TO DO 
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" LastModified="2020-01-08T00:00:00Z"
+    xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+    <Models>
+        <Model ModelUri="http://mynodeset/" Version="1.01" PublicationDate="2020-06-18T13:52:03Z">
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.03" PublicationDate="2019-09-09T00:00:00Z" />
+        </Model>
+    </Models>
+    <NamespaceUris>
+        <Uri>http://mynodeset/</Uri>
+    </NamespaceUris>
+
+    <Aliases>
+        <Alias Alias="Boolean">i=1</Alias>
+        <Alias Alias="SByte">i=2</Alias>
+        <Alias Alias="Byte">i=3</Alias>
+        <Alias Alias="Int16">i=4</Alias>
+        <Alias Alias="UInt16">i=5</Alias>
+        <Alias Alias="Int32">i=6</Alias>
+        <Alias Alias="UInt32">i=7</Alias>
+        <Alias Alias="Int64">i=8</Alias>
+        <Alias Alias="UInt64">i=9</Alias>
+        <Alias Alias="Float">i=10</Alias>
+        <Alias Alias="Double">i=11</Alias>
+        <Alias Alias="DateTime">i=13</Alias>
+        <Alias Alias="String">i=12</Alias>
+        <Alias Alias="ByteString">i=15</Alias>
+        <Alias Alias="Guid">i=14</Alias>
+        <Alias Alias="XmlElement">i=16</Alias>
+        <Alias Alias="NodeId">i=17</Alias>
+        <Alias Alias="ExpandedNodeId">i=18</Alias>
+        <Alias Alias="QualifiedName">i=20</Alias>
+        <Alias Alias="LocalizedText">i=21</Alias>
+        <Alias Alias="StatusCode">i=19</Alias>
+        <Alias Alias="Structure">i=22</Alias>
+        <Alias Alias="Number">i=26</Alias>
+        <Alias Alias="Integer">i=27</Alias>
+        <Alias Alias="UInteger">i=28</Alias>
+        <Alias Alias="HasComponent">i=47</Alias>
+        <Alias Alias="HasProperty">i=46</Alias>
+        <Alias Alias="Organizes">i=35</Alias>
+        <Alias Alias="HasEventSource">i=36</Alias>
+        <Alias Alias="HasNotifier">i=48</Alias>
+        <Alias Alias="HasSubtype">i=45</Alias>
+        <Alias Alias="HasTypeDefinition">i=40</Alias>
+        <Alias Alias="HasModellingRule">i=37</Alias>
+        <Alias Alias="HasEncoding">i=38</Alias>
+        <Alias Alias="HasDescription">i=39</Alias>
+    </Aliases>
+
+    <UADataType NodeId="ns=1;i=1000" BrowseName="1:CustomUnion">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=12756</Reference>
+            <Reference ReferenceType="HasEncoding">ns=1;i=1001</Reference>
+        </References>
+        <Definition Name="1:CustomUnion" IsUnion="true">
+            <Field Name="ByteString" DataType="ByteString" />
+            <Field Name="String" DataType="String" />
+            <Field Name="Custom" />
+        </Definition>
+    </UADataType>
+    <UAObject NodeId="ns=1;i=1001" BrowseName="Default Binary" SymbolicName="DefaultBinary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=1000</Reference>
+        </References>
+    </UAObject>
+
+    <UADataType NodeId="ns=1;i=2000" BrowseName="1:CustomStruct">
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+            <Reference ReferenceType="HasEncoding">ns=1;i=2001</Reference>
+        </References>
+        <Definition Name="1:CustomStruct">
+            <Field Name="ByteString" DataType="ByteString" />
+            <Field Name="String" DataType="String" />
+            <Field Name="Custom" />
+        </Definition>
+    </UADataType>
+    <UAObject NodeId="ns=1;i=2001" BrowseName="Default Binary" SymbolicName="DefaultBinary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=2x²000</Reference>
+        </References>
+    </UAObject>
+
+</UANodeSet>

package/test_helpers/test_fixtures/datatype_as_per_1.04.xml

@@ -7,15 +7,15 @@
     </NamespaceUris>
     <Models>
         <Model ModelUri="http://A" PublicationDate="2021-01-01T00:00:00Z" Version="1.00">
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7"/>
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7" />
         </Model>
         <Model ModelUri="http://B" PublicationDate="2021-01-01T00:00:00Z" Version="1.00">
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7"/>
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7" />
         </Model>
         <Model ModelUri="http://C" PublicationDate="2021-01-01T00:00:00Z" Version="1.00">
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7"/>
-            <RequiredModel ModelUri="http://A" PublicationDate="2021-01-01T00:00:00Z" Version="1.00"/>
-            <RequiredModel ModelUri="http://B" PublicationDate="2021-01-01T00:00:00Z" Version="1.00"/>
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" PublicationDate="2020-07-15T00:00:00Z" Version="1.04.7" />
+            <RequiredModel ModelUri="http://A" PublicationDate="2021-01-01T00:00:00Z" Version="1.00" />
+            <RequiredModel ModelUri="http://B" PublicationDate="2021-01-01T00:00:00Z" Version="1.00" />
         </Model>
     </Models>
     <Aliases>
@@ -69,10 +69,10 @@
             <Reference ReferenceType="HasEncoding">ns=1;i=5004</Reference>
         </References>
         <Definition Name="1:MixingToFilling">
-            <Field DataType="Boolean" Name="Start"/>
-            <Field DataType="Boolean" Name="Stop"/>
-            <Field DataType="Boolean" Name="Hold"/>
-            <Field DataType="Double" Name="Amount"/>
+            <Field DataType="Boolean" Name="Start" />
+            <Field DataType="Boolean" Name="Stop" />
+            <Field DataType="Boolean" Name="Hold" />
+            <Field DataType="Double" Name="Amount" />
         </Definition>
     </UADataType>
     <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=5003" BrowseName="Default Binary">
@@ -87,4 +87,32 @@
             <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
         </References>
     </UAObject>
-</UANodeSet>
+
+
+    <UADataType NodeId="ns=1;i=10001" BrowseName="1:MyStructureWithMatrix">
+        <DisplayName>MyStructureWithMatrix</DisplayName>
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+            <Reference ReferenceType="HasEncoding">ns=1;i=10002</Reference>
+            <Reference ReferenceType="HasEncoding">ns=1;i=10003</Reference>
+        </References>
+        <Definition Name="1:MyStructureWithMatrix">
+            <Field DataType="Double" Name="MyArray"  ValueRank="1" ArrayDimensions="2" />
+            <Field DataType="Double" Name="MyMatrix" ValueRank="2" ArrayDimensions="2,3" />
+            <Field DataType="Double" Name="MyCube"   ValueRank="3" ArrayDimensions="2,2,2" />
+        </Definition>
+    </UADataType>
+    
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=10002" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+        </References>
+    </UAObject>
+    <UAObject SymbolicName="DefaultXML" NodeId="ns=1;i=10003" BrowseName="Default XML">
+        <DisplayName>Default XML</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+        </References>
+    </UAObject>
+</UANodeSet>