node-opcua-client-dynamic-extension-object 2.97.0 → 2.98.1

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.
Files changed (28) hide show
  1. package/dist/convert_data_type_definition_to_structuretype_schema.d.ts +14 -14
  2. package/dist/convert_data_type_definition_to_structuretype_schema.js +410 -410
  3. package/dist/convert_structuretype_schema_to_structure_definition.d.ts +3 -3
  4. package/dist/convert_structuretype_schema_to_structure_definition.js +53 -53
  5. package/dist/extra_data_type_manager.d.ts +16 -16
  6. package/dist/extra_data_type_manager.js +78 -78
  7. package/dist/get_extension_object_constructor.d.ts +7 -7
  8. package/dist/get_extension_object_constructor.js +37 -37
  9. package/dist/get_extra_data_type_manager.d.ts +3 -3
  10. package/dist/get_extra_data_type_manager.js +51 -51
  11. package/dist/index.d.ts +13 -13
  12. package/dist/index.js +29 -29
  13. package/dist/populate_data_type_manager.d.ts +3 -3
  14. package/dist/populate_data_type_manager.js +88 -88
  15. package/dist/private/find_encodings.d.ts +4 -4
  16. package/dist/private/find_encodings.js +55 -55
  17. package/dist/private/populate_data_type_manager_103.d.ts +9 -9
  18. package/dist/private/populate_data_type_manager_103.js +639 -639
  19. package/dist/private/populate_data_type_manager_104.d.ts +9 -9
  20. package/dist/private/populate_data_type_manager_104.js +217 -217
  21. package/dist/promote_opaque_structure.d.ts +7 -7
  22. package/dist/promote_opaque_structure.js +46 -46
  23. package/dist/promote_opaque_structure_in_notification_data.d.ts +3 -3
  24. package/dist/promote_opaque_structure_in_notification_data.js +51 -51
  25. package/dist/resolve_dynamic_extension_object.d.ts +6 -6
  26. package/dist/resolve_dynamic_extension_object.js +177 -177
  27. package/package.json +22 -18
  28. package/test/test_convertStructureTypeSchemaToStructureDefinition.ts +0 -117
@@ -1,89 +1,89 @@
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
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.populateDataTypeManager = void 0;
13
- const node_opcua_data_model_1 = require("node-opcua-data-model");
14
- const node_opcua_nodeid_1 = require("node-opcua-nodeid");
15
- const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
16
- const node_opcua_constants_1 = require("node-opcua-constants");
17
- const node_opcua_variant_1 = require("node-opcua-variant");
18
- const populate_data_type_manager_103_1 = require("./private/populate_data_type_manager_103");
19
- const populate_data_type_manager_104_1 = require("./private/populate_data_type_manager_104");
20
- function serverImplementsDataTypeDefinition(session) {
21
- return __awaiter(this, void 0, void 0, function* () {
22
- // check if server provides DataTypeDefinition => in this case this is the prefered route,
23
- // as we go along, more and more servers will implement this.
24
- const browseResult = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
25
- browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
26
- includeSubtypes: true,
27
- nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
28
- nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_variant_1.DataType.ExtensionObject),
29
- referenceTypeId: "HasSubtype",
30
- resultMask: 63
31
- });
32
- const browseResult2 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
33
- browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
34
- includeSubtypes: true,
35
- nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
36
- nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.DataTypeIds.Union),
37
- referenceTypeId: "HasSubtype",
38
- resultMask: 63
39
- });
40
- let references = [];
41
- if (browseResult && browseResult.references)
42
- references = references.concat(browseResult.references);
43
- if (browseResult2 && browseResult2.references)
44
- references = references.concat(browseResult2.references);
45
- if (references.length === 0)
46
- return false;
47
- // DataType Structure from namespace 0 are not interesting and will not provide DataTypeDefinition attribute anyway
48
- // on some servers.
49
- references = references.filter((a, index) => a.nodeId.namespace !== 0);
50
- if (references.length === 0)
51
- return false;
52
- let nodesToRead = references.map((r) => ({
53
- nodeId: r.nodeId,
54
- attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition
55
- }));
56
- const nodesToRead2 = nodesToRead.map((r) => ({ nodeId: r.nodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract }));
57
- const abstractFlags = (yield session.read(nodesToRead2)).map((d) => d.value.value);
58
- // also remove the abstract dataStructure => they don't provide valid DataTypeDefinition
59
- nodesToRead = nodesToRead.filter((_nodesToRead, index) => !abstractFlags[index]);
60
- if (nodesToRead.length === 0)
61
- return false;
62
- const dataValues = yield session.read(nodesToRead);
63
- // for (let i = 0; i < dataValues.length; i++) {
64
- // console.log(i, " | ", nodesToRead[i].nodeId.toString().padEnd(40), references[i].browseName.toString().padEnd(50), dataValues[i].statusCode.toString());
65
- // }
66
- const countOK = dataValues.reduce((prev, a) => prev + (a.statusCode.isGood() ? 1 : 0), 0);
67
- if (countOK === dataValues.length) {
68
- return true;
69
- // await populateDataTypeManager104(session, dataTypeManager);
70
- // return;
71
- }
72
- return false;
73
- });
74
- }
75
- function populateDataTypeManager(session, dataTypeManager) {
76
- return __awaiter(this, void 0, void 0, function* () {
77
- const force104 = yield serverImplementsDataTypeDefinition(session);
78
- if (force104) {
79
- // console.log("xxxxxxx! using 1.04");
80
- yield (0, populate_data_type_manager_104_1.populateDataTypeManager104)(session, dataTypeManager);
81
- return;
82
- }
83
- // old way for 1.03 and early 1.04 prototype
84
- yield (0, populate_data_type_manager_103_1.populateDataTypeManager103)(session, dataTypeManager);
85
- yield (0, populate_data_type_manager_104_1.populateDataTypeManager104)(session, dataTypeManager);
86
- });
87
- }
88
- exports.populateDataTypeManager = populateDataTypeManager;
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
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.populateDataTypeManager = void 0;
13
+ const node_opcua_data_model_1 = require("node-opcua-data-model");
14
+ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
15
+ const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
16
+ const node_opcua_constants_1 = require("node-opcua-constants");
17
+ const node_opcua_variant_1 = require("node-opcua-variant");
18
+ const populate_data_type_manager_103_1 = require("./private/populate_data_type_manager_103");
19
+ const populate_data_type_manager_104_1 = require("./private/populate_data_type_manager_104");
20
+ function serverImplementsDataTypeDefinition(session) {
21
+ return __awaiter(this, void 0, void 0, function* () {
22
+ // check if server provides DataTypeDefinition => in this case this is the prefered route,
23
+ // as we go along, more and more servers will implement this.
24
+ const browseResult = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
25
+ browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
26
+ includeSubtypes: true,
27
+ nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
28
+ nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_variant_1.DataType.ExtensionObject),
29
+ referenceTypeId: "HasSubtype",
30
+ resultMask: 63
31
+ });
32
+ const browseResult2 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
33
+ browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
34
+ includeSubtypes: true,
35
+ nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
36
+ nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.DataTypeIds.Union),
37
+ referenceTypeId: "HasSubtype",
38
+ resultMask: 63
39
+ });
40
+ let references = [];
41
+ if (browseResult && browseResult.references)
42
+ references = references.concat(browseResult.references);
43
+ if (browseResult2 && browseResult2.references)
44
+ references = references.concat(browseResult2.references);
45
+ if (references.length === 0)
46
+ return false;
47
+ // DataType Structure from namespace 0 are not interesting and will not provide DataTypeDefinition attribute anyway
48
+ // on some servers.
49
+ references = references.filter((a, index) => a.nodeId.namespace !== 0);
50
+ if (references.length === 0)
51
+ return false;
52
+ let nodesToRead = references.map((r) => ({
53
+ nodeId: r.nodeId,
54
+ attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition
55
+ }));
56
+ const nodesToRead2 = nodesToRead.map((r) => ({ nodeId: r.nodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract }));
57
+ const abstractFlags = (yield session.read(nodesToRead2)).map((d) => d.value.value);
58
+ // also remove the abstract dataStructure => they don't provide valid DataTypeDefinition
59
+ nodesToRead = nodesToRead.filter((_nodesToRead, index) => !abstractFlags[index]);
60
+ if (nodesToRead.length === 0)
61
+ return false;
62
+ const dataValues = yield session.read(nodesToRead);
63
+ // for (let i = 0; i < dataValues.length; i++) {
64
+ // console.log(i, " | ", nodesToRead[i].nodeId.toString().padEnd(40), references[i].browseName.toString().padEnd(50), dataValues[i].statusCode.toString());
65
+ // }
66
+ const countOK = dataValues.reduce((prev, a) => prev + (a.statusCode.isGood() ? 1 : 0), 0);
67
+ if (countOK === dataValues.length) {
68
+ return true;
69
+ // await populateDataTypeManager104(session, dataTypeManager);
70
+ // return;
71
+ }
72
+ return false;
73
+ });
74
+ }
75
+ function populateDataTypeManager(session, dataTypeManager) {
76
+ return __awaiter(this, void 0, void 0, function* () {
77
+ const force104 = yield serverImplementsDataTypeDefinition(session);
78
+ if (force104) {
79
+ // console.log("xxxxxxx! using 1.04");
80
+ yield (0, populate_data_type_manager_104_1.populateDataTypeManager104)(session, dataTypeManager);
81
+ return;
82
+ }
83
+ // old way for 1.03 and early 1.04 prototype
84
+ yield (0, populate_data_type_manager_103_1.populateDataTypeManager103)(session, dataTypeManager);
85
+ yield (0, populate_data_type_manager_104_1.populateDataTypeManager104)(session, dataTypeManager);
86
+ });
87
+ }
88
+ exports.populateDataTypeManager = populateDataTypeManager;
89
89
  //# sourceMappingURL=populate_data_type_manager.js.map
@@ -1,4 +1,4 @@
1
- import { NodeId } from "node-opcua-nodeid";
2
- import { IBasicSession } from "node-opcua-pseudo-session";
3
- import { DataTypeAndEncodingId } from "node-opcua-schemas";
4
- export declare function _findEncodings(session: IBasicSession, dataTypeNodeId: NodeId): Promise<DataTypeAndEncodingId>;
1
+ import { NodeId } from "node-opcua-nodeid";
2
+ import { IBasicSession } from "node-opcua-pseudo-session";
3
+ import { DataTypeAndEncodingId } from "node-opcua-schemas";
4
+ export declare function _findEncodings(session: IBasicSession, dataTypeNodeId: NodeId): Promise<DataTypeAndEncodingId>;
@@ -1,56 +1,56 @@
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
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports._findEncodings = void 0;
13
- const node_opcua_data_model_1 = require("node-opcua-data-model");
14
- const node_opcua_nodeid_1 = require("node-opcua-nodeid");
15
- const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
16
- function _findEncodings(session, dataTypeNodeId) {
17
- return __awaiter(this, void 0, void 0, function* () {
18
- const nodeToBrowse = {
19
- browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
20
- includeSubtypes: true,
21
- nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object"),
22
- nodeId: dataTypeNodeId,
23
- referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
24
- resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
25
- };
26
- const result = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
27
- const references = result.references || [];
28
- if (references.length === 0) {
29
- // xx throw new Error("Cannot find encodings on type " + dataTypeNodeId.toString() + " statusCode " + result.statusCode.toString());
30
- }
31
- const encodings = {
32
- dataTypeNodeId,
33
- binaryEncodingNodeId: new node_opcua_nodeid_1.NodeId(),
34
- jsonEncodingNodeId: new node_opcua_nodeid_1.NodeId(),
35
- xmlEncodingNodeId: new node_opcua_nodeid_1.NodeId()
36
- };
37
- for (const ref of references) {
38
- switch (ref.browseName.name) {
39
- case "Default Binary":
40
- encodings.binaryEncodingNodeId = ref.nodeId;
41
- break;
42
- case "Default XML":
43
- encodings.xmlEncodingNodeId = ref.nodeId;
44
- break;
45
- case "Default JSON":
46
- encodings.jsonEncodingNodeId = ref.nodeId;
47
- break;
48
- default:
49
- console.log(" ignoring encoding ", ref.browseName.toString());
50
- }
51
- }
52
- return encodings;
53
- });
54
- }
55
- exports._findEncodings = _findEncodings;
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
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports._findEncodings = void 0;
13
+ const node_opcua_data_model_1 = require("node-opcua-data-model");
14
+ const node_opcua_nodeid_1 = require("node-opcua-nodeid");
15
+ const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
16
+ function _findEncodings(session, dataTypeNodeId) {
17
+ return __awaiter(this, void 0, void 0, function* () {
18
+ const nodeToBrowse = {
19
+ browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
20
+ includeSubtypes: true,
21
+ nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object"),
22
+ nodeId: dataTypeNodeId,
23
+ referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
24
+ resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
25
+ };
26
+ const result = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
27
+ const references = result.references || [];
28
+ if (references.length === 0) {
29
+ // xx throw new Error("Cannot find encodings on type " + dataTypeNodeId.toString() + " statusCode " + result.statusCode.toString());
30
+ }
31
+ const encodings = {
32
+ dataTypeNodeId,
33
+ binaryEncodingNodeId: new node_opcua_nodeid_1.NodeId(),
34
+ jsonEncodingNodeId: new node_opcua_nodeid_1.NodeId(),
35
+ xmlEncodingNodeId: new node_opcua_nodeid_1.NodeId()
36
+ };
37
+ for (const ref of references) {
38
+ switch (ref.browseName.name) {
39
+ case "Default Binary":
40
+ encodings.binaryEncodingNodeId = ref.nodeId;
41
+ break;
42
+ case "Default XML":
43
+ encodings.xmlEncodingNodeId = ref.nodeId;
44
+ break;
45
+ case "Default JSON":
46
+ encodings.jsonEncodingNodeId = ref.nodeId;
47
+ break;
48
+ default:
49
+ console.log(" ignoring encoding ", ref.browseName.toString());
50
+ }
51
+ }
52
+ return encodings;
53
+ });
54
+ }
55
+ exports._findEncodings = _findEncodings;
56
56
  //# sourceMappingURL=find_encodings.js.map
@@ -1,9 +1,9 @@
1
- import { IBasicSession } from "node-opcua-pseudo-session";
2
- import { ExtraDataTypeManager } from "../extra_data_type_manager";
3
- /**
4
- * Extract all custom dataType
5
- * @param session
6
- * @param dataTypeManager
7
- * @async
8
- */
9
- export declare function populateDataTypeManager103(session: IBasicSession, dataTypeManager: ExtraDataTypeManager): Promise<void>;
1
+ import { IBasicSession } from "node-opcua-pseudo-session";
2
+ import { ExtraDataTypeManager } from "../extra_data_type_manager";
3
+ /**
4
+ * Extract all custom dataType
5
+ * @param session
6
+ * @param dataTypeManager
7
+ * @async
8
+ */
9
+ export declare function populateDataTypeManager103(session: IBasicSession, dataTypeManager: ExtraDataTypeManager): Promise<void>;