node-opcua-address-space 2.118.0 → 2.119.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/source/helpers/coerce_enum_value.js +1 -1
- package/dist/source/helpers/coerce_enum_value.js.map +1 -1
- package/dist/source/index.d.ts +1 -0
- package/dist/source/index.js +5 -2
- package/dist/source/index.js.map +1 -1
- package/dist/source/interfaces/alarms_and_conditions/condition_info_i.d.ts +2 -0
- package/dist/source/interfaces/alarms_and_conditions/condition_snapshot.d.ts +14 -6
- package/dist/source/interfaces/alarms_and_conditions/ua_condition_ex.d.ts +3 -2
- package/dist/source/interfaces/data_access/ua_multistate_discrete_ex.d.ts +26 -3
- package/dist/source/interfaces/data_access/ua_multistate_value_discrete_ex.d.ts +2 -1
- package/dist/source/interfaces/data_access/ua_two_state_discrete_ex.d.ts +2 -1
- package/dist/source/interfaces/i_condition_variable_type_setter_options.d.ts +3 -0
- package/dist/source/interfaces/i_condition_variable_type_setter_options.js +3 -0
- package/dist/source/interfaces/i_condition_variable_type_setter_options.js.map +1 -0
- package/dist/source/interfaces/i_set_state_options.d.ts +4 -0
- package/dist/source/interfaces/i_set_state_options.js +3 -0
- package/dist/source/interfaces/i_set_state_options.js.map +1 -0
- package/dist/source/ua_two_state_variable_ex.d.ts +2 -1
- package/dist/src/alarms_and_conditions/condition.d.ts +2 -1
- package/dist/src/alarms_and_conditions/condition.js +2 -2
- package/dist/src/alarms_and_conditions/condition.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.d.ts +20 -11
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js +72 -33
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_condition_impl.d.ts +3 -2
- package/dist/src/alarms_and_conditions/ua_condition_impl.js +13 -26
- package/dist/src/alarms_and_conditions/ua_condition_impl.js.map +1 -1
- package/dist/src/data_access/ua_multistate_discrete_impl.d.ts +3 -2
- package/dist/src/data_access/ua_multistate_discrete_impl.js +2 -2
- package/dist/src/data_access/ua_multistate_discrete_impl.js.map +1 -1
- package/dist/src/data_access/ua_multistate_value_discrete_impl.d.ts +8 -5
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js +91 -50
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js.map +1 -1
- package/dist/src/data_access/ua_two_state_discrete_impl.d.ts +2 -1
- package/dist/src/data_access/ua_two_state_discrete_impl.js +3 -3
- package/dist/src/data_access/ua_two_state_discrete_impl.js.map +1 -1
- package/dist/src/get_basic_datatype.d.ts +4 -1
- package/dist/src/get_basic_datatype.js +12 -7
- package/dist/src/get_basic_datatype.js.map +1 -1
- package/dist/src/nodeset_tools/construct_namespace_dependency.js +1 -1
- package/dist/src/nodeset_tools/construct_namespace_dependency.js.map +1 -1
- package/dist/src/state_machine/ua_two_state_variable.d.ts +2 -1
- package/dist/src/state_machine/ua_two_state_variable.js +10 -8
- package/dist/src/state_machine/ua_two_state_variable.js.map +1 -1
- package/dist/tsconfig_common.tsbuildinfo +1 -1
- package/package.json +27 -27
- package/source/helpers/coerce_enum_value.ts +2 -2
- package/source/index.ts +2 -0
- package/source/interfaces/alarms_and_conditions/condition_info_i.ts +4 -0
- package/source/interfaces/alarms_and_conditions/condition_snapshot.ts +13 -8
- package/source/interfaces/alarms_and_conditions/ua_condition_ex.ts +4 -2
- package/source/interfaces/data_access/ua_multistate_discrete_ex.ts +39 -3
- package/source/interfaces/data_access/ua_multistate_value_discrete_ex.ts +2 -1
- package/source/interfaces/data_access/ua_two_state_discrete_ex.ts +2 -1
- package/source/interfaces/i_condition_variable_type_setter_options.ts +5 -0
- package/source/interfaces/i_set_state_options.ts +4 -0
- package/source/ua_two_state_variable_ex.ts +2 -1
- package/src/alarms_and_conditions/condition.ts +4 -2
- package/src/alarms_and_conditions/condition_snapshot_impl.ts +75 -38
- package/src/alarms_and_conditions/ua_condition_impl.ts +14 -27
- package/src/data_access/ua_multistate_discrete_impl.ts +5 -3
- package/src/data_access/ua_multistate_value_discrete_impl.ts +109 -55
- package/src/data_access/ua_two_state_discrete_impl.ts +5 -3
- package/src/get_basic_datatype.ts +16 -7
- package/src/nodeset_tools/construct_namespace_dependency.ts +1 -1
- package/src/state_machine/ua_two_state_variable.ts +14 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_multistate_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_multistate_discrete_impl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,+DAAuD;AACvD,iEAA2E;AAC3E,mEAAiE;AACjE,2DAAyE;AAIzE,uFAAkF;AAClF,0DAAqD;
|
|
1
|
+
{"version":3,"file":"ua_multistate_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_multistate_discrete_impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { DTEnumValue } from "node-opcua-nodeset-ua";
|
|
|
8
8
|
import { INamespace, UAVariable, UAProperty, ISessionContext } from "node-opcua-address-space-base";
|
|
9
9
|
import { UAMultiStateValueDiscreteEx } from "../../source/interfaces/data_access/ua_multistate_value_discrete_ex";
|
|
10
10
|
import { AddMultiStateValueDiscreteOptions } from "../../source/address_space_ts";
|
|
11
|
+
import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
|
|
11
12
|
import { UAVariableImpl } from "../ua_variable_impl";
|
|
12
13
|
export interface UAMultiStateValueDiscreteImpl<T, DT extends DataType> {
|
|
13
14
|
enumValues: UAProperty<DTEnumValue[], DataType.ExtensionObject>;
|
|
@@ -16,9 +17,9 @@ export interface UAMultiStateValueDiscreteImpl<T, DT extends DataType> {
|
|
|
16
17
|
readValueAsync(context: ISessionContext | null, callback?: any): any;
|
|
17
18
|
}
|
|
18
19
|
export declare class UAMultiStateValueDiscreteImpl<T, DT extends DataType> extends UAVariableImpl implements UAMultiStateValueDiscreteEx<T, DT> {
|
|
19
|
-
setValue(value: string | number | Int64): void;
|
|
20
|
-
getValueAsString():
|
|
21
|
-
getValueAsNumber():
|
|
20
|
+
setValue(value: string | number | Int64, options?: ISetStateOptions): void;
|
|
21
|
+
getValueAsString(): any;
|
|
22
|
+
getValueAsNumber(): any;
|
|
22
23
|
checkVariantCompatibility(value: Variant): StatusCode;
|
|
23
24
|
clone<T, DT extends DataType>(options1: any, optionalFilter: any, extraInfo: any): UAMultiStateValueDiscreteImpl<T, DT>;
|
|
24
25
|
/**
|
|
@@ -34,7 +35,7 @@ export declare class UAMultiStateValueDiscreteImpl<T, DT extends DataType> exten
|
|
|
34
35
|
*
|
|
35
36
|
* @private
|
|
36
37
|
*/
|
|
37
|
-
_setValue(value: Int64): void;
|
|
38
|
+
_setValue(value: Int64, options?: ISetStateOptions): void;
|
|
38
39
|
/**
|
|
39
40
|
*
|
|
40
41
|
* @private
|
|
@@ -49,4 +50,6 @@ export declare class UAMultiStateValueDiscreteImpl<T, DT extends DataType> exten
|
|
|
49
50
|
}
|
|
50
51
|
export declare function promoteToMultiStateValueDiscrete<T, DT extends DataType>(node: UAVariable): UAMultiStateValueDiscreteImpl<T, DT>;
|
|
51
52
|
export declare function _addMultiStateValueDiscrete<T, DT extends DataType>(namespace: INamespace, options: AddMultiStateValueDiscreteOptions): UAMultiStateValueDiscreteEx<T, DT>;
|
|
52
|
-
export declare function
|
|
53
|
+
export declare function validateIsNumericDataType(dataTypeValue: any): void;
|
|
54
|
+
/** @deprecated: use validateIsNumericDataType instead */
|
|
55
|
+
export declare const validateDataType: typeof validateIsNumericDataType;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.validateDataType = exports._addMultiStateValueDiscrete = exports.promoteToMultiStateValueDiscrete = exports.UAMultiStateValueDiscreteImpl = void 0;
|
|
3
|
+
exports.validateDataType = exports.validateIsNumericDataType = exports._addMultiStateValueDiscrete = exports.promoteToMultiStateValueDiscrete = exports.UAMultiStateValueDiscreteImpl = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* @module node-opcua-address-space.DataAccess
|
|
6
6
|
*/
|
|
@@ -10,24 +10,62 @@ const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
|
10
10
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
11
11
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
12
12
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
13
|
+
const get_basic_datatype_1 = require("../get_basic_datatype");
|
|
13
14
|
const register_node_promoter_1 = require("../../source/loader/register_node_promoter");
|
|
14
15
|
const coerce_enum_value_1 = require("../../source/helpers/coerce_enum_value");
|
|
15
16
|
const ua_variable_impl_1 = require("../ua_variable_impl");
|
|
16
17
|
const add_dataItem_stuff_1 = require("./add_dataItem_stuff");
|
|
18
|
+
function convertToArray(array) {
|
|
19
|
+
if (Array.isArray(array))
|
|
20
|
+
return array;
|
|
21
|
+
const result = [];
|
|
22
|
+
for (let i = 0; i < array.length; i++) {
|
|
23
|
+
result[i] = array[i];
|
|
24
|
+
}
|
|
25
|
+
return result;
|
|
26
|
+
}
|
|
27
|
+
const getCoerceToInt32 = (dataType) => {
|
|
28
|
+
switch (dataType) {
|
|
29
|
+
case node_opcua_variant_1.DataType.UInt64:
|
|
30
|
+
return node_opcua_basic_types_1.coerceUInt64toInt32;
|
|
31
|
+
case node_opcua_variant_1.DataType.Int64:
|
|
32
|
+
return node_opcua_basic_types_1.coerceInt64toInt32;
|
|
33
|
+
default:
|
|
34
|
+
return node_opcua_basic_types_1.coerceInt32;
|
|
35
|
+
}
|
|
36
|
+
};
|
|
17
37
|
function install_synchronization(variable) {
|
|
18
38
|
const _variable = variable;
|
|
19
|
-
_variable.on("value_changed", (
|
|
39
|
+
_variable.on("value_changed", (dataValue) => {
|
|
20
40
|
const valueAsTextNode = variable.valueAsText || _variable.getComponentByName("ValueAsText");
|
|
21
41
|
if (!valueAsTextNode) {
|
|
22
42
|
return;
|
|
23
43
|
}
|
|
24
|
-
|
|
25
|
-
|
|
44
|
+
if (dataValue.value.arrayType === node_opcua_variant_1.VariantArrayType.Array || dataValue.value.arrayType === node_opcua_variant_1.VariantArrayType.Matrix) {
|
|
45
|
+
//
|
|
46
|
+
const coerce = getCoerceToInt32(_variable.getBasicDataType());
|
|
47
|
+
const values = convertToArray(dataValue.value.value).map((a) => (0, node_opcua_basic_types_1.coerceInt32)(a));
|
|
48
|
+
const variantArray = values.map((a) => _variable.findValueAsText(a));
|
|
49
|
+
const localizedText = variantArray.map((a) => a.value);
|
|
50
|
+
const valueAsText1 = new node_opcua_variant_1.Variant({
|
|
51
|
+
arrayType: dataValue.value.arrayType,
|
|
52
|
+
dataType: node_opcua_variant_1.DataType.LocalizedText,
|
|
53
|
+
value: localizedText,
|
|
54
|
+
dimensions: dataValue.value.dimensions
|
|
55
|
+
});
|
|
56
|
+
valueAsTextNode.setValueFromSource(valueAsText1);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const valueAsText1 = _variable.findValueAsText(dataValue.value.value);
|
|
60
|
+
valueAsTextNode.setValueFromSource(valueAsText1);
|
|
61
|
+
}
|
|
26
62
|
});
|
|
27
|
-
|
|
63
|
+
const dataValue = _variable.readValue();
|
|
64
|
+
// detect value changes to update valueAsText (initial state)
|
|
65
|
+
_variable.emit("value_changed", dataValue);
|
|
28
66
|
}
|
|
29
67
|
class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
30
|
-
setValue(value) {
|
|
68
|
+
setValue(value, options) {
|
|
31
69
|
if (typeof value === "string") {
|
|
32
70
|
const enumValues = this.enumValues.readValue().value.value;
|
|
33
71
|
const selected = enumValues.filter((a) => a.displayName.text === value)[0];
|
|
@@ -39,11 +77,15 @@ class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
39
77
|
}
|
|
40
78
|
}
|
|
41
79
|
else {
|
|
42
|
-
this._setValue((0, node_opcua_basic_types_1.coerceUInt64)(value));
|
|
80
|
+
this._setValue((0, node_opcua_basic_types_1.coerceUInt64)(value), options);
|
|
43
81
|
}
|
|
44
82
|
}
|
|
45
83
|
getValueAsString() {
|
|
46
|
-
|
|
84
|
+
const v = this.valueAsText.readValue().value.value;
|
|
85
|
+
if (Array.isArray(v)) {
|
|
86
|
+
return v.map((a) => a.text);
|
|
87
|
+
}
|
|
88
|
+
return v.text || "";
|
|
47
89
|
}
|
|
48
90
|
getValueAsNumber() {
|
|
49
91
|
return this.readValue().value.value;
|
|
@@ -66,7 +108,7 @@ class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
66
108
|
_isValueInRange(value) {
|
|
67
109
|
// MultiStateValueDiscreteType
|
|
68
110
|
const enumValues = this.enumValues.readValue().value.value;
|
|
69
|
-
const e = enumValues.findIndex((x) => (0, node_opcua_basic_types_1.
|
|
111
|
+
const e = enumValues.findIndex((x) => (0, node_opcua_basic_types_1.coerceInt64toInt32)(x.value) === value);
|
|
70
112
|
return !(e === -1);
|
|
71
113
|
}
|
|
72
114
|
/**
|
|
@@ -90,18 +132,18 @@ class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
90
132
|
*
|
|
91
133
|
* @private
|
|
92
134
|
*/
|
|
93
|
-
_setValue(value) {
|
|
135
|
+
_setValue(value, options) {
|
|
136
|
+
const int32Value = (0, node_opcua_basic_types_1.coerceInt64toInt32)(value);
|
|
94
137
|
// check that value is in bound
|
|
95
|
-
if (!this._isValueInRange(
|
|
138
|
+
if (!this._isValueInRange(int32Value)) {
|
|
96
139
|
throw new Error("UAMultiStateValueDiscrete#_setValue out of range " + value);
|
|
97
140
|
}
|
|
98
141
|
const dataType = this._getDataType();
|
|
99
142
|
if (dataType === node_opcua_variant_1.DataType.Int64 || dataType === node_opcua_variant_1.DataType.UInt64) {
|
|
100
|
-
this.setValueFromSource({ dataType, value });
|
|
143
|
+
this.setValueFromSource({ dataType, arrayType: node_opcua_variant_1.VariantArrayType.Scalar, value });
|
|
101
144
|
}
|
|
102
145
|
else {
|
|
103
|
-
|
|
104
|
-
this.setValueFromSource({ dataType, value: valueN });
|
|
146
|
+
this.setValueFromSource({ dataType, arrayType: node_opcua_variant_1.VariantArrayType.Scalar, value: int32Value });
|
|
105
147
|
}
|
|
106
148
|
}
|
|
107
149
|
/**
|
|
@@ -113,13 +155,10 @@ class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
113
155
|
if (value === undefined) {
|
|
114
156
|
throw new Error("Unexpected undefined value");
|
|
115
157
|
}
|
|
116
|
-
|
|
117
|
-
value = value[1];
|
|
118
|
-
}
|
|
119
|
-
(0, node_opcua_assert_1.assert)(!(value instanceof node_opcua_variant_1.Variant));
|
|
158
|
+
const valueAsInt32 = (0, node_opcua_basic_types_1.coerceInt64toInt32)(value);
|
|
120
159
|
let valueAsText1 = "Invalid";
|
|
121
|
-
if (enumValueIndex[
|
|
122
|
-
valueAsText1 = enumValueIndex[
|
|
160
|
+
if (enumValueIndex[valueAsInt32] !== undefined) {
|
|
161
|
+
valueAsText1 = enumValueIndex[valueAsInt32].displayName.text || `Invalid:${value}`;
|
|
123
162
|
}
|
|
124
163
|
const result = new node_opcua_variant_1.Variant({
|
|
125
164
|
dataType: node_opcua_variant_1.DataType.LocalizedText,
|
|
@@ -142,7 +181,7 @@ class UAMultiStateValueDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
142
181
|
// MultiStateValueDiscrete Variables can have any numeric Data Type;
|
|
143
182
|
// this includes signed and unsigned integers from 8 to 64 Bit length.
|
|
144
183
|
// istanbul ignore next
|
|
145
|
-
|
|
184
|
+
validateIsNumericDataType(this.dataType.value);
|
|
146
185
|
// find the enum value type
|
|
147
186
|
install_synchronization(this);
|
|
148
187
|
}
|
|
@@ -174,31 +213,29 @@ function _addMultiStateValueDiscrete(namespace, options) {
|
|
|
174
213
|
if (options.value === undefined && enumValues[0]) {
|
|
175
214
|
options.value = enumValues[0].value; // Int64
|
|
176
215
|
}
|
|
216
|
+
// Only DataTypes that can be represented with EnumValues are allowed for Variables of MultiStateValueDiscreteType.
|
|
217
|
+
// These are Integers up to 64 Bits (signed and unsigned).:
|
|
218
|
+
const dataType = (0, get_basic_datatype_1._getBasicDataTypeFromDataTypeNodeId)(addressSpace, options.dataType || node_opcua_variant_1.DataType.UInt32);
|
|
177
219
|
let value;
|
|
178
|
-
if (typeof options.value === "number" ||
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
}
|
|
185
|
-
else {
|
|
186
|
-
value = new node_opcua_variant_1.Variant({
|
|
187
|
-
dataType: node_opcua_variant_1.DataType.UInt32,
|
|
188
|
-
value: options.value
|
|
189
|
-
});
|
|
190
|
-
}
|
|
220
|
+
if (typeof options.value === "number" ||
|
|
221
|
+
(0, node_opcua_basic_types_1.isValidUInt64)(options.value) ||
|
|
222
|
+
(0, node_opcua_basic_types_1.isValidInt64)(options.value)) {
|
|
223
|
+
value = new node_opcua_variant_1.Variant({
|
|
224
|
+
dataType,
|
|
225
|
+
value: options.value
|
|
226
|
+
});
|
|
191
227
|
}
|
|
192
228
|
else {
|
|
193
229
|
value = options.value;
|
|
194
230
|
}
|
|
195
231
|
const cloned_options = {
|
|
196
232
|
...options,
|
|
197
|
-
dataType
|
|
233
|
+
dataType,
|
|
198
234
|
typeDefinition: multiStateValueDiscreteType.nodeId,
|
|
199
235
|
// valueRank:
|
|
200
236
|
// note : OPCUA Spec 1.03 specifies -1:Scalar (part 8 page 8) but nodeset file specifies -2:Any
|
|
201
237
|
value,
|
|
238
|
+
// limitation: although the Specs specify -2:any, we only support -1(Scalar)
|
|
202
239
|
valueRank: -1 // -1 : Scalar
|
|
203
240
|
};
|
|
204
241
|
const variable = namespace.addVariable(cloned_options);
|
|
@@ -226,6 +263,8 @@ function _addMultiStateValueDiscrete(namespace, options) {
|
|
|
226
263
|
minimumSamplingInterval: 0,
|
|
227
264
|
modellingRule: options.modellingRule ? "Mandatory" : undefined,
|
|
228
265
|
propertyOf: variable,
|
|
266
|
+
arrayDimensions: options.arrayDimensions,
|
|
267
|
+
valueRank: options.valueRank,
|
|
229
268
|
typeDefinition: "PropertyType",
|
|
230
269
|
userAccessLevel: "CurrentRead"
|
|
231
270
|
// value: valueAsText
|
|
@@ -238,22 +277,24 @@ function _addMultiStateValueDiscrete(namespace, options) {
|
|
|
238
277
|
return variable;
|
|
239
278
|
}
|
|
240
279
|
exports._addMultiStateValueDiscrete = _addMultiStateValueDiscrete;
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
if (typeof dataTypeValue !== "number" ||
|
|
280
|
+
const validBasicNumericDataTypes = [
|
|
281
|
+
node_opcua_variant_1.DataType.UInt64,
|
|
282
|
+
node_opcua_variant_1.DataType.Int64,
|
|
283
|
+
node_opcua_variant_1.DataType.UInt32,
|
|
284
|
+
node_opcua_variant_1.DataType.Int32,
|
|
285
|
+
node_opcua_variant_1.DataType.UInt16,
|
|
286
|
+
node_opcua_variant_1.DataType.Int16,
|
|
287
|
+
node_opcua_variant_1.DataType.Byte,
|
|
288
|
+
node_opcua_variant_1.DataType.Byte,
|
|
289
|
+
node_opcua_variant_1.DataType.SByte,
|
|
290
|
+
26 /*Number*/
|
|
291
|
+
];
|
|
292
|
+
function validateIsNumericDataType(dataTypeValue) {
|
|
293
|
+
if (typeof dataTypeValue !== "number" || validBasicNumericDataTypes.indexOf(dataTypeValue) < 0) {
|
|
255
294
|
throw new Error(`Invalid DataType in UAMultiStateValueDiscrete => ${dataTypeValue.toString()}`);
|
|
256
295
|
}
|
|
257
296
|
}
|
|
258
|
-
exports.
|
|
297
|
+
exports.validateIsNumericDataType = validateIsNumericDataType;
|
|
298
|
+
/** @deprecated: use validateIsNumericDataType instead */
|
|
299
|
+
exports.validateDataType = validateIsNumericDataType;
|
|
259
300
|
//# sourceMappingURL=ua_multistate_value_discrete_impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_multistate_value_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_multistate_value_discrete_impl.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,2DAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"ua_multistate_value_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_multistate_value_discrete_impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { NumericRange } from "node-opcua-numeric-range";
|
|
|
6
6
|
import { UAVariableImpl } from "../ua_variable_impl";
|
|
7
7
|
import { AddTwoStateDiscreteOptions } from "../../source/address_space_ts";
|
|
8
8
|
import { UATwoStateDiscreteEx } from "../../source/interfaces/data_access/ua_two_state_discrete_ex";
|
|
9
|
+
import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
|
|
9
10
|
export interface UATwoStateDiscreteImpl {
|
|
10
11
|
falseState: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
|
|
11
12
|
trueState: UAProperty<LocalizedText, /*c*/ DataType.LocalizedText>;
|
|
@@ -14,7 +15,7 @@ export interface UATwoStateDiscreteImpl {
|
|
|
14
15
|
}
|
|
15
16
|
export declare class UATwoStateDiscreteImpl extends UAVariableImpl implements UATwoStateDiscreteEx {
|
|
16
17
|
_post_initialize(): void;
|
|
17
|
-
setValue(value: boolean | LocalizedTextLike): void;
|
|
18
|
+
setValue(value: boolean | LocalizedTextLike, options?: ISetStateOptions): void;
|
|
18
19
|
getValue(): boolean;
|
|
19
20
|
getValueAsString(): string;
|
|
20
21
|
getTrueStateAsString(): string;
|
|
@@ -37,17 +37,17 @@ class UATwoStateDiscreteImpl extends ua_variable_impl_1.UAVariableImpl {
|
|
|
37
37
|
console.warn("waring: UATwoStateDiscrete -> a TrueState property is mandatory", this.browseName.toString(), this.nodeId.toString());
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
setValue(value) {
|
|
40
|
+
setValue(value, options) {
|
|
41
41
|
if (typeof value === "boolean") {
|
|
42
42
|
this.setValueFromSource({ dataType: node_opcua_variant_1.DataType.Boolean, value });
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
45
|
const text = (typeof value === "string" ? value : value.text) || "";
|
|
46
46
|
if (text === this.getTrueStateAsString()) {
|
|
47
|
-
this.setValue(true);
|
|
47
|
+
this.setValue(true, options);
|
|
48
48
|
}
|
|
49
49
|
else if (text === this.getFalseStateAsString()) {
|
|
50
|
-
this.setValue(false);
|
|
50
|
+
this.setValue(false, options);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
throw new Error("setValue invalid value " + value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ua_two_state_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_two_state_discrete_impl.ts"],"names":[],"mappings":";;;;;;AAAA,0EAAuC;AACvC,iEAAiH;AACjH,2DAAoE;AACpE,+DAAuD;AAKvD,0DAAqD;AACrD,uFAAkF;
|
|
1
|
+
{"version":3,"file":"ua_two_state_discrete_impl.js","sourceRoot":"","sources":["../../../src/data_access/ua_two_state_discrete_impl.ts"],"names":[],"mappings":";;;;;;AAAA,0EAAuC;AACvC,iEAAiH;AACjH,2DAAoE;AACpE,+DAAuD;AAKvD,0DAAqD;AACrD,uFAAkF;AAKlF,6DAA0D;AAe1D,MAAa,sBAAuB,SAAQ,iCAAc;IACtD;;OAEG;IACH,gBAAgB;QACZ,yFAAyF;QACzF,gGAAgG;QAChG,gDAAgD;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACxD,0BAA0B;QAC1B,IAAI,UAAU,EAAE;YACZ,UAAU,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;SAC3C;aAAM;YACH,OAAO,CAAC,IAAI,CACR,oEAAoE,EACpE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CACzB,CAAC;SACL;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACtD,0BAA0B;QAC1B,IAAI,SAAS,EAAE;YACX,SAAS,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;SAC1C;aAAM;YACH,OAAO,CAAC,IAAI,CACR,iEAAiE,EACjE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CACzB,CAAC;SACL;IACL,CAAC;IACD,QAAQ,CAAC,KAAkC,EAAE,OAA0B;QACnE,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;YAC5B,IAAI,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAClE;aAAM;YACH,MAAM,IAAI,GAAW,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5E,IAAI,IAAI,KAAK,IAAI,CAAC,oBAAoB,EAAE,EAAE;gBACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAChC;iBAAM,IAAI,IAAI,KAAK,IAAI,CAAC,qBAAqB,EAAE,EAAE;gBAC9C,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACjC;iBAAM;gBACH,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC;aACtD;SACJ;IACL,CAAC;IACD,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,KAAgB,CAAC;IACnD,CAAC;IACD,gBAAgB;QACZ,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACjB,OAAO,IAAI,CAAC,oBAAoB,EAAE,CAAC;SACtC;aAAM;YACH,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;SACvC;IACL,CAAC;IACD,oBAAoB;QAChB,OAAQ,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,KAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;IAChF,CAAC;IACD,qBAAqB;QACjB,OAAQ,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,KAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,QAAa,EAAE,cAAmB,EAAE,SAAc;QAC3D,MAAM,SAAS,GAAG,iCAAc,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;QACjG,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACrC,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AArED,wDAqEC;AAED,SAAgB,yBAAyB,CAAC,IAAgB;IACtD,IAAI,IAAI,YAAY,sBAAsB,EAAE;QACxC,OAAO,IAAuC,CAAC,CAAC,mBAAmB;KACtE;IACD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAA,2BAAM,EAAC,IAAI,YAAY,sBAAsB,EAAE,qCAAqC,CAAC,CAAC;IACtF,MAAM,KAAK,GAAG,IAA8B,CAAC;IAC7C,KAAK,CAAC,gBAAgB,EAAE,CAAC;IACzB,OAAO,KAAwC,CAAC;AACpD,CAAC;AATD,8DASC;AACD,IAAA,6CAAoB,EAAC,sCAAe,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,CAAC;AAEtF,SAAgB,oBAAoB,CAAC,SAAqB,EAAE,OAAmC;IAC3F,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;IAE5C,IAAA,2BAAM,EAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEzE,MAAM,oBAAoB,GAAG,YAAY,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;IACnF,IAAI,CAAC,oBAAoB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;KAC5F;IAED,IAAI,KAAsC,CAAC;IAC3C,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE;QACpC,KAAK,GAAG,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;KAC/E;SAAM;QACH,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACzB;IACD,iDAAiD;IACjD,0DAA0D;IAE1D,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,CAAC;QACnC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,QAAQ,EAAE,6BAAQ,CAAC,OAAO;QAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,cAAc,EAAE,oBAAoB,CAAC,MAAM;QAC3C,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;QACxD,KAAK;KACR,CAAe,CAAC;IAEjB;;;MAGE;IACF,MAAM,OAAO,GAAI,QAA2B,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEpF,IAAA,uCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC;QACxC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,EAAE;QACpD,QAAQ,EAAE,eAAe;QACzB,uBAAuB,EAAE,CAAC;QAC1B,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,cAAc;QAC9B,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAC9D,KAAK,EAAE,IAAI,4BAAO,CAAC;YACf,QAAQ,EAAE,6BAAQ,CAAC,aAAa;YAChC,KAAK,EAAE,IAAA,2CAAmB,EAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;SACxD,CAAC;KACL,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE3C,MAAM,cAAc,GAAG,SAAS,CAAC,WAAW,CAAC;QACzC,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,EAAE;QACrD,QAAQ,EAAE,eAAe;QACzB,uBAAuB,EAAE,CAAC;QAC1B,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,cAAc;QAC9B,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAE9D,KAAK,EAAE,IAAI,4BAAO,CAAC;YACf,QAAQ,EAAE,6BAAQ,CAAC,aAAa;YAChC,KAAK,EAAE,IAAA,2CAAmB,EAAC,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC;SAC1D,CAAC;KACL,CAAC,CAAC;IAEH,cAAc,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAE5C,QAAQ,CAAC,wBAAwB,EAAE,CAAC;IAEpC,OAAO,yBAAyB,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AA5ED,oDA4EC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { IAddressSpace } from "node-opcua-address-space-base";
|
|
2
2
|
import { DataType } from "node-opcua-basic-types";
|
|
3
|
-
import { NodeId } from "node-opcua-nodeid";
|
|
3
|
+
import { NodeId, NodeIdLike } from "node-opcua-nodeid";
|
|
4
4
|
export interface IBaseNodeVariableOrVariableType {
|
|
5
5
|
addressSpace: IAddressSpace;
|
|
6
6
|
dataType: NodeId;
|
|
7
7
|
}
|
|
8
|
+
export declare function _getBasicDataTypeFromDataTypeNodeId(addressSpace: IAddressSpace, dataTypeNodeId: {
|
|
9
|
+
nodeId: NodeIdLike;
|
|
10
|
+
} | NodeIdLike): DataType;
|
|
8
11
|
export declare function _getBasicDataType(uaNode: IBaseNodeVariableOrVariableType): DataType;
|
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports._getBasicDataType = void 0;
|
|
3
|
+
exports._getBasicDataType = exports._getBasicDataTypeFromDataTypeNodeId = void 0;
|
|
4
4
|
const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
5
|
-
|
|
5
|
+
function _getBasicDataTypeFromDataTypeNodeId(addressSpace, dataTypeNodeId) {
|
|
6
|
+
const dataTypeNodeId_ = dataTypeNodeId.nodeId ? dataTypeNodeId.nodeId : dataTypeNodeId;
|
|
7
|
+
const dataTypeNode = addressSpace.findDataType(dataTypeNodeId_);
|
|
8
|
+
if (!dataTypeNode) {
|
|
9
|
+
return node_opcua_basic_types_1.DataType.Null;
|
|
10
|
+
}
|
|
11
|
+
return dataTypeNode.getBasicDataType();
|
|
12
|
+
}
|
|
13
|
+
exports._getBasicDataTypeFromDataTypeNodeId = _getBasicDataTypeFromDataTypeNodeId;
|
|
6
14
|
function _getBasicDataType(uaNode) {
|
|
7
15
|
const _uaNode = uaNode;
|
|
8
16
|
if (_uaNode._basicDataType) {
|
|
@@ -16,11 +24,8 @@ function _getBasicDataType(uaNode) {
|
|
|
16
24
|
// may be node has been deleted already
|
|
17
25
|
return node_opcua_basic_types_1.DataType.Null;
|
|
18
26
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
// const basicDataType = addressSpace.findCorrespondingBasicDataType(uaNode.dataType);
|
|
22
|
-
_uaNode._basicDataType = basicDataType;
|
|
23
|
-
return basicDataType;
|
|
27
|
+
_uaNode._basicDataType = _getBasicDataTypeFromDataTypeNodeId(addressSpace, _uaNode.dataType);
|
|
28
|
+
return _uaNode._basicDataType;
|
|
24
29
|
}
|
|
25
30
|
exports._getBasicDataType = _getBasicDataType;
|
|
26
31
|
//# sourceMappingURL=get_basic_datatype.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_basic_datatype.js","sourceRoot":"","sources":["../../src/get_basic_datatype.ts"],"names":[],"mappings":";;;AACA,mEAAkD;
|
|
1
|
+
{"version":3,"file":"get_basic_datatype.js","sourceRoot":"","sources":["../../src/get_basic_datatype.ts"],"names":[],"mappings":";;;AACA,mEAAkD;AAYlD,SAAgB,mCAAmC,CAC/C,YAA2B,EAC3B,cAAmD;IAEnD,MAAM,eAAe,GAAM,cAAsB,CAAC,MAAM,CAAC,CAAC,CAAE,cAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC;IAC3G,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY,EAAE;QACf,OAAO,iCAAQ,CAAC,IAAI,CAAC;KACxB;IACD,OAAO,YAAY,CAAC,gBAAgB,EAAE,CAAC;AAC3C,CAAC;AAVD,kFAUC;AAED,SAAgB,iBAAiB,CAAC,MAAuC;IACrE,MAAM,OAAO,GAAG,MAA2C,CAAC;IAC5D,IAAI,OAAO,CAAC,cAAc,EAAE;QACxB,OAAO,OAAO,CAAC,cAAc,CAAC;KACjC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,EAAE;QAClE,OAAO,iCAAQ,CAAC,IAAI,CAAC;KACxB;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC1C,IAAI,CAAC,YAAY,EAAE;QACf,uCAAuC;QACvC,OAAO,iCAAQ,CAAC,IAAI,CAAC;KACxB;IACD,OAAO,CAAC,cAAc,GAAI,mCAAmC,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9F,OAAO,OAAO,CAAC,cAAc,CAAC;AAClC,CAAC;AAfD,8CAeC"}
|
|
@@ -285,7 +285,7 @@ function constructNamespacePriorityTable(addressSpace) {
|
|
|
285
285
|
return { loadingOrder, priorityTable };
|
|
286
286
|
}
|
|
287
287
|
exports.constructNamespacePriorityTable = constructNamespacePriorityTable;
|
|
288
|
-
const doDebug =
|
|
288
|
+
const doDebug = false;
|
|
289
289
|
function constructNamespaceDependency(namespace, priorityTable) {
|
|
290
290
|
const addressSpace = namespace.addressSpace;
|
|
291
291
|
priorityTable = priorityTable || constructNamespacePriorityTable(addressSpace).priorityTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"construct_namespace_dependency.js","sourceRoot":"","sources":["../../../src/nodeset_tools/construct_namespace_dependency.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"construct_namespace_dependency.js","sourceRoot":"","sources":["../../../src/nodeset_tools/construct_namespace_dependency.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { QualifiedNameLike } from "node-opcua-data-model";
|
|
|
9
9
|
import { AddTwoStateVariableOptions } from "../../source/address_space_ts";
|
|
10
10
|
import { UATwoStateVariableEx } from "../../source/ua_two_state_variable_ex";
|
|
11
11
|
import { UAVariableImplT } from "../ua_variable_impl";
|
|
12
|
+
import { ISetStateOptions } from "../../source/interfaces/i_set_state_options";
|
|
12
13
|
export declare function _install_TwoStateVariable_machinery(node: UAVariable, options: TwoStateVariableInitializeOptions): UATwoStateVariableEx;
|
|
13
14
|
export declare function promoteToTwoStateVariable(node: UAVariable): UATwoStateVariableEx;
|
|
14
15
|
export interface TwoStateVariableInitializeOptions {
|
|
@@ -43,7 +44,7 @@ export declare class UATwoStateVariableImpl extends UAVariableImplT<LocalizedTex
|
|
|
43
44
|
* @method setValue
|
|
44
45
|
* @param boolValue {Boolean}
|
|
45
46
|
*/
|
|
46
|
-
setValue(boolValue: boolean): void;
|
|
47
|
+
setValue(boolValue: boolean, options?: ISetStateOptions): void;
|
|
47
48
|
/**
|
|
48
49
|
* @method getValue
|
|
49
50
|
* @return {Boolean}
|
|
@@ -46,18 +46,20 @@ const hasFalseSubState_ReferenceTypeNodeId = (0, node_opcua_nodeid_1.resolveNode
|
|
|
46
46
|
// HasFalseSubState StateMachine or
|
|
47
47
|
// TwoStateVariableType
|
|
48
48
|
// <StateIdentifier> Defined in Clause 5.4.3 Optional
|
|
49
|
-
function _updateTransitionTime(node, _subState) {
|
|
49
|
+
function _updateTransitionTime(node, _subState, options) {
|
|
50
50
|
// TransitionTime specifies the time when the current state was entered.
|
|
51
51
|
if (node.transitionTime) {
|
|
52
|
-
|
|
52
|
+
const transitionTime = options?.transitionTime || new Date();
|
|
53
|
+
node.transitionTime.setValueFromSource({ dataType: node_opcua_variant_2.DataType.DateTime, value: transitionTime });
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
|
-
function _updateEffectiveTransitionTime(node) {
|
|
56
|
+
function _updateEffectiveTransitionTime(node, options) {
|
|
56
57
|
if (node.effectiveTransitionTime) {
|
|
58
|
+
const effectiveTransitionTime = options?.effectiveTransitionTime || new Date();
|
|
57
59
|
// because subStateNode ",subStateNode.browseName.toString());
|
|
58
60
|
node.effectiveTransitionTime.setValueFromSource({
|
|
59
61
|
dataType: node_opcua_variant_2.DataType.DateTime,
|
|
60
|
-
value:
|
|
62
|
+
value: effectiveTransitionTime
|
|
61
63
|
});
|
|
62
64
|
}
|
|
63
65
|
}
|
|
@@ -236,7 +238,7 @@ class UATwoStateVariableImpl extends ua_variable_impl_1.UAVariableImplT {
|
|
|
236
238
|
* @method setValue
|
|
237
239
|
* @param boolValue {Boolean}
|
|
238
240
|
*/
|
|
239
|
-
setValue(boolValue) {
|
|
241
|
+
setValue(boolValue, options) {
|
|
240
242
|
(0, node_opcua_assert_1.assert)(typeof boolValue === "boolean");
|
|
241
243
|
const dataValue = this.id.readValue();
|
|
242
244
|
const oldValue = dataValue.value.value;
|
|
@@ -245,8 +247,8 @@ class UATwoStateVariableImpl extends ua_variable_impl_1.UAVariableImplT {
|
|
|
245
247
|
}
|
|
246
248
|
//
|
|
247
249
|
this.id.setValueFromSource(new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_2.DataType.Boolean, value: boolValue }));
|
|
248
|
-
_updateTransitionTime(this);
|
|
249
|
-
_updateEffectiveTransitionTime(this);
|
|
250
|
+
_updateTransitionTime(this, undefined, options);
|
|
251
|
+
_updateEffectiveTransitionTime(this, options);
|
|
250
252
|
}
|
|
251
253
|
/**
|
|
252
254
|
* @method getValue
|
|
@@ -292,7 +294,7 @@ class UATwoStateVariableImpl extends ua_variable_impl_1.UAVariableImplT {
|
|
|
292
294
|
const addressSpace = this.addressSpace;
|
|
293
295
|
// add event handle
|
|
294
296
|
const subState = addressSpace.findNode(reference.nodeId);
|
|
295
|
-
subState.on("value_changed", _updateEffectiveTransitionTime.bind(null, this));
|
|
297
|
+
subState.on("value_changed", _updateEffectiveTransitionTime.bind(null, this, undefined));
|
|
296
298
|
}
|
|
297
299
|
}
|
|
298
300
|
}
|