node-opcua-address-space 2.56.0 → 2.59.0

package/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.ts

@@ -5,9 +5,10 @@ import { UAAcknowledgeableCondition_Base, UAAcknowledgeableCondition, UAConditio
 import { assert } from "node-opcua-assert";
 import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
 import { NodeId } from "node-opcua-nodeid";
-import { StatusCode, StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { DataType, VariantLike } from "node-opcua-variant";
 import { INamespace, RaiseEventData, ISessionContext, UAEventType, UAMethod } from "node-opcua-address-space-base";
+import { CallMethodResultOptions } from "node-opcua-service-call";
 
 import { UATwoStateVariableEx } from "../../source/ua_two_state_variable_ex";
 import { AddressSpacePrivate } from "../address_space_private";
@@ -106,10 +107,10 @@ export class UAAcknowledgeableConditionImpl extends UAConditionImpl implements U
     }
 
     public static install_method_handle_on_type(addressSpace: AddressSpacePrivate): void {
-        const acknowledgeableConditionType = addressSpace.findEventType("AcknowledgeableConditionType");
+        const acknowledgeableConditionType = addressSpace.findEventType("AcknowledgeableConditionType") as unknown as UAAcknowledgeableCondition_Base;
         assert(acknowledgeableConditionType !== null);
-        (acknowledgeableConditionType as any).acknowledge.bindMethod(_acknowledge_method);
-        (acknowledgeableConditionType as any).confirm.bindMethod(_confirm_method);
+        acknowledgeableConditionType.acknowledge.bindMethod(_acknowledge_method);
+        acknowledgeableConditionType.confirm?.bindMethod(_confirm_method);
     }
 
     public _raiseAuditConditionAcknowledgeEvent(branch: ConditionSnapshot): void {
@@ -296,7 +297,7 @@ export class UAAcknowledgeableConditionImpl extends UAConditionImpl implements U
     }
 }
 
-function _acknowledge_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _acknowledge_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     UAConditionImpl.with_condition_method(
         inputArguments,
         context,
@@ -321,7 +322,7 @@ function _acknowledge_method(inputArguments: VariantLike[], context: ISessionCon
  *
  * @private
  */
-function _confirm_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _confirm_method(inputArguments: VariantLike[], context: ISessionContext,  callback: CallbackT<CallMethodResultOptions>) {
     UAConditionImpl.with_condition_method(
         inputArguments,
         context,

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -21,8 +21,8 @@ import { DataValue } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
 import { minDate } from "node-opcua-factory";
 import { coerceNodeId, makeNodeId, NodeId, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
-import { StatusCode, StatusCodes } from "node-opcua-status-code";
-import { TimeZoneDataType } from "node-opcua-types";
+import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
+import { CallMethodResultOptions, TimeZoneDataType } from "node-opcua-types";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 import { UAVariable, INamespace, ISessionContext, UAEventType, BaseNode, UAObject } from "node-opcua-address-space-base";
 import { UACondition_Base, UAConditionVariable, UACondition } from "node-opcua-nodeset-ua";
@@ -258,13 +258,13 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
     }
 
     public getBranches(): ConditionSnapshot[] {
-        return Object.keys(this._branches).map((x: any) => {
+        return Object.keys(this._branches).map((x) => {
             return this._branches[x];
         });
     }
 
     public getBranchIds(): NodeId[] {
-        return this.getBranches().map((b: any) => b.getBranchId());
+        return this.getBranches().map((b) => b.getBranchId());
     }
 
     /**
@@ -1028,7 +1028,7 @@ function UACondition_instantiate(
     return conditionNode;
 }
 
-function _disable_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _disable_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 0);
 
     const conditionNode = context.object;
@@ -1047,7 +1047,7 @@ function _disable_method(inputArguments: VariantLike[], context: ISessionContext
     });
 }
 
-function _enable_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _enable_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 0);
     const conditionNode = context.object;
     assert(conditionNode);
@@ -1063,7 +1063,11 @@ function _enable_method(inputArguments: VariantLike[], context: ISessionContext,
     });
 }
 
-function _condition_refresh_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _condition_refresh_method(
+    inputArguments: VariantLike[],
+    context: ISessionContext,
+    callback: CallbackT<CallMethodResultOptions>
+) {
     // arguments : IntegerId SubscriptionId
     assert(inputArguments.length === 1);
     const addressSpace = context.object!.addressSpace as AddressSpacePrivate;
@@ -1119,7 +1123,7 @@ function _perform_condition_refresh(addressSpace: AddressSpacePrivate, inputArgu
     return StatusCodes.Good;
 }
 
-function _condition_refresh2_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _condition_refresh2_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     // arguments : IntegerId SubscriptionId
     // arguments : IntegerId MonitoredItemId
     assert(inputArguments.length === 2);
@@ -1142,7 +1146,7 @@ function _condition_refresh2_method(inputArguments: VariantLike[], context: ISes
     });
 }
 
-function _add_comment_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _add_comment_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     //
     // The AddComment Method is used to apply a comment to a specific state of a Condition
     // instance. Normally, the NodeId of the object instance as the ObjectId is passed to the Call

package/src/namespace_impl.ts

@@ -194,7 +194,7 @@ function detachNode(node: BaseNode) {
  * @params options.publicationDate="" {Date}
  *
  */
-export class UANamespace implements NamespacePrivate {
+export class NamespaceImpl implements NamespacePrivate {
     public static _handle_hierarchy_parent = _handle_hierarchy_parent;
     public static isNonEmptyQualifiedName = isNonEmptyQualifiedName;
 
@@ -237,8 +237,8 @@ export class UANamespace implements NamespacePrivate {
         this._nodeIdManager = new NodeIdManager(this.index, this.addressSpace);
     }
 
-    public getDefaultNamespace(): UANamespace {
-        return this.index === 0 ? this : (this.addressSpace.getDefaultNamespace() as UANamespace);
+    public getDefaultNamespace(): NamespacePrivate {
+        return this.index === 0 ? this : (this.addressSpace.getDefaultNamespace());
     }
 
     public dispose(): void {
@@ -1814,7 +1814,7 @@ export class UANamespace implements NamespacePrivate {
         }
         const references: UAReference[] = [];
 
-        function process_subtypeOf_options(this: UANamespace, options2: any, references1: AddReferenceOpts[]) {
+        function process_subtypeOf_options(this: NamespaceImpl, options2: any, references1: AddReferenceOpts[]) {
             // check common misspelling mistake
             assert(!options2.subTypeOf, "misspell error : it should be 'subtypeOf' instead");
             if (Object.prototype.hasOwnProperty.call(options2, "hasTypeDefinition")) {

package/src/nodeset_tools/nodeset_to_xml.ts

@@ -51,7 +51,7 @@ import { UAReferenceTypeImpl } from "../ua_reference_type_impl";
 import { UAObjectTypeImpl } from "../ua_object_type_impl";
 import { UAVariableImpl } from "../ua_variable_impl";
 import { UAObjectImpl } from "../ua_object_impl";
-import { UANamespace } from "../namespace_impl";
+import { NamespaceImpl } from "../namespace_impl";
 import { UAMethodImpl } from "../ua_method_impl";
 import { UADataTypeImpl } from "../ua_data_type_impl";
 import { UAVariableTypeImpl } from "../ua_variable_type_impl";
@@ -1199,7 +1199,7 @@ UADataTypeImpl.prototype.dumpXML = function (xw: XmlWriter) {
     dumpUADataType(xw, this);
 };
 
-UANamespace.prototype.toNodeset2XML = function (this: UANamespace) {
+NamespaceImpl.prototype.toNodeset2XML = function (this: NamespaceImpl) {
     const dependency = constructNamespaceDependency(this);
     const translationTable = constructNamespaceTranslationTable(dependency);
 

package/src/reference_impl.ts

@@ -53,9 +53,9 @@ function _w(str: string, width: number): string {
     return (str + "                                         ").substr(0, width);
 }
 
-function _localCoerceToNodeID(nodeIdLike: string | NodeId | BaseNode) {
-    if ((nodeIdLike as any).nodeId) {
-        return (nodeIdLike as BaseNode).nodeId;
+function _localCoerceToNodeID(nodeIdLike: string | NodeIdLike | { nodeId: NodeId }): NodeId {
+    if (Object.prototype.hasOwnProperty.call(nodeIdLike, "nodeId")) {
+        return (nodeIdLike as { nodeId: NodeId }).nodeId;
     }
     return coerceNodeId(nodeIdLike);
 }

package/src/state_machine/ua_shelving_state_machine_ex.ts

@@ -7,12 +7,13 @@
 // --------------------------------------------------------------------------------------------------
 
 import { assert } from "node-opcua-assert";
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
-import { UAProperty, MethodFunctorCallback, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
+import { UAProperty, ISessionContext, UAMethod, UAObject } from "node-opcua-address-space-base";
 import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
 import { UAShelvedStateMachine_Base, UAState } from "node-opcua-nodeset-ua";
+import { CallMethodResultOptions } from "node-opcua-service-call";
 
 import { UAAlarmConditionImpl } from "../alarms_and_conditions/ua_alarm_condition_impl";
 import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
@@ -93,7 +94,7 @@ export class UAShelvedStateMachineEx extends UAStateMachineImpl implements UAShe
 // specifying ConditionId as the ObjectId. The Method cannot be called with an ObjectId of the
 // ShelvedStateMachineType Node.
 // output => BadConditionNotShelved
-function _unshelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _unshelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 0);
     // var alarmNode = context.object.parent;
     // if (!(alarmNode instanceof UAAlarmConditionImpl)) {
@@ -188,7 +189,7 @@ function _start_timer_for_automatic_unshelve(shelvingState: UAShelvedStateMachin
 //                                           a reset of the shelved timer.
 //               BadShelvingTimeOutOfRange
 
-function _timedShelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: any) {
+function _timedShelve_method(inputArguments: VariantLike[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) {
     assert(inputArguments.length === 1);
     if (!context.object) {
         return;
@@ -250,7 +251,7 @@ function _oneShotShelve_method(
     this: UAMethod,
     inputArguments: Variant[],
     context: ISessionContext,
-    callback: MethodFunctorCallback
+    callback: CallbackT<CallMethodResultOptions>
 ) {
     assert(inputArguments.length === 0);
     const shelvingState = context.object! as UAShelvedStateMachineEx;

package/src/ua_method_impl.ts

@@ -1,6 +1,7 @@
 /**
  * @module node-opcua-address-space
  */
+import { callbackify } from "util";
 import * as chalk from "chalk";
 import { assert } from "node-opcua-assert";
 
@@ -11,13 +12,14 @@ import { make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug"
 import { NodeId } from "node-opcua-nodeid";
 import { NumericRange } from "node-opcua-numeric-range";
 import { Argument } from "node-opcua-service-call";
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { CallMethodResultOptions, PermissionType } from "node-opcua-types";
 import { Variant } from "node-opcua-variant";
 import { DataType, VariantLike } from "node-opcua-variant";
 import {
     MethodFunctor,
-    MethodFunctorCallback,
+    MethodFunctorA,
+    MethodFunctorC,
     UAMethod,
     UAObject,
     CloneExtraInfo,
@@ -122,6 +124,10 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
 
     public bindMethod(async_func: MethodFunctor): void {
         assert(typeof async_func === "function");
+        if (async_func.length === 2) {
+            async_func = callbackify(async_func as MethodFunctorA) as MethodFunctorC;
+        }
+        assert(async_func.length === 3);
         this._asyncExecutionFunction = async_func;
     }
     public execute(
@@ -133,13 +139,13 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
         object: UAObject | UAObjectType | null,
         inputArguments: null | VariantLike[],
         context: ISessionContext,
-        callback: MethodFunctorCallback
+        callback: CallbackT<CallMethodResultOptions>
     ): void;
     public execute(
         object: UAObject | UAObjectType | null,
         inputArguments: VariantLike[] | null,
         context: ISessionContext,
-        callback?: MethodFunctorCallback
+        callback?: CallbackT<CallMethodResultOptions>
     ): any {
         // istanbul ignore next
         if (!callback) {
@@ -200,7 +206,7 @@ export class UAMethodImpl extends BaseNodeImpl implements UAMethod {
                 this as UAMethodImpl,
                 inputArguments as Variant[],
                 context,
-                (err: Error | null, callMethodResult: CallMethodResultOptions) => {
+                (err: Error | null, callMethodResult?: CallMethodResultOptions) => {
                     if (err) {
                         debugLog(err.message);
                         debugLog(err);

package/testHelpers.d.ts

@@ -1 +1 @@
-export * from "./distHelpers";
+export * from "./distHelpers";

package/test_helpers/add_event_generator_object.ts

@@ -1,10 +1,11 @@
 /**
  * @module node-opcua-address-space
  */
-import { StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant } from "node-opcua-variant";
-import { INamespace, UAObject, ISessionContext, MethodFunctorCallback } from "node-opcua-address-space-base";
+import { INamespace, UAObject, ISessionContext } from "node-opcua-address-space-base";
 import { UAFolder } from "node-opcua-nodeset-ua";
+import { CallMethodResultOptions } from "node-opcua-types";
 
 export function add_eventGeneratorObject(namespace: INamespace, parentFolder: UAFolder | string): void {
     const myEvtType = namespace.addEventType({
@@ -40,7 +41,7 @@ export function add_eventGeneratorObject(namespace: INamespace, parentFolder: UA
         outputArguments: []
     });
 
-    method.bindMethod((inputArguments: Variant[], context: ISessionContext, callback: MethodFunctorCallback) => {
+    method.bindMethod((inputArguments: Variant[], context: ISessionContext, callback: CallbackT<CallMethodResultOptions>) => {
         // xx console.log("In Event Generator Method");
         // xx console.log(this.toString());
         // xx console.log(context.object.toString());

package/test_helpers/test_fixtures/dataType_in_separateNamespace.xml

@@ -1,150 +1,150 @@
-<?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="2019-05-01T00:00:00Z" 
-    xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
-    <NamespaceUris>
-        <Uri>http://opcfoundation.org/UA/DI/</Uri>
-    </NamespaceUris>
-    <Models>
-        <Model ModelUri="http://opcfoundation.org/UA/DI/" Version="1.02" PublicationDate="2019-05-01T00:00:00Z">
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.4" PublicationDate="2020-01-08T00:00:00Z" />
-        </Model>
-    </Models>
-    <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=6522" BrowseName="1:FetchResultDataType" IsAbstract="true">
-        <DisplayName>FetchResultDataType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
-        </References>
-    </UADataType>
-    <UADataType NodeId="ns=1;i=6525" BrowseName="1:ParameterResultDataType">
-        <DisplayName>ParameterResultDataType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
-        </References>
-        <Definition Name="1:ParameterResultDataType">
-            <Field Name="NodePath" DataType="i=20" ValueRank="1" />
-            <Field Name="StatusCode" DataType="i=19" />
-            <Field Name="Diagnostics" DataType="i=25" />
-        </Definition>
-    </UADataType>
-    <UADataType NodeId="ns=1;i=15889" BrowseName="1:TransferResultDataDataType">
-        <DisplayName>TransferResultDataDataType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=6522</Reference>
-        </References>
-        <Definition Name="1:TransferResultDataDataType">
-            <Field Name="SequenceNumber" DataType="i=6" />
-            <Field Name="EndOfResults" DataType="i=1" />
-            <Field Name="ParameterDefs" DataType="ns=1;i=6525" ValueRank="1" />
-        </Definition>
-    </UADataType>
-    <!-- A -->
-    <UAObject NodeId="ns=1;i=6554" BrowseName="Default Binary" SymbolicName="DefaultBinary">
-        <DisplayName>Default Binary</DisplayName>
-        <References>
-            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=6525</Reference>
-            <Reference ReferenceType="HasDescription">ns=1;i=6564</Reference>
-            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
-        </References>
-    </UAObject>
-    <UAVariable NodeId="ns=1;i=6564" BrowseName="1:ParameterResultDataType" ParentNodeId="ns=1;i=6435" DataType="String">
-        <DisplayName>ParameterResultDataType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
-            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
-        </References>
-        <Value>
-            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">ParameterResultDataType</String>
-        </Value>
-    </UAVariable>
-    <!-- B-->
-    <UAObject NodeId="ns=1;i=15892" BrowseName="Default Binary" SymbolicName="DefaultBinary">
-        <DisplayName>Default Binary</DisplayName>
-        <References>
-            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=15889</Reference>
-            <Reference ReferenceType="HasDescription">ns=1;i=15897</Reference>
-            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
-        </References>
-    </UAObject>
-    <UAVariable NodeId="ns=1;i=15897" BrowseName="1:TransferResultDataDataType" ParentNodeId="ns=1;i=6435" DataType="String">
-        <DisplayName>TransferResultDataDataType</DisplayName>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
-            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
-        </References>
-        <Value>
-            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">TransferResultDataDataType</String>
-        </Value>
-    </UAVariable>
-    <!-- C -->
-    <UAVariable NodeId="ns=1;i=6435" BrowseName="1:Opc.Ua.Di" SymbolicName="OpcUaDi_BinarySchema" DataType="ByteString">
-        <DisplayName>Opc.Ua.Di</DisplayName>
-        <References>
-            <Reference ReferenceType="HasProperty">ns=1;i=6437</Reference>
-            <Reference ReferenceType="HasProperty">ns=1;i=15893</Reference>
-
-            <Reference ReferenceType="HasComponent">ns=1;i=15897</Reference>
-            <Reference ReferenceType="HasComponent">ns=1;i=6564</Reference>
-            <Reference ReferenceType="HasComponent" IsForward="false">i=93</Reference>
-            <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
-        </References>
-        <Value/>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=6437" BrowseName="NamespaceUri" ParentNodeId="ns=1;i=6435" DataType="String">
-        <DisplayName>NamespaceUri</DisplayName>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
-        </References>
-        <Value>
-            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">http://opcfoundation.org/UA/DI/</String>
-        </Value>
-    </UAVariable>
-    <UAVariable NodeId="ns=1;i=15893" BrowseName="Deprecated" ParentNodeId="ns=1;i=6435" DataType="Boolean">
-        <DisplayName>Deprecated</DisplayName>
-        <References>
-            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
-            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
-        </References>
-        <Value>
-            <Boolean xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">true</Boolean>
-        </Value>
-    </UAVariable>
-</UANodeSet>
+<?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="2019-05-01T00:00:00Z" 
+    xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+    <NamespaceUris>
+        <Uri>http://opcfoundation.org/UA/DI/</Uri>
+    </NamespaceUris>
+    <Models>
+        <Model ModelUri="http://opcfoundation.org/UA/DI/" Version="1.02" PublicationDate="2019-05-01T00:00:00Z">
+            <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.4" PublicationDate="2020-01-08T00:00:00Z" />
+        </Model>
+    </Models>
+    <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=6522" BrowseName="1:FetchResultDataType" IsAbstract="true">
+        <DisplayName>FetchResultDataType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+    </UADataType>
+    <UADataType NodeId="ns=1;i=6525" BrowseName="1:ParameterResultDataType">
+        <DisplayName>ParameterResultDataType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+        <Definition Name="1:ParameterResultDataType">
+            <Field Name="NodePath" DataType="i=20" ValueRank="1" />
+            <Field Name="StatusCode" DataType="i=19" />
+            <Field Name="Diagnostics" DataType="i=25" />
+        </Definition>
+    </UADataType>
+    <UADataType NodeId="ns=1;i=15889" BrowseName="1:TransferResultDataDataType">
+        <DisplayName>TransferResultDataDataType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasSubtype" IsForward="false">ns=1;i=6522</Reference>
+        </References>
+        <Definition Name="1:TransferResultDataDataType">
+            <Field Name="SequenceNumber" DataType="i=6" />
+            <Field Name="EndOfResults" DataType="i=1" />
+            <Field Name="ParameterDefs" DataType="ns=1;i=6525" ValueRank="1" />
+        </Definition>
+    </UADataType>
+    <!-- A -->
+    <UAObject NodeId="ns=1;i=6554" BrowseName="Default Binary" SymbolicName="DefaultBinary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=6525</Reference>
+            <Reference ReferenceType="HasDescription">ns=1;i=6564</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+        </References>
+    </UAObject>
+    <UAVariable NodeId="ns=1;i=6564" BrowseName="1:ParameterResultDataType" ParentNodeId="ns=1;i=6435" DataType="String">
+        <DisplayName>ParameterResultDataType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
+        </References>
+        <Value>
+            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">ParameterResultDataType</String>
+        </Value>
+    </UAVariable>
+    <!-- B-->
+    <UAObject NodeId="ns=1;i=15892" BrowseName="Default Binary" SymbolicName="DefaultBinary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=15889</Reference>
+            <Reference ReferenceType="HasDescription">ns=1;i=15897</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+        </References>
+    </UAObject>
+    <UAVariable NodeId="ns=1;i=15897" BrowseName="1:TransferResultDataDataType" ParentNodeId="ns=1;i=6435" DataType="String">
+        <DisplayName>TransferResultDataDataType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6435</Reference>
+        </References>
+        <Value>
+            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">TransferResultDataDataType</String>
+        </Value>
+    </UAVariable>
+    <!-- C -->
+    <UAVariable NodeId="ns=1;i=6435" BrowseName="1:Opc.Ua.Di" SymbolicName="OpcUaDi_BinarySchema" DataType="ByteString">
+        <DisplayName>Opc.Ua.Di</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty">ns=1;i=6437</Reference>
+            <Reference ReferenceType="HasProperty">ns=1;i=15893</Reference>
+
+            <Reference ReferenceType="HasComponent">ns=1;i=15897</Reference>
+            <Reference ReferenceType="HasComponent">ns=1;i=6564</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">i=93</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
+        </References>
+        <Value/>
+    </UAVariable>
+    <UAVariable NodeId="ns=1;i=6437" BrowseName="NamespaceUri" ParentNodeId="ns=1;i=6435" DataType="String">
+        <DisplayName>NamespaceUri</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
+        </References>
+        <Value>
+            <String xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">http://opcfoundation.org/UA/DI/</String>
+        </Value>
+    </UAVariable>
+    <UAVariable NodeId="ns=1;i=15893" BrowseName="Deprecated" ParentNodeId="ns=1;i=6435" DataType="Boolean">
+        <DisplayName>Deprecated</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=6435</Reference>
+        </References>
+        <Value>
+            <Boolean xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">true</Boolean>
+        </Value>
+    </UAVariable>
+</UANodeSet>