node-opcua-address-space 2.113.0 → 2.113.2

package/src/data_access/ua_multistate_discrete_impl.ts

@@ -11,6 +11,8 @@ import { BindVariableOptions, INamespace, UAVariable, UAProperty } from "node-op
 import { UAMultiStateDiscrete, UAMultiStateDiscrete_Base } from "node-opcua-nodeset-ua";
 import { registerNodePromoter } from "../../source/loader/register_node_promoter";
 import { UAVariableImpl } from "../ua_variable_impl";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
+
 import { AddMultiStateDiscreteOptions } from "../../source/address_space_ts";
 import { add_dataItem_stuff } from "./add_dataItem_stuff";
 
@@ -21,7 +23,7 @@ export interface UAMultiStateDiscreteEx<T, DT extends DataType> extends UAMultiS
     getValue(): number;
     getValueAsString(): string;
     getIndex(value: string): number;
-    setValue(value: string | number): void;
+    setValue(value: string | number, options?: ISetStateOptions): void;
     checkVariantCompatibility(value: Variant): StatusCode;
 }
 
@@ -50,13 +52,13 @@ export class UAMultiStateDiscreteImpl<T, DT extends DataType> extends UAVariable
         return index;
     }
 
-    public setValue(value: string | number): void {
+    public setValue(value: string | number, options?: ISetStateOptions): void {
         if (typeof value === "string") {
             const index = this.getIndex(value);
             if (index < 0) {
                 throw new Error("UAMultiStateDiscrete#setValue invalid multi state value provided : " + value);
             }
-            return this.setValue(index);
+            return this.setValue(index, options);
         }
         const arrayEnumStrings = this.enumStrings.readValue().value.value;
         if (value >= arrayEnumStrings.length) {

package/src/data_access/ua_multistate_value_discrete_impl.ts

@@ -17,6 +17,7 @@ import { registerNodePromoter } from "../../source/loader/register_node_promoter
 import { coerceEnumValues } from "../../source/helpers/coerce_enum_value";
 import { UAMultiStateValueDiscreteEx } from "../../source/interfaces/data_access/ua_multistate_value_discrete_ex";
 import { AddMultiStateValueDiscreteOptions } from "../../source/address_space_ts";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 import { UAVariableImpl } from "../ua_variable_impl";
 
 import { add_dataItem_stuff } from "./add_dataItem_stuff";
@@ -50,7 +51,7 @@ export class UAMultiStateValueDiscreteImpl<T, DT extends DataType>
     extends UAVariableImpl
     implements UAMultiStateValueDiscreteEx<T, DT>
 {
-    public setValue(value: string | number | Int64): void {
+    public setValue(value: string | number | Int64, options?: ISetStateOptions): void {
         if (typeof value === "string") {
             const enumValues = this.enumValues.readValue().value.value;
             const selected = enumValues.filter((a: any) => a.displayName.text === value)[0];
@@ -60,7 +61,7 @@ export class UAMultiStateValueDiscreteImpl<T, DT extends DataType>
                 throw new Error("cannot find enum string " + value + " in " + enumValues.toString());
             }
         } else {
-            this._setValue(coerceUInt64(value));
+            this._setValue(coerceUInt64(value), options);
         }
     }
 
@@ -116,7 +117,7 @@ export class UAMultiStateValueDiscreteImpl<T, DT extends DataType>
      *
      * @private
      */
-    public _setValue(value: Int64): void {
+    public _setValue(value: Int64, options?: ISetStateOptions): void {
         // check that value is in bound
         if (!this._isValueInRange(coerceInt32(value))) {
             throw new Error("UAMultiStateValueDiscrete#_setValue out of range " + value);
@@ -301,4 +302,4 @@ export function validateDataType(dataTypeValue: any): void {
     if (typeof dataTypeValue !== "number" || validTypes.indexOf(dataTypeValue) < 0) {
         throw new Error(`Invalid DataType in UAMultiStateValueDiscrete => ${dataTypeValue.toString()}`);
     }
-}
+}

package/src/data_access/ua_two_state_discrete_impl.ts

@@ -10,9 +10,11 @@ import { UAVariableImpl } from "../ua_variable_impl";
 import { registerNodePromoter } from "../../source/loader/register_node_promoter";
 import { AddTwoStateDiscreteOptions } from "../../source/address_space_ts";
 import { UATwoStateDiscreteEx } from "../../source/interfaces/data_access/ua_two_state_discrete_ex";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 
 import { add_dataItem_stuff } from "./add_dataItem_stuff";
 
+
 export interface UATwoStateDiscreteImpl {
     falseState: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
     trueState: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
@@ -58,15 +60,15 @@ export class UATwoStateDiscreteImpl extends UAVariableImpl implements UATwoState
             );
         }
     }
-    setValue(value: boolean | LocalizedTextLike): void {
+    setValue(value: boolean | LocalizedTextLike, options?: ISetStateOptions): void {
         if (typeof value === "boolean") {
             this.setValueFromSource({ dataType: DataType.Boolean, value });
         } else {
             const text: string = (typeof value === "string" ? value : value.text) || "";
             if (text === this.getTrueStateAsString()) {
-                this.setValue(true);
+                this.setValue(true, options);
             } else if (text === this.getFalseStateAsString()) {
-                this.setValue(false);
+                this.setValue(false, options);
             } else {
                 throw new Error("setValue invalid value " + value);
             }

package/src/state_machine/ua_two_state_variable.ts

@@ -21,6 +21,8 @@ import { AddTwoStateVariableOptions } from "../../source/address_space_ts";
 import { UATwoStateVariableEx } from "../../source/ua_two_state_variable_ex";
 // private types
 import { UAVariableImpl, UAVariableImplT } from "../ua_variable_impl";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
+
 
 const hasTrueSubState_ReferenceTypeNodeId = resolveNodeId("HasTrueSubState");
 const hasFalseSubState_ReferenceTypeNodeId = resolveNodeId("HasFalseSubState");
@@ -54,19 +56,23 @@ const hasFalseSubState_ReferenceTypeNodeId = resolveNodeId("HasFalseSubState");
 //                  TwoStateVariableType
 //                                                  <StateIdentifier> Defined in Clause 5.4.3 Optional
 
-function _updateTransitionTime(node: UATwoStateVariableEx, _subState?: UAVariable) {
+function _updateTransitionTime(node: UATwoStateVariableEx, _subState?: UAVariable, options?: ISetStateOptions) {
     // TransitionTime specifies the time when the current state was entered.
     if (node.transitionTime) {
-        node.transitionTime.setValueFromSource({ dataType: DataType.DateTime, value: new Date() });
+        const transitionTime = options?.transitionTime || new Date();
+        node.transitionTime.setValueFromSource({ dataType: DataType.DateTime, value: transitionTime });
     }
 }
 
-function _updateEffectiveTransitionTime(node: UATwoStateVariableImpl) {
+function _updateEffectiveTransitionTime(node: UATwoStateVariableImpl,options?: ISetStateOptions) {
     if (node.effectiveTransitionTime) {
+        
+        const effectiveTransitionTime = options?.effectiveTransitionTime || new Date();
+
         // because subStateNode ",subStateNode.browseName.toString());
         node.effectiveTransitionTime.setValueFromSource({
             dataType: DataType.DateTime,
-            value: new Date()
+            value: effectiveTransitionTime
         });
     }
 }
@@ -308,7 +314,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
      * @method setValue
      * @param boolValue {Boolean}
      */
-    public setValue(boolValue: boolean): void {
+    public setValue(boolValue: boolean, options?: ISetStateOptions): void {
         assert(typeof boolValue === "boolean");
         const dataValue = this.id!.readValue();
         const oldValue = dataValue.value.value;
@@ -317,8 +323,8 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
         }
         //
         this.id.setValueFromSource(new Variant({ dataType: DataType.Boolean, value: boolValue }));
-        _updateTransitionTime(this);
-        _updateEffectiveTransitionTime(this);
+        _updateTransitionTime(this, undefined, options);
+        _updateEffectiveTransitionTime(this, options);
     }
 
     /**
@@ -369,7 +375,7 @@ export class UATwoStateVariableImpl extends UAVariableImplT<LocalizedText, DataT
             const addressSpace = this.addressSpace;
             // add event handle
             const subState = addressSpace.findNode(reference.nodeId) as UAVariable;
-            subState.on("value_changed", _updateEffectiveTransitionTime.bind(null, this));
+            subState.on("value_changed", _updateEffectiveTransitionTime.bind(null, this, undefined));
         }
     }
 }