node-opcua-address-space 2.56.2 → 2.60.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_alarm_condition_impl.ts

@@ -6,7 +6,7 @@ import { isEqual } from "lodash";
 import { assert } from "node-opcua-assert";
 import { NodeClass } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
-import { NodeId } from "node-opcua-nodeid";
+import { NodeId, sameNodeId } from "node-opcua-nodeid";
 import { StatusCodes } from "node-opcua-status-code";
 import { DataType } from "node-opcua-variant";
 import { UAAlarmCondition_Base } from "node-opcua-nodeset-ua";
@@ -498,7 +498,7 @@ export class UAAlarmConditionImpl extends UAAcknowledgeableConditionImpl impleme
                 if (this.currentBranch().getRetain()) {
                     // we need to create a new branch so the previous state could be acknowledged
                     const newBranch = this.createBranch();
-                    assert(newBranch.getBranchId() !== NodeId.nullNodeId);
+                    assert(!sameNodeId(newBranch.getBranchId(), NodeId.nullNodeId));
                     // also raised a new Event for the new branch as branchId has changed
                     this.raiseNewBranchState(newBranch);
                 }

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";
@@ -238,7 +238,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      */
     public post_initialize(): void {
         assert(!this._branch0);
-        this._branch0 = new ConditionSnapshot(this, NodeId.nullNodeId);
+        this._branch0 = new ConditionSnapshot(this, new NodeId());
 
         // the condition OPCUA object alway reflects the default branch states
         // so we set a mechanism that automatically keeps self in sync
@@ -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());
     }
 
     /**
@@ -284,7 +284,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      */
     public deleteBranch(branch: ConditionSnapshot): void {
         const key = branch.getBranchId().toString();
-        assert(branch.getBranchId() !== NodeId.nullNodeId, "cannot delete branch zero");
+        assert(!sameNodeId(branch.getBranchId(), NodeId.nullNodeId), "cannot delete branch zero");
         assert(Object.prototype.hasOwnProperty.call(this._branches, key));
         delete this._branches[key];
         this.emit("branch_deleted", key);
@@ -560,7 +560,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
     public raiseNewBranchState(branch: ConditionSnapshot): void {
         this.raiseConditionEvent(branch, true);
 
-        if (branch.getBranchId() !== NodeId.nullNodeId && !branch.getRetain()) {
+        if (!sameNodeId(branch.getBranchId(), NodeId.nullNodeId) && !branch.getRetain()) {
             // xx console.log(" Deleting not longer needed branch ", branch.getBranchId().toString());
             // branch can be deleted
             this.deleteBranch(branch);
@@ -789,7 +789,7 @@ function UACondition_instantiate(
     // install initial branch ID (null NodeId);
     conditionNode.branchId.setValueFromSource({
         dataType: DataType.NodeId,
-        value: NodeId.nullNodeId
+        value: new NodeId()
     });
 
     // install 'Comment' condition variable
@@ -920,7 +920,9 @@ function UACondition_instantiate(
             conditionNode.sourceNode.setValueFromSource(conditionSourceNode.readAttribute(null, AttributeIds.NodeId).value);
 
             // set source Name (defined in UABaseEventType)
-            conditionNode.sourceName.setValueFromSource(conditionSourceNode.readAttribute(null, AttributeIds.DisplayName).value);
+            const displayName: LocalizedText = conditionSourceNode.readAttribute(null, AttributeIds.DisplayName).value
+                .value as LocalizedText;
+            conditionNode.sourceName.setValueFromSource({ dataType: DataType.String, value: displayName.text });
         }
     }
 
@@ -953,7 +955,7 @@ function UACondition_instantiate(
      */
     const baseConditionClassType = addressSpace.findObjectType("ProcessConditionClassType");
     // assert(baseConditionClassType,"Expecting BaseConditionClassType to be in addressSpace");
-    let conditionClassId = baseConditionClassType ? baseConditionClassType.nodeId : NodeId.nullNodeId;
+    let conditionClassId = baseConditionClassType ? baseConditionClassType.nodeId : new NodeId();
     let conditionClassName = baseConditionClassType ? baseConditionClassType.displayName[0] : "";
     if (options.conditionClass) {
         if (typeof options.conditionClass === "string") {
@@ -1028,7 +1030,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 +1049,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 +1065,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 +1125,11 @@ 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 +1152,11 @@ 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/alarms_and_conditions/ua_off_normal_alarm_impl.ts

@@ -79,7 +79,7 @@ export class UAOffNormalAlarmImpl extends UADiscreteAlarmImpl implements UAOffNo
         const normalState = addressSpace._coerceNode(options.normalState)! as UAVariable;
         //       assert(normalState, "Expecting a valid normalState node");
 
-        const normalStateNodeId = normalState ? normalState.nodeId : NodeId.nullNodeId;
+        const normalStateNodeId = normalState ? normalState.nodeId : new NodeId();
         alarmNode.normalState.setValueFromSource({ dataType: DataType.NodeId, value: normalStateNodeId });
 
         if (inputNode) {

package/src/base_node_private.ts

@@ -343,6 +343,10 @@ function AccessLevelFlags_toString(this: UAVariable, options: ToStringOption) {
         );
     }
 }
+
+interface WithDataValue {
+    $dataValue?: DataValue;
+}
 export function VariableOrVariableType_toString(this: UAVariableType | UAVariable, options: ToStringOption): void {
     assert(options);
     if (this.dataType) {
@@ -352,7 +356,7 @@ export function VariableOrVariableType_toString(this: UAVariableType | UAVariabl
         options.add(options.padding + chalk.yellow("          dataType            : ") + this.dataType + "  " + n);
     }
     if (this.nodeClass === NodeClass.Variable) {
-        const _dataValue = (<any>this)._dataValue as DataValue | undefined;
+        const _dataValue = (<WithDataValue>this).$dataValue as DataValue | undefined;
         if (_dataValue) {
             options.add(
                 options.padding +
@@ -622,7 +626,7 @@ function _makeReferenceDescription(addressSpace: IAddressSpace, reference: UARef
         };
     }
     if (data.typeDefinition === null) {
-        data.typeDefinition = NodeId.nullNodeId;
+        data.typeDefinition = new NodeId();
     }
     const referenceDescription = new ReferenceDescription(data);
     return referenceDescription;

package/src/event_data.ts

@@ -25,7 +25,7 @@ export class EventData implements IEventData {
 
     constructor(eventTypeNode: BaseNode) {
         this.__nodes = {};
-        this.eventId = NodeId.nullNodeId;
+        this.eventId = new NodeId();
         this.$eventDataSource = eventTypeNode;
     }
 

package/src/namespace_impl.ts

@@ -28,7 +28,7 @@ import {
     RolePermissionTypeOptions
 } from "node-opcua-types";
 import * as utils from "node-opcua-utils";
-import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
+import { DataType, Variant, VariantArrayType, verifyRankAndDimensions } from "node-opcua-variant";
 import {
     AddBaseNodeOptions,
     AddEnumerationTypeOptions,
@@ -100,7 +100,7 @@ import { _install_TwoStateVariable_machinery, _addTwoStateVariable } from "./sta
 //
 import { NamespacePrivate, UANamespace_process_modelling_rule } from "./namespace_private";
 import { BaseNodeImpl } from "./base_node_impl";
-import { UAVariableImpl, verifyRankAndDimensions } from "./ua_variable_impl";
+import { UAVariableImpl } from "./ua_variable_impl";
 
 import { ConstructNodeIdOptions, NodeIdManager } from "./nodeid_manager";
 import { _addTwoStateDiscrete } from "./data_access/ua_two_state_discrete";
@@ -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 {
@@ -656,7 +656,7 @@ export class UANamespace implements NamespacePrivate {
      */
     public deleteNode(nodeOrNodeId: NodeId | BaseNode): void {
         let node: BaseNode | null = null;
-        let nodeId: NodeId = NodeId.nullNodeId;
+        let nodeId: NodeId = new NodeId();
         if (nodeOrNodeId instanceof NodeId) {
             nodeId = nodeOrNodeId;
             node = this.findNode(nodeId);
@@ -1337,7 +1337,7 @@ export class UANamespace implements NamespacePrivate {
             //   or OptionSet DataType. It is derived from the DataType EnumValueType. If used for an
             //   OptionSet, the corresponding Value in the base type contains the number of the bit associated
             //   with the field. The EnumField is formally defined in Table 37.
-            (enumType as any).$definition = new EnumDefinition({
+            (enumType as any).$fullDefinition = new EnumDefinition({
                 fields: enumeration.map(
                     (x: string, index: number) =>
                         new EnumField({
@@ -1376,7 +1376,7 @@ export class UANamespace implements NamespacePrivate {
             });
             assert(enumValues.browseName.toString() === "EnumValues");
 
-            (enumType as any).$definition = new EnumDefinition({
+            (enumType as any).$fullDefinition = new EnumDefinition({
                 fields: enumeration.map(
                     (x: EnumerationItem, index: number) =>
                         new EnumField({
@@ -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";
@@ -592,7 +592,7 @@ function _dumpValue(xw: XmlWriter, node: UAVariable | UAVariableType, value: Var
 
 function _dumpArrayDimensionsAttribute(xw: XmlWriter, node: UAVariableType | UAVariable) {
     if (node.arrayDimensions) {
-        if (node.arrayDimensions.length === 1 && node.arrayDimensions[0] === 0) {
+        if (node.valueRank === -1 || (node.arrayDimensions.length === 1 && node.arrayDimensions[0] === 0)) {
             return;
         }
         xw.writeAttribute("ArrayDimensions", node.arrayDimensions.join(","));
@@ -749,7 +749,11 @@ function _dumpEnumDefinition(xw: XmlWriter, enumDefinition: EnumDefinition) {
         xw.endElement();
     }
 }
-function _dumpStructureDefinition(xw: XmlWriter, structureDefinition: StructureDefinition) {
+function _dumpStructureDefinition(
+    xw: XmlWriter,
+    structureDefinition: StructureDefinition,
+    baseStructureDefinition: StructureDefinition | null | undefined
+) {
     /*
      * note: baseDataType and defaultEncodingId are implicit and not stored in the XML file ??
      *
@@ -757,8 +761,12 @@ function _dumpStructureDefinition(xw: XmlWriter, structureDefinition: StructureD
     const baseDataType = structureDefinition.baseDataType;
     const defaultEncodingId = structureDefinition.defaultEncodingId;
 
-    structureDefinition.fields = structureDefinition.fields || [];
-    for (const defItem /*: StructureField*/ of structureDefinition.fields) {
+    // do not repeat elements that are already defined in base structure in the xml ouput!
+    const fields = structureDefinition.fields || [];
+    const nbFieldsInBase: number = baseStructureDefinition ? baseStructureDefinition.fields?.length || 0  : 0;
+
+    for(let index = nbFieldsInBase; index <fields.length; index++ ) {
+       const  defItem = fields[index];
         xw.startElement("Field");
         xw.writeAttribute("Name", defItem.name!);
 
@@ -788,27 +796,29 @@ function _dumpStructureDefinition(xw: XmlWriter, structureDefinition: StructureD
         xw.endElement();
     }
 }
-function _dumpUADataTypeDefinition(xw: XmlWriter, node: UADataType) {
+function _dumpUADataTypeDefinition(xw: XmlWriter, uaDataType: UADataType) {
     // to do remove DataType from base class
-
-    const definition = node.getDefinition();
+    const uaDataTypeBase = uaDataType.subtypeOfObj;
+    const definition = uaDataType.getDefinition();
     if (!definition) {
         return;
     }
     if (definition instanceof EnumDefinition) {
         xw.startElement("Definition");
-        xw.writeAttribute("Name", node.browseName.name!);
+        xw.writeAttribute("Name", uaDataType.browseName.name!);
         _dumpEnumDefinition(xw, definition);
         xw.endElement();
         return;
     }
     if (definition instanceof StructureDefinition) {
+        const baseDefinition = uaDataTypeBase ? (uaDataTypeBase.getDefinition() as StructureDefinition | null) : null;
+
         xw.startElement("Definition");
-        xw.writeAttribute("Name", node.browseName.name!);
+        xw.writeAttribute("Name", uaDataType.browseName.name!);
         if (definition.structureType === StructureType.Union) {
             xw.writeAttribute("IsUnion", "true");
         }
-        _dumpStructureDefinition(xw, definition);
+        _dumpStructureDefinition(xw, definition, baseDefinition);
         xw.endElement();
         return;
     }
@@ -1199,7 +1209,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/nodeset_tools/typedictionary_to_xml.ts

@@ -44,6 +44,7 @@ function dumpDataTypeStructure(
     addressSpace: IAddressSpace,
     map: { [key: number]: string },
     structureDefinition: StructureDefinition,
+    structureDefinitionBase: StructureDefinition | undefined| null,
     name: string,
     doc?: string
 ): void {
@@ -56,8 +57,14 @@ function dumpDataTypeStructure(
         xw.text(doc);
         xw.endElement();
     }
+
+    const fields = structureDefinition.fields || [];
+    // get base class
+    const nbFieldsInBase = structureDefinitionBase? structureDefinitionBase.fields?.length || 0 : 0;
+
     let optionalsCount = 0;
-    for (const f of structureDefinition.fields || []) {
+    for (let index = nbFieldsInBase; index < fields.length; index ++) {
+        const f=  fields [index];
         if (f.isOptional) {
             xw.startElement("opc:Field");
             xw.writeAttribute("Name", f.name + "Specified");
@@ -90,7 +97,9 @@ function dumpDataTypeStructure(
             xw.endElement();
         }
     }
-    for (const f of structureDefinition.fields || []) {
+    for (let index = nbFieldsInBase; index < fields.length; index ++) {
+        const f=  fields [index];
+   
         const isArray = f.valueRank > 0 && f.arrayDimensions?.length;
 
         if (isArray) {
@@ -124,12 +133,13 @@ function dumpDataTypeToBSD(xw: XmlWriter, dataType: UADataType, map: { [key: num
 
     const name: string = dataType.browseName.name!;
 
-    const def = (<UADataTypeImpl>dataType)._getDefinition(false);
-    if (def instanceof StructureDefinition) {
-        dumpDataTypeStructure(xw, addressSpace, map, def, name);
+    const definition = dataType.getDefinition();
+    if (definition instanceof StructureDefinition) {
+        const structureDefinitionBase = dataType.subtypeOfObj?.getStructureDefinition();
+        dumpDataTypeStructure(xw, addressSpace, map, definition, structureDefinitionBase, name);
     }
-    if (def instanceof EnumDefinition) {
-        dumpEnumeratedType(xw, def, name);
+    if (definition instanceof EnumDefinition) {
+        dumpEnumeratedType(xw, definition, name);
     }
 }
 

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,14 @@
 // --------------------------------------------------------------------------------------------------
 
 import { assert } from "node-opcua-assert";
-import { StatusCodes } from "node-opcua-status-code";
+import { Callback, 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 { DataValue } from "node-opcua-data-value";
 
 import { UAAlarmConditionImpl } from "../alarms_and_conditions/ua_alarm_condition_impl";
 import { UATransitionEx } from "../../source/interfaces/state_machine/ua_transition_ex";
@@ -75,7 +77,7 @@ export class UAShelvedStateMachineEx extends UAStateMachineImpl implements UAShe
             shelvingState.unshelveTime.minimumSamplingInterval = 500;
             shelvingState.unshelveTime.bindVariable(
                 {
-                    get: _unShelveTimeFunc.bind(null, shelvingState)
+                    timestamped_get: _unShelveTimeFunc.bind(null, shelvingState)
                 },
                 true
             );
@@ -93,7 +95,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 +190,11 @@ 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 +256,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;
@@ -290,24 +296,27 @@ function _oneShotShelve_method(
 //   TimedShelve Method call.
 // * For the OneShotShelved state the UnshelveTime will be a constant set to the maximum Duration
 //   except if a MaxTimeShelved Property is provided.
-function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineEx) {
+function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineEx): DataValue {
     if (shelvingState.getCurrentState() === "Unshelved") {
-        return new Variant({
-            dataType: DataType.StatusCode,
-            value: StatusCodes.BadConditionNotShelved
+        return new DataValue({
+            statusCode: StatusCodes.BadConditionNotShelved,
+            value: { dataType: DataType.Double, value: 0 }
         });
     }
 
     if (!shelvingState._sheveldTime) {
-        return new Variant({
-            dataType: DataType.StatusCode,
-            value: StatusCodes.BadConditionNotShelved
+        return new DataValue({
+            statusCode: StatusCodes.BadConditionNotShelved,
+            value: { dataType: DataType.Double, value: 0 }
         });
     }
     if (shelvingState.getCurrentState() === "OneShotShelved" && shelvingState._duration === UAAlarmConditionImpl.MaxDuration) {
-        return new Variant({
-            dataType: DataType.Double,
-            value: UAAlarmConditionImpl.MaxDuration
+        return new DataValue({
+            statusCode: StatusCodes.Good,
+            value: {
+                dataType: DataType.Double,
+                value: UAAlarmConditionImpl.MaxDuration
+            }
         });
     }
     const now = new Date();
@@ -316,8 +325,12 @@ function _unShelveTimeFunc(shelvingState: UAShelvedStateMachineEx) {
 
     // timeToAutomaticUnshelvedState should always be greater than (or equal) zero
     timeToAutomaticUnshelvedState = Math.max(timeToAutomaticUnshelvedState, 0);
-    return new Variant({
-        dataType: DataType.Double, // duration
-        value: timeToAutomaticUnshelvedState
+    return new DataValue({
+        statusCode: StatusCodes.Good,
+        value: {
+            dataType: DataType.Double, // duration
+            value: timeToAutomaticUnshelvedState
+        }
     });
 }
+