node-opcua-client-dynamic-extension-object 2.127.1 → 2.129.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/convert_data_type_definition_to_structuretype_schema.d.ts +14 -3
- package/dist/convert_data_type_definition_to_structuretype_schema.js +284 -202
- package/dist/convert_data_type_definition_to_structuretype_schema.js.map +1 -1
- package/dist/get_extra_data_type_manager.d.ts +3 -1
- package/dist/get_extra_data_type_manager.js +17 -5
- package/dist/get_extra_data_type_manager.js.map +1 -1
- package/dist/populate_data_type_manager.d.ts +7 -1
- package/dist/populate_data_type_manager.js +24 -7
- package/dist/populate_data_type_manager.js.map +1 -1
- package/dist/private/populate_data_type_manager_103.js +48 -44
- package/dist/private/populate_data_type_manager_103.js.map +1 -1
- package/dist/private/populate_data_type_manager_104.d.ts +2 -4
- package/dist/private/populate_data_type_manager_104.js +27 -99
- package/dist/private/populate_data_type_manager_104.js.map +1 -1
- package/package.json +16 -16
- package/source/convert_data_type_definition_to_structuretype_schema.ts +361 -236
- package/source/get_extra_data_type_manager.ts +17 -5
- package/source/populate_data_type_manager.ts +26 -6
- package/source/private/populate_data_type_manager_103.ts +68 -60
- package/source/private/populate_data_type_manager_104.ts +46 -119
|
@@ -7,12 +7,12 @@ const node_opcua_factory_1 = require("node-opcua-factory");
|
|
|
7
7
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
8
8
|
const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
|
|
9
9
|
const node_opcua_schemas_1 = require("node-opcua-schemas");
|
|
10
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
11
10
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
12
11
|
const convert_data_type_definition_to_structuretype_schema_1 = require("../convert_data_type_definition_to_structuretype_schema");
|
|
13
12
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
14
13
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
15
14
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
|
|
15
|
+
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
16
16
|
async function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name, dataTypeFactory, cache) {
|
|
17
17
|
try {
|
|
18
18
|
if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
|
|
@@ -37,8 +37,14 @@ async function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name,
|
|
|
37
37
|
/* istanbul ignore next */
|
|
38
38
|
if (dataTypeDefinitionDataValue.statusCode.isNotGood()) {
|
|
39
39
|
// may be we are reading a 1.03 server
|
|
40
|
+
// or it could be some of the di:ParameterResultDataType that are not marked as abstract
|
|
41
|
+
// in some cases
|
|
40
42
|
if (!isAbstract) {
|
|
41
|
-
|
|
43
|
+
const [isAbstract2, browseNameDV] = await session.read([
|
|
44
|
+
{ nodeId: dataTypeNodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract },
|
|
45
|
+
{ nodeId: dataTypeNodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName }
|
|
46
|
+
]);
|
|
47
|
+
warningLog(" Cannot find dataType Definition ! with nodeId =" + dataTypeNodeId.toString(), browseNameDV.value?.value?.toString(), isAbstract2.value?.value);
|
|
42
48
|
return;
|
|
43
49
|
}
|
|
44
50
|
// it is OK to not have dataTypeDefinition for Abstract type!
|
|
@@ -58,102 +64,6 @@ async function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name,
|
|
|
58
64
|
}
|
|
59
65
|
}
|
|
60
66
|
exports.readDataTypeDefinitionAndBuildType = readDataTypeDefinitionAndBuildType;
|
|
61
|
-
class TaskMan {
|
|
62
|
-
constructor() {
|
|
63
|
-
this.taskList = [];
|
|
64
|
-
this._runningTask = false;
|
|
65
|
-
this._resolve = undefined;
|
|
66
|
-
}
|
|
67
|
-
async flushTaskList() {
|
|
68
|
-
const firstTask = this.taskList.shift();
|
|
69
|
-
this._runningTask = true;
|
|
70
|
-
await firstTask();
|
|
71
|
-
this._runningTask = false;
|
|
72
|
-
if (this.taskList.length > 0) {
|
|
73
|
-
setImmediate(async () => {
|
|
74
|
-
await this.flushTaskList();
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
else {
|
|
78
|
-
if (this._resolve) {
|
|
79
|
-
const tmpResolve = this._resolve;
|
|
80
|
-
this._resolve = undefined;
|
|
81
|
-
tmpResolve();
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
/**
|
|
86
|
-
*
|
|
87
|
-
* a little async task queue that gets executed sequentially
|
|
88
|
-
* outside the main loop
|
|
89
|
-
*/
|
|
90
|
-
registerTask(taskFunc) {
|
|
91
|
-
this.taskList.push(taskFunc);
|
|
92
|
-
if (this.taskList.length === 1 && !this._runningTask) {
|
|
93
|
-
this.flushTaskList();
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
async waitForCompletion() {
|
|
97
|
-
if (this._resolve !== undefined) {
|
|
98
|
-
throw new Error("already waiting");
|
|
99
|
-
}
|
|
100
|
-
await new Promise((resolve) => {
|
|
101
|
-
this._resolve = resolve;
|
|
102
|
-
});
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
async function applyOnReferenceRecursively(session, nodeId, browseDescriptionTemplate, action) {
|
|
106
|
-
const taskManager = new TaskMan();
|
|
107
|
-
let pendingNodesToBrowse = [];
|
|
108
|
-
function processBrowseResults(nodesToBrowse, browseResults) {
|
|
109
|
-
for (let i = 0; i < browseResults.length; i++) {
|
|
110
|
-
const result = browseResults[i];
|
|
111
|
-
const nodeToBrowse = nodesToBrowse[i];
|
|
112
|
-
if (result.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadNoContinuationPoints) ||
|
|
113
|
-
result.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadContinuationPointInvalid)) {
|
|
114
|
-
// not enough continuation points .. we need to rebrowse
|
|
115
|
-
pendingNodesToBrowse.push(nodeToBrowse);
|
|
116
|
-
// taskManager.registerTask(flushBrowse);
|
|
117
|
-
}
|
|
118
|
-
else if (result.statusCode.isGood()) {
|
|
119
|
-
for (const r of result.references || []) {
|
|
120
|
-
// also explore sub types
|
|
121
|
-
browseSubDataTypeRecursively(r.nodeId);
|
|
122
|
-
taskManager.registerTask(async () => await action(r));
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
errorLog("Unexpected status code", i, new node_opcua_types_1.BrowseDescription(nodesToBrowse[i] || {})?.toString(), result.statusCode.toString());
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
async function flushBrowse() {
|
|
131
|
-
if (pendingNodesToBrowse.length) {
|
|
132
|
-
const nodesToBrowse = pendingNodesToBrowse;
|
|
133
|
-
pendingNodesToBrowse = [];
|
|
134
|
-
taskManager.registerTask(async () => {
|
|
135
|
-
try {
|
|
136
|
-
const browseResults = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowse);
|
|
137
|
-
processBrowseResults(nodesToBrowse, browseResults);
|
|
138
|
-
}
|
|
139
|
-
catch (err) {
|
|
140
|
-
errorLog("err", err.message);
|
|
141
|
-
errorLog(nodesToBrowse.toString());
|
|
142
|
-
}
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
function browseSubDataTypeRecursively(nodeId) {
|
|
147
|
-
const nodeToBrowse = {
|
|
148
|
-
...browseDescriptionTemplate,
|
|
149
|
-
nodeId
|
|
150
|
-
};
|
|
151
|
-
pendingNodesToBrowse.push(nodeToBrowse);
|
|
152
|
-
taskManager.registerTask(async () => flushBrowse());
|
|
153
|
-
}
|
|
154
|
-
browseSubDataTypeRecursively(nodeId);
|
|
155
|
-
await taskManager.waitForCompletion();
|
|
156
|
-
}
|
|
157
67
|
async function populateDataTypeManager104(session, dataTypeManager) {
|
|
158
68
|
const cache = {};
|
|
159
69
|
async function withDataType(r) {
|
|
@@ -175,7 +85,7 @@ async function populateDataTypeManager104(session, dataTypeManager) {
|
|
|
175
85
|
return;
|
|
176
86
|
}
|
|
177
87
|
// extract it formally
|
|
178
|
-
debugLog(" DataType => ", r.browseName.toString(), dataTypeNodeId.toString());
|
|
88
|
+
doDebug && debugLog(" DataType => ", r.browseName.toString(), dataTypeNodeId.toString());
|
|
179
89
|
await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, cache);
|
|
180
90
|
}
|
|
181
91
|
catch (err) {
|
|
@@ -193,4 +103,22 @@ async function populateDataTypeManager104(session, dataTypeManager) {
|
|
|
193
103
|
await applyOnReferenceRecursively(session, (0, node_opcua_nodeid_1.resolveNodeId)("Structure"), nodeToBrowse, withDataType);
|
|
194
104
|
}
|
|
195
105
|
exports.populateDataTypeManager104 = populateDataTypeManager104;
|
|
106
|
+
async function applyOnReferenceRecursively(session, nodeId, browseDescriptionTemplate, action) {
|
|
107
|
+
const oneLevel = async (nodeId) => {
|
|
108
|
+
const nodeToBrowse = {
|
|
109
|
+
...browseDescriptionTemplate,
|
|
110
|
+
nodeId
|
|
111
|
+
};
|
|
112
|
+
const browseResult = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
|
|
113
|
+
const promises = [];
|
|
114
|
+
for (const ref of browseResult.references || []) {
|
|
115
|
+
promises.push((async () => {
|
|
116
|
+
await action(ref);
|
|
117
|
+
await oneLevel(ref.nodeId);
|
|
118
|
+
})());
|
|
119
|
+
}
|
|
120
|
+
await Promise.all(promises);
|
|
121
|
+
};
|
|
122
|
+
await oneLevel(nodeId);
|
|
123
|
+
}
|
|
196
124
|
//# sourceMappingURL=populate_data_type_manager_104.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":";;;AAAA,iEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-client-dynamic-extension-object",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.129.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -12,21 +12,21 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"chalk": "4.1.2",
|
|
14
14
|
"node-opcua-assert": "2.120.0",
|
|
15
|
-
"node-opcua-binary-stream": "2.
|
|
15
|
+
"node-opcua-binary-stream": "2.128.0",
|
|
16
16
|
"node-opcua-constants": "2.125.0",
|
|
17
|
-
"node-opcua-data-model": "2.
|
|
18
|
-
"node-opcua-data-value": "2.
|
|
19
|
-
"node-opcua-debug": "2.
|
|
20
|
-
"node-opcua-extension-object": "2.
|
|
21
|
-
"node-opcua-factory": "2.
|
|
22
|
-
"node-opcua-nodeid": "2.
|
|
23
|
-
"node-opcua-pseudo-session": "2.
|
|
24
|
-
"node-opcua-schemas": "2.
|
|
25
|
-
"node-opcua-service-browse": "2.
|
|
26
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
27
|
-
"node-opcua-status-code": "2.
|
|
28
|
-
"node-opcua-types": "2.
|
|
29
|
-
"node-opcua-variant": "2.
|
|
17
|
+
"node-opcua-data-model": "2.128.0",
|
|
18
|
+
"node-opcua-data-value": "2.129.0",
|
|
19
|
+
"node-opcua-debug": "2.128.0",
|
|
20
|
+
"node-opcua-extension-object": "2.128.0",
|
|
21
|
+
"node-opcua-factory": "2.128.0",
|
|
22
|
+
"node-opcua-nodeid": "2.128.0",
|
|
23
|
+
"node-opcua-pseudo-session": "2.129.0",
|
|
24
|
+
"node-opcua-schemas": "2.129.0",
|
|
25
|
+
"node-opcua-service-browse": "2.129.0",
|
|
26
|
+
"node-opcua-service-translate-browse-path": "2.129.0",
|
|
27
|
+
"node-opcua-status-code": "2.128.0",
|
|
28
|
+
"node-opcua-types": "2.129.0",
|
|
29
|
+
"node-opcua-variant": "2.129.0"
|
|
30
30
|
},
|
|
31
31
|
"author": "Etienne Rossignon",
|
|
32
32
|
"license": "MIT",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"internet of things"
|
|
44
44
|
],
|
|
45
45
|
"homepage": "http://node-opcua.github.io/",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "8a1754350fb95a764e278d37a289f0c48ccb8c9d",
|
|
47
47
|
"files": [
|
|
48
48
|
"dist",
|
|
49
49
|
"source"
|