node-opcua-client-dynamic-extension-object 2.80.0 → 2.82.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.js +18 -11
- package/dist/convert_data_type_definition_to_structuretype_schema.js.map +1 -1
- package/dist/extra_data_type_manager.js +1 -1
- package/dist/extra_data_type_manager.js.map +1 -1
- package/dist/populate_data_type_manager.js +67 -0
- package/dist/populate_data_type_manager.js.map +1 -1
- package/dist/private/populate_data_type_manager_104.js +10 -2
- package/dist/private/populate_data_type_manager_104.js.map +1 -1
- package/dist/promote_opaque_structure.d.ts +1 -0
- package/dist/promote_opaque_structure.js +14 -9
- package/dist/promote_opaque_structure.js.map +1 -1
- package/dist/resolve_dynamic_extension_object.js +1 -1
- package/dist/resolve_dynamic_extension_object.js.map +1 -1
- package/package.json +17 -16
- package/source/convert_data_type_definition_to_structuretype_schema.ts +13 -3
- package/source/extra_data_type_manager.ts +1 -1
- package/source/populate_data_type_manager.ts +79 -2
- package/source/private/populate_data_type_manager_104.ts +13 -4
- package/source/promote_opaque_structure.ts +8 -6
- package/source/resolve_dynamic_extension_object.ts +1 -1
|
@@ -10,11 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.convertDataTypeDefinitionToStructureTypeSchema = void 0;
|
|
13
|
-
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
14
13
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
15
14
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
16
|
-
const node_opcua_factory_1 = require("node-opcua-factory");
|
|
17
15
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
16
|
+
//import { DataTypeIds } from "node-opcua-constant";
|
|
17
|
+
const node_opcua_factory_1 = require("node-opcua-factory");
|
|
18
|
+
const node_opcua_nodeid_2 = require("node-opcua-nodeid");
|
|
18
19
|
const node_opcua_pseudo_session_1 = require("node-opcua-pseudo-session");
|
|
19
20
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
20
21
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
@@ -29,14 +30,14 @@ function findSuperType(session, dataTypeNodeId) {
|
|
|
29
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
31
|
if (dataTypeNodeId.namespace === 0 && dataTypeNodeId.value === 24) {
|
|
31
32
|
// BaseDataType !
|
|
32
|
-
return (0,
|
|
33
|
+
return (0, node_opcua_nodeid_2.coerceNodeId)(0);
|
|
33
34
|
}
|
|
34
35
|
const nodeToBrowse3 = {
|
|
35
36
|
browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
|
|
36
37
|
includeSubtypes: false,
|
|
37
38
|
nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
|
|
38
39
|
nodeId: dataTypeNodeId,
|
|
39
|
-
referenceTypeId: (0,
|
|
40
|
+
referenceTypeId: (0, node_opcua_nodeid_2.resolveNodeId)("HasSubtype"),
|
|
40
41
|
resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | ReferenceType | BrowseName | NodeClass")
|
|
41
42
|
};
|
|
42
43
|
const result3 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse3);
|
|
@@ -197,7 +198,7 @@ function resolveFieldType(session, dataTypeNodeId, dataTypeFactory, cache) {
|
|
|
197
198
|
fieldTypeName,
|
|
198
199
|
schema,
|
|
199
200
|
allowSubType: true,
|
|
200
|
-
dataType: (0,
|
|
201
|
+
dataType: (0, node_opcua_nodeid_2.coerceNodeId)(node_opcua_variant_1.DataType.ExtensionObject)
|
|
201
202
|
};
|
|
202
203
|
}
|
|
203
204
|
const key = dataTypeNodeId.toString();
|
|
@@ -284,9 +285,9 @@ function _setupEncodings(session, dataTypeNodeId, schema) {
|
|
|
284
285
|
schema.dataTypeNodeId = dataTypeNodeId;
|
|
285
286
|
if (isAbstractDV.statusCode === node_opcua_status_code_1.StatusCodes.Good && isAbstractDV.value.value === false) {
|
|
286
287
|
const encodings = yield (0, find_encodings_1._findEncodings)(session, dataTypeNodeId);
|
|
287
|
-
schema.encodingDefaultBinary = (0,
|
|
288
|
-
schema.encodingDefaultXml = (0,
|
|
289
|
-
schema.encodingDefaultJson = (0,
|
|
288
|
+
schema.encodingDefaultBinary = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.binaryEncodingNodeId);
|
|
289
|
+
schema.encodingDefaultXml = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.xmlEncodingNodeId);
|
|
290
|
+
schema.encodingDefaultJson = (0, node_opcua_nodeid_2.makeExpandedNodeId)(encodings.jsonEncodingNodeId);
|
|
290
291
|
}
|
|
291
292
|
return schema;
|
|
292
293
|
});
|
|
@@ -357,8 +358,13 @@ function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId,
|
|
|
357
358
|
fields.push(field);
|
|
358
359
|
}
|
|
359
360
|
}
|
|
361
|
+
/// some server may provide definition.baseDataType to be i=22 (ExtensionObject)
|
|
362
|
+
/// instead of 12756 Union;
|
|
363
|
+
if (isUnion && (0, node_opcua_nodeid_1.sameNodeId)(definition.baseDataType, (0, node_opcua_nodeid_2.coerceNodeId)("i=22"))) {
|
|
364
|
+
definition.baseDataType = (0, node_opcua_nodeid_2.resolveNodeId)("i=1276"); // aka DataTypeIds.Union
|
|
365
|
+
}
|
|
360
366
|
const a = yield resolveFieldType(session, definition.baseDataType, dataTypeFactory, cache);
|
|
361
|
-
const baseType = a ? a.fieldTypeName : "ExtensionObject";
|
|
367
|
+
const baseType = a ? a.fieldTypeName : isUnion ? "Union" : "ExtensionObject";
|
|
362
368
|
const os = new node_opcua_factory_1.StructuredTypeSchema({
|
|
363
369
|
baseType,
|
|
364
370
|
bitFields,
|
|
@@ -385,8 +391,9 @@ function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId,
|
|
|
385
391
|
field.switchValue = switchValue;
|
|
386
392
|
switchValue += 1;
|
|
387
393
|
}
|
|
388
|
-
|
|
389
|
-
if (fieldD.valueRank
|
|
394
|
+
// (fieldD.valueRank === -1 || fieldD.valueRank === 1 || fieldD.valueRank === 0);
|
|
395
|
+
if (fieldD.valueRank >= 1) {
|
|
396
|
+
field.valueRank = fieldD.valueRank;
|
|
390
397
|
field.isArray = true;
|
|
391
398
|
}
|
|
392
399
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convert_data_type_definition_to_structuretype_schema.js","sourceRoot":"","sources":["../source/convert_data_type_definition_to_structuretype_schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iEAAqG;AAErG,uDAAiF;AACjF,yDAA+C;AAC/C,oDAAoD;AACpD,2DAY4B;AAC5B,yDAA4F;AAC5F,yEAAmI;AACnI,mEAAqD;AACrD,uDAO0B;AAC1B,6EAA8D;AAC9D,EAAE;AACF,2DAA8C;AAC9C,6DAA0D;AAE1D,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,SAAe,aAAa,CAAC,OAAsB,EAAE,cAAsB;;QACvE,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,EAAE,EAAE;YAC/D,iBAAiB;YACjB,OAAO,IAAA,gCAAY,EAAC,CAAC,CAAC,CAAC;SAC1B;QAED,MAAM,aAAa,GAA0B;YACzC,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,MAAM,EAAE,cAAc;YACtB,eAAe,EAAE,IAAA,iCAAa,EAAC,YAAY,CAAC;YAC5C,UAAU,EAAE,IAAA,sCAAc,EAAC,iDAAiD,CAAC;SAChF,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAExD,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7E;QACD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAE9C,0BAA0B;QAC1B,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChC,MAAM,IAAI,KAAK,CACX,uDAAuD,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAC1H,CAAC;SACL;QACD,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACxC,CAAC;CAAA;AACD,SAAe,oBAAoB,CAC/B,OAAsB,EACtB,KAAiD,EACjD,cAAsB;;QAEtB,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACnE,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5F,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;SAC9B;QACD,IAAI,QAAuB,CAAC;QAC5B,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,IAAI,EAAE,EAAE;YAC5D,uBAAuB;YACvB,QAAQ,aAAa,CAAC,KAAK,EAAE;gBACzB,KAAK,EAAE,CAAC,eAAe;oBACnB,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC;oBACjC,MAAM;gBACV,KAAK,EAAE,CAAC,iBAAiB;oBACrB,QAAQ,GAAG,kCAAa,CAAC,WAAW,CAAC;oBACrC,MAAM;gBACV;oBACI,QAAQ,GAAG,kCAAa,CAAC,KAAK,CAAC;oBAC/B,MAAM;aACb;YACD,OAAO,QAAQ,CAAC;SACnB;QACD,sBAAsB;QACtB,OAAO,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IACrE,CAAC;CAAA;AAED,SAAe,qBAAqB,CAChC,OAAsB,EACtB,KAAiD,EACjD,cAAsB;;QAEtB,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEnE,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE5F,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;SAC5B;QACD,IAAI,aAAa,CAAC,SAAS,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,GAAG,EAAE,EAAE;YAC3D,QAAQ,aAAa,CAAC,KAAK,EAAE;gBACzB,KAAK,EAAE,CAAC,CAAC,eAAe;gBACxB,KAAK,EAAE,CAAC,iBAAiB;oBACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC9D;oBACI,MAAM;aACb;YACD,MAAM,aAAa,GAAc,MAAM,OAAO,CAAC,IAAI,CAAC;gBAChD,WAAW,EAAE,oCAAY,CAAC,UAAU;gBACpC,MAAM,EAAE,aAAa;aACxB,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,IAAK,CAAC;YAC7C,OAAO,IAAA,mCAAc,EAAC,IAAI,CAAC,CAAC;SAC/B;QACD,sBAAsB;QACtB,OAAO,MAAM,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;CAAA;AAUD,SAAe,cAAc,CAAC,OAAsB,EAAE,MAAc;;QAChE,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,IAAI,SAAS,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;YAC3C,MAAM,OAAO,GACT,wCAAwC,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,gBAAgB,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACtH,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SAC5B;QACD,OAAO,SAAS,CAAC,KAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACvC,CAAC;CAAA;AAED,SAAe,QAAQ,CACnB,OAAsB,EACtB,cAAsB,EACtB,eAAgC,EAChC,aAAqB,EACrB,KAAiD;;QAEjD,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC5E,QAAQ,CAAC,QAAQ,GAAG,aAAa,GAAG,wDAAwD,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE9G,IAAI,MAAM,GAA+B,SAAS,CAAC;QACnD,QAAQ,QAAQ,EAAE;YACd,KAAK,kCAAa,CAAC,KAAK;gBACpB,MAAM,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;gBACrE,0BAA0B;gBAC1B,IAAI,CAAC,MAAM,EAAE;oBACT,QAAQ,CAAC,yBAAyB,GAAG,aAAa,CAAC,CAAC;iBACvD;gBACD,MAAM;YACV,QAAQ;YACR,KAAK,kCAAa,CAAC,OAAO;gBACtB;oBACI,MAAM,2BAA2B,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;wBACnD,WAAW,EAAE,oCAAY,CAAC,kBAAkB;wBAC5C,MAAM,EAAE,cAAc;qBACzB,CAAC,CAAC;oBAEH,0BAA0B;oBAC1B,IAAI,2BAA2B,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,EAAE;wBAC7D,MAAM,IAAI,KAAK,CAAC,kDAAkD,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACnG;oBACD,MAAM,UAAU,GAAG,2BAA2B,CAAC,KAAK,CAAC,KAAK,CAAC;oBAE3D,MAAM,oBAAoB,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEnD,MAAM,OAAO,GAAG,CAAC,MAA0B,EAAE,EAAE;wBAC3C,MAAM,MAAM,GAA2B,EAAE,CAAC;wBAC1C,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,KAAgB,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAC/G,OAAO,MAAM,CAAC;oBAClB,CAAC,CAAC;oBACF,IAAI,QAAQ,KAAK,kCAAa,CAAC,WAAW,EAAE;wBACxC,IAAI,UAAU,YAAY,iCAAc,EAAE;4BACtC,MAAM,CAAC,GAAG,IAAI,gDAA2B,CAAC,cAAc,EAAE;gCACtD,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;gCACtC,IAAI,EAAE,aAAa;6BACtB,CAAC,CAAC;4BACH,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;4BAEvC,MAAM,GAAG,CAAC,CAAC;yBACd;qBACJ;yBAAM;wBACH,MAAM,UAAU,GAAG,KAAK,CAAC;wBACzB,MAAM,GAAG,MAAM,8CAA8C,CACzD,OAAO,EACP,cAAc,EACd,aAAa,EACb,UAAU,EACV,eAAe,EACf,UAAU,EACV,KAAK,CACR,CAAC;qBACL;oBACD,6EAA6E;iBAChF;gBACD,MAAM;SACb;QACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;CAAA;AAED,MAAM,iBAAiB,GAAG,CAAO,OAAsB,EAAE,cAAsB,EAAoB,EAAE;IACjG,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,6BAAQ,CAAC,eAAe,EAAE;QACrF,OAAO,IAAI,CAAC;KACf;IACD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAClE,IAAI,YAAY,CAAC,SAAS,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,KAAK,6BAAQ,CAAC,eAAe,EAAE;QACjF,OAAO,IAAI,CAAC;KACf;IACD,IAAI,YAAY,CAAC,SAAS,KAAK,CAAC,IAAI,YAAY,CAAC,KAAK,GAAG,6BAAQ,CAAC,eAAe,EAAE;QAC/E,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,MAAM,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AAC1D,CAAC,CAAA,CAAC;AAEF,0CAA0C;AAC1C,SAAe,gBAAgB,CAC3B,OAAsB,EACtB,cAAsB,EACtB,eAAgC,EAChC,KAAiD;;QAEjD,IAAI,cAAc,CAAC,SAAS,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,KAAK,EAAE,EAAE;YAC/D,qBAAqB;YACrB,MAAM,QAAQ,GAAkB,kCAAa,CAAC,OAAO,CAAC;YACtD,MAAM,aAAa,GAAG,WAAW,CAAC;YAClC,MAAM,MAAM,GAAG,6CAAe,CAAC,MAAM,CAAC;YACtC,OAAO;gBACH,QAAQ;gBACR,aAAa;gBACb,MAAM;gBACN,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,IAAA,gCAAY,EAAC,6BAAQ,CAAC,eAAe,CAAC;aACnD,CAAC;SACL;QACD,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,EAAE;YACH,OAAO,CAAC,CAAC;SACZ;QAED,IAAI,cAAc,CAAC,KAAK,KAAK,CAAC,EAAE;YAC5B,MAAM,EAAE,GAA4B;gBAChC,QAAQ,EAAE,kCAAa,CAAC,KAAK;gBAC7B,aAAa,EAAE,SAAS;gBACxB,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC;aACpD,CAAC;YACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,UAAU,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QACtH,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAEpE,IAAI,UAAU,EAAE;YACZ,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAC5E,QAAQ,CACJ,YAAY,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,aAAa,GAAG,4BAA4B,GAAG,kBAAkB,CACrH,CAAC;YACF,IAAI,kBAAkB,EAAE;gBACpB,qCAAqC;gBACrC,MAAM,EAAE,GAA4B;oBAChC,QAAQ,EAAE,kCAAa,CAAC,OAAO;oBAC/B,aAAa,EAAE,aAAa;oBAC5B,MAAM,EAAE,6CAAe,CAAC,MAAM;oBAC9B,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,cAAc;iBAC3B,CAAC;gBACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,iCAAiC;gBACjC,MAAM,EAAE,GAA4B;oBAChC,QAAQ,EAAE,kCAAa,CAAC,KAAK;oBAC7B,aAAa,EAAE,aAAa;oBAC5B,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC;oBACjD,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,cAAc;iBAC3B,CAAC;gBACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;aACb;SACJ;QAED,IAAI,MAAkC,CAAC;QACvC,IAAI,QAAQ,GAAkB,kCAAa,CAAC,WAAW,CAAC;QAExD,IAAI,eAAe,CAAC,sBAAsB,CAAC,aAAc,CAAC,EAAE;YACxD,MAAM,GAAG,eAAe,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAChE,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC;SACpC;aAAM,IAAI,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,EAAE;YACvD,QAAQ,GAAG,kCAAa,CAAC,KAAK,CAAC;YAC/B,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,CAAC;SAC3D;aAAM,IAAI,eAAe,CAAC,cAAc,CAAC,aAAc,CAAC,EAAE;YACvD,QAAQ,GAAG,kCAAa,CAAC,WAAW,CAAC;YACrC,MAAM,GAAG,eAAe,CAAC,cAAc,CAAC,aAAc,CAAE,CAAC;SAC5D;aAAM;YACH,QAAQ,CAAC,QAAQ,GAAG,aAAa,GAAG,wCAAwC,CAAC,CAAC;YAC9E,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;YAC3F,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YACpB,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;SAC3B;QAED,0BAA0B;QAC1B,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,KAAK,CACX,wCAAwC,GAAG,aAAa,GAAG,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,cAAc,GAAG,QAAQ,CACzH,CAAC;SACL;QAED,MAAM,EAAE,GAA4B;YAChC,QAAQ;YACR,aAAa;YACb,MAAM;SACT,CAAC;QACF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACd,CAAC;CAAA;AAED,SAAe,eAAe,CAC1B,OAAsB,EACtB,cAAsB,EACtB,MAA6B;;QAE7B,qBAAqB;QACrB,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;QAEvC,IAAI,YAAY,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,EAAE;YACpF,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAChE,MAAM,CAAC,qBAAqB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;YAClF,MAAM,CAAC,kBAAkB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAC5E,MAAM,CAAC,mBAAmB,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;SACjF;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAED,0CAA0C;AAC1C,SAAsB,8CAA8C,CAChE,OAAsB,EACtB,cAAsB,EACtB,IAAY,EACZ,UAA8B,EAC9B,eAAgC,EAChC,UAAmB,EACnB,KAAiD;;QAEjD,IAAI,UAAU,YAAY,sCAAmB,EAAE;YAC3C,IAAI,kBAAkB,GAAG,CAAC,CAAC;YAC3B,MAAM,aAAa,GAAG,eAAe,CAAC,2BAA2B,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YAC3F,MAAM,UAAU,GAA6C,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC;YAEnF,IAAI,UAAU,EAAE;gBACZ,MAAM,cAAc,GAAG,IAAA,6CAAwB,EAAC,UAAU,CAAC,CAAC;gBAC5D,kBAAkB,IAAI,cAAc,CAAC,MAAM,CAAC;aAC/C;YACD,qHAAqH;YACrH,0CAA0C;YAC1C,mCAAmC;YACnC,IAAI;YAEJ,MAAM,MAAM,GAA4B,EAAE,CAAC;YAE3C,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,KAAK,gCAAa,CAAC,KAAK,CAAC;YAEjE,QAAQ,UAAU,CAAC,aAAa,EAAE;gBAC9B,KAAK,gCAAa,CAAC,KAAK;oBACpB,0CAA0C;oBAC1C,MAAM,CAAC,IAAI,CAAC;wBACR,SAAS,EAAE,QAAQ;wBACnB,IAAI,EAAE,aAAa;qBACtB,CAAC,CAAC;oBACH,MAAM;gBACV,KAAK,gCAAa,CAAC,SAAS,CAAC;gBAC7B,KAAK,gCAAa,CAAC,2BAA2B;oBAC1C,MAAM;aACb;YAED,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,IAAI,SAAS,GAAG,CAAC,CAAC;YAElB,MAAM,SAAS,GAA2B,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YAEnE,MAAM,WAAW,GAAgD,EAAE,CAAC;YAEpE,IAAI,UAAU,CAAC,MAAM,EAAE;gBACnB,KAAK,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAChE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACpC,sEAAsE;oBAEtE,IAAI,KAAwC,CAAC;oBAC7C,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;oBAEtG,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,KAAK,cAAc,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS,EAAE;wBAC1G,oDAAoD;wBACpD,oDAAoD;wBACpD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;wBACpE,CAAC,KAAK,CAAC,SAAS,GAAG,aAAc,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,GAAG,kCAAa,CAAC,OAAO,CAAC,CAAC;wBAC7E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACnB,MAAM,aAAa,GAAG,KAAK,CAAC;wBAC5B,WAAW,CAAC,IAAI,CAAC,CAAC,MAA6B,EAAE,EAAE;4BAC/C,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC;wBAClC,CAAC,CAAC,CAAC;wBACH,SAAS;qBACZ;oBACD,MAAM,EAAE,GAAG,CAAC,MAAM,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAE,CAAC;oBACvF,IAAI,CAAC,EAAE,EAAE;wBACL,QAAQ,CACJ,oEAAoE,EACpE,MAAM,CAAC,IAAI,EACX,IAAI,EACJ,IAAI,EACJ,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,qBAAqB,CAClE,CAAC;wBACF,SAAS;qBACZ;oBACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;oBAEvE,KAAK,CAAC,SAAS,GAAG,aAAc,CAAC;oBACjC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC1B,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACtB,KAAK,CAAC,QAAQ,GAAG,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC;oBAC7C,KAAK,CAAC,YAAY,GAAG,YAAY,IAAI,KAAK,CAAC;oBAC3C,KAAK,CAAC,aAAa,GAAG,MAAM,IAAA,6CAAiB,EAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACvE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACtB;aACJ;YACD,gFAAgF;YAChF,2BAA2B;YAC3B,IAAI,OAAO,IAAI,IAAA,8BAAU,EAAC,UAAU,CAAC,YAAY,EAAE,IAAA,gCAAY,EAAC,MAAM,CAAC,CAAC,EAAE;gBACtE,UAAU,CAAC,YAAY,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;aAC9E;YAED,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;YAC3F,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC;YAE7E,MAAM,EAAE,GAAG,IAAI,yCAAoB,CAAC;gBAChC,QAAQ;gBACR,SAAS;gBACT,MAAM;gBACN,IAAI;gBACJ,eAAe;aAClB,CAAC,CAAC;YACH,MAAM,oBAAoB,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;YAEhF,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAE9D,OAAO,oBAAoB,CAAC;SAC/B;QACD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEnC,SAAS,WAAW,CAChB,MAAsB,EACtB,SAAiB,EACjB,SAAiC,EACjC,OAAgB,EAChB,WAAmB;YAEnB,MAAM,KAAK,GAA0B;gBACjC,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,IAAK;gBAClB,MAAM,EAAE,SAAS;aACpB,CAAC;YAEF,IAAI,MAAM,CAAC,UAAU,EAAE;gBACnB,KAAK,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC;gBAC9B,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAK,GAAG,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;aACpE;YACD,IAAI,OAAO,EAAE;gBACT,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;gBAChC,WAAW,IAAI,CAAC,CAAC;aACpB;YAED,iFAAiF;YAEjF,IAAI,MAAM,CAAC,SAAS,IAAI,CAAC,EAAE;gBACvB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBACnC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACxB;iBAAM;gBACH,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;aACzB;YACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAC7C,CAAC;IACL,CAAC;CAAA;AAjJD,wGAiJC"}
|
|
@@ -40,7 +40,7 @@ class ExtraDataTypeManager {
|
|
|
40
40
|
getExtensionObjectConstructorFromDataType(dataTypeNodeId) {
|
|
41
41
|
const dataTypeFactory = this.getDataTypeFactory(dataTypeNodeId.namespace);
|
|
42
42
|
if (!dataTypeFactory) {
|
|
43
|
-
throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace);
|
|
43
|
+
throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace + " when requested for " + dataTypeNodeId.toString());
|
|
44
44
|
}
|
|
45
45
|
// find schema corresponding to dataTypeNodeId in typeDictionary
|
|
46
46
|
const Constructor = dataTypeFactory.findStructureInfoForDataType(dataTypeNodeId).constructor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extra_data_type_manager.js","sourceRoot":"","sources":["../source/extra_data_type_manager.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+BAA8B;AAE9B,yDAA2C;AAC3C,2DAAkG;AAIlG,MAAa,oBAAoB;IAI7B;QAHO,mBAAc,GAAa,EAAE,CAAC;QAC7B,kCAA6B,GAAuC,EAAE,CAAC;QAG3E,KAAK;IACT,CAAC;IAEM,iBAAiB,CAAC,cAAwB;QAC7C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAEM,kBAAkB,CAAC,cAAsB;QAC5C,OAAO,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE,cAAc,CAAC,CAAC;IACtG,CAAC;IAEM,uBAAuB,CAAC,cAAsB,EAAE,eAAgC;QACnF,0BAA0B;QAC1B,IAAA,0BAAM,EAAC,cAAc,KAAK,CAAC,EAAE,uDAAuD,CAAC,CAAC;QACtF,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SACpD;QACD,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC;IACzE,CAAC;IAEM,8BAA8B,CAAC,cAAsB;QACxD,IAAA,0BAAM,EAAC,cAAc,KAAK,CAAC,EAAE,8DAA8D,CAAC,CAAC;QAC7F,OAAO,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;IAC9D,CAAC;IAEM,kBAAkB,CAAC,cAAsB;QAC5C,IAAI,cAAc,KAAK,CAAC,EAAE;YACtB,OAAO,IAAA,+CAA0B,GAAE,CAAC;SACvC;QACD,OAAO,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;IAC9D,CAAC;IAEM,yCAAyC,CAAC,cAAsB;QACnE,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"extra_data_type_manager.js","sourceRoot":"","sources":["../source/extra_data_type_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,77 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
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_status_code_1 = require("node-opcua-status-code");
|
|
18
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
13
19
|
const populate_data_type_manager_103_1 = require("./private/populate_data_type_manager_103");
|
|
14
20
|
const populate_data_type_manager_104_1 = require("./private/populate_data_type_manager_104");
|
|
21
|
+
function serverImplementsDataTypeDefinition(session) {
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
// check if server provides DataTypeDefinition => in this case this is the prefered route,
|
|
24
|
+
// as we go along, more and more servers will implement this.
|
|
25
|
+
const browseResult = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
|
|
26
|
+
browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
|
|
27
|
+
includeSubtypes: true,
|
|
28
|
+
nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
|
|
29
|
+
nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_variant_1.DataType.ExtensionObject),
|
|
30
|
+
referenceTypeId: "HasSubtype",
|
|
31
|
+
resultMask: 63
|
|
32
|
+
});
|
|
33
|
+
const browseResult2 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, {
|
|
34
|
+
browseDirection: node_opcua_data_model_1.BrowseDirection.Forward,
|
|
35
|
+
includeSubtypes: true,
|
|
36
|
+
nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
|
|
37
|
+
nodeId: (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.DataTypeIds.Union),
|
|
38
|
+
referenceTypeId: "HasSubtype",
|
|
39
|
+
resultMask: 63
|
|
40
|
+
});
|
|
41
|
+
let references = [];
|
|
42
|
+
if (browseResult && browseResult.references)
|
|
43
|
+
references = references.concat(browseResult.references);
|
|
44
|
+
if (browseResult2 && browseResult2.references)
|
|
45
|
+
references = references.concat(browseResult2.references);
|
|
46
|
+
if (references.length === 0)
|
|
47
|
+
return false;
|
|
48
|
+
// DataType Structure from namespace 0 are not interesting and will not provide DataTypeDefinition attribute anyway
|
|
49
|
+
// on some servers.
|
|
50
|
+
references = references.filter((a, index) => a.nodeId.namespace !== 0);
|
|
51
|
+
if (references.length === 0)
|
|
52
|
+
return false;
|
|
53
|
+
let nodesToRead = references.map((r) => ({
|
|
54
|
+
nodeId: r.nodeId,
|
|
55
|
+
attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition
|
|
56
|
+
}));
|
|
57
|
+
const nodesToRead2 = nodesToRead.map((r) => ({ nodeId: r.nodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract }));
|
|
58
|
+
const abstractFlags = (yield session.read(nodesToRead2)).map((d) => d.value.value);
|
|
59
|
+
// also remove the abstract dataStructure => they don't provide valid DataTypeDefinition
|
|
60
|
+
nodesToRead = nodesToRead.filter((_nodesToRead, index) => !abstractFlags[index]);
|
|
61
|
+
if (nodesToRead.length === 0)
|
|
62
|
+
return false;
|
|
63
|
+
const dataValues = yield session.read(nodesToRead);
|
|
64
|
+
// for (let i = 0; i < dataValues.length; i++) {
|
|
65
|
+
// console.log(i, " | ", nodesToRead[i].nodeId.toString().padEnd(40), references[i].browseName.toString().padEnd(50), dataValues[i].statusCode.toString());
|
|
66
|
+
// }
|
|
67
|
+
const countOK = dataValues.reduce((prev, a) => prev + (a.statusCode === node_opcua_status_code_1.StatusCodes.Good ? 1 : 0), 0);
|
|
68
|
+
if (countOK === dataValues.length) {
|
|
69
|
+
return true;
|
|
70
|
+
// await populateDataTypeManager104(session, dataTypeManager);
|
|
71
|
+
// return;
|
|
72
|
+
}
|
|
73
|
+
return false;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
15
76
|
function populateDataTypeManager(session, dataTypeManager, force) {
|
|
16
77
|
return __awaiter(this, void 0, void 0, function* () {
|
|
78
|
+
const force104 = yield serverImplementsDataTypeDefinition(session);
|
|
79
|
+
if (force104) {
|
|
80
|
+
// console.log("xxxxxxx! using 1.04");
|
|
81
|
+
yield (0, populate_data_type_manager_104_1.populateDataTypeManager104)(session, dataTypeManager);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
17
84
|
// old way for 1.03 and early 1.04 prototype
|
|
18
85
|
yield (0, populate_data_type_manager_103_1.populateDataTypeManager103)(session, dataTypeManager);
|
|
19
86
|
// new way for 1.04 and later
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager.js","sourceRoot":"","sources":["../source/populate_data_type_manager.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"populate_data_type_manager.js","sourceRoot":"","sources":["../source/populate_data_type_manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iEAAqF;AACrF,yDAAgE;AAChE,yEAAqE;AACrE,+DAAmD;AAEnD,mEAAqD;AACrD,2DAA8C;AAI9C,6FAAsF;AACtF,6FAAsF;AAEtF,SAAe,kCAAkC,CAAC,OAAsB;;QACpE,0FAA0F;QAC1F,6DAA6D;QAC7D,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE;YAC1C,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,MAAM,EAAE,IAAA,iCAAa,EAAC,6BAAQ,CAAC,eAAe,CAAC;YAC/C,eAAe,EAAE,YAAY;YAC7B,UAAU,EAAE,EAAE;SACjB,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAS,EAAC,OAAO,EAAE;YAC3C,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,IAAI;YACrB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,MAAM,EAAE,IAAA,iCAAa,EAAC,kCAAW,CAAC,KAAK,CAAC;YACxC,eAAe,EAAE,YAAY;YAC7B,UAAU,EAAE,EAAE;SACjB,CAAC,CAAC;QAEH,IAAI,UAAU,GAA2B,EAAE,CAAC;QAC5C,IAAI,YAAY,IAAI,YAAY,CAAC,UAAU;YAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACrG,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU;YAAE,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAExG,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAE1C,mHAAmH;QACnH,mBAAmB;QACnB,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC;QACvE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAE1C,IAAI,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACrC,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,WAAW,EAAE,oCAAY,CAAC,kBAAkB;SAC/C,CAAC,CAAC,CAAC;QAEJ,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,oCAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC1G,MAAM,aAAa,GAAc,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE9F,wFAAwF;QACxF,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACjF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnD,gDAAgD;QAChD,+JAA+J;QAC/J,IAAI;QAEJ,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtG,IAAI,OAAO,KAAK,UAAU,CAAC,MAAM,EAAE;YAC/B,OAAO,IAAI,CAAC;YACZ,8DAA8D;YAC9D,UAAU;SACb;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA;AAED,SAAsB,uBAAuB,CACzC,OAAsB,EACtB,eAAqC,EACrC,KAAc;;QAEd,MAAM,QAAQ,GAAG,MAAM,kCAAkC,CAAC,OAAO,CAAC,CAAC;QACnE,IAAI,QAAQ,EAAE;YACV,sCAAsC;YACtC,MAAM,IAAA,2DAA0B,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YAC3D,OAAO;SACV;QACD,4CAA4C;QAC5C,MAAM,IAAA,2DAA0B,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC3D,6BAA6B;QAC7B,IAAI,KAAK,EAAE;YACP,MAAM,IAAA,2DAA0B,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;SAC9D;IACL,CAAC;CAAA;AAjBD,0DAiBC"}
|
|
@@ -15,6 +15,7 @@ const node_opcua_debug_1 = require("node-opcua-debug");
|
|
|
15
15
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
16
16
|
const node_opcua_schemas_1 = require("node-opcua-schemas");
|
|
17
17
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
18
|
+
const node_opcua_types_1 = require("node-opcua-types");
|
|
18
19
|
const convert_data_type_definition_to_structuretype_schema_1 = require("../convert_data_type_definition_to_structuretype_schema");
|
|
19
20
|
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
20
21
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
@@ -36,11 +37,15 @@ function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name, dataT
|
|
|
36
37
|
throw new Error(" Cannot find dataType isAbstract ! with nodeId =" + dataTypeNodeId.toString());
|
|
37
38
|
}
|
|
38
39
|
const isAbstract = isAbstractDataValue.value.value;
|
|
40
|
+
let dataTypeDefinition = dataTypeDefinitionDataValue.value.value;
|
|
39
41
|
/* istanbul ignore next */
|
|
40
42
|
if (dataTypeDefinitionDataValue.statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
|
|
41
|
-
|
|
43
|
+
if (!isAbstract) {
|
|
44
|
+
throw new Error(" Cannot find dataType Definition ! with nodeId =" + dataTypeNodeId.toString());
|
|
45
|
+
}
|
|
46
|
+
// it is OK to not have dataTypeDefinition for Abstract type!
|
|
47
|
+
dataTypeDefinition = new node_opcua_types_1.StructureDefinition();
|
|
42
48
|
}
|
|
43
|
-
const dataTypeDefinition = dataTypeDefinitionDataValue.value.value;
|
|
44
49
|
const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, name, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
|
|
45
50
|
if (isAbstract) {
|
|
46
51
|
// cannot construct an abstract structure
|
|
@@ -165,6 +170,9 @@ function populateDataTypeManager104(session, dataTypeManager) {
|
|
|
165
170
|
const dataTypeNodeId = r.nodeId;
|
|
166
171
|
try {
|
|
167
172
|
const dataTypeFactory = dataTypeManager.getDataTypeFactory(dataTypeNodeId.namespace);
|
|
173
|
+
if (!dataTypeFactory) {
|
|
174
|
+
throw new Error("cannot find dataType Manager for namespace of " + dataTypeNodeId.toString());
|
|
175
|
+
}
|
|
168
176
|
if (dataTypeNodeId.namespace === 0) {
|
|
169
177
|
// already known I guess
|
|
170
178
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populate_data_type_manager_104.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_104.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iEAAsE;AACtE,uDAAgE;AAEhE,yDAAsE;AAEtE,2DAAiH;AACjH,mEAAqD;
|
|
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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"}
|
|
@@ -3,4 +3,5 @@ import { Variant } from "node-opcua-variant";
|
|
|
3
3
|
export interface PseudoDataValue {
|
|
4
4
|
value: Variant;
|
|
5
5
|
}
|
|
6
|
+
export declare function extractDataValueToPromote(dataValues: PseudoDataValue[]): PseudoDataValue[];
|
|
6
7
|
export declare function promoteOpaqueStructure(session: IBasicSession, dataValues: PseudoDataValue[]): Promise<void>;
|
|
@@ -9,23 +9,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.promoteOpaqueStructure = void 0;
|
|
12
|
+
exports.promoteOpaqueStructure = exports.extractDataValueToPromote = void 0;
|
|
13
13
|
const node_opcua_extension_object_1 = require("node-opcua-extension-object");
|
|
14
14
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
15
15
|
//
|
|
16
16
|
const get_extra_data_type_manager_1 = require("./get_extra_data_type_manager");
|
|
17
17
|
const resolve_dynamic_extension_object_1 = require("./resolve_dynamic_extension_object");
|
|
18
18
|
;
|
|
19
|
+
function extractDataValueToPromote(dataValues) {
|
|
20
|
+
// count number of Opaque Structures
|
|
21
|
+
const dataValuesToFix = dataValues.filter((dataValue) => dataValue.value && dataValue.value.dataType === node_opcua_variant_1.DataType.ExtensionObject &&
|
|
22
|
+
((dataValue.value.arrayType === node_opcua_variant_1.VariantArrayType.Scalar
|
|
23
|
+
&& dataValue.value.value instanceof node_opcua_extension_object_1.OpaqueStructure)
|
|
24
|
+
||
|
|
25
|
+
(dataValue.value.arrayType !== node_opcua_variant_1.VariantArrayType.Scalar
|
|
26
|
+
&& dataValue.value.value && dataValue.value.value.length >= 0
|
|
27
|
+
&& dataValue.value.value[0] instanceof node_opcua_extension_object_1.OpaqueStructure)));
|
|
28
|
+
return dataValuesToFix;
|
|
29
|
+
}
|
|
30
|
+
exports.extractDataValueToPromote = extractDataValueToPromote;
|
|
19
31
|
function promoteOpaqueStructure(session, dataValues) {
|
|
20
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
|
|
22
|
-
const dataValuesToFix = dataValues.filter((dataValue) => dataValue.value && dataValue.value.dataType === node_opcua_variant_1.DataType.ExtensionObject &&
|
|
23
|
-
((dataValue.value.arrayType === node_opcua_variant_1.VariantArrayType.Scalar
|
|
24
|
-
&& dataValue.value.value instanceof node_opcua_extension_object_1.OpaqueStructure)
|
|
25
|
-
||
|
|
26
|
-
(dataValue.value.arrayType !== node_opcua_variant_1.VariantArrayType.Scalar
|
|
27
|
-
&& dataValue.value.value && dataValue.value.value.length >= 0
|
|
28
|
-
&& dataValue.value.value[0] instanceof node_opcua_extension_object_1.OpaqueStructure)));
|
|
33
|
+
const dataValuesToFix = extractDataValueToPromote(dataValues);
|
|
29
34
|
if (dataValuesToFix.length === 0) {
|
|
30
35
|
return;
|
|
31
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promote_opaque_structure.js","sourceRoot":"","sources":["../source/promote_opaque_structure.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAA8D;AAE9D,2DAAyE;AACzE,EAAE;AACF,+EAAwE;AACxE,yFAAmF;AAGhC,CAAC;AAEpD,
|
|
1
|
+
{"version":3,"file":"promote_opaque_structure.js","sourceRoot":"","sources":["../source/promote_opaque_structure.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAA8D;AAE9D,2DAAyE;AACzE,EAAE;AACF,+EAAwE;AACxE,yFAAmF;AAGhC,CAAC;AAEpD,SAAgB,yBAAyB,CAAC,UAA6B;IACnE,oCAAoC;IACpC,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAA0B,EAAE,EAAE,CACrE,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,6BAAQ,CAAC,eAAe;QACxE,CACI,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,qCAAgB,CAAC,MAAM;eAC/C,SAAS,CAAC,KAAK,CAAC,KAAK,YAAY,6CAAe,CAAC;;gBAExD,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,qCAAgB,CAAC,MAAM;uBAC/C,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC;uBAC1D,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,6CAAe,CAAC,CAC9D,CACJ,CAAC;IACF,OAAO,eAAe,CAAC;AAC3B,CAAC;AAdD,8DAcC;AACD,SAAsB,sBAAsB,CACxC,OAAsB,EACtB,UAA6B;;QAE7B,MAAM,eAAe,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;QAC9D,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,OAAO;SACV;QAED,mDAAmD;QACnD,MAAM,oBAAoB,GAAG,MAAM,IAAA,qDAAuB,EAAC,OAAO,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAChC,CAAO,SAA0B,EAAE,EAAE;YACjC,OAAO,MAAM,IAAA,gEAA6B,EAAC,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAC9F,CAAC,CAAA,CAAC,CAAC;QACP,oFAAoF;QACpF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;CAAA;AAlBD,wDAkBC"}
|
|
@@ -43,7 +43,7 @@ function getOrExtractConstructor(session, binaryEncodingNodeId, dataTypeManager)
|
|
|
43
43
|
const r = browseResult.references[0];
|
|
44
44
|
const dataTypeNodeId = r.nodeId;
|
|
45
45
|
if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
|
|
46
|
-
throw new Error("Internal Error: we are not expecting this dataType to be processed already");
|
|
46
|
+
throw new Error("Internal Error: we are not expecting this dataType to be processed already " + dataTypeNodeId.toString());
|
|
47
47
|
}
|
|
48
48
|
yield (0, populate_data_type_manager_104_1.readDataTypeDefinitionAndBuildType)(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, {});
|
|
49
49
|
const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAwD;AACxD,6EAA+E;AAC/E,2DAAyE;AACzE,uDAA4D;AAI5D,iEAAmF;AACnF,mEAAqD;AAGrD,6FAA8F;AAE9F,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,SAAe,uBAAuB,CAClC,OAAsB,EACtB,oBAA4B,EAC5B,eAAqC;;QAErC,MAAM,eAAe,GAAG,eAAe,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAGvG,MAAM,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QACzE,IAAI,WAAW,EAAE;YACb,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,oBAAoB,CAAC,SAAS,KAAK,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,qBAAqB;QACrB,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,MAAM,EAAE,oBAAoB;YAC5B,eAAe,EAAE,aAAa;YAC9B,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,UAAU,EAAE,kCAAU,CAAC,UAAU;SACpC,CAAC,CAAC;QACH,IAAI,YAAY,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,IAAI,YAAY,CAAC,UAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YACvF,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SACpC;QACD,MAAM,CAAC,GAAG,YAAY,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;QAEhC,IAAI,eAAe,CAAC,2BAA2B,CAAC,cAAc,CAAC,EAAE;YAC7D,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAwD;AACxD,6EAA+E;AAC/E,2DAAyE;AACzE,uDAA4D;AAI5D,iEAAmF;AACnF,mEAAqD;AAGrD,6FAA8F;AAE9F,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;AAE/C,SAAe,uBAAuB,CAClC,OAAsB,EACtB,oBAA4B,EAC5B,eAAqC;;QAErC,MAAM,eAAe,GAAG,eAAe,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAGvG,MAAM,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QACzE,IAAI,WAAW,EAAE;YACb,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,oBAAoB,CAAC,SAAS,KAAK,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,qBAAqB;QACrB,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;YACtC,MAAM,EAAE,oBAAoB;YAC5B,eAAe,EAAE,aAAa;YAC9B,eAAe,EAAE,uCAAe,CAAC,OAAO;YACxC,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,qCAAa,CAAC,QAAQ;YACrC,UAAU,EAAE,kCAAU,CAAC,UAAU;SACpC,CAAC,CAAC;QACH,IAAI,YAAY,CAAC,UAAU,KAAK,oCAAW,CAAC,IAAI,IAAI,YAAY,CAAC,UAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YACvF,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SACpC;QACD,MAAM,CAAC,GAAG,YAAY,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;QAEhC,IAAI,eAAe,CAAC,2BAA2B,CAAC,cAAc,CAAC,EAAE;YAC7D,MAAM,IAAI,KAAK,CAAC,6EAA6E,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC9H;QACD,MAAM,IAAA,mEAAkC,EAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,UAAU,CAAC,IAAK,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QAE3G,MAAM,aAAa,GAAI,eAAe,CAAC,2BAA2B,CAAC,cAAc,CAAE,CAAC;QACpF,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;SACpE;QACD,OAAO,aAAa,CAAC,WAAW,CAAC;IACrC,CAAC;CAAA;AAED,SAAsB,uCAAuC,CACzD,OAAsB,EACtB,eAAqC,EACrC,MAAuB;;QAEvB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAK7B,SAAe,2BAA2B,CACtC,OAAgC,EAChC,KAA0B,EAC1B,IAAO,EACP,IAAU;;gBAEV,IAAI,OAAO,YAAY,4BAAO,EAAE;oBAC5B,MAAM,6BAA6B,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;oBACvE,OAAO,OAAO,CAAC;iBAClB;gBACD,IAAI,CAAC,CAAC,OAAO,YAAY,6CAAe,CAAC,EAAE;oBACvC,OAAO,OAAO,CAAC;iBAClB;gBACD,MAAM,OAAO,GAAG,IAAI,4BAAO,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;gBACpF,MAAM,6BAA6B,CAAC,OAAO,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;gBACvE,OAAO,OAAO,CAAC,KAAgB,CAAC;YACpC,CAAC;SAAA;QACD,SAAS,kBAAkB,CAAC,MAAW,EAAE,KAA0B,EAAE,IAAO,EAAE,IAAU;YACnF,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAK,CAAC,KAAK,CAAC,YAAY,EAAE;gBACtD,OAAO;aACX;YACD,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAK,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE;gBAC9D,OAAO;aACV;YACD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,CAAC,EAAE;gBACJ,OAAO;aACV;YACD,IAAI,KAAK,CAAC,OAAO,EAAE;gBACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACf,QAAQ,CAAC,IAAI,CACT,CAAC,GAAS,EAAE;wBACR,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,2BAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBACnE,CAAC,CAAA,CAAC,EAAE,CACP,CAAC;iBACL;aACJ;iBAAM;gBACH,QAAQ,CAAC,IAAI,CACT,CAAC,GAAS,EAAE;oBACR,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,2BAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACjF,CAAC,CAAA,CAAC,EAAE,CACP,CAAC;aACL;QACL,CAAC;QACD,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,MAAM,CAAC,gBAAgB,CAAI,kBAAkB,EAAE,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC9E,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CAAA;AA3DD,0FA2DC;AAED,mIAAmI;AACnI,yDAAyD;AAEzD,2CAA2C;AAC3C,oEAAoE;AACpE,oCAAoC;AACpC,+CAA+C;AAC/C,sDAAsD;AACtD,yCAAyC;AACzC,uDAAuD;AACvD,gEAAgE;AAChE,8CAA8C;AAC9C,oEAAoE;AACpE,YAAY;AACZ,4EAA4E;AAC5E,iEAAiE;AACjE,2FAA2F;AAC3F,YAAY;AACZ,QAAQ;AACR,IAAI;AACJ,SAAe,8BAA8B,CACzC,OAAsB,EACtB,MAAuB,EACvB,eAAqC;;;QAErC,IAAI;YACA,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,IAAI,uCAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI;gBACA,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACtB,MAAM,uCAAuC,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;gBAChF,OAAO,MAAM,CAAC;aACjB;YAAC,OAAO,GAAG,EAAE;gBACV,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;gBAC/C,UAAU,CAAC,oBAAoB,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,QAAQ,EAAE,CAAC,CAAC;gBAC7D,UAAU,CAAC,oBAAoB,EAAE,IAAA,0BAAO,EAAC,MAAM,CAAC,MAAM,EAAC,GAAG,EAAC,GAAG,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,IAAA,0BAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBACnC,UAAU,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;gBACzD,0BAA0B;gBAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACtB,OAAO,MAAM,CAAC;aACjB;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACvB,UAAU,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3D,UAAU,CAAC,oBAAoB,EAAE,IAAI,GAAG,IAAA,0BAAO,EAAC,MAAM,CAAC,MAAM,EAAC,GAAG,EAAC,GAAG,CAAC,CAAC,CAAC;YACxE,UAAU,CAAC,IAAA,0BAAO,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YACnC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvC,MAAM,GAAG,CAAC;SACb;;CACJ;AAED,SAAsB,6BAA6B,CAC/C,OAAsB,EACtB,OAAgB,EAChB,eAAqC;;QAErC,IAAI,OAAO,CAAC,QAAQ,KAAK,6BAAQ,CAAC,eAAe,EAAE;YAC/C,OAAO;SACV;QACD,IAAI,OAAO,CAAC,SAAS,KAAK,qCAAgB,CAAC,MAAM,EAAE;YAC/C,IAAI,OAAO,CAAC,KAAK,YAAY,KAAK,EAAE;gBAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC3C,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,6CAAe,EAAE;wBAC7C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;qBACvG;iBACJ;aACJ;YACD,OAAO;SACV;QAED,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,YAAY,6CAAe,CAAC,EAAE;YAC7C,OAAO;SACV;QACD,OAAO,CAAC,KAAK,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAClG,CAAC;CAAA;AAvBD,sEAuBC"}
|
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.82.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,20 +12,21 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"chalk": "4.1.2",
|
|
14
14
|
"node-opcua-assert": "2.77.0",
|
|
15
|
-
"node-opcua-binary-stream": "2.
|
|
16
|
-
"node-opcua-
|
|
17
|
-
"node-opcua-data-
|
|
18
|
-
"node-opcua-
|
|
19
|
-
"node-opcua-
|
|
20
|
-
"node-opcua-
|
|
21
|
-
"node-opcua-
|
|
22
|
-
"node-opcua-
|
|
23
|
-
"node-opcua-
|
|
24
|
-
"node-opcua-
|
|
25
|
-
"node-opcua-service-
|
|
26
|
-
"node-opcua-
|
|
27
|
-
"node-opcua-
|
|
28
|
-
"node-opcua-
|
|
15
|
+
"node-opcua-binary-stream": "2.82.0",
|
|
16
|
+
"node-opcua-constants": "2.77.0",
|
|
17
|
+
"node-opcua-data-model": "2.82.0",
|
|
18
|
+
"node-opcua-data-value": "2.82.0",
|
|
19
|
+
"node-opcua-debug": "2.82.0",
|
|
20
|
+
"node-opcua-extension-object": "2.82.0",
|
|
21
|
+
"node-opcua-factory": "2.82.0",
|
|
22
|
+
"node-opcua-nodeid": "2.82.0",
|
|
23
|
+
"node-opcua-pseudo-session": "2.82.0",
|
|
24
|
+
"node-opcua-schemas": "2.82.0",
|
|
25
|
+
"node-opcua-service-browse": "2.82.0",
|
|
26
|
+
"node-opcua-service-translate-browse-path": "2.82.0",
|
|
27
|
+
"node-opcua-status-code": "2.82.0",
|
|
28
|
+
"node-opcua-types": "2.82.0",
|
|
29
|
+
"node-opcua-variant": "2.82.0"
|
|
29
30
|
},
|
|
30
31
|
"author": "Etienne Rossignon",
|
|
31
32
|
"license": "MIT",
|
|
@@ -42,5 +43,5 @@
|
|
|
42
43
|
"internet of things"
|
|
43
44
|
],
|
|
44
45
|
"homepage": "http://node-opcua.github.io/",
|
|
45
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "2f66e1fe69c825305f94b15ca17cff066aa37496"
|
|
46
47
|
}
|
|
@@ -2,6 +2,8 @@ import { assert } from "node-opcua-assert";
|
|
|
2
2
|
import { AttributeIds, BrowseDirection, makeResultMask, NodeClassMask } from "node-opcua-data-model";
|
|
3
3
|
import { DataValue } from "node-opcua-data-value";
|
|
4
4
|
import { make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
|
|
5
|
+
import { sameNodeId } from "node-opcua-nodeid";
|
|
6
|
+
//import { DataTypeIds } from "node-opcua-constant";
|
|
5
7
|
import {
|
|
6
8
|
BitField,
|
|
7
9
|
ConstructorFuncWithSchema,
|
|
@@ -443,8 +445,14 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
|
|
|
443
445
|
fields.push(field);
|
|
444
446
|
}
|
|
445
447
|
}
|
|
448
|
+
/// some server may provide definition.baseDataType to be i=22 (ExtensionObject)
|
|
449
|
+
/// instead of 12756 Union;
|
|
450
|
+
if (isUnion && sameNodeId(definition.baseDataType, coerceNodeId("i=22"))) {
|
|
451
|
+
definition.baseDataType = resolveNodeId("i=1276"); // aka DataTypeIds.Union
|
|
452
|
+
}
|
|
453
|
+
|
|
446
454
|
const a = await resolveFieldType(session, definition.baseDataType, dataTypeFactory, cache);
|
|
447
|
-
const baseType = a ? a.fieldTypeName : "ExtensionObject";
|
|
455
|
+
const baseType = a ? a.fieldTypeName : isUnion ? "Union" : "ExtensionObject";
|
|
448
456
|
|
|
449
457
|
const os = new StructuredTypeSchema({
|
|
450
458
|
baseType,
|
|
@@ -483,8 +491,10 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
|
|
|
483
491
|
switchValue += 1;
|
|
484
492
|
}
|
|
485
493
|
|
|
486
|
-
|
|
487
|
-
|
|
494
|
+
// (fieldD.valueRank === -1 || fieldD.valueRank === 1 || fieldD.valueRank === 0);
|
|
495
|
+
|
|
496
|
+
if (fieldD.valueRank >= 1) {
|
|
497
|
+
field.valueRank = fieldD.valueRank;
|
|
488
498
|
field.isArray = true;
|
|
489
499
|
} else {
|
|
490
500
|
field.isArray = false;
|
|
@@ -48,7 +48,7 @@ export class ExtraDataTypeManager {
|
|
|
48
48
|
public getExtensionObjectConstructorFromDataType(dataTypeNodeId: NodeId): AnyConstructorFunc {
|
|
49
49
|
const dataTypeFactory = this.getDataTypeFactory(dataTypeNodeId.namespace);
|
|
50
50
|
if (!dataTypeFactory) {
|
|
51
|
-
throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace);
|
|
51
|
+
throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace + " when requested for " + dataTypeNodeId.toString());
|
|
52
52
|
}
|
|
53
53
|
// find schema corresponding to dataTypeNodeId in typeDictionary
|
|
54
54
|
const Constructor = dataTypeFactory.findStructureInfoForDataType(dataTypeNodeId).constructor;
|
|
@@ -1,10 +1,87 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { findLastKey } from "lodash";
|
|
2
|
+
import { AttributeIds, BrowseDirection, NodeClassMask } from "node-opcua-data-model";
|
|
3
|
+
import { coerceNodeId, resolveNodeId } from "node-opcua-nodeid";
|
|
4
|
+
import { IBasicSession, browseAll } from "node-opcua-pseudo-session";
|
|
5
|
+
import { DataTypeIds } from "node-opcua-constants";
|
|
6
|
+
|
|
7
|
+
import { StatusCodes } from "node-opcua-status-code";
|
|
8
|
+
import { DataType } from "node-opcua-variant";
|
|
9
|
+
import { ReferenceDescription } from "node-opcua-types";
|
|
2
10
|
//
|
|
3
11
|
import { ExtraDataTypeManager } from "./extra_data_type_manager";
|
|
4
12
|
import { populateDataTypeManager103 } from "./private/populate_data_type_manager_103";
|
|
5
13
|
import { populateDataTypeManager104 } from "./private/populate_data_type_manager_104";
|
|
6
14
|
|
|
7
|
-
|
|
15
|
+
async function serverImplementsDataTypeDefinition(session: IBasicSession): Promise<boolean> {
|
|
16
|
+
// check if server provides DataTypeDefinition => in this case this is the prefered route,
|
|
17
|
+
// as we go along, more and more servers will implement this.
|
|
18
|
+
const browseResult = await browseAll(session, {
|
|
19
|
+
browseDirection: BrowseDirection.Forward,
|
|
20
|
+
includeSubtypes: true,
|
|
21
|
+
nodeClassMask: NodeClassMask.DataType,
|
|
22
|
+
nodeId: resolveNodeId(DataType.ExtensionObject),
|
|
23
|
+
referenceTypeId: "HasSubtype",
|
|
24
|
+
resultMask: 63
|
|
25
|
+
});
|
|
26
|
+
const browseResult2 = await browseAll(session, {
|
|
27
|
+
browseDirection: BrowseDirection.Forward,
|
|
28
|
+
includeSubtypes: true,
|
|
29
|
+
nodeClassMask: NodeClassMask.DataType,
|
|
30
|
+
nodeId: resolveNodeId(DataTypeIds.Union),
|
|
31
|
+
referenceTypeId: "HasSubtype",
|
|
32
|
+
resultMask: 63
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
let references: ReferenceDescription[] = [];
|
|
36
|
+
if (browseResult && browseResult.references) references = references.concat(browseResult.references);
|
|
37
|
+
if (browseResult2 && browseResult2.references) references = references.concat(browseResult2.references);
|
|
38
|
+
|
|
39
|
+
if (references.length === 0) return false;
|
|
40
|
+
|
|
41
|
+
// DataType Structure from namespace 0 are not interesting and will not provide DataTypeDefinition attribute anyway
|
|
42
|
+
// on some servers.
|
|
43
|
+
references = references.filter((a, index) => a.nodeId.namespace !== 0);
|
|
44
|
+
if (references.length === 0) return false;
|
|
45
|
+
|
|
46
|
+
let nodesToRead = references.map((r) => ({
|
|
47
|
+
nodeId: r.nodeId,
|
|
48
|
+
attributeId: AttributeIds.DataTypeDefinition
|
|
49
|
+
}));
|
|
50
|
+
|
|
51
|
+
const nodesToRead2 = nodesToRead.map((r) => ({ nodeId: r.nodeId, attributeId: AttributeIds.IsAbstract }));
|
|
52
|
+
const abstractFlags: boolean[] = (await session.read(nodesToRead2)).map((d) => d.value.value);
|
|
53
|
+
|
|
54
|
+
// also remove the abstract dataStructure => they don't provide valid DataTypeDefinition
|
|
55
|
+
nodesToRead = nodesToRead.filter((_nodesToRead, index) => !abstractFlags[index]);
|
|
56
|
+
if (nodesToRead.length === 0) return false;
|
|
57
|
+
|
|
58
|
+
const dataValues = await session.read(nodesToRead);
|
|
59
|
+
|
|
60
|
+
// for (let i = 0; i < dataValues.length; i++) {
|
|
61
|
+
// console.log(i, " | ", nodesToRead[i].nodeId.toString().padEnd(40), references[i].browseName.toString().padEnd(50), dataValues[i].statusCode.toString());
|
|
62
|
+
// }
|
|
63
|
+
|
|
64
|
+
const countOK = dataValues.reduce((prev, a) => prev + (a.statusCode === StatusCodes.Good ? 1 : 0), 0);
|
|
65
|
+
if (countOK === dataValues.length) {
|
|
66
|
+
return true;
|
|
67
|
+
// await populateDataTypeManager104(session, dataTypeManager);
|
|
68
|
+
// return;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export async function populateDataTypeManager(
|
|
75
|
+
session: IBasicSession,
|
|
76
|
+
dataTypeManager: ExtraDataTypeManager,
|
|
77
|
+
force: boolean
|
|
78
|
+
): Promise<void> {
|
|
79
|
+
const force104 = await serverImplementsDataTypeDefinition(session);
|
|
80
|
+
if (force104) {
|
|
81
|
+
// console.log("xxxxxxx! using 1.04");
|
|
82
|
+
await populateDataTypeManager104(session, dataTypeManager);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
8
85
|
// old way for 1.03 and early 1.04 prototype
|
|
9
86
|
await populateDataTypeManager103(session, dataTypeManager);
|
|
10
87
|
// new way for 1.04 and later
|
|
@@ -6,7 +6,7 @@ import { NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
|
|
|
6
6
|
import { IBasicSession, BrowseDescriptionLike } from "node-opcua-pseudo-session";
|
|
7
7
|
import { createDynamicObjectConstructor as createDynamicObjectConstructorAndRegister } from "node-opcua-schemas";
|
|
8
8
|
import { StatusCodes } from "node-opcua-status-code";
|
|
9
|
-
import { ReferenceDescription, BrowseResult, BrowseDescriptionOptions } from "node-opcua-types";
|
|
9
|
+
import { ReferenceDescription, BrowseResult, BrowseDescriptionOptions, StructureDefinition, DataTypeDefinition } from "node-opcua-types";
|
|
10
10
|
|
|
11
11
|
//
|
|
12
12
|
import { ExtraDataTypeManager } from "../extra_data_type_manager";
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
CacheForFieldResolution,
|
|
15
15
|
convertDataTypeDefinitionToStructureTypeSchema
|
|
16
16
|
} from "../convert_data_type_definition_to_structuretype_schema";
|
|
17
|
+
|
|
17
18
|
const errorLog = make_errorLog(__filename);
|
|
18
19
|
const debugLog = make_debugLog(__filename);
|
|
19
20
|
|
|
@@ -41,12 +42,16 @@ export async function readDataTypeDefinitionAndBuildType(
|
|
|
41
42
|
}
|
|
42
43
|
const isAbstract = isAbstractDataValue.value.value as boolean;
|
|
43
44
|
|
|
45
|
+
let dataTypeDefinition: DataTypeDefinition = dataTypeDefinitionDataValue.value.value as DataTypeDefinition;
|
|
44
46
|
/* istanbul ignore next */
|
|
45
47
|
if (dataTypeDefinitionDataValue.statusCode !== StatusCodes.Good) {
|
|
46
|
-
|
|
48
|
+
if (!isAbstract) {
|
|
49
|
+
throw new Error(" Cannot find dataType Definition ! with nodeId =" + dataTypeNodeId.toString());
|
|
50
|
+
}
|
|
51
|
+
// it is OK to not have dataTypeDefinition for Abstract type!
|
|
52
|
+
dataTypeDefinition = new StructureDefinition();
|
|
47
53
|
}
|
|
48
|
-
|
|
49
|
-
|
|
54
|
+
|
|
50
55
|
const schema = await convertDataTypeDefinitionToStructureTypeSchema(
|
|
51
56
|
session,
|
|
52
57
|
dataTypeNodeId,
|
|
@@ -177,10 +182,14 @@ export async function populateDataTypeManager104(session: IBasicSession, dataTyp
|
|
|
177
182
|
const dataTypeNodeId = r.nodeId;
|
|
178
183
|
try {
|
|
179
184
|
const dataTypeFactory = dataTypeManager.getDataTypeFactory(dataTypeNodeId.namespace);
|
|
185
|
+
if(!dataTypeFactory) {
|
|
186
|
+
throw new Error("cannot find dataType Manager for namespace of " + dataTypeNodeId.toString());
|
|
187
|
+
}
|
|
180
188
|
if (dataTypeNodeId.namespace === 0) {
|
|
181
189
|
// already known I guess
|
|
182
190
|
return;
|
|
183
191
|
}
|
|
192
|
+
|
|
184
193
|
// if not found already
|
|
185
194
|
if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
|
|
186
195
|
// already known !
|
|
@@ -8,11 +8,7 @@ import { resolveDynamicExtensionObject } from "./resolve_dynamic_extension_objec
|
|
|
8
8
|
|
|
9
9
|
export interface PseudoDataValue { value: Variant };
|
|
10
10
|
|
|
11
|
-
export
|
|
12
|
-
session: IBasicSession,
|
|
13
|
-
dataValues: PseudoDataValue[]
|
|
14
|
-
) {
|
|
15
|
-
|
|
11
|
+
export function extractDataValueToPromote(dataValues: PseudoDataValue[]): PseudoDataValue[] {
|
|
16
12
|
// count number of Opaque Structures
|
|
17
13
|
const dataValuesToFix = dataValues.filter((dataValue: PseudoDataValue) =>
|
|
18
14
|
dataValue.value && dataValue.value.dataType === DataType.ExtensionObject &&
|
|
@@ -25,7 +21,13 @@ export async function promoteOpaqueStructure(
|
|
|
25
21
|
&& dataValue.value.value[0] instanceof OpaqueStructure)
|
|
26
22
|
)
|
|
27
23
|
);
|
|
28
|
-
|
|
24
|
+
return dataValuesToFix;
|
|
25
|
+
}
|
|
26
|
+
export async function promoteOpaqueStructure(
|
|
27
|
+
session: IBasicSession,
|
|
28
|
+
dataValues: PseudoDataValue[]
|
|
29
|
+
) {
|
|
30
|
+
const dataValuesToFix = extractDataValueToPromote(dataValues);
|
|
29
31
|
if (dataValuesToFix.length === 0) {
|
|
30
32
|
return;
|
|
31
33
|
}
|
|
@@ -44,7 +44,7 @@ async function getOrExtractConstructor(
|
|
|
44
44
|
const dataTypeNodeId = r.nodeId;
|
|
45
45
|
|
|
46
46
|
if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
|
|
47
|
-
throw new Error("Internal Error: we are not expecting this dataType to be processed already");
|
|
47
|
+
throw new Error("Internal Error: we are not expecting this dataType to be processed already " + dataTypeNodeId.toString());
|
|
48
48
|
}
|
|
49
49
|
await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name!, dataTypeFactory, {});
|
|
50
50
|
|