node-opcua-client-dynamic-extension-object 2.70.3 → 2.71.0

package/dist/resolve_dynamic_extension_object.js

@@ -1,106 +1,106 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDynamicExtensionObject = void 0;
-const node_opcua_binary_stream_1 = require("node-opcua-binary-stream");
-const node_opcua_extension_object_1 = require("node-opcua-extension-object");
-const node_opcua_variant_1 = require("node-opcua-variant");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_data_model_1 = require("node-opcua-data-model");
-const node_opcua_status_code_1 = require("node-opcua-status-code");
-const populate_data_type_manager_104_1 = require("./private/populate_data_type_manager_104");
-const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
-function getOrExtractConstructor(session, binaryEncodingNodeId, dataTypeManager) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(binaryEncodingNodeId.namespace);
-        const Constructor = dataTypeFactory.getConstructor(binaryEncodingNodeId);
-        if (Constructor) {
-            return Constructor;
-        }
-        if (binaryEncodingNodeId.namespace === 0) {
-            throw new Error("Internal Error");
-        }
-        // need to extract it
-        const browseResult = yield session.browse({
-            nodeId: binaryEncodingNodeId,
-            referenceTypeId: "HasEncoding",
-            browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
-            includeSubtypes: false,
-            nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
-            resultMask: node_opcua_data_model_1.ResultMask.BrowseName
-        });
-        if (browseResult.statusCode !== node_opcua_status_code_1.StatusCodes.Good || browseResult.references.length !== 1) {
-            throw new Error("browse failed");
-        }
-        const r = browseResult.references[0];
-        const dataTypeNodeId = r.nodeId;
-        if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
-            throw new Error("Internal Error: we are not expecting this dataType to be processed already");
-        }
-        yield (0, populate_data_type_manager_104_1.readDataTypeDefinitionAndBuildType)(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, {});
-        return dataTypeFactory.getConstructorForDataType(dataTypeNodeId);
-    });
-}
-function resolveDynamicExtensionObjectV(session, opaque, dataTypeManager) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const Constructor = yield getOrExtractConstructor(session, opaque.nodeId, dataTypeManager);
-            const object = new Constructor();
-            const stream = new node_opcua_binary_stream_1.BinaryStream(opaque.buffer);
-            try {
-                object.decode(stream);
-                return object;
-            }
-            catch (err) {
-                warningLog("Constructor = ", Constructor.name);
-                warningLog("opaqueStructure = ", (_a = opaque === null || opaque === void 0 ? void 0 : opaque.nodeId) === null || _a === void 0 ? void 0 : _a.toString());
-                warningLog("opaqueStructure = ", "0x" + ((_b = opaque === null || opaque === void 0 ? void 0 : opaque.buffer) === null || _b === void 0 ? void 0 : _b.toString("hex")));
-                warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
-                warningLog("resolveDynamicExtensionObjectV err = ", err);
-                // try again for debugging
-                object.decode(stream);
-                return opaque;
-            }
-        }
-        catch (err) {
-            warningLog("err", err);
-            warningLog("opaqueStructure = ", opaque.nodeId.toString());
-            warningLog("opaqueStructure = ", "0x" + opaque.buffer.toString("hex"));
-            warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
-            warningLog(dataTypeManager.toString());
-            throw err;
-        }
-    });
-}
-function resolveDynamicExtensionObject(session, variant, dataTypeManager) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (variant.dataType !== node_opcua_variant_1.DataType.ExtensionObject) {
-            return;
-        }
-        if (variant.arrayType !== node_opcua_variant_1.VariantArrayType.Scalar) {
-            if (variant.value instanceof Array) {
-                for (let i = 0; i < variant.value.length; i++) {
-                    if (variant.value[i] instanceof node_opcua_extension_object_1.OpaqueStructure) {
-                        variant.value[i] = yield resolveDynamicExtensionObjectV(session, variant.value[i], dataTypeManager);
-                    }
-                }
-            }
-            return;
-        }
-        if (!(variant.value instanceof node_opcua_extension_object_1.OpaqueStructure)) {
-            return;
-        }
-        variant.value = yield resolveDynamicExtensionObjectV(session, variant.value, dataTypeManager);
-    });
-}
-exports.resolveDynamicExtensionObject = resolveDynamicExtensionObject;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDynamicExtensionObject = void 0;
+const node_opcua_binary_stream_1 = require("node-opcua-binary-stream");
+const node_opcua_extension_object_1 = require("node-opcua-extension-object");
+const node_opcua_variant_1 = require("node-opcua-variant");
+const node_opcua_debug_1 = require("node-opcua-debug");
+const node_opcua_data_model_1 = require("node-opcua-data-model");
+const node_opcua_status_code_1 = require("node-opcua-status-code");
+const populate_data_type_manager_104_1 = require("./private/populate_data_type_manager_104");
+const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
+function getOrExtractConstructor(session, binaryEncodingNodeId, dataTypeManager) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(binaryEncodingNodeId.namespace);
+        const Constructor = dataTypeFactory.getConstructor(binaryEncodingNodeId);
+        if (Constructor) {
+            return Constructor;
+        }
+        if (binaryEncodingNodeId.namespace === 0) {
+            throw new Error("Internal Error");
+        }
+        // need to extract it
+        const browseResult = yield session.browse({
+            nodeId: binaryEncodingNodeId,
+            referenceTypeId: "HasEncoding",
+            browseDirection: node_opcua_data_model_1.BrowseDirection.Inverse,
+            includeSubtypes: false,
+            nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
+            resultMask: node_opcua_data_model_1.ResultMask.BrowseName
+        });
+        if (browseResult.statusCode !== node_opcua_status_code_1.StatusCodes.Good || browseResult.references.length !== 1) {
+            throw new Error("browse failed");
+        }
+        const r = browseResult.references[0];
+        const dataTypeNodeId = r.nodeId;
+        if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
+            throw new Error("Internal Error: we are not expecting this dataType to be processed already");
+        }
+        yield (0, populate_data_type_manager_104_1.readDataTypeDefinitionAndBuildType)(session, dataTypeNodeId, r.browseName.name, dataTypeFactory, {});
+        return dataTypeFactory.getConstructorForDataType(dataTypeNodeId);
+    });
+}
+function resolveDynamicExtensionObjectV(session, opaque, dataTypeManager) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const Constructor = yield getOrExtractConstructor(session, opaque.nodeId, dataTypeManager);
+            const object = new Constructor();
+            const stream = new node_opcua_binary_stream_1.BinaryStream(opaque.buffer);
+            try {
+                object.decode(stream);
+                return object;
+            }
+            catch (err) {
+                warningLog("Constructor = ", Constructor.name);
+                warningLog("opaqueStructure = ", (_a = opaque === null || opaque === void 0 ? void 0 : opaque.nodeId) === null || _a === void 0 ? void 0 : _a.toString());
+                warningLog("opaqueStructure = ", "0x" + ((_b = opaque === null || opaque === void 0 ? void 0 : opaque.buffer) === null || _b === void 0 ? void 0 : _b.toString("hex")));
+                warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
+                warningLog("resolveDynamicExtensionObjectV err = ", err);
+                // try again for debugging
+                object.decode(stream);
+                return opaque;
+            }
+        }
+        catch (err) {
+            warningLog("err", err);
+            warningLog("opaqueStructure = ", opaque.nodeId.toString());
+            warningLog("opaqueStructure = ", "0x" + opaque.buffer.toString("hex"));
+            warningLog((0, node_opcua_debug_1.hexDump)(opaque.buffer));
+            warningLog(dataTypeManager.toString());
+            throw err;
+        }
+    });
+}
+function resolveDynamicExtensionObject(session, variant, dataTypeManager) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (variant.dataType !== node_opcua_variant_1.DataType.ExtensionObject) {
+            return;
+        }
+        if (variant.arrayType !== node_opcua_variant_1.VariantArrayType.Scalar) {
+            if (variant.value instanceof Array) {
+                for (let i = 0; i < variant.value.length; i++) {
+                    if (variant.value[i] instanceof node_opcua_extension_object_1.OpaqueStructure) {
+                        variant.value[i] = yield resolveDynamicExtensionObjectV(session, variant.value[i], dataTypeManager);
+                    }
+                }
+            }
+            return;
+        }
+        if (!(variant.value instanceof node_opcua_extension_object_1.OpaqueStructure)) {
+            return;
+        }
+        variant.value = yield resolveDynamicExtensionObjectV(session, variant.value, dataTypeManager);
+    });
+}
+exports.resolveDynamicExtensionObject = resolveDynamicExtensionObject;
 //# sourceMappingURL=resolve_dynamic_extension_object.js.map

package/dist/resolve_dynamic_extension_object.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_dynamic_extension_object.js","sourceRoot":"","sources":["../source/resolve_dynamic_extension_object.ts"],"names":[],"mappings":"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"}
+{"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

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client-dynamic-extension-object",
-    "version": "2.70.3",
+    "version": "2.71.0",
     "description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -12,21 +12,21 @@
     "dependencies": {
         "chalk": "4.1.2",
         "node-opcua-assert": "2.66.0",
-        "node-opcua-binary-stream": "2.69.0",
+        "node-opcua-binary-stream": "2.71.0",
         "node-opcua-constants": "2.70.0",
-        "node-opcua-data-model": "2.70.0",
-        "node-opcua-data-value": "2.70.0",
-        "node-opcua-debug": "2.69.0",
-        "node-opcua-extension-object": "2.70.0",
-        "node-opcua-factory": "2.70.0",
-        "node-opcua-nodeid": "2.70.0",
-        "node-opcua-pseudo-session": "2.70.3",
-        "node-opcua-schemas": "2.70.3",
-        "node-opcua-service-browse": "2.70.3",
-        "node-opcua-service-translate-browse-path": "2.70.3",
-        "node-opcua-status-code": "2.70.0",
-        "node-opcua-types": "2.70.3",
-        "node-opcua-variant": "2.70.0"
+        "node-opcua-data-model": "2.71.0",
+        "node-opcua-data-value": "2.71.0",
+        "node-opcua-debug": "2.71.0",
+        "node-opcua-extension-object": "2.71.0",
+        "node-opcua-factory": "2.71.0",
+        "node-opcua-nodeid": "2.71.0",
+        "node-opcua-pseudo-session": "2.71.0",
+        "node-opcua-schemas": "2.71.0",
+        "node-opcua-service-browse": "2.71.0",
+        "node-opcua-service-translate-browse-path": "2.71.0",
+        "node-opcua-status-code": "2.71.0",
+        "node-opcua-types": "2.71.0",
+        "node-opcua-variant": "2.71.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "08b5465af631fd010bc48843c951b2e556270de4"
+    "gitHead": "10f7cc1e1cd30dfef75adad9cb709a78401fabf3"
 }

package/source/convert_data_type_definition_to_structuretype_schema.ts

@@ -24,6 +24,7 @@ import {
 } from "node-opcua-types";
 import { ExtensionObject } from "node-opcua-extension-object";
 //
+import { DataType } from "node-opcua-variant";
 import { _findEncodings } from "./private/find_encodings";
 
 const debugLog = make_debugLog(__filename);
@@ -300,6 +301,14 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
     cache: { [key: string]: CacheForFieldResolution }
 ): Promise<StructuredTypeSchema> {
     if (definition instanceof StructureDefinition) {
+
+        let fieldCountToIgnore = 0;
+        let base: undefined | any = dataTypeFactory.getConstructorForDataType(definition.baseDataType)?.schema;
+        while (base && !(base.dataTypeNodeId.value === DataType.ExtensionObject && base.dataTypeNodeId.namespace === 0)) {
+            fieldCountToIgnore += base._possibleFields.length;
+            base = base._baseSchema;
+        }
+
         const fields: FieldInterfaceOptions[] = [];
 
         const isUnion = definition.structureType === StructureType.Union;
@@ -324,40 +333,44 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
 
         const postActions: ((schema: StructuredTypeSchema) => void)[] = [];
 
-        for (const fieldD of definition.fields!) {
-            let field: FieldInterfaceOptions | undefined;
-            ({ field, switchBit, switchValue } = createField(fieldD, switchBit, bitFields, isUnion, switchValue));
+        if (definition.fields) {
+            for (let i = fieldCountToIgnore; i < definition.fields.length; i++) {
+                const fieldD = definition.fields[i];
+                // we need to skip fields that have already been handled in base class
+
+                let field: FieldInterfaceOptions | undefined;
+                ({ field, switchBit, switchValue } = createField(fieldD, switchBit, bitFields, isUnion, switchValue));
+
+                if (fieldD.dataType.value === dataTypeNodeId.value && fieldD.dataType.namespace === dataTypeNodeId.namespace) {
+                    // this is a structure with a field of the same type
+                    // push an empty placeholder that we will fill later
+                    const fieldTypeName = await readBrowseName(session, dataTypeNodeId);
+                    (field.fieldType = fieldTypeName!), (field.category = FieldCategory.complex);
+                    fields.push(field);
+                    const capturedField = field;
+                    postActions.push((schema: StructuredTypeSchema) => {
+                        capturedField.schema = schema;
+                    });
+                    continue;
+                }
+                const rt = (await resolveFieldType(session, fieldD.dataType, dataTypeFactory, cache))!;
+                if (!rt) {
+                    errorLog(
+                        "convertDataTypeDefinitionToStructureTypeSchema cannot handle field",
+                        fieldD.name,
+                        "in",
+                        name,
+                        "because " + fieldD.dataType.toString() + " cannot be resolved"
+                    );
+                    continue;
+                }
+                const { schema, category, fieldTypeName } = rt;
 
-            if (fieldD.dataType.value === dataTypeNodeId.value && fieldD.dataType.namespace === dataTypeNodeId.namespace) {
-                // this is a structure with a field of the same type
-                // push an empty placeholder that we will fill later
-                const fieldTypeName = await readBrowseName(session, dataTypeNodeId);
-                (field.fieldType = fieldTypeName!), (field.category = FieldCategory.complex);
+                (field.fieldType = fieldTypeName!), (field.category = category);
+                field.schema = schema;
                 fields.push(field);
-                const capturedField = field;
-                postActions.push((schema: StructuredTypeSchema) => {
-                    capturedField.schema = schema;
-                });
-                continue;
-            }
-            const rt = (await resolveFieldType(session, fieldD.dataType, dataTypeFactory, cache))!;
-            if (!rt) {
-                errorLog(
-                    "convertDataTypeDefinitionToStructureTypeSchema cannot handle field",
-                    fieldD.name,
-                    "in",
-                    name,
-                    "because " + fieldD.dataType.toString() + " cannot be resolved"
-                );
-                continue;
             }
-            const { schema, category, fieldTypeName } = rt;
-
-            (field.fieldType = fieldTypeName!), (field.category = category);
-            field.schema = schema;
-            fields.push(field);
         }
-
         const a = await resolveFieldType(session, definition.baseDataType, dataTypeFactory, cache);
         const baseType = a ? a.fieldTypeName : "ExtensionObject";
 

package/source/private/populate_data_type_manager_104.ts

@@ -45,6 +45,7 @@ export async function readDataTypeDefinitionAndBuildType(
         );
 
         createDynamicObjectConstructor(schema, dataTypeFactory);
+
     } catch (err) {
         errorLog("Error", err);
     }

package/source/resolve_dynamic_extension_object.ts

@@ -13,15 +13,18 @@ import { readDataTypeDefinitionAndBuildType } from "./private/populate_data_type
 
 const warningLog = make_warningLog(__filename);
 
-async function getOrExtractConstructor(session: IBasicSession, binaryEncodingNodeId: NodeId, dataTypeManager: ExtraDataTypeManager): Promise<ConstructorFunc>
-{
+async function getOrExtractConstructor(
+    session: IBasicSession,
+    binaryEncodingNodeId: NodeId,
+    dataTypeManager: ExtraDataTypeManager
+): Promise<ConstructorFunc> {
     const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(binaryEncodingNodeId.namespace);
     const Constructor = dataTypeFactory.getConstructor(binaryEncodingNodeId);
     if (Constructor) {
         return Constructor;
     }
-    if (binaryEncodingNodeId.namespace ===0) {
-        throw new Error("Internal Error"); 
+    if (binaryEncodingNodeId.namespace === 0) {
+        throw new Error("Internal Error");
     }
     // need to extract it
     const browseResult = await session.browse({
@@ -35,14 +38,14 @@ async function getOrExtractConstructor(session: IBasicSession, binaryEncodingNod
     if (browseResult.statusCode !== StatusCodes.Good || browseResult.references!.length !== 1) {
         throw new Error("browse failed");
     }
-    const r =  browseResult.references![0];
-    const dataTypeNodeId =r.nodeId;
+    const r = browseResult.references![0];
+    const dataTypeNodeId = r.nodeId;
 
     if (dataTypeFactory.getConstructorForDataType(dataTypeNodeId)) {
-        throw new Error("Internal Error: we are not expecting this dataType to be processed already"); 
+        throw new Error("Internal Error: we are not expecting this dataType to be processed already");
     }
     await readDataTypeDefinitionAndBuildType(session, dataTypeNodeId, r.browseName.name!, dataTypeFactory, {});
-    
+
     return dataTypeFactory.getConstructorForDataType(dataTypeNodeId)!;
 }
 
@@ -100,5 +103,5 @@ export async function resolveDynamicExtensionObject(
     if (!(variant.value instanceof OpaqueStructure)) {
         return;
     }
-    variant.value = await resolveDynamicExtensionObjectV(session, variant.value as OpaqueStructure, dataTypeManager);
-}
+    variant.value = await resolveDynamicExtensionObjectV(session, variant.value, dataTypeManager);
+}