node-opcua-address-space 2.112.0 → 2.114.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/helpers/call_helpers.js +1 -2
- package/dist/source/helpers/call_helpers.js.map +1 -1
- package/dist/source/helpers/resolve_opaque_on_address_space.js +15 -26
- package/dist/source/helpers/resolve_opaque_on_address_space.js.map +1 -1
- package/dist/source/loader/decode_xml_extension_object.js +0 -2
- package/dist/source/loader/decode_xml_extension_object.js.map +1 -1
- package/dist/source/loader/ensure_datatype_extracted.js +19 -30
- package/dist/source/loader/ensure_datatype_extracted.js.map +1 -1
- package/dist/source/loader/generateAddressSpaceRaw.js +16 -27
- package/dist/source/loader/generateAddressSpaceRaw.js.map +1 -1
- package/dist/source/loader/load_nodeset2.js +101 -98
- package/dist/source/loader/load_nodeset2.js.map +1 -1
- package/dist/source/loader/make_xml_extension_object_parser.js +2 -4
- package/dist/source/loader/make_xml_extension_object_parser.js.map +1 -1
- package/dist/source/loader/namespace_post_step.js +24 -37
- package/dist/source/loader/namespace_post_step.js.map +1 -1
- package/dist/source/session_context.js +3 -6
- package/dist/source/session_context.js.map +1 -1
- package/dist/source/set_namespace_meta_data.js +2 -3
- package/dist/source/set_namespace_meta_data.js.map +1 -1
- package/dist/src/address_space.js +18 -37
- package/dist/src/address_space.js.map +1 -1
- package/dist/src/address_space_change_event_tools.js +1 -1
- package/dist/src/address_space_change_event_tools.js.map +1 -1
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js +2 -5
- package/dist/src/alarms_and_conditions/condition_snapshot_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.js +7 -4
- package/dist/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js +6 -7
- package/dist/src/alarms_and_conditions/ua_alarm_condition_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.js +2 -5
- package/dist/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.js.map +1 -1
- package/dist/src/alarms_and_conditions/ua_condition_impl.js +3 -7
- package/dist/src/alarms_and_conditions/ua_condition_impl.js.map +1 -1
- package/dist/src/base_node_impl.js +9 -19
- package/dist/src/base_node_impl.js.map +1 -1
- package/dist/src/base_node_private.js +17 -11
- package/dist/src/base_node_private.js.map +1 -1
- package/dist/src/data_access/ua_multistate_discrete_impl.js +7 -1
- 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 +2 -2
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js +10 -5
- package/dist/src/data_access/ua_multistate_value_discrete_impl.js.map +1 -1
- package/dist/src/extension_object_array_node.js +1 -2
- package/dist/src/extension_object_array_node.js.map +1 -1
- package/dist/src/get_basic_datatype.d.ts +8 -0
- package/dist/src/get_basic_datatype.js +26 -0
- package/dist/src/get_basic_datatype.js.map +1 -0
- package/dist/src/historical_access/address_space_historical_data_node.js +31 -48
- package/dist/src/historical_access/address_space_historical_data_node.js.map +1 -1
- package/dist/src/namespace_impl.js +17 -13
- package/dist/src/namespace_impl.js.map +1 -1
- package/dist/src/nodeset_tools/construct_namespace_dependency.js +58 -9
- package/dist/src/nodeset_tools/construct_namespace_dependency.js.map +1 -1
- package/dist/src/nodeset_tools/dump_to_bsd.js +4 -6
- package/dist/src/nodeset_tools/dump_to_bsd.js.map +1 -1
- package/dist/src/nodeset_tools/nodeset_to_xml.js +36 -35
- package/dist/src/nodeset_tools/nodeset_to_xml.js.map +1 -1
- package/dist/src/private_namespace.js +1 -1
- package/dist/src/private_namespace.js.map +1 -1
- package/dist/src/reference_impl.js +5 -2
- package/dist/src/reference_impl.js.map +1 -1
- package/dist/src/state_machine/finite_state_machine.js +2 -3
- package/dist/src/state_machine/finite_state_machine.js.map +1 -1
- package/dist/src/state_machine/ua_shelving_state_machine_ex.js +2 -2
- package/dist/src/state_machine/ua_shelving_state_machine_ex.js.map +1 -1
- package/dist/src/state_machine/ua_two_state_variable.js +1 -3
- package/dist/src/state_machine/ua_two_state_variable.js.map +1 -1
- package/dist/src/ua_data_type_impl.js +6 -29
- package/dist/src/ua_data_type_impl.js.map +1 -1
- package/dist/src/ua_method_impl.js +6 -4
- package/dist/src/ua_method_impl.js.map +1 -1
- package/dist/src/ua_object_impl.js +5 -1
- package/dist/src/ua_object_impl.js.map +1 -1
- package/dist/src/ua_object_type_impl.js +1 -2
- package/dist/src/ua_object_type_impl.js.map +1 -1
- package/dist/src/ua_variable_impl.js +18 -26
- package/dist/src/ua_variable_impl.js.map +1 -1
- package/dist/src/ua_variable_impl_ext_obj.js +25 -17
- package/dist/src/ua_variable_impl_ext_obj.js.map +1 -1
- package/dist/src/ua_variable_type_impl.d.ts +2 -0
- package/dist/src/ua_variable_type_impl.js +7 -6
- package/dist/src/ua_variable_type_impl.js.map +1 -1
- package/dist/tsconfig_common.tsbuildinfo +1 -1
- package/distHelpers/add_event_generator_object.js +0 -4
- package/distHelpers/add_event_generator_object.js.map +1 -1
- package/distNodeJS/generate_address_space.js +10 -21
- package/distNodeJS/generate_address_space.js.map +1 -1
- package/package.json +39 -39
- package/source/loader/decode_xml_extension_object.ts +0 -2
- package/source/loader/load_nodeset2.ts +16 -12
- package/source/loader/make_xml_extension_object_parser.ts +1 -4
- package/source/loader/namespace_post_step.ts +1 -0
- package/src/address_space.ts +7 -15
- package/src/alarms_and_conditions/condition_snapshot_impl.ts +2 -6
- package/src/alarms_and_conditions/ua_acknowledgeable_condition_impl.ts +6 -3
- package/src/alarms_and_conditions/ua_alarm_condition_impl.ts +6 -6
- package/src/alarms_and_conditions/ua_certificate_expiration_alarm_impl.ts +0 -1
- package/src/alarms_and_conditions/ua_condition_impl.ts +3 -7
- package/src/base_node_impl.ts +12 -20
- package/src/data_access/ua_multistate_value_discrete_impl.ts +9 -11
- package/src/get_basic_datatype.ts +32 -0
- package/src/namespace_impl.ts +5 -6
- package/src/nodeset_tools/construct_namespace_dependency.ts +60 -18
- package/src/nodeset_tools/nodeset_to_xml.ts +42 -39
- package/src/reference_impl.ts +5 -1
- package/src/state_machine/finite_state_machine.ts +3 -4
- package/src/state_machine/ua_shelving_state_machine_ex.ts +2 -3
- package/src/state_machine/ua_two_state_variable.ts +0 -1
- package/src/ua_data_type_impl.ts +6 -26
- package/src/ua_variable_impl.ts +5 -22
- package/src/ua_variable_impl_ext_obj.ts +119 -86
- package/src/ua_variable_type_impl.ts +5 -4
|
@@ -44,7 +44,6 @@ function callMethodHelper(context, addressSpace, callMethodRequest, callback) {
|
|
|
44
44
|
(0, resolve_opaque_on_address_space_1.resolveOpaqueOnAddressSpace)(addressSpace, inputArguments)
|
|
45
45
|
.then(() => {
|
|
46
46
|
methodObj.execute(object, inputArguments, context, (err, callMethodResponse) => {
|
|
47
|
-
var _a;
|
|
48
47
|
/* istanbul ignore next */
|
|
49
48
|
if (err) {
|
|
50
49
|
return callback(err);
|
|
@@ -55,7 +54,7 @@ function callMethodHelper(context, addressSpace, callMethodRequest, callback) {
|
|
|
55
54
|
callMethodResponse.inputArgumentResults =
|
|
56
55
|
callMethodResponse.inputArgumentResults || response.inputArgumentResults || [];
|
|
57
56
|
(0, node_opcua_assert_1.assert)(callMethodResponse.statusCode);
|
|
58
|
-
if (
|
|
57
|
+
if (callMethodResponse.statusCode?.isGood()) {
|
|
59
58
|
(0, node_opcua_assert_1.assert)(Array.isArray(callMethodResponse.outputArguments));
|
|
60
59
|
}
|
|
61
60
|
(0, node_opcua_assert_1.assert)(Array.isArray(callMethodResponse.inputArgumentResults));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../source/helpers/call_helpers.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,yDAA2C;AAC3C,iEAAkD;AAClD,yDAA2C;AAE3C,mEAAiE;AAKjE,mDAAkG;AAClG,uFAAgF;AAmBhF,SAAgB,gBAAgB,CAC5B,OAAwB,EACxB,YAA2B,EAC3B,iBAAoC,EACpC,QAAmD;IAEnD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC;IAC5C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC;IAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,cAAc,IAAI,EAAE,CAAC;IAE9D,IAAA,0BAAM,EAAC,QAAQ,YAAY,0BAAM,CAAC,CAAC;IACnC,IAAA,0BAAM,EAAC,QAAQ,YAAY,0BAAM,CAAC,CAAC;IAEnC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAa,CAAC;IAC3D,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oCAAW,CAAC,gBAAgB,EAAE,CAAC,CAAC;KACvE;IACD,IAAI,MAAM,CAAC,SAAS,KAAK,iCAAS,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,KAAK,iCAAS,CAAC,UAAU,EAAE;QACpF,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oCAAW,CAAC,gBAAgB,EAAE,CAAC,CAAC;KACvE;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAa,CAAC;IAC9D,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oCAAW,CAAC,gBAAgB,EAAE,CAAC,CAAC;KACvE;IACD,IAAI,SAAS,CAAC,SAAS,KAAK,iCAAS,CAAC,MAAM,EAAE;QAC1C,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,oCAAW,CAAC,gBAAgB,EAAE,CAAC,CAAC;KACvE;IAED,MAAM,SAAS,GAAG,IAAA,iDAAiC,EAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEtF,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;QAClC,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;KAC/D;IACD,MAAM,iBAAiB,GAAG,SAAS,CAAC,iBAAkB,CAAC;IAEvD,0BAA0B;IAC1B,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;IAEnE,MAAM,QAAQ,GAAG,IAAA,4CAA4B,EAAC,YAAY,EAAE,oBAAoB,EAAE,cAAc,CAAC,CAAC;IAClG,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE;QACjC,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;KACnC;IAED,IAAA,6DAA2B,EAAC,YAAY,EAAE,cAAc,CAAC;SACpD,IAAI,CAAC,GAAG,EAAE;QACP,SAAS,CAAC,OAAO,CACb,MAAM,EACN,cAAc,EACd,OAAO,EACP,CAAC,GAAiB,EAAE,kBAA4C,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"call_helpers.js","sourceRoot":"","sources":["../../../source/helpers/call_helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.resolveOpaqueOnAddressSpace = void 0;
|
|
13
4
|
const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
|
|
14
5
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
15
6
|
const pseudo_session_1 = require("../pseudo_session");
|
|
16
7
|
const ensure_datatype_extracted_1 = require("../loader/ensure_datatype_extracted");
|
|
17
|
-
function resolveOpaqueOnAddressSpace(addressSpace, variants) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
8
|
+
async function resolveOpaqueOnAddressSpace(addressSpace, variants) {
|
|
9
|
+
if (!variants) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const session = new pseudo_session_1.PseudoSession(addressSpace);
|
|
13
|
+
const extraDataTypeManager = await (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
|
|
14
|
+
if (variants instanceof node_opcua_variant_1.Variant) {
|
|
15
|
+
await (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variants, extraDataTypeManager);
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
// resolve opaque data structure from inputArguments
|
|
19
|
+
for (const variant of variants) {
|
|
20
|
+
if (variant) {
|
|
21
|
+
await (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variant, extraDataTypeManager);
|
|
21
22
|
}
|
|
22
|
-
|
|
23
|
-
const extraDataTypeManager = yield (0, ensure_datatype_extracted_1.ensureDatatypeExtracted)(addressSpace);
|
|
24
|
-
if (variants instanceof node_opcua_variant_1.Variant) {
|
|
25
|
-
yield (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variants, extraDataTypeManager);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
// resolve opaque data structure from inputArguments
|
|
29
|
-
for (const variant of variants) {
|
|
30
|
-
if (variant) {
|
|
31
|
-
yield (0, node_opcua_client_dynamic_extension_object_1.resolveDynamicExtensionObject)(session, variant, extraDataTypeManager);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
});
|
|
23
|
+
}
|
|
35
24
|
}
|
|
36
25
|
exports.resolveOpaqueOnAddressSpace = resolveOpaqueOnAddressSpace;
|
|
37
26
|
//# sourceMappingURL=resolve_opaque_on_address_space.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve_opaque_on_address_space.js","sourceRoot":"","sources":["../../../source/helpers/resolve_opaque_on_address_space.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve_opaque_on_address_space.js","sourceRoot":"","sources":["../../../source/helpers/resolve_opaque_on_address_space.ts"],"names":[],"mappings":";;;AAAA,2GAA2F;AAC3F,2DAA6C;AAE7C,sDAAkD;AAClD,mFAA8E;AAEvE,KAAK,UAAU,2BAA2B,CAC7C,YAA2B,EAC3B,QAA+C;IAE/C,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO;KACV;IACD,MAAM,OAAO,GAAG,IAAI,8BAAa,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,oBAAoB,GAAG,MAAM,IAAA,mDAAuB,EAAC,YAAY,CAAC,CAAC;IACzE,IAAI,QAAQ,YAAY,4BAAO,EAAE;QAC7B,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QAC7E,OAAO;KACV;IACD,oDAAoD;IACpD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC5B,IAAI,OAAO,EAAE;YACT,MAAM,IAAA,0EAA6B,EAAC,OAAO,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;SAC/E;KACJ;AACL,CAAC;AAnBD,kEAmBC"}
|
|
@@ -14,7 +14,6 @@ function encodingNodeIdToDataTypeNode(addressSpace, encodingNodeId) {
|
|
|
14
14
|
if (!encodingNode) {
|
|
15
15
|
throw new Error("findDataTypeNode: Cannot find encoding NodeId" + encodingNodeId.toString());
|
|
16
16
|
}
|
|
17
|
-
// xx console.log("encodingNode", encodingNode.toString());
|
|
18
17
|
const refs = encodingNode.findReferences("HasEncoding", false);
|
|
19
18
|
const dataTypes = refs.map((ref) => addressSpace.findNode(ref.nodeId)).filter((obj) => obj !== null);
|
|
20
19
|
// istanbul ignore next
|
|
@@ -35,7 +34,6 @@ function makeDefinitionMap(addressSpace) {
|
|
|
35
34
|
throw new Error("Expecting a DataType node here");
|
|
36
35
|
}
|
|
37
36
|
const name = dataTypeNode.browseName.name || "";
|
|
38
|
-
// console.log("yy)=", dataTypeNode.toString());
|
|
39
37
|
if (dataTypeNode.isStructure()) {
|
|
40
38
|
const definition = dataTypeNode.getStructureDefinition();
|
|
41
39
|
return { name, definition };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decode_xml_extension_object.js","sourceRoot":"","sources":["../../../source/loader/decode_xml_extension_object.ts"],"names":[],"mappings":";;;AACA,uDAAgF;AAGhF,uDAA6C;AAC7C,6DAA+C;AAE/C,yFAA4G;AAE5G,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C,SAAS,4BAA4B,CAAC,YAA2B,EAAE,cAAsB;IACrF,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAE,CAAC;IAE5D,uBAAuB;IACvB,IAAI,CAAC,YAAY,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;KACjG;IACD,
|
|
1
|
+
{"version":3,"file":"decode_xml_extension_object.js","sourceRoot":"","sources":["../../../source/loader/decode_xml_extension_object.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ensureDatatypeExtractedWithCallback = exports.ensureDatatypeExtracted = void 0;
|
|
13
4
|
const node_opcua_client_dynamic_extension_object_1 = require("node-opcua-client-dynamic-extension-object");
|
|
@@ -38,28 +29,26 @@ function fixDefinition103(addressSpace, namespaceArray, dataTypeManager) {
|
|
|
38
29
|
}
|
|
39
30
|
}
|
|
40
31
|
}
|
|
41
|
-
function ensureDatatypeExtracted(addressSpace) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
|
|
53
|
-
}
|
|
54
|
-
// inject simple types
|
|
55
|
-
// now extract structure and enumeration from old form
|
|
56
|
-
const session = new pseudo_session_1.PseudoSession(addressSpace);
|
|
57
|
-
yield (0, node_opcua_client_dynamic_extension_object_1.populateDataTypeManager)(session, dataTypeManager);
|
|
58
|
-
// turn old <=103 structure to have valid DataTypeDefinition
|
|
59
|
-
fixDefinition103(addressSpace, namespaceArray, dataTypeManager);
|
|
32
|
+
async function ensureDatatypeExtracted(addressSpace) {
|
|
33
|
+
const addressSpacePriv = addressSpace;
|
|
34
|
+
if (!addressSpacePriv.$$extraDataTypeManager) {
|
|
35
|
+
const dataTypeManager = new node_opcua_client_dynamic_extension_object_1.ExtraDataTypeManager();
|
|
36
|
+
const namespaceArray = addressSpace.getNamespaceArray().map((n) => n.namespaceUri);
|
|
37
|
+
debugLog("INamespace Array = ", namespaceArray.join("\n "));
|
|
38
|
+
dataTypeManager.setNamespaceArray(namespaceArray);
|
|
39
|
+
addressSpacePriv.$$extraDataTypeManager = dataTypeManager;
|
|
40
|
+
for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
|
|
41
|
+
const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
|
|
42
|
+
dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
|
|
60
43
|
}
|
|
61
|
-
|
|
62
|
-
|
|
44
|
+
// inject simple types
|
|
45
|
+
// now extract structure and enumeration from old form
|
|
46
|
+
const session = new pseudo_session_1.PseudoSession(addressSpace);
|
|
47
|
+
await (0, node_opcua_client_dynamic_extension_object_1.populateDataTypeManager)(session, dataTypeManager);
|
|
48
|
+
// turn old <=103 structure to have valid DataTypeDefinition
|
|
49
|
+
fixDefinition103(addressSpace, namespaceArray, dataTypeManager);
|
|
50
|
+
}
|
|
51
|
+
return addressSpacePriv.$$extraDataTypeManager;
|
|
63
52
|
}
|
|
64
53
|
exports.ensureDatatypeExtracted = ensureDatatypeExtracted;
|
|
65
54
|
function ensureDatatypeExtractedWithCallback(addressSpace, callback) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../source/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensure_datatype_extracted.js","sourceRoot":"","sources":["../../../source/loader/ensure_datatype_extracted.ts"],"names":[],"mappings":";;;AACA,2GAIoD;AACpD,uDAAiD;AACjD,2DAAiF;AAIjF,sDAAkD;AAElD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAM3C,SAAS,gBAAgB,CAAC,YAA2B,EAAE,cAAwB,EAAE,eAAqC;IAClH,iCAAiC;IACjC,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;QACnF,MAAM,EAAE,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAmB,CAAC;YACtF,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;gBAChB,SAAS;aACZ;YACD,IAAI,CAAC,QAAQ,EAAE;gBACX,SAAS;aACZ;YACD,IAAI,QAAQ,CAAC,kBAAkB,IAAI,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE;gBACnE,SAAS;aACZ;YACD,6DAA6D;YAC7D,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;gBAC3G,MAAM,EAAE,GAAG,IAAA,4FAA+C,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACrE,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC,MAAM,IAAI,SAAS,CAAC;aACxD;SACJ;KACJ;AACL,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAC,YAA2B;IACrE,MAAM,gBAAgB,GAAQ,YAAmC,CAAC;IAClE,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE;QAC1C,MAAM,eAAe,GAAG,IAAI,iEAAoB,EAAE,CAAC;QAEnD,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAC/F,QAAQ,CAAC,qBAAqB,EAAE,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAC9E,eAAe,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAClD,gBAAgB,CAAC,sBAAsB,GAAG,eAAe,CAAC;QAE1D,KAAK,IAAI,cAAc,GAAG,CAAC,EAAE,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;YACnF,MAAM,gBAAgB,GAAG,IAAI,oCAAe,CAAC,CAAC,IAAA,+CAA0B,GAAE,CAAC,CAAC,CAAC;YAC7E,eAAe,CAAC,uBAAuB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;SAC7E;QACD,sBAAsB;QAEtB,sDAAsD;QACtD,MAAM,OAAO,GAAG,IAAI,8BAAa,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,IAAA,oEAAuB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAExD,4DAA4D;QAC5D,gBAAgB,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;KACnE;IACD,OAAO,gBAAgB,CAAC,sBAAsB,CAAC;AACnD,CAAC;AAxBD,0DAwBC;AAED,SAAgB,mCAAmC,CAAC,YAA2B,EAAE,QAAyC;IACtH,uBAAuB,CAAC,YAAY,CAAC;SAChC,IAAI,CAAC,CAAC,MAA4B,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC9D,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACvC,CAAC;AAJD,kFAIC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.generateAddressSpaceRaw = void 0;
|
|
13
4
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
@@ -21,26 +12,24 @@ const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
|
21
12
|
* @xmlFiles: a lis of xml files
|
|
22
13
|
* @param xmlLoader - a helper function to return the content of the xml file
|
|
23
14
|
*/
|
|
24
|
-
function generateAddressSpaceRaw(addressSpace, xmlFiles, xmlLoader, options) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
15
|
+
async function generateAddressSpaceRaw(addressSpace, xmlFiles, xmlLoader, options) {
|
|
16
|
+
const nodesetLoader = new load_nodeset2_1.NodeSetLoader(addressSpace, options);
|
|
17
|
+
if (!Array.isArray(xmlFiles)) {
|
|
18
|
+
xmlFiles = [xmlFiles];
|
|
19
|
+
}
|
|
20
|
+
for (let index = 0; index < xmlFiles.length; index++) {
|
|
21
|
+
const xmlData = await xmlLoader(xmlFiles[index]);
|
|
22
|
+
try {
|
|
23
|
+
await nodesetLoader.addNodeSetAsync(xmlData);
|
|
29
24
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
yield nodesetLoader.addNodeSetAsync(xmlData);
|
|
34
|
-
}
|
|
35
|
-
catch (err) {
|
|
36
|
-
errorLog("generateAddressSpace: Loading xml file ", xmlFiles[index], " failed with error ", err.message);
|
|
37
|
-
throw err;
|
|
38
|
-
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
errorLog("generateAddressSpace: Loading xml file ", xmlFiles[index], " failed with error ", err.message);
|
|
27
|
+
throw err;
|
|
39
28
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
29
|
+
}
|
|
30
|
+
await nodesetLoader.terminateAsync();
|
|
31
|
+
(0, adjust_namespace_array_1.adjustNamespaceArray)(addressSpace);
|
|
32
|
+
// however process them in series
|
|
44
33
|
}
|
|
45
34
|
exports.generateAddressSpaceRaw = generateAddressSpaceRaw;
|
|
46
35
|
//# sourceMappingURL=generateAddressSpaceRaw.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateAddressSpaceRaw.js","sourceRoot":"","sources":["../../../source/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generateAddressSpaceRaw.js","sourceRoot":"","sources":["../../../source/loader/generateAddressSpaceRaw.ts"],"names":[],"mappings":";;;AAAA,uDAAgF;AAIhF,2FAAsF;AAEtF,mDAAgD;AAEhD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAE3C;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CACzC,YAA2B,EAC3B,QAA2B,EAC3B,SAAsD,EACtD,OAA6B;IAE7B,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAE/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC1B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;KACzB;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAClD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,IAAI;YACA,MAAM,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SAChD;QAAC,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,0CAA0C,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,qBAAqB,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACrH,MAAM,GAAG,CAAC;SACb;KACJ;IACD,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;IACrC,IAAA,6CAAoB,EAAC,YAAY,CAAC,CAAC;IACnC,iCAAiC;AACrC,CAAC;AAvBD,0DAuBC"}
|