node-opcua-address-space 2.102.0 → 2.104.0
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/address_space_ts.js +1 -1
- package/dist/source/address_space_ts.js.map +1 -1
- package/dist/source/helpers/argument_list.js +5 -5
- package/dist/source/helpers/argument_list.js.map +1 -1
- package/dist/source/helpers/dump_tools.js +8 -5
- package/dist/source/helpers/dump_tools.js.map +1 -1
- package/dist/source/helpers/ensure_secure_access.js +0 -18
- package/dist/source/helpers/ensure_secure_access.js.map +1 -1
- package/dist/source/loader/load_nodeset2.js +35 -32
- package/dist/source/loader/load_nodeset2.js.map +1 -1
- package/dist/source/namespace_data_access.d.ts +20 -1
- package/dist/source/pseudo_session.js +35 -3
- package/dist/source/pseudo_session.js.map +1 -1
- package/dist/source/session_context.js +6 -3
- package/dist/source/session_context.js.map +1 -1
- package/dist/src/address_space.js +35 -9
- package/dist/src/address_space.js.map +1 -1
- package/dist/src/address_space_change_event_tools.js +5 -2
- package/dist/src/address_space_change_event_tools.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js +1 -1
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_condition_impl.js +7 -4
- package/dist/src/alarms_and_conditions/ua_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_off_normal_alarm_impl.js +24 -1
- package/dist/src/alarms_and_conditions/ua_off_normal_alarm_impl.js.map +1 -1
- package/dist/src/base_node_impl.js +36 -10
- package/dist/src/base_node_impl.js.map +1 -1
- package/dist/src/base_node_private.js +36 -33
- package/dist/src/base_node_private.js.map +1 -1
- package/dist/src/data_access/adjust_datavalue_status_code.d.ts +4 -0
- package/dist/src/data_access/adjust_datavalue_status_code.js +30 -0
- package/dist/src/data_access/adjust_datavalue_status_code.js.map +1 -0
- package/dist/src/data_access/ua_two_state_discrete_impl.js +4 -1
- package/dist/src/data_access/ua_two_state_discrete_impl.js.map +1 -1
- package/dist/src/historical_access/address_space_historical_data_node.js +5 -2
- package/dist/src/historical_access/address_space_historical_data_node.js.map +1 -1
- package/dist/src/index_current.d.ts +1 -1
- package/dist/src/index_current.js +1 -1
- package/dist/src/index_current.js.map +1 -1
- package/dist/src/namespace_impl.js +35 -7
- package/dist/src/namespace_impl.js.map +1 -1
- package/dist/src/nodeset_tools/nodeset_to_xml.js +24 -1
- package/dist/src/nodeset_tools/nodeset_to_xml.js.map +1 -1
- package/dist/src/reference_impl.js +29 -3
- package/dist/src/reference_impl.js.map +1 -1
- package/dist/src/state_machine/finite_state_machine.js +5 -2
- package/dist/src/state_machine/finite_state_machine.js.map +1 -1
- package/dist/src/state_machine/ua_two_state_variable.js +4 -4
- package/dist/src/state_machine/ua_two_state_variable.js.map +1 -1
- package/dist/src/ua_data_type_impl.js +36 -10
- package/dist/src/ua_data_type_impl.js.map +1 -1
- package/dist/src/ua_method_impl.js +5 -2
- package/dist/src/ua_method_impl.js.map +1 -1
- package/dist/src/ua_object_impl.js +7 -4
- package/dist/src/ua_object_impl.js.map +1 -1
- package/dist/src/ua_object_type_impl.js +25 -2
- package/dist/src/ua_object_type_impl.js.map +1 -1
- package/dist/src/ua_reference_type_impl.js +24 -1
- package/dist/src/ua_reference_type_impl.js.map +1 -1
- package/dist/src/ua_variable_impl.d.ts +1 -0
- package/dist/src/ua_variable_impl.js +68 -23
- package/dist/src/ua_variable_impl.js.map +1 -1
- package/dist/src/ua_variable_impl_ext_obj.js +5 -2
- package/dist/src/ua_variable_impl_ext_obj.js.map +1 -1
- package/dist/src/ua_variable_type_impl.js +31 -5
- package/dist/src/ua_variable_type_impl.js.map +1 -1
- package/dist/tsconfig_common.tsbuildinfo +1 -1
- package/distHelpers/create_minimalist_address_space_nodeset.js +5 -2
- package/distHelpers/create_minimalist_address_space_nodeset.js.map +1 -1
- package/distHelpers/get_address_space_fixture.js +25 -2
- package/distHelpers/get_address_space_fixture.js.map +1 -1
- package/distNodeJS/generate_address_space.js +24 -1
- package/distNodeJS/generate_address_space.js.map +1 -1
- package/package.json +41 -41
- package/source/helpers/argument_list.ts +5 -5
- package/source/helpers/dump_tools.ts +1 -1
- package/source/helpers/ensure_secure_access.ts +0 -19
- package/source/loader/load_nodeset2.ts +14 -14
- package/source/namespace_data_access.ts +27 -2
- package/source/pseudo_session.ts +12 -4
- package/source/session_context.ts +1 -0
- package/src/address_space.ts +1 -1
- package/src/address_space_change_event_tools.ts +1 -1
- package/src/alarms_and_conditions/ua_condition_impl.ts +1 -1
- package/src/base_node_impl.ts +1 -1
- package/src/base_node_private.ts +1 -1
- package/src/data_access/adjust_datavalue_status_code.ts +36 -0
- package/src/historical_access/address_space_historical_data_node.ts +1 -1
- package/src/index_current.ts +1 -1
- package/src/namespace_impl.ts +38 -32
- package/src/reference_impl.ts +1 -1
- package/src/state_machine/finite_state_machine.ts +1 -1
- package/src/state_machine/ua_two_state_variable.ts +3 -3
- package/src/ua_data_type_impl.ts +1 -1
- package/src/ua_method_impl.ts +1 -1
- package/src/ua_object_impl.ts +1 -1
- package/src/ua_variable_impl.ts +27 -7
- package/src/ua_variable_impl_ext_obj.ts +3 -1
- package/src/ua_variable_type_impl.ts +1 -1
- package/src/data_access/check_variant_compatibility_ua_analog_item.ts +0 -38
|
@@ -5,7 +5,7 @@ var EUEngineeringUnit;
|
|
|
5
5
|
(function (EUEngineeringUnit) {
|
|
6
6
|
EUEngineeringUnit[EUEngineeringUnit["degree_celsius"] = 0] = "degree_celsius";
|
|
7
7
|
// to be continued
|
|
8
|
-
})(EUEngineeringUnit
|
|
8
|
+
})(EUEngineeringUnit || (exports.EUEngineeringUnit = EUEngineeringUnit = {}));
|
|
9
9
|
class AddressSpace {
|
|
10
10
|
static create() {
|
|
11
11
|
return new AddressSpace();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"address_space_ts.js","sourceRoot":"","sources":["../../source/address_space_ts.ts"],"names":[],"mappings":";;;AAwDA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,6EAAc,CAAA;IACd,kBAAkB;AACtB,CAAC,EAHW,iBAAiB,
|
|
1
|
+
{"version":3,"file":"address_space_ts.js","sourceRoot":"","sources":["../../source/address_space_ts.ts"],"names":[],"mappings":";;;AAwDA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,6EAAc,CAAA;IACd,kBAAkB;AACtB,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B;AAoFD,MAAa,YAAY;IAGd,MAAM,CAAC,MAAM;QAChB,OAAO,IAAI,YAAY,EAAkB,CAAC;IAC9C,CAAC;IAED;QACI,WAAW;IACf,CAAC;CACJ;AAVD,oCAUC"}
|
|
@@ -6,10 +6,10 @@ exports.verifyArguments_ArgumentList = exports.isArgumentValid = exports.getMeth
|
|
|
6
6
|
* @module node-opcua-address-space
|
|
7
7
|
*/
|
|
8
8
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
9
|
-
const
|
|
9
|
+
const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
10
10
|
const node_opcua_binary_stream_1 = require("node-opcua-binary-stream");
|
|
11
11
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
12
|
-
const
|
|
12
|
+
const node_opcua_factory_1 = require("node-opcua-factory");
|
|
13
13
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
14
14
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
15
15
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
@@ -20,7 +20,7 @@ const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
|
20
20
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
21
21
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
22
22
|
function myfindBuiltInType(dataType) {
|
|
23
|
-
return
|
|
23
|
+
return (0, node_opcua_factory_1.findBuiltInType)(node_opcua_variant_1.DataType[dataType]);
|
|
24
24
|
}
|
|
25
25
|
function encode_ArgumentList(definition, args, stream) {
|
|
26
26
|
(0, node_opcua_assert_1.assert)(definition.length === args.length);
|
|
@@ -37,7 +37,7 @@ function encode_ArgumentList(definition, args, stream) {
|
|
|
37
37
|
// todo : handle -3 -2
|
|
38
38
|
const isArray = def.valueRank && (def.valueRank === 1 || def.valueRank !== -1);
|
|
39
39
|
if (isArray) {
|
|
40
|
-
|
|
40
|
+
(0, node_opcua_basic_types_1.encodeArray)(value, stream, encodeFunc);
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
43
|
encodeFunc(value, stream);
|
|
@@ -58,7 +58,7 @@ function decode_ArgumentList(definition, stream) {
|
|
|
58
58
|
// xx assert(def.valueRank === -1 || def.valueRank==0);
|
|
59
59
|
const isArray = def.valueRank === 1 || def.valueRank === -1;
|
|
60
60
|
if (isArray) {
|
|
61
|
-
value =
|
|
61
|
+
value = (0, node_opcua_basic_types_1.decodeArray)(stream, decodeFunc);
|
|
62
62
|
}
|
|
63
63
|
else {
|
|
64
64
|
value = decodeFunc(stream);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"argument_list.js","sourceRoot":"","sources":["../../../source/helpers/argument_list.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B;;GAEG;AACH,yDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"argument_list.js","sourceRoot":"","sources":["../../../source/helpers/argument_list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.dumpReferences = exports.dumpBrowseDescription = exports.dumpReferenceDescriptions = exports.dumpReferenceDescription = exports.referenceTypeToString = void 0;
|
|
4
7
|
/**
|
|
5
8
|
* @module node-opcua-address-space
|
|
6
9
|
*/
|
|
7
10
|
// tslint:disable:no-console
|
|
8
|
-
const
|
|
11
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
9
12
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
10
13
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
11
14
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
@@ -28,7 +31,7 @@ function nodeIdInfo(addressSpace, nodeId) {
|
|
|
28
31
|
}
|
|
29
32
|
function dumpReferenceDescription(addressSpace, referenceDescription) {
|
|
30
33
|
(0, node_opcua_assert_1.assert)(referenceDescription.referenceTypeId); // must be known;
|
|
31
|
-
console.log(
|
|
34
|
+
console.log(chalk_1.default.red("referenceDescription"));
|
|
32
35
|
console.log(" referenceTypeId : ", referenceTypeToString(addressSpace, referenceDescription.referenceTypeId));
|
|
33
36
|
console.log(" isForward : ", referenceDescription.isForward ? "true" : "false");
|
|
34
37
|
console.log(" nodeId : ", nodeIdInfo(addressSpace, referenceDescription.nodeId));
|
|
@@ -46,11 +49,11 @@ function dumpBrowseDescription(node, _browseDescription) {
|
|
|
46
49
|
const addressSpace = node.addressSpace;
|
|
47
50
|
console.log(" Browse Node :");
|
|
48
51
|
if (browseDescription.nodeId) {
|
|
49
|
-
console.log(" nodeId : ",
|
|
52
|
+
console.log(" nodeId : ", chalk_1.default.cyan(browseDescription.nodeId.toString()));
|
|
50
53
|
}
|
|
51
|
-
console.log(" nodeId : ",
|
|
54
|
+
console.log(" nodeId : ", chalk_1.default.cyan(node.browseName.toString()), "(", node.nodeId.toString(), ")");
|
|
52
55
|
console.log(" referenceTypeId :", referenceTypeToString(addressSpace, browseDescription.referenceTypeId));
|
|
53
|
-
console.log(" browseDirection :",
|
|
56
|
+
console.log(" browseDirection :", chalk_1.default.cyan(node_opcua_data_model_1.BrowseDirection[browseDescription.browseDirection]));
|
|
54
57
|
console.log(" includeSubType :", browseDescription.includeSubtypes ? "true" : "false");
|
|
55
58
|
console.log(" nodeClassMask :", browseDescription.nodeClassMask);
|
|
56
59
|
console.log(" resultMask :", browseDescription.resultMask);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dump_tools.js","sourceRoot":"","sources":["../../../source/helpers/dump_tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dump_tools.js","sourceRoot":"","sources":["../../../source/helpers/dump_tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,23 +10,6 @@ function isChannelSecure(channel) {
|
|
|
10
10
|
}
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
|
-
function newIsUserReadable(context) {
|
|
14
|
-
if (context) {
|
|
15
|
-
if (!context.session) {
|
|
16
|
-
// console.log(" context has no session", context);
|
|
17
|
-
return false;
|
|
18
|
-
}
|
|
19
|
-
if (!context.session.channel) {
|
|
20
|
-
// console.log(" context has no channel", context);
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
23
|
-
if (!isChannelSecure(context.session.channel)) {
|
|
24
|
-
return false;
|
|
25
|
-
}
|
|
26
|
-
return true;
|
|
27
|
-
}
|
|
28
|
-
return false;
|
|
29
|
-
}
|
|
30
13
|
/**
|
|
31
14
|
* make sure that the given ia node can only be read
|
|
32
15
|
* by Administrator user on a encrypted channel
|
|
@@ -56,7 +39,6 @@ const restrictedAccessFlag = (0, node_opcua_data_model_1.makeAccessRestrictionsF
|
|
|
56
39
|
function ensureObjectIsSecure(node) {
|
|
57
40
|
node.setAccessRestrictions(restrictedAccessFlag);
|
|
58
41
|
if (node.nodeClass === node_opcua_data_model_1.NodeClass.Variable) {
|
|
59
|
-
// replaceMethod(node, "isUserReadable", newIsUserReadable);
|
|
60
42
|
const variable = node;
|
|
61
43
|
variable.setRolePermissions(restrictedPermissions);
|
|
62
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure_secure_access.js","sourceRoot":"","sources":["../../../source/helpers/ensure_secure_access.ts"],"names":[],"mappings":";;;AAAA,iEAAmI;AACnI,uDAAuD;AAEvD,wDAAoD;AAEpD,SAAS,eAAe,CAAC,OAAqB;IAC1C,IAAI,OAAO,CAAC,YAAY,KAAK,sCAAmB,CAAC,cAAc,EAAE;QAC7D,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"ensure_secure_access.js","sourceRoot":"","sources":["../../../source/helpers/ensure_secure_access.ts"],"names":[],"mappings":";;;AAAA,iEAAmI;AACnI,uDAAuD;AAEvD,wDAAoD;AAEpD,SAAS,eAAe,CAAC,OAAqB;IAC1C,IAAI,OAAO,CAAC,YAAY,KAAK,sCAAmB,CAAC,cAAc,EAAE;QAC7D,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;EAKE;AACF,MAAM,qBAAqB,GAAG;IAC1B,EAAE,MAAM,EAAE,gCAAc,CAAC,aAAa,EAAE,WAAW,EAAE,sCAAc,EAAE;IACrE,EAAE,MAAM,EAAE,gCAAc,CAAC,cAAc,EAAE,WAAW,EAAE,sCAAc,EAAE;IACtE,EAAE,MAAM,EAAE,gCAAc,CAAC,UAAU,EAAE,WAAW,EAAE,sCAAc,EAAE;IAClE,EAAE,MAAM,EAAE,gCAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAA,0CAAkB,EAAC,QAAQ,CAAC,EAAE;IAC9E,EAAE,MAAM,EAAE,gCAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAA,0CAAkB,EAAC,QAAQ,CAAC,EAAE;IAC9E,EAAE,MAAM,EAAE,gCAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAA,0CAAkB,EAAC,QAAQ,CAAC,EAAE;IAC9E;;;EAGF;CACD,CAAC;AACF,MAAM,oBAAoB,GAAG,IAAA,kDAA0B,EAAC,sCAAsC,CAAC,CAAC;AAChG;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,IAAc;IAC/C,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,SAAS,KAAK,iCAAS,CAAC,QAAQ,EAAE;QACvC,MAAM,QAAQ,GAAG,IAAkB,CAAC;QACpC,QAAQ,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;KACtD;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,iCAAS,CAAC,MAAM,EAAE;QACrC,MAAM,MAAM,GAAG,IAAgB,CAAC;QAChC,MAAM,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;KACpD;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,iCAAS,CAAC,MAAM,EAAE;QACrC,MAAM,MAAM,GAAG,IAAgB,CAAC;QAChC,MAAM,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;KACpD;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,uCAAe,CAAC,OAAO,CAAC,CAAC;IACtF,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;QAC1B,oBAAoB,CAAC,KAAK,CAAC,CAAC;KAC/B;AACL,CAAC;AAlBD,oDAkBC"}
|
|
@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.NodeSetLoader = void 0;
|
|
13
16
|
/* eslint-disable max-statements */
|
|
@@ -15,10 +18,10 @@ exports.NodeSetLoader = void 0;
|
|
|
15
18
|
* @module node-opcua-address-space
|
|
16
19
|
*/
|
|
17
20
|
const util_1 = require("util");
|
|
18
|
-
const
|
|
19
|
-
const ec = require("node-opcua-basic-types");
|
|
20
|
-
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
21
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
21
22
|
const node_opcua_basic_types_1 = require("node-opcua-basic-types");
|
|
23
|
+
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
24
|
+
const node_opcua_basic_types_2 = require("node-opcua-basic-types");
|
|
22
25
|
const node_opcua_data_access_1 = require("node-opcua-data-access");
|
|
23
26
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
24
27
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
@@ -29,7 +32,7 @@ const node_opcua_service_call_1 = require("node-opcua-service-call");
|
|
|
29
32
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
30
33
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
31
34
|
const node_opcua_xml2json_1 = require("node-opcua-xml2json");
|
|
32
|
-
const
|
|
35
|
+
const semver_1 = __importDefault(require("semver"));
|
|
33
36
|
const namespace_post_step_1 = require("./namespace_post_step");
|
|
34
37
|
const ensure_datatype_extracted_1 = require("./ensure_datatype_extracted");
|
|
35
38
|
const decode_xml_extension_object_1 = require("./decode_xml_extension_object");
|
|
@@ -204,7 +207,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
204
207
|
const isLowerVersion = (existingVersion, requiredVersion) => {
|
|
205
208
|
const existingSemver = (0, make_semver_compatible_1.makeSemverCompatible)(existingVersion);
|
|
206
209
|
const requiredSemver = (0, make_semver_compatible_1.makeSemverCompatible)(requiredVersion);
|
|
207
|
-
return
|
|
210
|
+
return semver_1.default.lt(existingSemver, requiredSemver);
|
|
208
211
|
};
|
|
209
212
|
if (isLowerVersion(existingNamespace.version, requiredModel.version)) {
|
|
210
213
|
errorLog("Expecting ", requiredModel.modelUri, " with version to be at least", requiredModel.version, " but namespace version is ", existingNamespace.version);
|
|
@@ -305,10 +308,10 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
305
308
|
_perform();
|
|
306
309
|
this.obj = {};
|
|
307
310
|
this.obj.nodeClass = node_opcua_data_model_1.NodeClass.Object;
|
|
308
|
-
this.obj.isAbstract =
|
|
311
|
+
this.obj.isAbstract = (0, node_opcua_basic_types_1.coerceBoolean)(attrs.IsAbstract);
|
|
309
312
|
this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
|
|
310
313
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
311
|
-
this.obj.eventNotifier =
|
|
314
|
+
this.obj.eventNotifier = (0, node_opcua_basic_types_1.coerceByte)(attrs.EventNotifier) || 0;
|
|
312
315
|
this.obj.symbolicName = attrs.SymbolicName || null;
|
|
313
316
|
this.isDraft = attrs.ReleaseStatus === "Draft";
|
|
314
317
|
this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
|
|
@@ -338,10 +341,10 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
338
341
|
_perform();
|
|
339
342
|
this.obj = {};
|
|
340
343
|
this.obj.nodeClass = node_opcua_data_model_1.NodeClass.ObjectType;
|
|
341
|
-
this.obj.isAbstract =
|
|
344
|
+
this.obj.isAbstract = (0, node_opcua_basic_types_1.coerceBoolean)(attrs.IsAbstract);
|
|
342
345
|
this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
|
|
343
346
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
344
|
-
this.obj.eventNotifier =
|
|
347
|
+
this.obj.eventNotifier = (0, node_opcua_basic_types_1.coerceByte)(attrs.EventNotifier) || 0;
|
|
345
348
|
},
|
|
346
349
|
finish() {
|
|
347
350
|
_internal_createNode(this.obj);
|
|
@@ -365,7 +368,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
365
368
|
_perform();
|
|
366
369
|
this.obj = {};
|
|
367
370
|
this.obj.nodeClass = node_opcua_data_model_1.NodeClass.ReferenceType;
|
|
368
|
-
this.obj.isAbstract =
|
|
371
|
+
this.obj.isAbstract = (0, node_opcua_basic_types_1.coerceBoolean)(attrs.IsAbstract);
|
|
369
372
|
this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
|
|
370
373
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
371
374
|
},
|
|
@@ -397,7 +400,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
397
400
|
_perform();
|
|
398
401
|
this.obj = {};
|
|
399
402
|
this.obj.nodeClass = node_opcua_data_model_1.NodeClass.DataType;
|
|
400
|
-
this.obj.isAbstract =
|
|
403
|
+
this.obj.isAbstract = (0, node_opcua_basic_types_1.coerceBoolean)(attrs.IsAbstract) || false;
|
|
401
404
|
this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
|
|
402
405
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
403
406
|
this.obj.displayName = "";
|
|
@@ -726,7 +729,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
726
729
|
}
|
|
727
730
|
let captureXmlBody = this.bodyXML;
|
|
728
731
|
if (doDebug) {
|
|
729
|
-
debugLog("xxxx ",
|
|
732
|
+
debugLog("xxxx ", chalk_1.default.yellow(captureXmlBody));
|
|
730
733
|
}
|
|
731
734
|
// this is a user defined Extension Object
|
|
732
735
|
debugLog("load nodeset2: typeDefinitionId in ExtensionObject Default XML = " + xmlEncodingNodeId.toString());
|
|
@@ -804,8 +807,8 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
804
807
|
}
|
|
805
808
|
};
|
|
806
809
|
}
|
|
807
|
-
const parseUInt64 = (str) => (0,
|
|
808
|
-
const parseInt64 = (str) => (0,
|
|
810
|
+
const parseUInt64 = (str) => (0, node_opcua_basic_types_2.coerceUInt64)(str);
|
|
811
|
+
const parseInt64 = (str) => (0, node_opcua_basic_types_2.coerceInt64)(str);
|
|
809
812
|
const state_Variant = {
|
|
810
813
|
init: () => {
|
|
811
814
|
/* empty */
|
|
@@ -844,7 +847,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
844
847
|
String: {
|
|
845
848
|
finish() {
|
|
846
849
|
const guid = this.text;
|
|
847
|
-
if (!(0,
|
|
850
|
+
if (!(0, node_opcua_basic_types_2.isValidGuid)(guid)) {
|
|
848
851
|
/* ?*/
|
|
849
852
|
}
|
|
850
853
|
this.parent.parent.parent.obj.value = {
|
|
@@ -870,7 +873,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
870
873
|
}
|
|
871
874
|
}
|
|
872
875
|
},
|
|
873
|
-
Boolean: parser2("Boolean",
|
|
876
|
+
Boolean: parser2("Boolean", node_opcua_basic_types_1.coerceBoolean),
|
|
874
877
|
Byte: parser2("Byte", parseInt),
|
|
875
878
|
Int16: parser2("Int16", parseInt),
|
|
876
879
|
Int32: parser2("Int32", parseInt),
|
|
@@ -997,7 +1000,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
997
1000
|
this.listData.push(this.parser.NodeId.nodeId);
|
|
998
1001
|
}
|
|
999
1002
|
},
|
|
1000
|
-
ListOfBoolean: ListOf("Boolean",
|
|
1003
|
+
ListOfBoolean: ListOf("Boolean", node_opcua_basic_types_1.coerceBoolean),
|
|
1001
1004
|
ListOfByte: ListOf("Byte", parseInt),
|
|
1002
1005
|
ListOfDouble: ListOf("Double", parseFloat),
|
|
1003
1006
|
ListOfFloat: ListOf("Float", parseFloat),
|
|
@@ -1102,7 +1105,7 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1102
1105
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
1103
1106
|
this.obj.parentNodeId = convertToNodeId(attrs.ParentNodeId);
|
|
1104
1107
|
this.obj.dataType = convertToNodeId(attrs.DataType);
|
|
1105
|
-
this.obj.valueRank = attrs.ValueRank === undefined ? -1 :
|
|
1108
|
+
this.obj.valueRank = attrs.ValueRank === undefined ? -1 : (0, node_opcua_basic_types_1.coerceInt32)(attrs.ValueRank);
|
|
1106
1109
|
this.obj.arrayDimensions = this.obj.valueRank <= 0 ? null : stringToUInt32Array(attrs.ArrayDimensions);
|
|
1107
1110
|
this.obj.minimumSamplingInterval = attrs.MinimumSamplingInterval ? parseInt(attrs.MinimumSamplingInterval, 10) : 0;
|
|
1108
1111
|
this.obj.minimumSamplingInterval = parseInt(this.obj.minimumSamplingInterval, 10);
|
|
@@ -1155,10 +1158,10 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1155
1158
|
debugLog("2 setting value to ", capturedVariable.nodeId.toString(), value);
|
|
1156
1159
|
}
|
|
1157
1160
|
if (value.dataType === node_opcua_variant_1.DataType.Null) {
|
|
1158
|
-
capturedVariable.setValueFromSource(value,
|
|
1161
|
+
capturedVariable.setValueFromSource(value, node_opcua_basic_types_2.StatusCodes.BadWaitingForInitialData);
|
|
1159
1162
|
}
|
|
1160
1163
|
else {
|
|
1161
|
-
capturedVariable.setValueFromSource(value,
|
|
1164
|
+
capturedVariable.setValueFromSource(value, node_opcua_basic_types_2.StatusCodes.Good);
|
|
1162
1165
|
}
|
|
1163
1166
|
}
|
|
1164
1167
|
capturedVariable = undefined;
|
|
@@ -1187,12 +1190,12 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1187
1190
|
init(name, attrs) {
|
|
1188
1191
|
_perform();
|
|
1189
1192
|
this.obj = {};
|
|
1190
|
-
this.obj.isAbstract =
|
|
1193
|
+
this.obj.isAbstract = (0, node_opcua_basic_types_1.coerceBoolean)(attrs.IsAbstract);
|
|
1191
1194
|
this.obj.nodeClass = node_opcua_data_model_1.NodeClass.VariableType;
|
|
1192
1195
|
this.obj.browseName = convertQualifiedName(attrs.BrowseName);
|
|
1193
1196
|
this.obj.parentNodeId = attrs.ParentNodeId || null;
|
|
1194
1197
|
this.obj.dataType = convertToNodeId(attrs.DataType) || null;
|
|
1195
|
-
this.obj.valueRank =
|
|
1198
|
+
this.obj.valueRank = (0, node_opcua_basic_types_1.coerceInt32)(attrs.ValueRank) || -1;
|
|
1196
1199
|
this.obj.arrayDimensions = this.obj.valueRank <= 0 ? null : stringToUInt32Array(attrs.ArrayDimensions);
|
|
1197
1200
|
this.obj.minimumSamplingInterval = attrs.MinimumSamplingInterval ? parseInt(attrs.MinimumSamplingInterval, 10) : 0;
|
|
1198
1201
|
this.obj.historizing = false;
|
|
@@ -1385,8 +1388,8 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1385
1388
|
}
|
|
1386
1389
|
}
|
|
1387
1390
|
doDebug &&
|
|
1388
|
-
debugLog(
|
|
1389
|
-
|
|
1391
|
+
debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks -------------------------------------------") +
|
|
1392
|
+
chalk_1.default.green("DONE"));
|
|
1390
1393
|
function performPostLoadingTasks(tasks) {
|
|
1391
1394
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1392
1395
|
for (const task of tasks) {
|
|
@@ -1409,17 +1412,17 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1409
1412
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1410
1413
|
/// ----------------------------------------------------------------------------------------
|
|
1411
1414
|
// perform post task
|
|
1412
|
-
doDebug && debugLog(
|
|
1415
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks -------------------------------------------"));
|
|
1413
1416
|
yield performPostLoadingTasks(postTasks);
|
|
1414
1417
|
doDebug &&
|
|
1415
|
-
debugLog(
|
|
1418
|
+
debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Simple Variables ---------------------"));
|
|
1416
1419
|
yield performPostLoadingTasks(postTasks0_InitializeVariable);
|
|
1417
|
-
doDebug && debugLog(
|
|
1420
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("Performing DataType extraction -------------------------------------------"));
|
|
1418
1421
|
(0, node_opcua_assert_1.assert)(!addressSpace1.suspendBackReference);
|
|
1419
1422
|
yield (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
|
|
1420
1423
|
const dataTypeManager = addressSpace.getDataTypeManager();
|
|
1421
1424
|
/// ----------------------------------------------------------------------------------------
|
|
1422
|
-
doDebug && debugLog(
|
|
1425
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("DataType extraction done ") + chalk_1.default.green("DONE"));
|
|
1423
1426
|
for (const { name, dataTypeNodeId } of pendingSimpleTypeToRegister) {
|
|
1424
1427
|
if (dataTypeNodeId.namespace === 0) {
|
|
1425
1428
|
continue;
|
|
@@ -1427,14 +1430,14 @@ function makeNodeSetParserEngine(addressSpace, options) {
|
|
|
1427
1430
|
const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(dataTypeNodeId.namespace);
|
|
1428
1431
|
}
|
|
1429
1432
|
pendingSimpleTypeToRegister.splice(0);
|
|
1430
|
-
doDebug && debugLog(
|
|
1433
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Decoding Pojo String (parsing XML objects) -"));
|
|
1431
1434
|
yield performPostLoadingTasks(postTasks0_DecodePojoString);
|
|
1432
1435
|
doDebug &&
|
|
1433
|
-
debugLog(
|
|
1436
|
+
debugLog(chalk_1.default.bgGreenBright("Performing post loading task: Initializing Complex Variables ---------------------"));
|
|
1434
1437
|
yield performPostLoadingTasks(postTasks1_InitializeVariable);
|
|
1435
|
-
doDebug && debugLog(
|
|
1438
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post loading tasks: (assigning Extension Object to Variables) -"));
|
|
1436
1439
|
yield performPostLoadingTasks(postTasks2_AssignedExtensionObjectToDataValue);
|
|
1437
|
-
doDebug && debugLog(
|
|
1440
|
+
doDebug && debugLog(chalk_1.default.bgGreenBright("Performing post variable initialization ---------------------"));
|
|
1438
1441
|
(0, namespace_post_step_1.promoteObjectsAndVariables)(addressSpace);
|
|
1439
1442
|
});
|
|
1440
1443
|
}
|