node-opcua-client-dynamic-extension-object 2.76.2 → 2.77.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.
Files changed (21) hide show
  1. package/dist/convert_data_type_definition_to_structuretype_schema.d.ts +3 -3
  2. package/dist/convert_data_type_definition_to_structuretype_schema.js +15 -11
  3. package/dist/convert_data_type_definition_to_structuretype_schema.js.map +1 -1
  4. package/dist/extra_data_type_manager.js +4 -1
  5. package/dist/extra_data_type_manager.js.map +1 -1
  6. package/dist/get_extension_object_constructor.js +3 -3
  7. package/dist/get_extension_object_constructor.js.map +1 -1
  8. package/dist/private/populate_data_type_manager_103.js +14 -6
  9. package/dist/private/populate_data_type_manager_103.js.map +1 -1
  10. package/dist/private/populate_data_type_manager_104.js +24 -9
  11. package/dist/private/populate_data_type_manager_104.js.map +1 -1
  12. package/dist/resolve_dynamic_extension_object.d.ts +2 -0
  13. package/dist/resolve_dynamic_extension_object.js +79 -6
  14. package/dist/resolve_dynamic_extension_object.js.map +1 -1
  15. package/package.json +18 -18
  16. package/source/convert_data_type_definition_to_structuretype_schema.ts +27 -15
  17. package/source/extra_data_type_manager.ts +4 -1
  18. package/source/get_extension_object_constructor.ts +3 -3
  19. package/source/private/populate_data_type_manager_103.ts +18 -7
  20. package/source/private/populate_data_type_manager_104.ts +26 -10
  21. package/source/resolve_dynamic_extension_object.ts +94 -6
package/dist/convert_data_type_definition_to_structuretype_schema.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { DataTypeFactory, FieldCategory, StructuredTypeSchema, TypeDefinition } from "node-opcua-factory";
1
+ import { DataTypeFactory, FieldCategory, IStructuredTypeSchema, TypeDefinition } from "node-opcua-factory";
2
2
  import { NodeId } from "node-opcua-nodeid";
3
3
  import { IBasicSession } from "node-opcua-pseudo-session";
4
4
  import { DataTypeDefinition } from "node-opcua-types";
@@ -9,6 +9,6 @@ export interface CacheForFieldResolution {
9
9
  allowSubType?: boolean;
10
10
  dataType?: NodeId;
11
11
  }
12
- export declare function convertDataTypeDefinitionToStructureTypeSchema(session: IBasicSession, dataTypeNodeId: NodeId, name: string, definition: DataTypeDefinition, dataTypeFactory: DataTypeFactory, cache: {
12
+ export declare function convertDataTypeDefinitionToStructureTypeSchema(session: IBasicSession, dataTypeNodeId: NodeId, name: string, definition: DataTypeDefinition, dataTypeFactory: DataTypeFactory, isAbstract: boolean, cache: {
13
13
  [key: string]: CacheForFieldResolution;
14
- }): Promise<StructuredTypeSchema>;
14
+ }): Promise<IStructuredTypeSchema>;
package/dist/convert_data_type_definition_to_structuretype_schema.js CHANGED
@@ -162,7 +162,8 @@ function resolve2(session, dataTypeNodeId, dataTypeFactory, fieldTypeName, cache
162
162
  }
163
163
  }
164
164
  else {
165
- schema = yield convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, fieldTypeName, definition, dataTypeFactory, cache);
165
+ const isAbstract = false;
166
+ schema = yield convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, fieldTypeName, definition, dataTypeFactory, isAbstract, cache);
166
167
  }
167
168
  // xx const schema1 = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
168
169
  }
@@ -246,7 +247,7 @@ function resolveFieldType(session, dataTypeNodeId, dataTypeFactory, cache) {
246
247
  }
247
248
  let schema;
248
249
  let category = node_opcua_factory_1.FieldCategory.enumeration;
249
- if (dataTypeFactory.hasStructuredType(fieldTypeName)) {
250
+ if (dataTypeFactory.hasStructureByTypeName(fieldTypeName)) {
250
251
  schema = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
251
252
  category = node_opcua_factory_1.FieldCategory.complex;
252
253
  }
@@ -282,7 +283,6 @@ function _setupEncodings(session, dataTypeNodeId, schema) {
282
283
  // read abstract flag
283
284
  const isAbstractDV = yield session.read({ nodeId: dataTypeNodeId, attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract });
284
285
  schema.dataTypeNodeId = dataTypeNodeId;
285
- schema.id = dataTypeNodeId;
286
286
  if (isAbstractDV.statusCode === node_opcua_status_code_1.StatusCodes.Good && isAbstractDV.value.value === false) {
287
287
  const encodings = yield (0, find_encodings_1._findEncodings)(session, dataTypeNodeId);
288
288
  schema.encodingDefaultBinary = (0, node_opcua_nodeid_1.makeExpandedNodeId)(encodings.binaryEncodingNodeId);
@@ -293,16 +293,20 @@ function _setupEncodings(session, dataTypeNodeId, schema) {
293
293
  });
294
294
  }
295
295
  // eslint-disable-next-line max-statements
296
- function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, name, definition, dataTypeFactory, cache) {
297
- var _a;
296
+ function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId, name, definition, dataTypeFactory, isAbstract, cache) {
298
297
  return __awaiter(this, void 0, void 0, function* () {
299
298
  if (definition instanceof node_opcua_types_1.StructureDefinition) {
300
299
  let fieldCountToIgnore = 0;
301
- let base = (_a = dataTypeFactory.getConstructorForDataType(definition.baseDataType)) === null || _a === void 0 ? void 0 : _a.schema;
302
- while (base && !(base.dataTypeNodeId.value === node_opcua_variant_1.DataType.ExtensionObject && base.dataTypeNodeId.namespace === 0)) {
303
- fieldCountToIgnore += base._possibleFields.length;
304
- base = base._baseSchema;
300
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(definition.baseDataType);
301
+ const baseSchema = structureInfo === null || structureInfo === void 0 ? void 0 : structureInfo.schema;
302
+ if (baseSchema) {
303
+ const possibleFields = (0, node_opcua_factory_1.extractAllPossibleFields)(baseSchema);
304
+ fieldCountToIgnore += possibleFields.length;
305
305
  }
306
+ // while (base && !(base.dataTypeNodeId.value === DataType.ExtensionObject && base.dataTypeNodeId.namespace === 0)) {
307
+ // fieldCountToIgnore += base..length;
308
+ // base = base.getBaseSchema();
309
+ // }
306
310
  const fields = [];
307
311
  const isUnion = definition.structureType === node_opcua_types_1.StructureType.Union;
308
312
  switch (definition.structureType) {
@@ -360,8 +364,8 @@ function convertDataTypeDefinitionToStructureTypeSchema(session, dataTypeNodeId,
360
364
  baseType,
361
365
  bitFields,
362
366
  fields,
363
- id: 0,
364
- name
367
+ name,
368
+ dataTypeFactory
365
369
  });
366
370
  const structuredTypeSchema = yield _setupEncodings(session, dataTypeNodeId, os);
367
371
  postActions.forEach((action) => action(structuredTypeSchema));
package/dist/convert_data_type_definition_to_structuretype_schema.js.map CHANGED
@@ -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":"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"}
package/dist/extra_data_type_manager.js CHANGED
@@ -43,7 +43,10 @@ class ExtraDataTypeManager {
43
43
  throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace);
44
44
  }
45
45
  // find schema corresponding to dataTypeNodeId in typeDictionary
46
- const Constructor = dataTypeFactory.findConstructorForDataType(dataTypeNodeId);
46
+ const Constructor = dataTypeFactory.findStructureInfoForDataType(dataTypeNodeId).constructor;
47
+ if (!Constructor) {
48
+ throw new Error("Cannot find Extension Object Constructor for Abstract dataType");
49
+ }
47
50
  return Constructor;
48
51
  }
49
52
  getExtensionObjectConstructorFromBinaryEncoding(binaryEncodingNodeId) {
package/dist/extra_data_type_manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extra_data_type_manager.js","sourceRoot":"","sources":["../source/extra_data_type_manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extra_data_type_manager.js","sourceRoot":"","sources":["../source/extra_data_type_manager.ts"],"names":[],"mappings":"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"}
package/dist/get_extension_object_constructor.js CHANGED
@@ -21,9 +21,9 @@ function getExtensionObjectConstructor(session, dataTypeNodeId) {
21
21
  return __awaiter(this, void 0, void 0, function* () {
22
22
  const extraDataTypeManager = yield (0, get_extra_data_type_manager_1.getExtraDataTypeManager)(session);
23
23
  const dataTypeFactory = extraDataTypeManager.getDataTypeFactory(dataTypeNodeId.namespace);
24
- const Constructor = dataTypeFactory.getConstructorForDataType(dataTypeNodeId);
25
- if (Constructor) {
26
- return Constructor;
24
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId);
25
+ if (structureInfo) {
26
+ return structureInfo.constructor;
27
27
  }
28
28
  const dataValue = yield session.read({
29
29
  nodeId: dataTypeNodeId,
package/dist/get_extension_object_constructor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get_extension_object_constructor.js","sourceRoot":"","sources":["../source/get_extension_object_constructor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAAoE;AAIpE,EAAE;AACF,+EAAwE;AACxE,6FAA8F;AAE9F;;GAEG;AACH,SAAsB,6BAA6B,CAAC,OAAsB,EAAE,cAAsB;;QAC9F,MAAM,oBAAoB,GAAG,MAAM,IAAA,qDAAuB,EAAC,OAAO,CAAC,CAAC;QAEpE,MAAM,eAAe,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1F,MAAM,WAAW,GAAG,eAAe,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;QAC9E,IAAI,WAAW,EAAE;YACb,OAAO,WAA4C,CAAC;SACvD;QACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACjC,MAAM,EAAE,cAAc;YACtB,WAAW,EAAE,oCAAY,CAAC,UAAU;SACvC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,KAAsB,CAAC;QAC1D,MAAM,IAAA,mEAAkC,EAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,IAAK,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QAEzG,OAAO,MAAM,oBAAoB,CAAC,yCAAyC,CAAC,cAAc,CAAC,CAAC;IAChG,CAAC;CAAA;AAhBD,sEAgBC"}
1
+ {"version":3,"file":"get_extension_object_constructor.js","sourceRoot":"","sources":["../source/get_extension_object_constructor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAAoE;AAIpE,EAAE;AACF,+EAAwE;AACxE,6FAA8F;AAE9F;;GAEG;AACH,SAAsB,6BAA6B,CAAC,OAAsB,EAAE,cAAsB;;QAC9F,MAAM,oBAAoB,GAAG,MAAM,IAAA,qDAAuB,EAAC,OAAO,CAAC,CAAC;QAEpE,MAAM,eAAe,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,eAAe,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;QAClF,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC,WAA4C,CAAC;SACrE;QACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACjC,MAAM,EAAE,cAAc;YACtB,WAAW,EAAE,oCAAY,CAAC,UAAU;SACvC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,KAAsB,CAAC;QAC1D,MAAM,IAAA,mEAAkC,EAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,IAAK,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QAEzG,OAAO,MAAM,oBAAoB,CAAC,yCAAyC,CAAC,cAAc,CAAC,CAAC;IAChG,CAAC;CAAA;AAhBD,sEAgBC"}
package/dist/private/populate_data_type_manager_103.js CHANGED
@@ -119,8 +119,13 @@ function _enrichWithDescriptionOf(session, dataTypeDescriptions) {
119
119
  for (const result3 of results3) {
120
120
  const dataTypeDescription = dataTypeDescriptions[i++];
121
121
  result3.references = result3.references || [];
122
+ if (result3.references.length === 0) {
123
+ // may be the dataType is abstract and as no need for DescriptionOF
124
+ continue;
125
+ }
122
126
  if (result3.references.length !== 1) {
123
127
  warningLog("_enrichWithDescriptionOf : expecting 1 reference for ", dataTypeDescription.browseName.toString());
128
+ warningLog(result3.toString());
124
129
  continue;
125
130
  }
126
131
  for (const ref of result3.references) {
@@ -220,7 +225,7 @@ function _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNod
220
225
  const dataTypeDefinition = dataValue.value.value;
221
226
  if (dataTypeDefinition && dataTypeDefinition instanceof node_opcua_types_1.StructureDefinition) {
222
227
  const className = dataTypeDescription.browseName.name;
223
- dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition });
228
+ dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract: false });
224
229
  }
225
230
  }
226
231
  else {
@@ -233,17 +238,17 @@ function _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNod
233
238
  if (doDebug) {
234
239
  debugLog("order ", dataTypeDefinitionsSorted.map((a) => a.className + " " + a.dataTypeNodeId).join(" -> "));
235
240
  }
236
- for (const { className, dataTypeNodeId, dataTypeDefinition } of dataTypeDefinitionsSorted) {
241
+ for (const { className, dataTypeNodeId, dataTypeDefinition, isAbstract } of dataTypeDefinitionsSorted) {
237
242
  // istanbul ignore next
238
243
  if (doDebug) {
239
244
  debugLog(chalk.yellow("--------------------------------------- "), className, dataTypeNodeId.toString());
240
245
  }
241
- if (dataTypeFactory.hasStructuredType(className)) {
246
+ if (dataTypeFactory.hasStructureByTypeName(className)) {
242
247
  continue; // this structure has already been seen
243
248
  }
244
249
  // now fill typeDictionary
245
250
  try {
246
- const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, className, dataTypeDefinition, dataTypeFactory, cache);
251
+ const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, className, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
247
252
  // istanbul ignore next
248
253
  if (doDebug) {
249
254
  debugLog(chalk.red("Registering "), chalk.cyan(className.padEnd(30, " ")), schema.dataTypeNodeId.toString());
@@ -358,9 +363,12 @@ function _exploreDataTypeDefinition(session, dataTypeDictionaryTypeNode, dataTyp
358
363
  }
359
364
  // let's verify that constructor is operational
360
365
  try {
361
- const constructor = dataTypeFactory.getStructureTypeConstructor(name);
366
+ const Constructor = dataTypeFactory.getStructureInfoByTypeName(name).constructor;
367
+ if (!Constructor) {
368
+ throw new Error(`Cannot instantiate abstract DataType(name=${name})`);
369
+ }
362
370
  // xx const constructor = getOrCreateConstructor(name, dataTypeFactory, defaultBinary);
363
- const testObject = new constructor();
371
+ const testObject = new Constructor();
364
372
  debugLog(testObject.toString());
365
373
  }
366
374
  catch (err) {
package/dist/private/populate_data_type_manager_103.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"populate_data_type_manager_103.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_103.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"populate_data_type_manager_103.js","sourceRoot":"","sources":["../../source/private/populate_data_type_manager_103.ts"],"names":[],"mappings":"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"}
package/dist/private/populate_data_type_manager_104.js CHANGED
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.populateDataTypeManager104 = exports.readDataTypeDefinitionAndBuildType = 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
15
  const node_opcua_nodeid_1 = require("node-opcua-nodeid");
@@ -22,17 +21,34 @@ const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
22
21
  function readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, name, dataTypeFactory, cache) {
23
22
  return __awaiter(this, void 0, void 0, function* () {
24
23
  try {
25
- const dataTypeDefinitionDataValue = yield session.read({
26
- attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition,
27
- nodeId: dataTypeNodeId
28
- });
24
+ const [isAbstractDataValue, dataTypeDefinitionDataValue] = yield session.read([
25
+ {
26
+ attributeId: node_opcua_data_model_1.AttributeIds.IsAbstract,
27
+ nodeId: dataTypeNodeId
28
+ },
29
+ {
30
+ attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition,
31
+ nodeId: dataTypeNodeId
32
+ }
33
+ ]);
34
+ /* istanbul ignore next */
35
+ if (isAbstractDataValue.statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
36
+ throw new Error(" Cannot find dataType isAbstract ! with nodeId =" + dataTypeNodeId.toString());
37
+ }
38
+ const isAbstract = isAbstractDataValue.value.value;
29
39
  /* istanbul ignore next */
30
40
  if (dataTypeDefinitionDataValue.statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
31
41
  throw new Error(" Cannot find dataType Definition ! with nodeId =" + dataTypeNodeId.toString());
32
42
  }
33
43
  const dataTypeDefinition = dataTypeDefinitionDataValue.value.value;
34
- const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, name, dataTypeDefinition, dataTypeFactory, cache);
35
- (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
44
+ const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, name, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
45
+ if (isAbstract) {
46
+ // cannot construct an abstract structure
47
+ dataTypeFactory.registerAbstractStructure(dataTypeNodeId, name, schema);
48
+ }
49
+ else {
50
+ const Constructor = (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
51
+ }
36
52
  }
37
53
  catch (err) {
38
54
  errorLog("Error", err);
@@ -154,14 +170,13 @@ function populateDataTypeManager104(session, dataTypeManager) {
154
170
  return;
155
171
  }
156
172
  // if not found already
157
- if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
173
+ if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
158
174
  // already known !
159
175
  return;
160
176
  }
161
177
  // extract it formally
162
178
  debugLog(" DataType => ", r.browseName.toString(), dataTypeNodeId.toString());
163
179
  yield readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, cache);
164
- (0, node_opcua_assert_1.assert)(dataTypeFactory.getConstructorForDataType(dataTypeNodeId));
165
180
  }
166
181
  catch (err) {
167
182
  errorLog("err=", err);
package/dist/private/populate_data_type_manager_104.js.map CHANGED
@@ -1 +1 @@
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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"}
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/dist/resolve_dynamic_extension_object.d.ts CHANGED
@@ -1,4 +1,6 @@
1
+ import { ExtensionObject } from "node-opcua-extension-object";
1
2
  import { Variant } from "node-opcua-variant";
2
3
  import { IBasicSession } from "node-opcua-pseudo-session";
3
4
  import { ExtraDataTypeManager } from "./extra_data_type_manager";
5
+ export declare function resolveOpaqueStructureInExtentionObject(session: IBasicSession, dataTypeManager: ExtraDataTypeManager, object: ExtensionObject): Promise<void>;
4
6
  export declare function resolveDynamicExtensionObject(session: IBasicSession, variant: Variant, dataTypeManager: ExtraDataTypeManager): Promise<void>;
package/dist/resolve_dynamic_extension_object.js CHANGED
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.resolveDynamicExtensionObject = void 0;
12
+ exports.resolveDynamicExtensionObject = exports.resolveOpaqueStructureInExtentionObject = void 0;
13
13
  const node_opcua_binary_stream_1 = require("node-opcua-binary-stream");
14
14
  const node_opcua_extension_object_1 = require("node-opcua-extension-object");
15
15
  const node_opcua_variant_1 = require("node-opcua-variant");
@@ -42,15 +42,87 @@ function getOrExtractConstructor(session, binaryEncodingNodeId, dataTypeManager)
42
42
  }
43
43
  const r = browseResult.references[0];
44
44
  const dataTypeNodeId = r.nodeId;
45
- if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
45
+ if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
46
46
  throw new Error("Internal Error: we are not expecting this dataType to be processed already");
47
47
  }
48
48
  yield (0, populate_data_type_manager_104_1.readDataTypeDefinitionAndBuildType)(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, {});
49
- return dataTypeFactory.getConstructorForDataType(dataTypeNodeId);
49
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId);
50
+ if (!structureInfo.constructor) {
51
+ throw new Error("Cannot find constructor for abstract DataType");
52
+ }
53
+ return structureInfo.constructor;
54
+ });
55
+ }
56
+ function resolveOpaqueStructureInExtentionObject(session, dataTypeManager, object) {
57
+ return __awaiter(this, void 0, void 0, function* () {
58
+ const schema = object.schema;
59
+ function fixOpaqueStructureOnElement(element, field, data, args) {
60
+ return __awaiter(this, void 0, void 0, function* () {
61
+ if (element instanceof node_opcua_variant_1.Variant) {
62
+ yield resolveDynamicExtensionObject(session, element, dataTypeManager);
63
+ return element;
64
+ }
65
+ if (!(element instanceof node_opcua_extension_object_1.OpaqueStructure)) {
66
+ return element;
67
+ }
68
+ const variant = new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.ExtensionObject, value: element });
69
+ yield resolveDynamicExtensionObject(session, variant, dataTypeManager);
70
+ return variant.value;
71
+ });
72
+ }
73
+ function fixOpaqueStructure(object, field, data, args) {
74
+ if (field.category === "complex" && !field.allowSubType) {
75
+ return;
76
+ }
77
+ if (field.category === "basic" && field.fieldType !== "Variant") {
78
+ return;
79
+ }
80
+ console.log("field", field.name, field.category, field.fieldType);
81
+ const a = object[field.name];
82
+ if (!a) {
83
+ return;
84
+ }
85
+ if (field.isArray) {
86
+ for (let i = 0; i < a.length; i++) {
87
+ const x = a[i];
88
+ promises.push((() => __awaiter(this, void 0, void 0, function* () {
89
+ a[i] = yield fixOpaqueStructureOnElement(x, field, data, args);
90
+ }))());
91
+ }
92
+ }
93
+ else {
94
+ promises.push((() => __awaiter(this, void 0, void 0, function* () {
95
+ object[field.name] = yield fixOpaqueStructureOnElement(a, field, data, args);
96
+ }))());
97
+ }
98
+ }
99
+ const promises = [];
100
+ object.applyOnAllFields(fixOpaqueStructure, { dataTypeManager, promises });
101
+ yield Promise.all(promises);
50
102
  });
51
103
  }
104
+ exports.resolveOpaqueStructureInExtentionObject = resolveOpaqueStructureInExtentionObject;
105
+ // async function resolveInnerVariantType(session: IBasicSession, object: ExtensionObject, dataTypeManager: ExtraDataTypeManager) {
106
+ // console.log("object = ", object.constructor.name);
107
+ // const fields = object.schema.fields;
108
+ // const _object = object as unknown as Record<string, unknown>;
109
+ // for (const field of fields) {
110
+ // console.log("field = ", field.name);
111
+ // if (field.category !== "complex") continue;
112
+ // const p = _object[field.name];
113
+ // if (p === undefined || p === null) continue;
114
+ // console.log("=>", field.name, (p as any).toString());
115
+ // if (p instanceof ExtensionObject) {
116
+ // resolveInnerVariantType(session, p, dataTypeManager);
117
+ // }
118
+ // if (p instanceof Variant && p.value instanceof OpaqueStructure) {
119
+ // console.log("§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§");
120
+ // p.value = resolveDynamicExtensionObjectV(session, p.value, dataTypeManager);
121
+ // }
122
+ // }
123
+ // }
52
124
  function resolveDynamicExtensionObjectV(session, opaque, dataTypeManager) {
53
- var _a, _b;
125
+ var _a;
54
126
  return __awaiter(this, void 0, void 0, function* () {
55
127
  try {
56
128
  const Constructor = yield getOrExtractConstructor(session, opaque.nodeId, dataTypeManager);
@@ -58,12 +130,13 @@ function resolveDynamicExtensionObjectV(session, opaque, dataTypeManager) {
58
130
  const stream = new node_opcua_binary_stream_1.BinaryStream(opaque.buffer);
59
131
  try {
60
132
  object.decode(stream);
133
+ yield resolveOpaqueStructureInExtentionObject(session, dataTypeManager, object);
61
134
  return object;
62
135
  }
63
136
  catch (err) {
64
137
  warningLog("Constructor = ", Constructor.name);
65
138
  warningLog("opaqueStructure = ", (_a = opaque === null || opaque === void 0 ? void 0 : opaque.nodeId) === null || _a === void 0 ? void 0 : _a.toString());
66
- warningLog("opaqueStructure = ", "0x" + ((_b = opaque === null || opaque === void 0 ? void 0 : opaque.buffer) === null || _b === void 0 ? void 0 : _b.toString("hex")));
139
+ warningLog("opaqueStructure = ", (0, node_opcua_debug_1.hexDump)(opaque.buffer, 132, 100));
67
140
  warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
68
141
  warningLog("resolveDynamicExtensionObjectV err = ", err);
69
142
  // try again for debugging
@@ -74,7 +147,7 @@ function resolveDynamicExtensionObjectV(session, opaque, dataTypeManager) {
74
147
  catch (err) {
75
148
  warningLog("err", err);
76
149
  warningLog("opaqueStructure = ", opaque.nodeId.toString());
77
- warningLog("opaqueStructure = ", "0x" + opaque.buffer.toString("hex"));
150
+ warningLog("opaqueStructure = ", "0x" + (0, node_opcua_debug_1.hexDump)(opaque.buffer, 132, 100));
78
151
  warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
79
152
  warningLog(dataTypeManager.toString());
80
153
  throw err;
package/dist/resolve_dynamic_extension_object.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,31 +1,31 @@
1
1
  {
2
2
  "name": "node-opcua-client-dynamic-extension-object",
3
- "version": "2.76.2",
3
+ "version": "2.77.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",
7
7
  "scripts": {
8
8
  "build": "tsc -b",
9
- "clean": "npx rimraf dist *.tsbuildinfo",
9
+ "clean": "npx rimraf node_modules dist *.tsbuildinfo",
10
10
  "test": "echo no test"
11
11
  },
12
12
  "dependencies": {
13
13
  "chalk": "4.1.2",
14
- "node-opcua-assert": "2.76.0",
15
- "node-opcua-binary-stream": "2.76.2",
16
- "node-opcua-data-model": "2.76.2",
17
- "node-opcua-data-value": "2.76.2",
18
- "node-opcua-debug": "2.76.2",
19
- "node-opcua-extension-object": "2.76.2",
20
- "node-opcua-factory": "2.76.2",
21
- "node-opcua-nodeid": "2.76.2",
22
- "node-opcua-pseudo-session": "2.76.2",
23
- "node-opcua-schemas": "2.76.2",
24
- "node-opcua-service-browse": "2.76.2",
25
- "node-opcua-service-translate-browse-path": "2.76.2",
26
- "node-opcua-status-code": "2.76.2",
27
- "node-opcua-types": "2.76.2",
28
- "node-opcua-variant": "2.76.2"
14
+ "node-opcua-assert": "2.77.0",
15
+ "node-opcua-binary-stream": "2.77.0",
16
+ "node-opcua-data-model": "2.77.0",
17
+ "node-opcua-data-value": "2.77.0",
18
+ "node-opcua-debug": "2.77.0",
19
+ "node-opcua-extension-object": "2.77.0",
20
+ "node-opcua-factory": "2.77.0",
21
+ "node-opcua-nodeid": "2.77.0",
22
+ "node-opcua-pseudo-session": "2.77.0",
23
+ "node-opcua-schemas": "2.77.0",
24
+ "node-opcua-service-browse": "2.77.0",
25
+ "node-opcua-service-translate-browse-path": "2.77.0",
26
+ "node-opcua-status-code": "2.77.0",
27
+ "node-opcua-types": "2.77.0",
28
+ "node-opcua-variant": "2.77.0"
29
29
  },
30
30
  "author": "Etienne Rossignon",
31
31
  "license": "MIT",
@@ -42,5 +42,5 @@
42
42
  "internet of things"
43
43
  ],
44
44
  "homepage": "http://node-opcua.github.io/",
45
- "gitHead": "acb5ecaf1e1c71af3b63e80909d58447f3f298e7"
45
+ "gitHead": "5c8d45772d786fa4ba59369dd26679353ab5482b"
46
46
  }
package/source/convert_data_type_definition_to_structuretype_schema.ts CHANGED
@@ -3,11 +3,15 @@ import { AttributeIds, BrowseDirection, makeResultMask, NodeClassMask } from "no
3
3
  import { DataValue } from "node-opcua-data-value";
4
4
  import { make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
5
5
  import {
6
+ BitField,
7
+ ConstructorFuncWithSchema,
6
8
  DataTypeFactory,
7
9
  EnumerationDefinitionSchema,
10
+ extractAllPossibleFields,
8
11
  FieldCategory,
9
12
  FieldInterfaceOptions,
10
13
  getBuiltInType,
14
+ IStructuredTypeSchema,
11
15
  StructuredTypeSchema,
12
16
  TypeDefinition
13
17
  } from "node-opcua-factory";
@@ -196,12 +200,14 @@ async function resolve2(
196
200
  schema = e;
197
201
  }
198
202
  } else {
203
+ const isAbstract = false;
199
204
  schema = await convertDataTypeDefinitionToStructureTypeSchema(
200
205
  session,
201
206
  dataTypeNodeId,
202
207
  fieldTypeName,
203
208
  definition,
204
209
  dataTypeFactory,
210
+ isAbstract,
205
211
  cache
206
212
  );
207
213
  }
@@ -298,7 +304,7 @@ async function resolveFieldType(
298
304
  let schema: TypeDefinition | undefined;
299
305
  let category: FieldCategory = FieldCategory.enumeration;
300
306
 
301
- if (dataTypeFactory.hasStructuredType(fieldTypeName!)) {
307
+ if (dataTypeFactory.hasStructureByTypeName(fieldTypeName!)) {
302
308
  schema = dataTypeFactory.getStructuredTypeSchema(fieldTypeName);
303
309
  category = FieldCategory.complex;
304
310
  } else if (dataTypeFactory.hasBuiltInType(fieldTypeName!)) {
@@ -333,12 +339,11 @@ async function resolveFieldType(
333
339
  async function _setupEncodings(
334
340
  session: IBasicSession,
335
341
  dataTypeNodeId: NodeId,
336
- schema: StructuredTypeSchema
337
- ): Promise<StructuredTypeSchema> {
342
+ schema: IStructuredTypeSchema
343
+ ): Promise<IStructuredTypeSchema> {
338
344
  // read abstract flag
339
345
  const isAbstractDV = await session.read({ nodeId: dataTypeNodeId, attributeId: AttributeIds.IsAbstract });
340
346
  schema.dataTypeNodeId = dataTypeNodeId;
341
- schema.id = dataTypeNodeId;
342
347
 
343
348
  if (isAbstractDV.statusCode === StatusCodes.Good && isAbstractDV.value.value === false) {
344
349
  const encodings = await _findEncodings(session, dataTypeNodeId);
@@ -356,15 +361,22 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
356
361
  name: string,
357
362
  definition: DataTypeDefinition,
358
363
  dataTypeFactory: DataTypeFactory,
364
+ isAbstract: boolean,
359
365
  cache: { [key: string]: CacheForFieldResolution }
360
- ): Promise<StructuredTypeSchema> {
366
+ ): Promise<IStructuredTypeSchema> {
361
367
  if (definition instanceof StructureDefinition) {
362
368
  let fieldCountToIgnore = 0;
363
- let base: undefined | any = dataTypeFactory.getConstructorForDataType(definition.baseDataType)?.schema;
364
- while (base && !(base.dataTypeNodeId.value === DataType.ExtensionObject && base.dataTypeNodeId.namespace === 0)) {
365
- fieldCountToIgnore += base._possibleFields.length;
366
- base = base._baseSchema;
369
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(definition.baseDataType);
370
+ const baseSchema: IStructuredTypeSchema | undefined | null = structureInfo?.schema;
371
+
372
+ if (baseSchema) {
373
+ const possibleFields = extractAllPossibleFields(baseSchema);
374
+ fieldCountToIgnore += possibleFields.length;
367
375
  }
376
+ // while (base && !(base.dataTypeNodeId.value === DataType.ExtensionObject && base.dataTypeNodeId.namespace === 0)) {
377
+ // fieldCountToIgnore += base..length;
378
+ // base = base.getBaseSchema();
379
+ // }
368
380
 
369
381
  const fields: FieldInterfaceOptions[] = [];
370
382
 
@@ -386,9 +398,9 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
386
398
  let switchValue = 1;
387
399
  let switchBit = 0;
388
400
 
389
- const bitFields: { name: string; length?: number }[] | undefined = isUnion ? undefined : [];
401
+ const bitFields: BitField[] | undefined = isUnion ? undefined : [];
390
402
 
391
- const postActions: ((schema: StructuredTypeSchema) => void)[] = [];
403
+ const postActions: ((schema: IStructuredTypeSchema) => void)[] = [];
392
404
 
393
405
  if (definition.fields) {
394
406
  for (let i = fieldCountToIgnore; i < definition.fields.length; i++) {
@@ -405,7 +417,7 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
405
417
  (field.fieldType = fieldTypeName!), (field.category = FieldCategory.complex);
406
418
  fields.push(field);
407
419
  const capturedField = field;
408
- postActions.push((schema: StructuredTypeSchema) => {
420
+ postActions.push((schema: IStructuredTypeSchema) => {
409
421
  capturedField.schema = schema;
410
422
  });
411
423
  continue;
@@ -439,8 +451,8 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
439
451
  baseType,
440
452
  bitFields,
441
453
  fields,
442
- id: 0,
443
- name
454
+ name,
455
+ dataTypeFactory
444
456
  });
445
457
  const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, os);
446
458
 
@@ -453,7 +465,7 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
453
465
  function createField(
454
466
  fieldD: StructureField,
455
467
  switchBit: number,
456
- bitFields: { name: string; length?: number | undefined }[] | undefined,
468
+ bitFields: BitField[] | undefined,
457
469
  isUnion: boolean,
458
470
  switchValue: number
459
471
  ): { field: FieldInterfaceOptions; switchBit: number; switchValue: number } {
package/source/extra_data_type_manager.ts CHANGED
@@ -51,7 +51,10 @@ export class ExtraDataTypeManager {
51
51
  throw new Error("cannot find dataFactory for namespace=" + dataTypeNodeId.namespace);
52
52
  }
53
53
  // find schema corresponding to dataTypeNodeId in typeDictionary
54
- const Constructor = dataTypeFactory.findConstructorForDataType(dataTypeNodeId);
54
+ const Constructor = dataTypeFactory.findStructureInfoForDataType(dataTypeNodeId).constructor;
55
+ if (!Constructor) {
56
+ throw new Error("Cannot find Extension Object Constructor for Abstract dataType");
57
+ }
55
58
  return Constructor;
56
59
  }
57
60
 
package/source/get_extension_object_constructor.ts CHANGED
@@ -13,9 +13,9 @@ export async function getExtensionObjectConstructor(session: IBasicSession, data
13
13
  const extraDataTypeManager = await getExtraDataTypeManager(session);
14
14
 
15
15
  const dataTypeFactory = extraDataTypeManager.getDataTypeFactory(dataTypeNodeId.namespace);
16
- const Constructor = dataTypeFactory.getConstructorForDataType(dataTypeNodeId);
17
- if (Constructor) {
18
- return Constructor as unknown as AnyConstructorFunc;
16
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId);
17
+ if (structureInfo) {
18
+ return structureInfo.constructor as unknown as AnyConstructorFunc;
19
19
  }
20
20
  const dataValue = await session.read({
21
21
  nodeId: dataTypeNodeId,
package/source/private/populate_data_type_manager_103.ts CHANGED
@@ -7,7 +7,7 @@ import * as chalk from "chalk";
7
7
 
8
8
  import { assert } from "node-opcua-assert";
9
9
  import { AttributeIds, makeNodeClassMask, makeResultMask, QualifiedName } from "node-opcua-data-model";
10
- import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog} from "node-opcua-debug";
10
+ import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
11
11
  import { ConstructorFuncWithSchema, DataTypeFactory, getStandardDataTypeFactory } from "node-opcua-factory";
12
12
  import { ExpandedNodeId, NodeId, resolveNodeId, sameNodeId } from "node-opcua-nodeid";
13
13
  import { browseAll, BrowseDescriptionLike, IBasicSession } from "node-opcua-pseudo-session";
@@ -127,8 +127,14 @@ async function _enrichWithDescriptionOf(session: IBasicSession, dataTypeDescript
127
127
  const dataTypeDescription = dataTypeDescriptions[i++];
128
128
 
129
129
  result3.references = result3.references || [];
130
+
131
+ if (result3.references.length === 0) {
132
+ // may be the dataType is abstract and as no need for DescriptionOF
133
+ continue;
134
+ }
130
135
  if (result3.references.length !== 1) {
131
136
  warningLog("_enrichWithDescriptionOf : expecting 1 reference for ", dataTypeDescription.browseName.toString());
137
+ warningLog(result3.toString());
132
138
  continue;
133
139
  }
134
140
  for (const ref of result3.references) {
@@ -181,6 +187,7 @@ interface IDataTypeDefInfo {
181
187
  className: string;
182
188
  dataTypeNodeId: NodeId;
183
189
  dataTypeDefinition: StructureDefinition;
190
+ isAbstract: boolean;
184
191
  }
185
192
  type DataTypeDefinitions = IDataTypeDefInfo[];
186
193
 
@@ -211,7 +218,7 @@ function sortStructure(dataTypeDefinitions: DataTypeDefinitions) {
211
218
  }
212
219
  _visit(ddd);
213
220
  }
214
-
221
+
215
222
  dataTypeDefinitionsSorted.push(d);
216
223
  }
217
224
  for (const d of dataTypeDefinitions) {
@@ -255,7 +262,7 @@ async function _extractDataTypeDictionaryFromDefinition(
255
262
 
256
263
  if (dataTypeDefinition && dataTypeDefinition instanceof StructureDefinition) {
257
264
  const className = dataTypeDescription.browseName.name!;
258
- dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition });
265
+ dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract: false });
259
266
  }
260
267
  } else {
261
268
  debugLog(
@@ -272,12 +279,12 @@ async function _extractDataTypeDictionaryFromDefinition(
272
279
  if (doDebug) {
273
280
  debugLog("order ", dataTypeDefinitionsSorted.map((a) => a.className + " " + a.dataTypeNodeId).join(" -> "));
274
281
  }
275
- for (const { className, dataTypeNodeId, dataTypeDefinition } of dataTypeDefinitionsSorted) {
282
+ for (const { className, dataTypeNodeId, dataTypeDefinition, isAbstract } of dataTypeDefinitionsSorted) {
276
283
  // istanbul ignore next
277
284
  if (doDebug) {
278
285
  debugLog(chalk.yellow("--------------------------------------- "), className, dataTypeNodeId.toString());
279
286
  }
280
- if (dataTypeFactory.hasStructuredType(className)) {
287
+ if (dataTypeFactory.hasStructureByTypeName(className)) {
281
288
  continue; // this structure has already been seen
282
289
  }
283
290
  // now fill typeDictionary
@@ -288,6 +295,7 @@ async function _extractDataTypeDictionaryFromDefinition(
288
295
  className,
289
296
  dataTypeDefinition,
290
297
  dataTypeFactory,
298
+ isAbstract,
291
299
  cache
292
300
  );
293
301
 
@@ -440,9 +448,12 @@ async function _exploreDataTypeDefinition(
440
448
  }
441
449
  // let's verify that constructor is operational
442
450
  try {
443
- const constructor = dataTypeFactory.getStructureTypeConstructor(name);
451
+ const Constructor = dataTypeFactory.getStructureInfoByTypeName(name).constructor;
452
+ if (!Constructor) {
453
+ throw new Error(`Cannot instantiate abstract DataType(name=${name})`);
454
+ }
444
455
  // xx const constructor = getOrCreateConstructor(name, dataTypeFactory, defaultBinary);
445
- const testObject = new constructor();
456
+ const testObject = new Constructor();
446
457
  debugLog(testObject.toString());
447
458
  } catch (err) {
448
459
  debugLog(" Error cannot construct Extension Object " + name);
package/source/private/populate_data_type_manager_104.ts CHANGED
@@ -4,7 +4,7 @@ import { make_debugLog, make_errorLog } from "node-opcua-debug";
4
4
  import { DataTypeFactory } from "node-opcua-factory";
5
5
  import { NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
6
6
  import { IBasicSession, BrowseDescriptionLike } from "node-opcua-pseudo-session";
7
- import { createDynamicObjectConstructor } from "node-opcua-schemas";
7
+ import { createDynamicObjectConstructor as createDynamicObjectConstructorAndRegister } from "node-opcua-schemas";
8
8
  import { StatusCodes } from "node-opcua-status-code";
9
9
  import { ReferenceDescription, BrowseResult, BrowseDescriptionOptions } from "node-opcua-types";
10
10
 
@@ -25,10 +25,22 @@ export async function readDataTypeDefinitionAndBuildType(
25
25
  cache: { [key: string]: CacheForFieldResolution }
26
26
  ) {
27
27
  try {
28
- const dataTypeDefinitionDataValue = await session.read({
29
- attributeId: AttributeIds.DataTypeDefinition,
30
- nodeId: dataTypeNodeId
31
- });
28
+ const [isAbstractDataValue, dataTypeDefinitionDataValue] = await session.read([
29
+ {
30
+ attributeId: AttributeIds.IsAbstract,
31
+ nodeId: dataTypeNodeId
32
+ },
33
+ {
34
+ attributeId: AttributeIds.DataTypeDefinition,
35
+ nodeId: dataTypeNodeId
36
+ }
37
+ ]);
38
+ /* istanbul ignore next */
39
+ if (isAbstractDataValue.statusCode !== StatusCodes.Good) {
40
+ throw new Error(" Cannot find dataType isAbstract ! with nodeId =" + dataTypeNodeId.toString());
41
+ }
42
+ const isAbstract = isAbstractDataValue.value.value as boolean;
43
+
32
44
  /* istanbul ignore next */
33
45
  if (dataTypeDefinitionDataValue.statusCode !== StatusCodes.Good) {
34
46
  throw new Error(" Cannot find dataType Definition ! with nodeId =" + dataTypeNodeId.toString());
@@ -41,11 +53,16 @@ export async function readDataTypeDefinitionAndBuildType(
41
53
  name,
42
54
  dataTypeDefinition,
43
55
  dataTypeFactory,
56
+ isAbstract,
44
57
  cache
45
58
  );
46
-
47
- createDynamicObjectConstructor(schema, dataTypeFactory);
48
-
59
+ if (isAbstract) {
60
+ // cannot construct an abstract structure
61
+ dataTypeFactory.registerAbstractStructure(dataTypeNodeId, name, schema);
62
+
63
+ } else {
64
+ const Constructor = createDynamicObjectConstructorAndRegister(schema, dataTypeFactory);
65
+ }
49
66
  } catch (err) {
50
67
  errorLog("Error", err);
51
68
  }
@@ -165,14 +182,13 @@ export async function populateDataTypeManager104(session: IBasicSession, dataTyp
165
182
  return;
166
183
  }
167
184
  // if not found already
168
- if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
185
+ if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
169
186
  // already known !
170
187
  return;
171
188
  }
172
189
  // extract it formally
173
190
  debugLog(" DataType => ", r.browseName.toString(), dataTypeNodeId.toString());
174
191
  await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name!, dataTypeFactory, cache);
175
- assert(dataTypeFactory.getConstructorForDataType(dataTypeNodeId));
176
192
  } catch (err) {
177
193
  errorLog("err=", err);
178
194
  }
package/source/resolve_dynamic_extension_object.ts CHANGED
@@ -4,7 +4,7 @@ import { DataType, Variant, VariantArrayType } from "node-opcua-variant";
4
4
  import { hexDump, make_warningLog } from "node-opcua-debug";
5
5
  import { IBasicSession } from "node-opcua-pseudo-session";
6
6
  import { NodeId } from "node-opcua-nodeid";
7
- import { ConstructorFunc } from "node-opcua-factory";
7
+ import { ConstructorFunc, StructuredTypeField } from "node-opcua-factory";
8
8
  import { BrowseDirection, NodeClassMask, ResultMask } from "node-opcua-data-model";
9
9
  import { StatusCodes } from "node-opcua-status-code";
10
10
  //
@@ -19,6 +19,8 @@ async function getOrExtractConstructor(
19
19
  dataTypeManager: ExtraDataTypeManager
20
20
  ): Promise<ConstructorFunc> {
21
21
  const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(binaryEncodingNodeId.namespace);
22
+
23
+
22
24
  const Constructor = dataTypeFactory.getConstructor(binaryEncodingNodeId);
23
25
  if (Constructor) {
24
26
  return Constructor;
@@ -41,14 +43,99 @@ async function getOrExtractConstructor(
41
43
  const r = browseResult.references![0];
42
44
  const dataTypeNodeId = r.nodeId;
43
45
 
44
- if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
46
+ if (dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)) {
45
47
  throw new Error("Internal Error: we are not expecting this dataType to be processed already");
46
48
  }
47
49
  await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name!, dataTypeFactory, {});
48
50
 
49
- return dataTypeFactory.getConstructorForDataType(dataTypeNodeId)!;
51
+ const structureInfo = dataTypeFactory.getStructureInfoForDataType(dataTypeNodeId)!;
52
+ if (!structureInfo.constructor) {
53
+ throw new Error("Cannot find constructor for abstract DataType");
54
+ }
55
+ return structureInfo.constructor;
50
56
  }
51
57
 
58
+ export async function resolveOpaqueStructureInExtentionObject(
59
+ session: IBasicSession,
60
+ dataTypeManager: ExtraDataTypeManager,
61
+ object: ExtensionObject
62
+ ) {
63
+ const schema = object.schema;
64
+ interface D {
65
+ dataTypeManager: ExtraDataTypeManager;
66
+ promises: Promise<void>[];
67
+ }
68
+ async function fixOpaqueStructureOnElement(
69
+ element: Record<string, unknown>,
70
+ field: StructuredTypeField,
71
+ data: D,
72
+ args?: any
73
+ ): Promise<unknown> {
74
+ if (element instanceof Variant) {
75
+ await resolveDynamicExtensionObject(session, element, dataTypeManager);
76
+ return element;
77
+ }
78
+ if (!(element instanceof OpaqueStructure)) {
79
+ return element;
80
+ }
81
+ const variant = new Variant({ dataType: DataType.ExtensionObject, value: element });
82
+ await resolveDynamicExtensionObject(session, variant, dataTypeManager);
83
+ return variant.value as unknown;
84
+ }
85
+ function fixOpaqueStructure(object: any, field: StructuredTypeField, data: D, args?: any) {
86
+ if (field.category === "complex" && !field.allowSubType) {
87
+ return;
88
+ }
89
+ if (field.category === "basic" && field.fieldType !== "Variant") {
90
+ return;
91
+ }
92
+ console.log("field", field.name, field.category, field.fieldType);
93
+ const a = object[field.name];
94
+ if (!a) {
95
+ return;
96
+ }
97
+ if (field.isArray) {
98
+ for (let i = 0; i < a.length; i++) {
99
+ const x = a[i];
100
+ promises.push(
101
+ (async () => {
102
+ a[i] = await fixOpaqueStructureOnElement(x, field, data, args);
103
+ })()
104
+ );
105
+ }
106
+ } else {
107
+ promises.push(
108
+ (async () => {
109
+ object[field.name] = await fixOpaqueStructureOnElement(a, field, data, args);
110
+ })()
111
+ );
112
+ }
113
+ }
114
+ const promises: Promise<void>[] = [];
115
+ object.applyOnAllFields<D>(fixOpaqueStructure, { dataTypeManager, promises });
116
+ await Promise.all(promises);
117
+ }
118
+
119
+ // async function resolveInnerVariantType(session: IBasicSession, object: ExtensionObject, dataTypeManager: ExtraDataTypeManager) {
120
+ // console.log("object = ", object.constructor.name);
121
+
122
+ // const fields = object.schema.fields;
123
+ // const _object = object as unknown as Record<string, unknown>;
124
+ // for (const field of fields) {
125
+ // console.log("field = ", field.name);
126
+ // if (field.category !== "complex") continue;
127
+ // const p = _object[field.name];
128
+ // if (p === undefined || p === null) continue;
129
+ // console.log("=>", field.name, (p as any).toString());
130
+ // if (p instanceof ExtensionObject) {
131
+ // resolveInnerVariantType(session, p, dataTypeManager);
132
+ // }
133
+ // if (p instanceof Variant && p.value instanceof OpaqueStructure) {
134
+ // console.log("§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§§");
135
+ // p.value = resolveDynamicExtensionObjectV(session, p.value, dataTypeManager);
136
+ // }
137
+ // }
138
+ // }
52
139
  async function resolveDynamicExtensionObjectV(
53
140
  session: IBasicSession,
54
141
  opaque: OpaqueStructure,
@@ -60,11 +147,12 @@ async function resolveDynamicExtensionObjectV(
60
147
  const stream = new BinaryStream(opaque.buffer);
61
148
  try {
62
149
  object.decode(stream);
63
- return object as ExtensionObject;
150
+ await resolveOpaqueStructureInExtentionObject(session, dataTypeManager, object);
151
+ return object;
64
152
  } catch (err) {
65
153
  warningLog("Constructor = ", Constructor.name);
66
154
  warningLog("opaqueStructure = ", opaque?.nodeId?.toString());
67
- warningLog("opaqueStructure = ", "0x" + opaque?.buffer?.toString("hex"));
155
+ warningLog("opaqueStructure = ", hexDump(opaque.buffer,132,100));
68
156
  warningLog(hexDump(opaque.buffer));
69
157
  warningLog("resolveDynamicExtensionObjectV err = ", err);
70
158
  // try again for debugging
@@ -74,7 +162,7 @@ async function resolveDynamicExtensionObjectV(
74
162
  } catch (err) {
75
163
  warningLog("err", err);
76
164
  warningLog("opaqueStructure = ", opaque.nodeId.toString());
77
- warningLog("opaqueStructure = ", "0x" + opaque.buffer.toString("hex"));
165
+ warningLog("opaqueStructure = ", "0x" + hexDump(opaque.buffer,132,100));
78
166
  warningLog(hexDump(opaque.buffer));
79
167
  warningLog(dataTypeManager.toString());
80
168
  throw err;