node-opcua-address-space 2.113.0 → 2.113.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.113.0",
+    "version": "2.113.2",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -84,7 +84,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "36db335391fedd39726990a1b37f7768da16466a",
+    "gitHead": "d72e73db4c07d27ea2da81ccbd258e63ad6c640b",
     "files": [
         "dist",
         "distHelpers",

package/source/interfaces/alarms_and_conditions/condition_info_i.ts

@@ -10,6 +10,10 @@ export interface ConditionInfoOptions {
     quality?: StatusCode | null;
     severity?: UInt16 | null;
     retain?: boolean | null;
+
+    time?: Date | null;
+    receiveTime?: Date | null;
+
 }
 
 export interface ConditionInfo {

package/source/interfaces/alarms_and_conditions/condition_snapshot.ts

@@ -10,20 +10,25 @@ import { NodeId } from "node-opcua-nodeid";
 import { StatusCode } from "node-opcua-status-code";
 import { TimeZoneDataType } from "node-opcua-types";
 import { UtcTime } from "../state_machine/ua_state_machine_type";
+import { ISetStateOptions } from "../i_set_state_options";
+import { IConditionVariableTypeSetterOptions } from "../i_condition_variable_type_setter_options";
 
 export interface ConditionSnapshot {
-    on(eventName: "value_changed", eventHandler: (node: UAVariable, variant: Variant) => void): this;
+    on(
+        eventName: "valueChanged",
+        eventHandler: (node: UAVariable, variant: Variant, options: { sourceTimestamp: Date }) => void
+    ): this;
 }
 
-
 export interface ConditionSnapshot extends EventEmitter {
     // static normalizeName = normalizeName;
 
+    emit(eventName: "valueChanged", node: UAVariable, variant: Variant, options: { sourceTimestamp: Date }): boolean;
+    emit(eventName: string | symbol): boolean;
     condition: BaseNode;
     eventData: IEventData | null;
     branchId: NodeId | null;
 
-   
     /**
      * @method getBrandId
      * @return {NodeId}
@@ -62,7 +67,7 @@ export interface ConditionSnapshot extends EventEmitter {
      * @param value {Boolean}
      * @return void
      */
-    setEnabledState(value: boolean): void;
+    setEnabledState(value: boolean, options?: ISetStateOptions): void;
     /**
      * @method getEnabledStateAsString
      * @return {String}
@@ -86,7 +91,7 @@ export interface ConditionSnapshot extends EventEmitter {
      * @method setComment
      * @param txtMessage {LocalizedText}
      */
-    setComment(txtMessage: LocalizedTextLike): void;
+    setComment(txtMessage: LocalizedTextLike, options?: IConditionVariableTypeSetterOptions): void;
     /**
      *
      * @method setMessage
@@ -129,7 +134,7 @@ export interface ConditionSnapshot extends EventEmitter {
      * @method setQuality
      * @param quality {StatusCode}
      */
-    setQuality(quality: StatusCode): void;
+    setQuality(quality: StatusCode, options?: IConditionVariableTypeSetterOptions): void;
     /**
      * @method getQuality
      * @return {StatusCode}
@@ -169,7 +174,7 @@ export interface ConditionSnapshot extends EventEmitter {
      * @method setSeverity
      * @param severity {UInt16}
      */
-    setSeverity(severity: UInt16): void;
+    setSeverity(severity: UInt16, options?: IConditionVariableTypeSetterOptions): void;
 
     /**
      * @method getSeverity
@@ -188,7 +193,7 @@ export interface ConditionSnapshot extends EventEmitter {
      * @method setLastSeverity
      * @param severity {UInt16}
      */
-    setLastSeverity(severity: UInt16): void;
+    setLastSeverity(severity: UInt16, options?: IConditionVariableTypeSetterOptions): void;
     /**
      * @method getLastSeverity
      * @return {UInt16}

package/source/interfaces/alarms_and_conditions/ua_condition_ex.ts

@@ -4,10 +4,11 @@ import { NodeId } from "node-opcua-nodeid";
 import { UACondition_Base } from "node-opcua-nodeset-ua";
 import { StatusCode } from "node-opcua-status-code";
 import { TimeZoneDataType } from "node-opcua-types";
+import { DataType } from "node-opcua-basic-types";
+import { ISetStateOptions } from "../i_set_state_options";
 import { UATwoStateVariableEx } from "../../ua_two_state_variable_ex";
 import { ConditionInfoOptions } from "./condition_info_i";
 import { ConditionSnapshot } from "./condition_snapshot";
-import { DataType } from "node-opcua-basic-types";
 
 
 
@@ -26,6 +27,7 @@ export interface UAConditionHelper {
     on(eventName: "branch_deleted", eventHandler: (branchId: string) => void): this;
 }
 
+
 export interface UAConditionHelper extends UABaseEventHelper {
     getBranchCount(): number;
     getBranches(): ConditionSnapshot[];
@@ -34,7 +36,7 @@ export interface UAConditionHelper extends UABaseEventHelper {
     deleteBranch(branch: ConditionSnapshot): void;
     getEnabledState(): boolean;
     getEnabledStateAsString(): string;
-    setEnabledState(requestedEnabledState: boolean): StatusCode;
+    setEnabledState(requestedEnabledState: boolean, options?: ISetStateOptions): StatusCode;
     setReceiveTime(time: Date): void;
     setLocalTime(time: TimeZoneDataType): void;
     setTime(time: Date): void;

package/source/interfaces/data_access/ua_multistate_discrete_ex.ts

@@ -13,6 +13,7 @@ import { DataType, Variant } from "node-opcua-variant";
 import { StatusCode } from "node-opcua-status-code";
 import { UAMultiStateDiscrete_Base } from "node-opcua-nodeset-ua";
 import { UAVariableT } from "node-opcua-address-space-base";
+import { ISetStateOptions } from "../i_set_state_options";
 
 export { UAMultiStateDiscrete } from "node-opcua-nodeset-ua";
 
@@ -21,6 +22,6 @@ export interface UAMultiStateDiscreteEx<T, DT extends DataType> extends UAVariab
     getValue(): number;
     getValueAsString(): string;
     getIndex(value: string): number;
-    setValue(value: string | number): void;
+    setValue(value: string | number, options?: ISetStateOptions): void;
     checkVariantCompatibility(value: Variant): StatusCode;
 }

package/source/interfaces/data_access/ua_multistate_value_discrete_ex.ts

@@ -5,6 +5,7 @@ import { DataType, Variant } from "node-opcua-variant";
 import { Int64, UInt64 } from "node-opcua-basic-types";
 import { UAMultiStateValueDiscrete_Base } from "node-opcua-nodeset-ua";
 import { UAVariableT } from "node-opcua-address-space-base";
+import { ISetStateOptions } from "../i_set_state_options";
 
 /**
  * @see https://reference.opcfoundation.org/v104/Core/docs/Part8/5.3.3/#5.3.3.4
@@ -27,7 +28,7 @@ export interface UAMultiStateValueDiscreteEx<T, DT extends DataType>
     getValueAsString(): string;
     getValueAsNumber(): number;
 
-    setValue(value: string | number | Int64): void;
+    setValue(value: string | number | Int64, options?: ISetStateOptions): void;
 
     findValueAsText(value: number | UInt64): Variant;
 }

package/source/interfaces/data_access/ua_two_state_discrete_ex.ts

@@ -2,6 +2,7 @@ import { LocalizedTextLike } from "node-opcua-data-model";
 import { DataType } from "node-opcua-variant";
 import { UAVariableT } from "node-opcua-address-space-base";
 import { UATwoStateDiscrete_Base } from "node-opcua-nodeset-ua";
+import { ISetStateOptions } from "../i_set_state_options";
 
 /**
  * @see https://reference.opcfoundation.org/v104/Core/VariableTypes/TwoStateDiscreteType/
@@ -10,5 +11,5 @@ export interface UATwoStateDiscreteEx extends UAVariableT<boolean, DataType.Bool
     // --- helpers ---
     getValue(): boolean;
     getValueAsString(): string;
-    setValue(value: boolean | LocalizedTextLike): void;
+    setValue(value: boolean | LocalizedTextLike, options?: ISetStateOptions): void;
 }

package/source/interfaces/i_condition_variable_type_setter_options.ts

@@ -0,0 +1,5 @@
+
+
+export interface IConditionVariableTypeSetterOptions {
+    sourceTimestamp?: Date;
+}

package/source/interfaces/i_set_state_options.ts

@@ -0,0 +1,4 @@
+export interface ISetStateOptions {
+    transitionTime?: Date;
+    effectiveTransitionTime?: Date;
+}

package/source/ua_two_state_variable_ex.ts

@@ -5,6 +5,7 @@ import { UAVariableT } from "node-opcua-address-space-base";
 import { LocalizedText } from "node-opcua-data-model";
 import { UAStateVariable, UATwoStateVariable_Base } from "node-opcua-nodeset-ua";
 import { DataType } from "node-opcua-variant";
+import { ISetStateOptions } from "./interfaces/i_set_state_options";
 
 /**
  * @see https://reference.opcfoundation.org/v104/Core/docs/Part9/5.2/
@@ -18,7 +19,7 @@ export interface UATwoStateVariableHelper {
     readonly isTrueSubStateOf: UAStateVariable<LocalizedText> | null;
 
     // --- helpers ---
-    setValue(boolValue: boolean): void;
+    setValue(boolValue: boolean, options?: ISetStateOptions): void;
 
     getValue(): boolean;
 

package/src/alarms_and_conditions/condition.ts

@@ -6,13 +6,15 @@ import { assert } from "node-opcua-assert";
 import { LocalizedText, LocalizedTextLike } from "node-opcua-data-model";
 import { minDate } from "node-opcua-basic-types";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 import { ConditionSnapshotImpl } from "./condition_snapshot_impl";
 
 export function _setAckedState(
     self: ConditionSnapshotImpl,
     requestedAckedState: boolean,
     conditionEventId?: Buffer,
-    comment?: string | LocalizedText | LocalizedTextLike
+    comment?: string | LocalizedText | LocalizedTextLike,
+    options?: ISetStateOptions
 ): StatusCode {
     assert(self instanceof ConditionSnapshotImpl);
 
@@ -21,7 +23,7 @@ export function _setAckedState(
     if (ackedState && requestedAckedState) {
         return StatusCodes.BadConditionBranchAlreadyAcked;
     }
-    self._set_twoStateVariable("AckedState", requestedAckedState);
+    self._set_twoStateVariable("AckedState", requestedAckedState, options);
     return StatusCodes.Good;
 }
 

package/src/alarms_and_conditions/condition_snapshot_impl.ts

@@ -16,7 +16,9 @@ import { TimeZoneDataType } from "node-opcua-types";
 import { DataType, Variant } from "node-opcua-variant";
 
 import { ConditionSnapshot } from "../../source/interfaces/alarms_and_conditions/condition_snapshot";
+import { IConditionVariableTypeSetterOptions } from "../../source/interfaces/i_condition_variable_type_setter_options";
 import { UtcTime } from "../../source/interfaces/state_machine/ua_state_machine_type";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 import { EventData } from "../event_data";
 import { UATwoStateVariableImpl } from "../state_machine/ua_two_state_variable";
 import { _setAckedState } from "./condition";
@@ -35,7 +37,6 @@ function _visit(self: any, node: BaseNode, prefix: string): void {
     for (const aggregate of aggregates) {
         if (aggregate.nodeClass === NodeClass.Variable) {
             const name = aggregate.browseName.toString();
-           
             const key = prefix + name;
 
             // istanbul ignore next
@@ -64,7 +65,7 @@ function _installOnChangeEventHandlers(self: any, node: BaseNode, prefix: string
     for (const aggregate of aggregates) {
         if (aggregate.nodeClass === NodeClass.Variable) {
             const name = aggregate.browseName.toString();
-        
+
             const key = prefix + name;
 
             // istanbul ignore next
@@ -91,7 +92,7 @@ function _ensure_condition_values_correctness(self: any, node: BaseNode, prefix:
     for (const aggregate of aggregates) {
         if (aggregate.nodeClass === NodeClass.Variable) {
             const name = aggregate.browseName.toString();
-            
+
             const key = prefix + name;
 
             const snapshot_value = self._map[key].toString();
@@ -136,6 +137,7 @@ const _varTable = {
     "EnabledState.EffectiveDisplayName": 1,
     "EnabledState.Id": 1,
     "EnabledState.TransitionTime": 1,
+    "EnabledState.EffectiveTransitionTime": 1,
     EventId: 1,
     EventType: 1,
     LocalTime: 1,
@@ -143,6 +145,7 @@ const _varTable = {
     SourceNode: 1,
     Time: 1
 };
+
 type FullBrowsePath = string;
 export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnapshot {
     public static normalizeName = normalizeName;
@@ -234,7 +237,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         return variant.value;
     }
 
-    public _set_var(varName: string, dataType: DataType, value: unknown): void {
+    public _set_var(varName: string, dataType: DataType, value: unknown, options?: IConditionVariableTypeSetterOptions): void {
         const key = normalizeName(varName);
         // istanbul ignore next
         if (!Object.prototype.hasOwnProperty.call(this._map, key)) {
@@ -249,11 +252,21 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
             value
         });
 
-        if (this._map[key + ".SourceTimestamp"]) {
-            this._map[key + ".SourceTimestamp"] = new Variant({
+        const sourceTimestamp = options?.sourceTimestamp || new Date();
+        const sourceTimestampKey = key + ".SourceTimestamp";
+        if (this._map[sourceTimestampKey]) {
+            // from spec 1.03 : 5.3 condition variables
+            // a condition VariableType has a sourceTimeStamp exposed property
+            // SourceTimestamp indicates the time of the last change of the Value of this ConditionVariable.
+            // It shall be the same time that would be returned from the Read Service inside the DataValue
+            // structure for the ConditionVariable Value Attribute.
+            const variant = new Variant({
                 dataType: DataType.DateTime,
-                value: new Date()
+                value: sourceTimestamp
             });
+            this._map[sourceTimestampKey] = variant;
+            const node = this._node_index[sourceTimestampKey];
+            this.emit("valueChanged", node, variant, { sourceTimestamp });
         }
 
         const variant = this._map[key];
@@ -264,7 +277,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
             return;
         }
         assert(node.nodeClass === NodeClass.Variable);
-        this.emit("value_changed", node, variant);
+        this.emit("valueChanged", node, variant, { sourceTimestamp });
     }
 
     /**
@@ -327,8 +340,8 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @param value {Boolean}
      * @return void
      */
-    public setEnabledState(value: boolean): void {
-        return this._set_twoStateVariable("EnabledState", value);
+    public setEnabledState(value: boolean, options?: ISetStateOptions): void {
+        return this._set_twoStateVariable("EnabledState", value, options);
     }
 
     /**
@@ -359,9 +372,9 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @method setComment
      * @param txtMessage {LocalizedText}
      */
-    public setComment(txtMessage: LocalizedTextLike): void {
+    public setComment(txtMessage: LocalizedTextLike, options?: IConditionVariableTypeSetterOptions): void {
         const txtMessage1 = coerceLocalizedText(txtMessage);
-        this._set_var("Comment", DataType.LocalizedText, txtMessage1);
+        this._set_var("Comment", DataType.LocalizedText, txtMessage1, options);
     }
 
     /**
@@ -412,8 +425,8 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @method setQuality
      * @param quality {StatusCode}
      */
-    public setQuality(quality: StatusCode): void {
-        this._set_var("Quality", DataType.StatusCode, quality);
+    public setQuality(quality: StatusCode, options?: IConditionVariableTypeSetterOptions): void {
+        this._set_var("Quality", DataType.StatusCode, quality, options);
     }
 
     /**
@@ -458,13 +471,15 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @method setSeverity
      * @param severity {UInt16}
      */
-    public setSeverity(severity: UInt16): void {
+    public setSeverity(severity: UInt16, options?: IConditionVariableTypeSetterOptions): void {
         assert(isFinite(severity), "expecting a UInt16");
 
         // record automatically last severity
         const lastSeverity = this.getSeverity();
-        this.setLastSeverity(lastSeverity);
-        this._set_var("Severity", DataType.UInt16, severity);
+        const sourceTimestamp = this.getSeveritySourceTimestamp();
+        this.setLastSeverity(lastSeverity, { sourceTimestamp });
+
+        this._set_var("Severity", DataType.UInt16, severity, options);
     }
 
     /**
@@ -477,6 +492,10 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         const value = this._get_var("Severity");
         return +value;
     }
+    public getSeveritySourceTimestamp(): Date {
+        const c = this.condition as UAConditionImpl;
+        return c.severity.readValue().sourceTimestamp || new Date();
+    }
 
     /*
      * as per spec 1.0.3 - part 9:
@@ -489,9 +508,9 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @method setLastSeverity
      * @param severity {UInt16}
      */
-    public setLastSeverity(severity: UInt16): void {
+    public setLastSeverity(severity: UInt16, options?: IConditionVariableTypeSetterOptions): void {
         severity = +severity;
-        return this._set_var("LastSeverity", DataType.UInt16, severity);
+        return this._set_var("LastSeverity", DataType.UInt16, severity, options);
     }
 
     /**
@@ -523,8 +542,8 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @param time {Date} : UTCTime
      */
     public setReceiveTime(time: UtcTime): void {
-        assert(time instanceof Date);
-        return this._set_var("ReceiveTime", DataType.DateTime, time);
+        if (!(time instanceof Date)) { throw new Error("setReceiveTime expecting a Date")};
+        return this._set_var("ReceiveTime", DataType.DateTime, time, { sourceTimestamp: time });
     }
 
     /**
@@ -537,8 +556,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @param time {Date}
      */
     public setTime(time: Date): void {
-        assert(time instanceof Date);
-        return this._set_var("Time", DataType.DateTime, time);
+        return this._set_var("Time", DataType.DateTime, time, { sourceTimestamp: time });
     }
 
     /**
@@ -601,10 +619,9 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         return this._get_twoStateVariable("AckedState");
     }
 
-    public setAckedState(ackedState: boolean): StatusCode {
+    public setAckedState(ackedState: boolean, options?: ISetStateOptions): StatusCode {
         ackedState = !!ackedState;
-
-        return _setAckedState(this, ackedState);
+        return _setAckedState(this, ackedState, undefined, undefined, options);
     }
 
     public getConfirmedState(): boolean {
@@ -613,7 +630,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         return this._get_twoStateVariable("ConfirmedState");
     }
 
-    public setConfirmedStateIfExists(confirmedState: boolean): void {
+    public setConfirmedStateIfExists(confirmedState: boolean, options?: ISetStateOptions): void {
         confirmedState = !!confirmedState;
         const acknowledgeableCondition = this.condition as UAAcknowledgeableCondition;
         if (!acknowledgeableCondition.confirmedState) {
@@ -622,7 +639,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
             return;
         }
         // todo deal with Error code BadConditionBranchAlreadyConfirmed
-        return this._set_twoStateVariable("ConfirmedState", confirmedState);
+        return this._set_twoStateVariable("ConfirmedState", confirmedState, options);
     }
 
     public setConfirmedState(confirmedState: boolean): void {
@@ -647,29 +664,48 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @method setSuppressedState
      * @param suppressed {Boolean}
      */
-    public setSuppressedState(suppressed: boolean): void {
+    public setSuppressedState(suppressed: boolean, options?: ISetStateOptions): void {
         suppressed = !!suppressed;
-        this._set_twoStateVariable("SuppressedState", suppressed);
+        this._set_twoStateVariable("SuppressedState", suppressed, options);
     }
 
     public getActiveState(): boolean {
         return this._get_twoStateVariable("ActiveState");
     }
 
-    public setActiveState(newActiveState: boolean): StatusCode {
+    public setActiveState(newActiveState: boolean, options?: ISetStateOptions): StatusCode {
         // xx var activeState = self.getActiveState();
         // xx if (activeState === newActiveState) {
         // xx     return StatusCodes.Bad;
         // xx }
-        this._set_twoStateVariable("ActiveState", newActiveState);
+        this._set_twoStateVariable("ActiveState", newActiveState, options);
         return StatusCodes.Good;
     }
 
-    // tslint:disable:no-empty
+    public setLatchedState(newLatchedState: boolean, options?: ISetStateOptions): StatusCode {
+        this._set_twoStateVariable("LatchedState", newLatchedState, options);
+        return StatusCodes.Good;
+    }
+    public getLatchedState(): boolean {
+        return this._get_twoStateVariable("LatchedState");
+    }
+    public setOutOfServiceState(newOutOfServiceState: boolean, options?: ISetStateOptions): StatusCode {
+        this._set_twoStateVariable("OutOfServiceState", newOutOfServiceState, options);
+        return StatusCodes.Good;
+    }
+    public getOutOfServiceState(): boolean {
+        return this._get_twoStateVariable("OutOfServiceState");
+    }
+    public setSilentState(newSilentState: boolean, options?: ISetStateOptions): StatusCode {
+        this._set_twoStateVariable("SilentState", newSilentState, options);
+        return StatusCodes.Good;
+    }
+    public getSilentState(): boolean {
+        return this._get_twoStateVariable("SilentState");
+    }
     public setShelvingState(): void {
-        // todo
+        throw new Error("Method not implemented.");
     }
-
     public toString(): string {
         //   public condition: any = null;
         //   public eventData: any = null;
@@ -704,7 +740,7 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
      * @param value
      * @private
      */
-    public _set_twoStateVariable(varName: string, value: boolean): void {
+    public _set_twoStateVariable(varName: string, value: boolean, options?: ISetStateOptions): void {
         value = !!value;
 
         const hrKey = ConditionSnapshotImpl.normalizeName(varName);
@@ -733,9 +769,10 @@ export class ConditionSnapshotImpl extends EventEmitter implements ConditionSnap
         // also change ConditionNode if we are on currentBranch
         if (this.isCurrentBranch()) {
             assert(twoStateNode instanceof UATwoStateVariableImpl);
-            twoStateNode.setValue(value as boolean);
+            twoStateNode.setValue(value as boolean, options);
         }
-        this.emit("value_changed", node, variant);
+        const sourceTimestamp = options?.effectiveTransitionTime || new Date();
+        this.emit("valueChanged", node, variant, { sourceTimestamp });
     }
 
     protected _get_twoStateVariable(varName: string): any {

package/src/alarms_and_conditions/ua_condition_impl.ts

@@ -41,6 +41,7 @@ import { ConditionInfoOptions } from "../../source/interfaces/alarms_and_conditi
 import { UAConditionEx } from "../../source/interfaces/alarms_and_conditions/ua_condition_ex";
 import { ConditionSnapshot } from "../../source/interfaces/alarms_and_conditions/condition_snapshot";
 import { InstantiateConditionOptions } from "../../source/interfaces/alarms_and_conditions/instantiate_condition_options";
+import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
 
 import { AddressSpacePrivate } from "../address_space_private";
 import { _install_TwoStateVariable_machinery } from "../state_machine/ua_two_state_variable";
@@ -214,9 +215,8 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
         // the implication of this convention is that interacting with the condition variable
         // shall be made by using branch0, any value change made
         // using the standard setValueFromSource mechanism will not be work properly.
-        this._branch0.on("value_changed", (node: UAVariable, variant: Variant) => {
-            assert(node.nodeClass === NodeClass.Variable);
-            node.setValueFromSource(variant);
+        this._branch0.on("valueChanged", (node: UAVariable, variant: Variant, options: { sourceTimestamp: Date }) => {
+            node.setValueFromSource(variant, StatusCodes.Good, options.sourceTimestamp);
         });
     }
 
@@ -277,7 +277,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      * returns {StatusCode} StatusCodes.Good if successful or BadConditionAlreadyEnabled/BadConditionAlreadyDisabled
      * @private
      */
-    public _setEnabledState(requestedEnabledState: boolean): StatusCode {
+    public _setEnabledState(requestedEnabledState: boolean, options?: ISetStateOptions): StatusCode {
         assert(typeof requestedEnabledState === "boolean");
 
         const enabledState = this.getEnabledState();
@@ -288,7 +288,7 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
             return StatusCodes.BadConditionAlreadyDisabled;
         }
 
-        this._branch0.setEnabledState(requestedEnabledState);
+        this._branch0.setEnabledState(requestedEnabledState, options);
         // conditionNode.enabledState.setValue(requestedEnabledState);
 
         // xx assert(conditionNode.enabledState.id.readValue().value.value === requestedEnabledState,"sanity check 1");
@@ -346,8 +346,8 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
      * @param requestedEnabledState {Boolean}
      * @private
      */
-    public setEnabledState(requestedEnabledState: boolean): StatusCode {
-        return this._setEnabledState(requestedEnabledState);
+    public setEnabledState(requestedEnabledState: boolean, options?: ISetStateOptions): StatusCode {
+        return this._setEnabledState(requestedEnabledState, options);
     }
 
     /**
@@ -491,11 +491,13 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
 
         const branch = this.currentBranch();
 
-        const now = new Date();
+        const currentDefaultDate = new Date();
+        const time = conditionInfo.time || currentDefaultDate;
+        const receiveTime = conditionInfo.receiveTime || currentDefaultDate;
         // install the eventTimestamp
         // set the received Time
-        branch.setTime(now);
-        branch.setReceiveTime(now);
+        branch.setTime(time);
+        branch.setReceiveTime(receiveTime);
 
         // note : in 1.04 LocalTime property is optional
         if (Object.prototype.hasOwnProperty.call(this, "localTime")) {
@@ -515,11 +517,11 @@ export class UAConditionImpl extends UABaseEventImpl implements UAConditionEx {
 
         if (Object.prototype.hasOwnProperty.call(conditionInfo, "severity") && conditionInfo.severity !== null) {
             assert(isFinite(conditionInfo.severity!));
-            branch.setSeverity(conditionInfo.severity!);
+            branch.setSeverity(conditionInfo.severity!, { sourceTimestamp: time });
         }
         if (Object.prototype.hasOwnProperty.call(conditionInfo, "quality") && conditionInfo.quality !== null) {
             assert(conditionInfo.quality instanceof StatusCode);
-            branch.setQuality(conditionInfo.quality!);
+            branch.setQuality(conditionInfo.quality!, { sourceTimestamp: time });
         }
         if (Object.prototype.hasOwnProperty.call(conditionInfo, "retain") && conditionInfo.retain !== null) {
             assert(typeof conditionInfo.retain === "boolean");
@@ -1206,12 +1208,6 @@ function _create_new_branch_id() {
     return makeNodeId(randomGuid(), 1);
 }
 
-function _update_sourceTimestamp<T, DT extends DataType>(this: UAConditionVariable<T, DT>, dataValue: DataValue /*, indexRange*/) {
-    this.sourceTimestamp.setValueFromSource({
-        dataType: DataType.DateTime,
-        value: dataValue.sourceTimestamp
-    });
-}
 
 // tslint:disable:no-console
 function _install_condition_variable_type<T, DT extends DataType>(node: UAConditionVariable<T, DT>) {
@@ -1225,15 +1221,6 @@ function _install_condition_variable_type<T, DT extends DataType>(node: UACondit
     }
     node.accessLevel = makeAccessLevelFlag("CurrentRead");
 
-    // from spec 1.03 : 5.3 condition variables
-    // a condition VariableType has a sourceTimeStamp exposed property
-    // SourceTimestamp indicates the time of the last change of the Value of this ConditionVariable.
-    // It shall be the same time that would be returned from the Read Service inside the DataValue
-    // structure for the ConditionVariable Value Attribute.
-
-    assert(node.typeDefinitionObj.browseName.toString() === "ConditionVariableType");
-    assert(node.sourceTimestamp.browseName.toString() === "SourceTimestamp");
-    node.on("value_changed", _update_sourceTimestamp);
 }
 
 /**