node-opcua-client-dynamic-extension-object 2.63.1 → 2.64.1

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client-dynamic-extension-object",
-    "version": "2.63.1",
+    "version": "2.64.1",
     "description": "pure nodejs OPCUA SDK - module client-dynamic-extension-object",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -11,22 +11,22 @@
     },
     "dependencies": {
         "chalk": "4.1.2",
-        "node-opcua-assert": "2.63.0",
-        "node-opcua-binary-stream": "2.63.1",
-        "node-opcua-constants": "2.62.7",
-        "node-opcua-data-model": "2.63.1",
-        "node-opcua-data-value": "2.63.1",
-        "node-opcua-debug": "2.63.1",
-        "node-opcua-extension-object": "2.63.1",
-        "node-opcua-factory": "2.63.1",
-        "node-opcua-nodeid": "2.63.1",
-        "node-opcua-pseudo-session": "2.63.1",
-        "node-opcua-schemas": "2.63.1",
-        "node-opcua-service-browse": "2.63.1",
-        "node-opcua-service-translate-browse-path": "2.63.1",
-        "node-opcua-status-code": "2.63.1",
-        "node-opcua-types": "2.63.1",
-        "node-opcua-variant": "2.63.1"
+        "node-opcua-assert": "2.64.1",
+        "node-opcua-binary-stream": "2.64.1",
+        "node-opcua-constants": "2.64.1",
+        "node-opcua-data-model": "2.64.1",
+        "node-opcua-data-value": "2.64.1",
+        "node-opcua-debug": "2.64.1",
+        "node-opcua-extension-object": "2.64.1",
+        "node-opcua-factory": "2.64.1",
+        "node-opcua-nodeid": "2.64.1",
+        "node-opcua-pseudo-session": "2.64.1",
+        "node-opcua-schemas": "2.64.1",
+        "node-opcua-service-browse": "2.64.1",
+        "node-opcua-service-translate-browse-path": "2.64.1",
+        "node-opcua-status-code": "2.64.1",
+        "node-opcua-types": "2.64.1",
+        "node-opcua-variant": "2.64.1"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "d37385314fce703c1cc197104c592df03b2663fb"
+    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
 }

package/source/convert_data_type_definition_to_structuretype_schema.ts

@@ -14,7 +14,7 @@ import {
 import { NodeId, makeExpandedNodeId, resolveNodeId } from "node-opcua-nodeid";
 import { browseAll, BrowseDescriptionLike, IBasicSession } from "node-opcua-pseudo-session";
 import { StatusCodes } from "node-opcua-status-code";
-import { EnumDefinition, DataTypeDefinition, StructureDefinition, StructureType } from "node-opcua-types";
+import { EnumDefinition, DataTypeDefinition, StructureDefinition, StructureType, StructureField } from "node-opcua-types";
 import { ExtensionObject } from "node-opcua-extension-object";
 //
 import { _findEncodings } from "./private/find_encodings";
@@ -276,6 +276,7 @@ async function _setupEncodings(
     return schema;
 }
 
+// eslint-disable-next-line max-statements
 export async function convertDataTypeDefinitionToStructureTypeSchema(
     session: IBasicSession,
     dataTypeNodeId: NodeId,
@@ -307,10 +308,29 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
 
         const bitFields: { name: string; length?: number }[] | undefined = isUnion ? undefined : [];
 
+        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 (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) {
-                console.log(
+                errorLog(
                     "convertDataTypeDefinitionToStructureTypeSchema cannot handle field",
                     fieldD.name,
                     "in",
@@ -321,27 +341,7 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
             }
             const { schema, category, fieldTypeName } = rt;
 
-            const field: FieldInterfaceOptions = {
-                fieldType: fieldTypeName!,
-                name: fieldD.name!,
-                schema
-            };
-
-            if (fieldD.isOptional) {
-                field.switchBit = switchBit++;
-                bitFields?.push({ name: fieldD.name! + "Specified", length: 1 });
-            }
-            if (isUnion) {
-                field.switchValue = switchValue;
-                switchValue += 1;
-            }
-
-            assert(fieldD.valueRank === -1 || fieldD.valueRank === 1 || fieldD.valueRank === 0);
-            if (fieldD.valueRank === 1) {
-                field.isArray = true;
-            } else {
-                field.isArray = false;
-            }
+            field.fieldType= fieldTypeName!,
             field.category = category;
             field.schema = schema;
             fields.push(field);
@@ -358,7 +358,35 @@ export async function convertDataTypeDefinitionToStructureTypeSchema(
             name
         });
         const structuredTypeSchema = await _setupEncodings(session, dataTypeNodeId, os);
+
+        postActions.forEach((action)=>action(structuredTypeSchema));
+
         return structuredTypeSchema;
     }
     throw new Error("Not Implemented");
+
+    function createField(fieldD: StructureField, switchBit: number, bitFields: { name: string; length?: number | undefined; }[] | undefined, isUnion: boolean, switchValue: number) {
+        const field: FieldInterfaceOptions = {
+            fieldType: "",
+            name: fieldD.name!,
+            schema: null
+        };
+
+        if (fieldD.isOptional) {
+            field.switchBit = switchBit++;
+            bitFields?.push({ name: fieldD.name! + "Specified", length: 1 });
+        }
+        if (isUnion) {
+            field.switchValue = switchValue;
+            switchValue += 1;
+        }
+
+        assert(fieldD.valueRank === -1 || fieldD.valueRank === 1 || fieldD.valueRank === 0);
+        if (fieldD.valueRank === 1) {
+            field.isArray = true;
+        } else {
+            field.isArray = false;
+        }
+        return { field, switchBit, switchValue };
+    }
 }

package/source/private/populate_data_type_manager_103.ts

@@ -198,6 +198,7 @@ function sortStructure(dataTypeDefinitions: DataTypeDefinitions) {
         if (_visited[hash]) {
             return;
         }
+        _visited[hash] = d;
         const bbb = _map[d.dataTypeDefinition.baseDataType.toString()];
         if (bbb) {
             _visit(bbb);
@@ -210,7 +211,7 @@ function sortStructure(dataTypeDefinitions: DataTypeDefinitions) {
             }
             _visit(ddd);
         }
-        _visited[hash] = d;
+       
         dataTypeDefinitionsSorted.push(d);
     }
     for (const d of dataTypeDefinitions) {