node-opcua-client-dynamic-extension-object 2.113.0 → 2.114.0

package/dist/private/populate_data_type_manager_103.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -52,153 +43,145 @@ const warningLog = (0, node_opcua_debug_1.make_warningLog)(__filename);
 //           It will takes time for old opcua server to be refurbished and we may have to
 //           keep the current method to access type definition from embedded xsd.
 //
-function _readDeprecatedFlag(session, dataTypeDictionary) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const browsePath = (0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(dataTypeDictionary, ".Deprecated");
-        const a = yield session.translateBrowsePath(browsePath);
-        /* istanbul ignore next */
-        if (!a.targets || a.targets.length === 0) {
-            // the server is probably version < 1.04.
-            debugLog("Cannot find Deprecated property for dataTypeDictionary " + dataTypeDictionary.toString());
-            return false;
-        }
-        const deprecatedFlagNodeId = a.targets[0].targetId;
-        const dataValue = yield session.read({ nodeId: deprecatedFlagNodeId, attributeId: node_opcua_data_model_1.AttributeIds.Value });
-        return dataValue.value.value;
-    });
+async function _readDeprecatedFlag(session, dataTypeDictionary) {
+    const browsePath = (0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(dataTypeDictionary, ".Deprecated");
+    const a = await session.translateBrowsePath(browsePath);
+    /* istanbul ignore next */
+    if (!a.targets || a.targets.length === 0) {
+        // the server is probably version < 1.04.
+        debugLog("Cannot find Deprecated property for dataTypeDictionary " + dataTypeDictionary.toString());
+        return false;
+    }
+    const deprecatedFlagNodeId = a.targets[0].targetId;
+    const dataValue = await session.read({ nodeId: deprecatedFlagNodeId, attributeId: node_opcua_data_model_1.AttributeIds.Value });
+    return dataValue.value.value;
 }
-function _readNamespaceUriProperty(session, dataTypeDictionary) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const a = yield session.translateBrowsePath((0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(dataTypeDictionary, ".NamespaceUri"));
-        /* istanbul ignore next */
-        if (!a.targets || a.targets.length === 0) {
-            return "??dataTypeDictionary doesn't expose NamespaceUri property??";
-        }
-        const namespaceUriProp = a.targets[0].targetId;
-        const dataValue = yield session.read({ nodeId: namespaceUriProp, attributeId: node_opcua_data_model_1.AttributeIds.Value });
-        return dataValue.value.value || "<not set>";
-    });
+async function _readNamespaceUriProperty(session, dataTypeDictionary) {
+    const a = await session.translateBrowsePath((0, node_opcua_service_translate_browse_path_1.makeBrowsePath)(dataTypeDictionary, ".NamespaceUri"));
+    /* istanbul ignore next */
+    if (!a.targets || a.targets.length === 0) {
+        return "??dataTypeDictionary doesn't expose NamespaceUri property??";
+    }
+    const namespaceUriProp = a.targets[0].targetId;
+    const dataValue = await session.read({ nodeId: namespaceUriProp, attributeId: node_opcua_data_model_1.AttributeIds.Value });
+    return dataValue.value.value || "<not set>";
 }
-function _getDataTypeDescriptions(session, dataTypeDictionaryNodeId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nodeToBrowse2 = {
-            browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
-            includeSubtypes: false,
-            nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
-            nodeId: dataTypeDictionaryNodeId,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
-            // resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
-            resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
-        };
-        const result2 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse2);
-        result2.references = result2.references || [];
-        return result2.references.map((r) => ({ nodeId: r.nodeId, browseName: r.browseName }));
-    });
+async function _getDataTypeDescriptions(session, dataTypeDictionaryNodeId) {
+    const nodeToBrowse2 = {
+        browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
+        includeSubtypes: false,
+        nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
+        nodeId: dataTypeDictionaryNodeId,
+        referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
+        // resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
+        resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
+    };
+    const result2 = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse2);
+    result2.references = result2.references || [];
+    return result2.references.map((r) => ({ nodeId: r.nodeId, browseName: r.browseName }));
 }
-function _enrichWithDescriptionOf(session, dataTypeDescriptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nodesToBrowse3 = [];
-        for (const ref of dataTypeDescriptions) {
-            ref.browseName.toString();
-            nodesToBrowse3.push({
+async function _enrichWithDescriptionOf(session, dataTypeDescriptions) {
+    const nodesToBrowse3 = [];
+    for (const ref of dataTypeDescriptions) {
+        ref.browseName.toString();
+        nodesToBrowse3.push({
+            browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
+            includeSubtypes: false,
+            nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object"),
+            nodeId: ref.nodeId.toString(),
+            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasDescription"),
+            //            resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
+            resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId")
+        });
+    }
+    /* istanbul ignore next */
+    if (nodesToBrowse3.length === 0) {
+        return [];
+    }
+    const results3 = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowse3);
+    const binaryEncodings = [];
+    const nodesToBrowseDataType = [];
+    for (let i = 0; i < results3.length; i++) {
+        const result3 = results3[i];
+        const dataTypeDescription = dataTypeDescriptions[i];
+        result3.references = result3.references || [];
+        if (result3.references.length === 0) {
+            // may be the dataType is abstract and as no need for DescriptionOF
+            continue;
+        }
+        if (result3.references.length !== 1) {
+            warningLog("_enrichWithDescriptionOf : expecting 1 reference for ", dataTypeDescription.browseName.toString());
+            warningLog(result3.toString());
+            continue;
+        }
+        for (const ref of result3.references) {
+            const binaryEncodingNodeId = ref.nodeId;
+            dataTypeDescription.encodings = dataTypeDescription.encodings || {
+                binaryEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
+                dataTypeNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
+                jsonEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
+                xmlEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId
+            };
+            dataTypeDescription.encodings.binaryEncodingNodeId = binaryEncodingNodeId;
+            binaryEncodings.push(binaryEncodingNodeId);
+            nodesToBrowseDataType.push({
                 browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
                 includeSubtypes: false,
-                nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object"),
-                nodeId: ref.nodeId.toString(),
-                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasDescription"),
+                nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
+                nodeId: ref.nodeId,
+                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
                 //            resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
-                resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId")
+                resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
             });
         }
-        /* istanbul ignore next */
-        if (nodesToBrowse3.length === 0) {
-            return [];
-        }
-        const results3 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowse3);
-        const binaryEncodings = [];
-        const nodesToBrowseDataType = [];
-        for (let i = 0; i < results3.length; i++) {
-            const result3 = results3[i];
-            const dataTypeDescription = dataTypeDescriptions[i];
-            result3.references = result3.references || [];
-            if (result3.references.length === 0) {
-                // may be the dataType is abstract and as no need for DescriptionOF
-                continue;
-            }
-            if (result3.references.length !== 1) {
-                warningLog("_enrichWithDescriptionOf : expecting 1 reference for ", dataTypeDescription.browseName.toString());
-                warningLog(result3.toString());
-                continue;
-            }
-            for (const ref of result3.references) {
-                const binaryEncodingNodeId = ref.nodeId;
-                dataTypeDescription.encodings = dataTypeDescription.encodings || {
-                    binaryEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
-                    dataTypeNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
-                    jsonEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId,
-                    xmlEncodingNodeId: node_opcua_nodeid_1.NodeId.nullNodeId
-                };
-                dataTypeDescription.encodings.binaryEncodingNodeId = binaryEncodingNodeId;
-                binaryEncodings.push(binaryEncodingNodeId);
-                nodesToBrowseDataType.push({
-                    browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
-                    includeSubtypes: false,
-                    nodeClassMask: node_opcua_data_model_1.NodeClassMask.DataType,
-                    nodeId: ref.nodeId,
-                    referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
-                    //            resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
-                    resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
-                });
-            }
-        }
-        const dataTypeNodeIds = [];
-        if (nodesToBrowseDataType.length > 0) {
-            const results4 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowseDataType);
-            for (let i = 0; i < results4.length; i++) {
-                const result4 = results4[i];
-                result4.references = result4.references || [];
-                /* istanbul ignore next */
-                if (result4.references.length !== 1) {
-                    errorLog("What's going on ?", result4.toString(), "result4.references.length = ", result4.references.length);
-                }
-                const ref = result4.references[0];
-                const dataTypeNodeId = ref.nodeId;
-                dataTypeNodeIds[i] = dataTypeNodeId;
-                const dataTypeDescription = dataTypeDescriptions[i];
-                dataTypeDescription.encodings.dataTypeNodeId = dataTypeNodeId;
+    }
+    const dataTypeNodeIds = [];
+    if (nodesToBrowseDataType.length > 0) {
+        const results4 = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowseDataType);
+        for (let i = 0; i < results4.length; i++) {
+            const result4 = results4[i];
+            result4.references = result4.references || [];
+            /* istanbul ignore next */
+            if (result4.references.length !== 1) {
+                errorLog("What's going on ?", result4.toString(), "result4.references.length = ", result4.references.length);
             }
-        }
-        const otherEncodingBrowse = dataTypeNodeIds.map((dataTypeNodeId) => ({
-            browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
-            includeSubtypes: false,
-            nodeClassMask: node_opcua_data_model_1.NodeClassMask.Object,
-            nodeId: dataTypeNodeId,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
-            //            resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
-            resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
-        }));
-        const results5 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, otherEncodingBrowse);
-        for (let i = 0; i < results5.length; i++) {
-            const result5 = results5[i];
+            const ref = result4.references[0];
+            const dataTypeNodeId = ref.nodeId;
+            dataTypeNodeIds[i] = dataTypeNodeId;
             const dataTypeDescription = dataTypeDescriptions[i];
-            for (const ref of result5.references || []) {
-                switch (ref.browseName.name) {
-                    case "Default XML":
-                        dataTypeDescription.encodings.xmlEncodingNodeId = ref.nodeId;
-                        break;
-                    case "Default Binary":
-                        dataTypeDescription.encodings.binaryEncodingNodeId = ref.nodeId;
-                        break;
-                    case "Default JSON":
-                        dataTypeDescription.encodings.jsonEncodingNodeId = ref.nodeId;
-                        break;
-                    default:
-                        errorLog("Cannot handle unknown encoding", ref.browseName.name);
-                }
+            dataTypeDescription.encodings.dataTypeNodeId = dataTypeNodeId;
+        }
+    }
+    const otherEncodingBrowse = dataTypeNodeIds.map((dataTypeNodeId) => ({
+        browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
+        includeSubtypes: false,
+        nodeClassMask: node_opcua_data_model_1.NodeClassMask.Object,
+        nodeId: dataTypeNodeId,
+        referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasEncoding"),
+        //            resultMask: makeResultMask("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
+        resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | BrowseName")
+    }));
+    const results5 = await (0, node_opcua_pseudo_session_1.browseAll)(session, otherEncodingBrowse);
+    for (let i = 0; i < results5.length; i++) {
+        const result5 = results5[i];
+        const dataTypeDescription = dataTypeDescriptions[i];
+        for (const ref of result5.references || []) {
+            switch (ref.browseName.name) {
+                case "Default XML":
+                    dataTypeDescription.encodings.xmlEncodingNodeId = ref.nodeId;
+                    break;
+                case "Default Binary":
+                    dataTypeDescription.encodings.binaryEncodingNodeId = ref.nodeId;
+                    break;
+                case "Default JSON":
+                    dataTypeDescription.encodings.jsonEncodingNodeId = ref.nodeId;
+                    break;
+                default:
+                    errorLog("Cannot handle unknown encoding", ref.browseName.name);
             }
         }
-        return dataTypeNodeIds;
-    });
+    }
+    return dataTypeNodeIds;
 }
 function sortStructure(dataTypeDefinitions) {
     const dataTypeDefinitionsSorted = [];
@@ -231,185 +214,177 @@ function sortStructure(dataTypeDefinitions) {
     }
     return dataTypeDefinitionsSorted;
 }
-function _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory) {
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, node_opcua_assert_1.assert)(dataTypeFactory, "expecting a dataTypeFactory");
-        const dataTypeDescriptions = yield _getDataTypeDescriptions(session, dataTypeDictionaryNodeId);
-        const dataTypeNodeIds = yield _enrichWithDescriptionOf(session, dataTypeDescriptions);
-        // now read DataTypeDefinition attributes of all the dataTypeNodeIds, this will only contains concrete structure
-        const nodesToRead = dataTypeNodeIds.map((nodeId) => ({
-            attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition,
-            nodeId
-        }));
-        const cache = {};
-        const dataValuesWithDataTypeDefinition = nodesToRead.length > 0 ? yield session.read(nodesToRead) : [];
-        // in some circumstances like Euromap, this assert fails:
-        // assert(dataValuesWithDataTypeDefinition.length === dataTypeDescriptions.length);
-        const dataTypeDefinitions = [];
-        let index = 0;
-        for (const dataValue of dataValuesWithDataTypeDefinition) {
-            const dataTypeNodeId = dataTypeNodeIds[index];
-            const dataTypeDescription = dataTypeDescriptions[index];
-            /* istanbul ignore else */
-            if (dataValue.statusCode.isGood()) {
-                const dataTypeDefinition = dataValue.value.value;
-                if (dataTypeDefinition && dataTypeDefinition instanceof node_opcua_types_1.StructureDefinition) {
-                    const className = dataTypeDescription.browseName.name;
-                    dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract: false });
-                }
-            }
-            else {
-                debugLog("dataTypeNodeId ", dataTypeNodeId.toString(), " has no DataTypeDescription attribute", dataValue.statusCode.toString());
+async function _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory) {
+    (0, node_opcua_assert_1.assert)(dataTypeFactory, "expecting a dataTypeFactory");
+    const dataTypeDescriptions = await _getDataTypeDescriptions(session, dataTypeDictionaryNodeId);
+    const dataTypeNodeIds = await _enrichWithDescriptionOf(session, dataTypeDescriptions);
+    // now read DataTypeDefinition attributes of all the dataTypeNodeIds, this will only contains concrete structure
+    const nodesToRead = dataTypeNodeIds.map((nodeId) => ({
+        attributeId: node_opcua_data_model_1.AttributeIds.DataTypeDefinition,
+        nodeId
+    }));
+    const cache = {};
+    const dataValuesWithDataTypeDefinition = nodesToRead.length > 0 ? await session.read(nodesToRead) : [];
+    // in some circumstances like Euromap, this assert fails:
+    // assert(dataValuesWithDataTypeDefinition.length === dataTypeDescriptions.length);
+    const dataTypeDefinitions = [];
+    let index = 0;
+    for (const dataValue of dataValuesWithDataTypeDefinition) {
+        const dataTypeNodeId = dataTypeNodeIds[index];
+        const dataTypeDescription = dataTypeDescriptions[index];
+        /* istanbul ignore else */
+        if (dataValue.statusCode.isGood()) {
+            const dataTypeDefinition = dataValue.value.value;
+            if (dataTypeDefinition && dataTypeDefinition instanceof node_opcua_types_1.StructureDefinition) {
+                const className = dataTypeDescription.browseName.name;
+                dataTypeDefinitions.push({ className, dataTypeNodeId, dataTypeDefinition, isAbstract: false });
             }
-            index++;
         }
-        // to do put in logical order
-        const dataTypeDefinitionsSorted = sortStructure(dataTypeDefinitions);
+        else {
+            debugLog("dataTypeNodeId ", dataTypeNodeId.toString(), " has no DataTypeDescription attribute", dataValue.statusCode.toString());
+        }
+        index++;
+    }
+    // to do put in logical order
+    const dataTypeDefinitionsSorted = sortStructure(dataTypeDefinitions);
+    // istanbul ignore next
+    if (doDebug) {
+        debugLog("order ", dataTypeDefinitionsSorted.map((a) => a.className + " " + a.dataTypeNodeId).join(" ->  "));
+    }
+    for (const { className, dataTypeNodeId, dataTypeDefinition, isAbstract } of dataTypeDefinitionsSorted) {
         // istanbul ignore next
         if (doDebug) {
-            debugLog("order ", dataTypeDefinitionsSorted.map((a) => a.className + " " + a.dataTypeNodeId).join(" ->  "));
+            debugLog(chalk_1.default.yellow("--------------------------------------- "), className, dataTypeNodeId.toString());
+        }
+        if (dataTypeFactory.hasStructureByTypeName(className)) {
+            continue; // this structure has already been seen
         }
-        for (const { className, dataTypeNodeId, dataTypeDefinition, isAbstract } of dataTypeDefinitionsSorted) {
+        // now fill typeDictionary
+        try {
+            const schema = await (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, className, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
             // istanbul ignore next
             if (doDebug) {
-                debugLog(chalk_1.default.yellow("--------------------------------------- "), className, dataTypeNodeId.toString());
-            }
-            if (dataTypeFactory.hasStructureByTypeName(className)) {
-                continue; // this structure has already been seen
-            }
-            // now fill typeDictionary
-            try {
-                const schema = yield (0, convert_data_type_definition_to_structuretype_schema_1.convertDataTypeDefinitionToStructureTypeSchema)(session, dataTypeNodeId, className, dataTypeDefinition, dataTypeFactory, isAbstract, cache);
-                // istanbul ignore next
-                if (doDebug) {
-                    debugLog(chalk_1.default.red("Registering "), chalk_1.default.cyan(className.padEnd(30, " ")), schema.dataTypeNodeId.toString());
-                }
-                const Constructor = (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
-                (0, node_opcua_assert_1.assert)(Constructor.schema === schema);
-            }
-            catch (err) {
-                errorLog("Constructor verification err: ", err.message);
-                errorLog("For this reason class " + className + " has not been registered");
-                errorLog(err);
+                debugLog(chalk_1.default.red("Registering "), chalk_1.default.cyan(className.padEnd(30, " ")), schema.dataTypeNodeId.toString());
             }
+            const Constructor = (0, node_opcua_schemas_1.createDynamicObjectConstructor)(schema, dataTypeFactory);
+            (0, node_opcua_assert_1.assert)(Constructor.schema === schema);
         }
-    });
+        catch (err) {
+            errorLog("Constructor verification err: ", err.message);
+            errorLog("For this reason class " + className + " has not been registered");
+            errorLog(err);
+        }
+    }
 }
-function _extractNodeIds(session, dataTypeDictionaryNodeId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const map = {};
-        const dataTypeDescriptions = yield _getDataTypeDescriptions(session, dataTypeDictionaryNodeId);
-        /* const dataTypeNodeIds =  */
-        yield _enrichWithDescriptionOf(session, dataTypeDescriptions);
-        for (const dataTypeDescription of dataTypeDescriptions) {
-            map[dataTypeDescription.browseName.name.toString()] = dataTypeDescription.encodings;
+async function _extractNodeIds(session, dataTypeDictionaryNodeId) {
+    const map = {};
+    const dataTypeDescriptions = await _getDataTypeDescriptions(session, dataTypeDictionaryNodeId);
+    /* const dataTypeNodeIds =  */
+    await _enrichWithDescriptionOf(session, dataTypeDescriptions);
+    for (const dataTypeDescription of dataTypeDescriptions) {
+        map[dataTypeDescription.browseName.name.toString()] = dataTypeDescription.encodings;
+    }
+    return {
+        getDataTypeAndEncodingId(key) {
+            return map[key] || null;
         }
-        return {
-            getDataTypeAndEncodingId(key) {
-                return map[key] || null;
-            }
-        };
-    });
+    };
 }
 function _isOldDataTypeDictionary(d) {
     const isDictionaryDeprecated = d.isDictionaryDeprecated; // await _readDeprecatedFlag(session, dataTypeDictionaryNodeId);
     const rawSchema = d.rawSchema; // DataValue = await session.read({ nodeId: dataTypeDictionaryNodeId, attributeId: AttributeIds.Value });
     return !isDictionaryDeprecated && rawSchema.length >= 0;
 }
-function _extractDataTypeDictionary(session, d, dataTypeManager) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const dataTypeDictionaryNodeId = d.reference.nodeId;
-        const name = yield session.read({ nodeId: dataTypeDictionaryNodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName });
-        const namespace = yield _readNamespaceUriProperty(session, dataTypeDictionaryNodeId);
-        if (!_isOldDataTypeDictionary(d)) {
-            debugLog("DataTypeDictionary is deprecated or BSD schema stored in dataValue is null !", chalk_1.default.cyan(name.value.value.toString()), "namespace =", namespace);
-            debugLog("let's use the new way (1.04) and let's crawl all dataTypes exposed by this name space");
-            // dataType definition in store directly in UADataType under the definition attribute
-            const dataTypeFactory2 = dataTypeManager.getDataTypeFactory(dataTypeDictionaryNodeId.namespace);
-            if (!dataTypeFactory2) {
-                throw new Error("cannot find dataTypeFactory for namespace " + dataTypeDictionaryNodeId.namespace);
-            }
-            yield _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory2);
+async function _extractDataTypeDictionary(session, d, dataTypeManager) {
+    const dataTypeDictionaryNodeId = d.reference.nodeId;
+    const name = await session.read({ nodeId: dataTypeDictionaryNodeId, attributeId: node_opcua_data_model_1.AttributeIds.BrowseName });
+    const namespace = await _readNamespaceUriProperty(session, dataTypeDictionaryNodeId);
+    if (!_isOldDataTypeDictionary(d)) {
+        debugLog("DataTypeDictionary is deprecated or BSD schema stored in dataValue is null !", chalk_1.default.cyan(name.value.value.toString()), "namespace =", namespace);
+        debugLog("let's use the new way (1.04) and let's crawl all dataTypes exposed by this name space");
+        // dataType definition in store directly in UADataType under the definition attribute
+        const dataTypeFactory2 = dataTypeManager.getDataTypeFactory(dataTypeDictionaryNodeId.namespace);
+        if (!dataTypeFactory2) {
+            throw new Error("cannot find dataTypeFactory for namespace " + dataTypeDictionaryNodeId.namespace);
         }
-        else {
-            const rawSchema = d.rawSchema; // DataValue = await session.read({ nodeId: dataTypeDictionaryNodeId, attributeId: AttributeIds.Value });
-            debugLog(" ----- Using old method for extracting schema => with BSD files");
-            // old method ( until 1.03 )
-            // one need to read the schema file store in the dataTypeDictionary node and parse it !
-            /* istanbul ignore next */
-            if (doDebug) {
-                debugLog("---------------------------------------------");
-                debugLog(rawSchema.toString());
-                debugLog("---------------------------------------------");
-            }
-            const idProvider = yield _extractNodeIds(session, dataTypeDictionaryNodeId);
-            const dataTypeFactory1 = dataTypeManager.getDataTypeFactory(dataTypeDictionaryNodeId.namespace);
-            yield (0, node_opcua_schemas_1.parseBinaryXSDAsync)(rawSchema, idProvider, dataTypeFactory1);
+        await _extractDataTypeDictionaryFromDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory2);
+    }
+    else {
+        const rawSchema = d.rawSchema; // DataValue = await session.read({ nodeId: dataTypeDictionaryNodeId, attributeId: AttributeIds.Value });
+        debugLog(" ----- Using old method for extracting schema => with BSD files");
+        // old method ( until 1.03 )
+        // one need to read the schema file store in the dataTypeDictionary node and parse it !
+        /* istanbul ignore next */
+        if (doDebug) {
+            debugLog("---------------------------------------------");
+            debugLog(rawSchema.toString());
+            debugLog("---------------------------------------------");
         }
-    });
+        const idProvider = await _extractNodeIds(session, dataTypeDictionaryNodeId);
+        const dataTypeFactory1 = dataTypeManager.getDataTypeFactory(dataTypeDictionaryNodeId.namespace);
+        await (0, node_opcua_schemas_1.parseBinaryXSDAsync)(rawSchema, idProvider, dataTypeFactory1);
+    }
 }
-function _exploreDataTypeDefinition(session, dataTypeDictionaryTypeNode, dataTypeFactory, namespaces) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const nodeToBrowse = {
-            browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
+async function _exploreDataTypeDefinition(session, dataTypeDictionaryTypeNode, dataTypeFactory, namespaces) {
+    const nodeToBrowse = {
+        browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
+        includeSubtypes: false,
+        nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
+        nodeId: dataTypeDictionaryTypeNode,
+        referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
+        resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
+    };
+    const result = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
+    const references = result.references || [];
+    /* istanbul ignore next */
+    if (references.length === 0) {
+        return;
+    }
+    // request the Definition of each nodes
+    const nodesToBrowse2 = references.map((ref) => {
+        return {
+            browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
             includeSubtypes: false,
-            nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
-            nodeId: dataTypeDictionaryTypeNode,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
-            resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
+            nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object | Variable"),
+            nodeId: ref.nodeId,
+            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasDescription"),
+            resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
         };
-        const result = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
-        const references = result.references || [];
+    });
+    const results2 = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowse2);
+    const binaryEncodingNodeIds = results2.map((br) => {
+        const defaultBin = br.references.filter((r) => r.browseName.toString() === "Default Binary");
         /* istanbul ignore next */
-        if (references.length === 0) {
-            return;
+        if (defaultBin.length < 1) {
+            return node_opcua_nodeid_1.ExpandedNodeId;
         }
-        // request the Definition of each nodes
-        const nodesToBrowse2 = references.map((ref) => {
-            return {
-                browseDirection: node_opcua_service_browse_1.BrowseDirection.Inverse,
-                includeSubtypes: false,
-                nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Object | Variable"),
-                nodeId: ref.nodeId,
-                referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasDescription"),
-                resultMask: (0, node_opcua_data_model_1.makeResultMask)("NodeId | ReferenceType | BrowseName | NodeClass | TypeDefinition")
-            };
-        });
-        const results2 = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodesToBrowse2);
-        const binaryEncodingNodeIds = results2.map((br) => {
-            const defaultBin = br.references.filter((r) => r.browseName.toString() === "Default Binary");
-            /* istanbul ignore next */
-            if (defaultBin.length < 1) {
-                return node_opcua_nodeid_1.ExpandedNodeId;
-            }
-            return node_opcua_nodeid_1.ExpandedNodeId.fromNodeId(defaultBin[0].nodeId, namespaces[defaultBin[0].nodeId.namespace]);
-        });
-        // follow now Default Binary <= [Has Encoding] = [DataType]
-        /* istanbul ignore next */
-        if (doDebug) {
-            debugLog(chalk_1.default.bgWhite.red("testing new constructors"));
-            for (let i = 0; i < references.length; i++) {
-                const ref = references[i];
-                const binaryEncoding = binaryEncodingNodeIds[i];
-                const name = ref.browseName.name.toString();
-                debugLog("      type ", name.padEnd(30, " "), binaryEncoding.toString());
-                // let's verify that constructor is operational
-                try {
-                    const Constructor = dataTypeFactory.getStructureInfoByTypeName(name).constructor;
-                    if (!Constructor) {
-                        throw new Error(`Cannot instantiate abstract DataType(name=${name})`);
-                    }
-                    // xx const constructor = getOrCreateConstructor(name, dataTypeFactory, defaultBinary);
-                    const testObject = new Constructor();
-                    debugLog(testObject.toString());
-                }
-                catch (err) {
-                    debugLog("         Error cannot construct Extension Object " + name);
-                    debugLog("         " + err.message);
+        return node_opcua_nodeid_1.ExpandedNodeId.fromNodeId(defaultBin[0].nodeId, namespaces[defaultBin[0].nodeId.namespace]);
+    });
+    // follow now Default Binary <= [Has Encoding] = [DataType]
+    /* istanbul ignore next */
+    if (doDebug) {
+        debugLog(chalk_1.default.bgWhite.red("testing new constructors"));
+        for (let i = 0; i < references.length; i++) {
+            const ref = references[i];
+            const binaryEncoding = binaryEncodingNodeIds[i];
+            const name = ref.browseName.name.toString();
+            debugLog("      type ", name.padEnd(30, " "), binaryEncoding.toString());
+            // let's verify that constructor is operational
+            try {
+                const Constructor = dataTypeFactory.getStructureInfoByTypeName(name).constructor;
+                if (!Constructor) {
+                    throw new Error(`Cannot instantiate abstract DataType(name=${name})`);
                 }
+                // xx const constructor = getOrCreateConstructor(name, dataTypeFactory, defaultBinary);
+                const testObject = new Constructor();
+                debugLog(testObject.toString());
+            }
+            catch (err) {
+                debugLog("         Error cannot construct Extension Object " + name);
+                debugLog("         " + err.message);
             }
         }
-    });
+    }
 }
 const regexTargetNamespaceAttribute = /TargetNamespace="([^"]+)"|TargetNamespace='([^']+)'/;
 function extractTargetNamespaceAttribute(xmlElement) {
@@ -436,207 +411,200 @@ function extraNamespaceRef(attribute) {
  * @param dataTypeManager
  * @async
  */
-function populateDataTypeManager103(session, dataTypeManager) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        debugLog("in ... populateDataTypeManager");
-        // read namespace array
-        const dataValueNamespaceArray = yield session.read({
-            attributeId: node_opcua_data_model_1.AttributeIds.Value,
-            nodeId: (0, node_opcua_nodeid_1.resolveNodeId)("Server_NamespaceArray")
-        });
-        const namespaceArray = dataValueNamespaceArray.value.value;
-        // istanbul ignore next
-        if (!namespaceArray) {
-            debugLog("session: cannot read Server_NamespaceArray");
-            // throw new Error("Cannot get Server_NamespaceArray as a array of string");
-            return;
-        }
-        // istanbul ignore next
-        if (doDebug) {
-            debugLog("namespaceArray ", namespaceArray.map((a, index) => " " + index.toString().padEnd(3) + ":" + a).join(" "));
-        }
-        if (dataValueNamespaceArray.statusCode.isGood() && namespaceArray && namespaceArray.length > 0) {
-            dataTypeManager.setNamespaceArray(namespaceArray);
-            for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
-                if (!dataTypeManager.hasDataTypeFactory(namespaceIndex)) {
-                    const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
-                    dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
-                }
+async function populateDataTypeManager103(session, dataTypeManager) {
+    debugLog("in ... populateDataTypeManager");
+    // read namespace array
+    const dataValueNamespaceArray = await session.read({
+        attributeId: node_opcua_data_model_1.AttributeIds.Value,
+        nodeId: (0, node_opcua_nodeid_1.resolveNodeId)("Server_NamespaceArray")
+    });
+    const namespaceArray = dataValueNamespaceArray.value.value;
+    // istanbul ignore next
+    if (!namespaceArray) {
+        debugLog("session: cannot read Server_NamespaceArray");
+        // throw new Error("Cannot get Server_NamespaceArray as a array of string");
+        return;
+    }
+    // istanbul ignore next
+    if (doDebug) {
+        debugLog("namespaceArray ", namespaceArray.map((a, index) => " " + index.toString().padEnd(3) + ":" + a).join(" "));
+    }
+    if (dataValueNamespaceArray.statusCode.isGood() && namespaceArray && namespaceArray.length > 0) {
+        dataTypeManager.setNamespaceArray(namespaceArray);
+        for (let namespaceIndex = 1; namespaceIndex < namespaceArray.length; namespaceIndex++) {
+            if (!dataTypeManager.hasDataTypeFactory(namespaceIndex)) {
+                const dataTypeFactory1 = new node_opcua_factory_1.DataTypeFactory([(0, node_opcua_factory_1.getStandardDataTypeFactory)()]);
+                dataTypeManager.registerDataTypeFactory(namespaceIndex, dataTypeFactory1);
             }
         }
-        /// to do :: may be not useful
-        if (!dataValueNamespaceArray.value.value && dataTypeManager.namespaceArray.length === 0) {
-            dataTypeManager.setNamespaceArray([]);
-        }
-        const dataTypeDictionaryType = (0, node_opcua_nodeid_1.resolveNodeId)("DataTypeDictionaryType");
-        // DataType/OPCBinary => i=93 [OPCBinarySchema_TypeSystem]
-        // "OPC Binary"[DataSystemType]
-        const opcBinaryNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("OPCBinarySchema_TypeSystem");
-        // let find all DataType dictionary node corresponding to a given namespace
-        // (have DataTypeDictionaryType)
-        const nodeToBrowse = {
-            browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
-            includeSubtypes: false,
-            nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
-            nodeId: opcBinaryNodeId,
-            referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
-            resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
-        };
-        const result = yield (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
-        // istanbul ignore next
-        if (doDebug) {
-            debugLog(result.statusCode.toString());
-            debugLog((_a = result.references) === null || _a === void 0 ? void 0 : _a.map((r) => { var _a; return (_a = r.browseName) === null || _a === void 0 ? void 0 : _a.toString(); }).join(" "));
-        }
-        // filter nodes that have the expected namespace Index
-        // ( more specifically we want to filter out DataStructure from namespace 0)
-        // we also want to keep only object of type DataTypeDictionaryType
-        const references = result.references.filter((e) => e.nodeId.namespace !== 0 && (0, node_opcua_nodeid_1.sameNodeId)(e.typeDefinition, dataTypeDictionaryType));
-        debugLog(`found ${references.length} dictionary`);
-        function putInCorrectOrder() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const infos = [];
-                const innerMap = {};
-                for (const reference of references) {
-                    const dataTypeDictionaryNodeId = reference.nodeId;
-                    const isDictionaryDeprecated = yield _readDeprecatedFlag(session, dataTypeDictionaryNodeId);
-                    const rawSchemaDataValue = yield session.read({
-                        attributeId: node_opcua_data_model_1.AttributeIds.Value,
-                        nodeId: dataTypeDictionaryNodeId
-                    });
-                    const rawSchema = rawSchemaDataValue.value.value ? rawSchemaDataValue.value.value.toString() : "";
-                    const info = {
-                        dataTypeDictionaryNodeId,
-                        dependencies: {},
-                        isDictionaryDeprecated,
-                        rawSchema,
-                        reference,
-                        targetNamespace: ""
-                    };
-                    infos.push(info);
-                    if (!isDictionaryDeprecated && rawSchema.length > 0) {
-                        // istanbul ignore next
-                        if (doDebug) {
-                            debugLog("schema", rawSchema);
-                        }
-                        const matches = rawSchema.match(/<opc:TypeDictionary([^>]+)>/);
-                        if (matches) {
-                            // extract xml:NS="namespace" from attribute list
-                            // for instance:
-                            //      <opc:TypeDictionary
-                            //                xmlns:opc="http://opcfoundation.org/BinarySchema/"
-                            //                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                            //                xmlns:ua="http://opcfoundation.org/UA/"
-                            //                xmlns:tns="urn:SomeName:Ua:Types:GlobalTypes"
-                            //                DefaultByteOrder="LittleEndian"
-                            //                TargetNamespace="urn:SomeName:Ua:Types:GlobalTypes">
-                            const typeDictionaryElementAttributes = matches[1];
-                            info.targetNamespace = extractTargetNamespaceAttribute(typeDictionaryElementAttributes);
-                            const nsKeyNamespace = {};
-                            for (const attribute of typeDictionaryElementAttributes.split(" ")) {
-                                const r = extraNamespaceRef(attribute);
-                                if (r) {
-                                    const { xmlns, namespace } = r;
-                                    nsKeyNamespace[xmlns] = namespace;
-                                    debugLog("xxxx ns= ", xmlns, "=>", namespace);
-                                }
-                            }
-                            info.dependencies = nsKeyNamespace;
-                            debugLog("xxx targetNamespace = ", info.targetNamespace);
-                            innerMap[info.targetNamespace] = info;
-                        }
-                    }
-                    else {
-                        // may be 1.04 => the rawSchema is no more needed in new version
-                        info.targetNamespace = namespaceArray[dataTypeDictionaryNodeId.namespace];
-                        debugLog("xxx targetNamespace = ", info.targetNamespace);
-                        innerMap[info.targetNamespace] = info;
-                    }
-                    // assert(info.targetNamespace.length !== 0);
+    }
+    /// to do :: may be not useful
+    if (!dataValueNamespaceArray.value.value && dataTypeManager.namespaceArray.length === 0) {
+        dataTypeManager.setNamespaceArray([]);
+    }
+    const dataTypeDictionaryType = (0, node_opcua_nodeid_1.resolveNodeId)("DataTypeDictionaryType");
+    // DataType/OPCBinary => i=93 [OPCBinarySchema_TypeSystem]
+    // "OPC Binary"[DataSystemType]
+    const opcBinaryNodeId = (0, node_opcua_nodeid_1.resolveNodeId)("OPCBinarySchema_TypeSystem");
+    // let find all DataType dictionary node corresponding to a given namespace
+    // (have DataTypeDictionaryType)
+    const nodeToBrowse = {
+        browseDirection: node_opcua_service_browse_1.BrowseDirection.Forward,
+        includeSubtypes: false,
+        nodeClassMask: (0, node_opcua_data_model_1.makeNodeClassMask)("Variable"),
+        nodeId: opcBinaryNodeId,
+        referenceTypeId: (0, node_opcua_nodeid_1.resolveNodeId)("HasComponent"),
+        resultMask: (0, node_opcua_data_model_1.makeResultMask)("ReferenceType | IsForward | BrowseName | NodeClass | TypeDefinition")
+    };
+    const result = await (0, node_opcua_pseudo_session_1.browseAll)(session, nodeToBrowse);
+    // istanbul ignore next
+    if (doDebug) {
+        debugLog(result.statusCode.toString());
+        debugLog(result.references?.map((r) => r.browseName?.toString()).join(" "));
+    }
+    // filter nodes that have the expected namespace Index
+    // ( more specifically we want to filter out DataStructure from namespace 0)
+    // we also want to keep only object of type DataTypeDictionaryType
+    const references = result.references.filter((e) => e.nodeId.namespace !== 0 && (0, node_opcua_nodeid_1.sameNodeId)(e.typeDefinition, dataTypeDictionaryType));
+    debugLog(`found ${references.length} dictionary`);
+    async function putInCorrectOrder() {
+        const infos = [];
+        const innerMap = {};
+        for (const reference of references) {
+            const dataTypeDictionaryNodeId = reference.nodeId;
+            const isDictionaryDeprecated = await _readDeprecatedFlag(session, dataTypeDictionaryNodeId);
+            const rawSchemaDataValue = await session.read({
+                attributeId: node_opcua_data_model_1.AttributeIds.Value,
+                nodeId: dataTypeDictionaryNodeId
+            });
+            const rawSchema = rawSchemaDataValue.value.value ? rawSchemaDataValue.value.value.toString() : "";
+            const info = {
+                dataTypeDictionaryNodeId,
+                dependencies: {},
+                isDictionaryDeprecated,
+                rawSchema,
+                reference,
+                targetNamespace: ""
+            };
+            infos.push(info);
+            if (!isDictionaryDeprecated && rawSchema.length > 0) {
+                // istanbul ignore next
+                if (doDebug) {
+                    debugLog("schema", rawSchema);
                 }
-                // ----------------------------------
-                const orderedList = [];
-                const visited = {};
-                function explore(d) {
-                    if (visited[d.targetNamespace]) {
-                        return;
-                    }
-                    visited[d.targetNamespace] = 1;
-                    for (const [xmlns, namespace] of Object.entries(d.dependencies)) {
-                        if (!innerMap[namespace] || namespace === d.targetNamespace) {
-                            continue;
+                const matches = rawSchema.match(/<opc:TypeDictionary([^>]+)>/);
+                if (matches) {
+                    // extract xml:NS="namespace" from attribute list
+                    // for instance:
+                    //      <opc:TypeDictionary
+                    //                xmlns:opc="http://opcfoundation.org/BinarySchema/"
+                    //                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    //                xmlns:ua="http://opcfoundation.org/UA/"
+                    //                xmlns:tns="urn:SomeName:Ua:Types:GlobalTypes"
+                    //                DefaultByteOrder="LittleEndian"
+                    //                TargetNamespace="urn:SomeName:Ua:Types:GlobalTypes">
+                    const typeDictionaryElementAttributes = matches[1];
+                    info.targetNamespace = extractTargetNamespaceAttribute(typeDictionaryElementAttributes);
+                    const nsKeyNamespace = {};
+                    for (const attribute of typeDictionaryElementAttributes.split(" ")) {
+                        const r = extraNamespaceRef(attribute);
+                        if (r) {
+                            const { xmlns, namespace } = r;
+                            nsKeyNamespace[xmlns] = namespace;
+                            debugLog("xxxx ns= ", xmlns, "=>", namespace);
                         }
-                        explore(innerMap[namespace]);
                     }
-                    orderedList.push(d);
+                    info.dependencies = nsKeyNamespace;
+                    debugLog("xxx targetNamespace = ", info.targetNamespace);
+                    innerMap[info.targetNamespace] = info;
                 }
-                for (const d of infos) {
-                    explore(d);
-                }
-                debugLog(" Ordered List = ", orderedList.map((a) => a.targetNamespace).join("  "));
-                return orderedList;
-            });
+            }
+            else {
+                // may be 1.04 => the rawSchema is no more needed in new version
+                info.targetNamespace = namespaceArray[dataTypeDictionaryNodeId.namespace];
+                debugLog("xxx targetNamespace = ", info.targetNamespace);
+                innerMap[info.targetNamespace] = info;
+            }
+            // assert(info.targetNamespace.length !== 0);
         }
-        const dataTypeDictionaryInfo = yield putInCorrectOrder();
-        // setup dependencies
-        const map = {};
-        for (const d of dataTypeDictionaryInfo) {
-            map[d.targetNamespace] = d;
-            debugLog(" fixing based dataTypeFactory dependencies for  ", d.targetNamespace, "index = ", d.dataTypeDictionaryNodeId.namespace);
-            const baseDataFactories = [(0, node_opcua_factory_1.getStandardDataTypeFactory)()];
-            for (const namespace of Object.values(d.dependencies)) {
-                if (namespace === d.targetNamespace) {
-                    continue;
-                }
-                const baseDataFactory = map[namespace];
-                if (!baseDataFactory) {
+        // ----------------------------------
+        const orderedList = [];
+        const visited = {};
+        function explore(d) {
+            if (visited[d.targetNamespace]) {
+                return;
+            }
+            visited[d.targetNamespace] = 1;
+            for (const [xmlns, namespace] of Object.entries(d.dependencies)) {
+                if (!innerMap[namespace] || namespace === d.targetNamespace) {
                     continue;
                 }
-                const namespaceIndex = baseDataFactory.dataTypeDictionaryNodeId.namespace;
-                if (dataTypeManager.hasDataTypeFactory(namespaceIndex)) {
-                    const dep = dataTypeManager.getDataTypeFactory(namespaceIndex);
-                    baseDataFactories.push(dep);
-                    debugLog("   considering , ", baseDataFactory.targetNamespace, "index = ", baseDataFactory.dataTypeDictionaryNodeId.namespace);
-                }
-            }
-            const dataTypeFactory = dataTypeManager.getDataTypeFactory(d.dataTypeDictionaryNodeId.namespace);
-            if (dataTypeFactory) {
-                dataTypeFactory.repairBaseDataFactories(baseDataFactories);
+                explore(innerMap[namespace]);
             }
+            orderedList.push(d);
         }
-        // --------------------
-        // now investigate DataTypeDescriptionType
-        function processReferenceOnDataTypeDictionaryType(d) {
-            return __awaiter(this, void 0, void 0, function* () {
-                debugLog(chalk_1.default.cyan("processReferenceOnDataTypeDictionaryType on  "), d.targetNamespace);
-                const ref = d.reference;
-                const dataTypeDictionaryNodeId = d.reference.nodeId;
-                yield _extractDataTypeDictionary(session, d, dataTypeManager);
-                /* istanbul ignore next */
-                if (doDebug) {
-                    debugLog(chalk_1.default.bgWhite("                                         => "), ref.browseName.toString(), ref.nodeId.toString());
-                }
-                const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(dataTypeDictionaryNodeId.namespace);
-                yield _exploreDataTypeDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory, dataTypeManager.namespaceArray);
-            });
+        for (const d of infos) {
+            explore(d);
         }
-        // https://medium.com/swlh/dealing-with-multiple-promises-in-javascript-41d6c21f20ff
-        for (const d of dataTypeDictionaryInfo) {
-            try {
-                yield processReferenceOnDataTypeDictionaryType(d).catch((e) => {
-                    debugLog("processReferenceOnDataTypeDictionaryType has failed ");
-                    debugLog("Error", e.message);
-                    debugLog(e);
-                    return e;
-                });
+        debugLog(" Ordered List = ", orderedList.map((a) => a.targetNamespace).join("  "));
+        return orderedList;
+    }
+    const dataTypeDictionaryInfo = await putInCorrectOrder();
+    // setup dependencies
+    const map = {};
+    for (const d of dataTypeDictionaryInfo) {
+        map[d.targetNamespace] = d;
+        debugLog(" fixing based dataTypeFactory dependencies for  ", d.targetNamespace, "index = ", d.dataTypeDictionaryNodeId.namespace);
+        const baseDataFactories = [(0, node_opcua_factory_1.getStandardDataTypeFactory)()];
+        for (const namespace of Object.values(d.dependencies)) {
+            if (namespace === d.targetNamespace) {
+                continue;
             }
-            catch (err) {
-                debugLog(chalk_1.default.red("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "), err);
+            const baseDataFactory = map[namespace];
+            if (!baseDataFactory) {
+                continue;
+            }
+            const namespaceIndex = baseDataFactory.dataTypeDictionaryNodeId.namespace;
+            if (dataTypeManager.hasDataTypeFactory(namespaceIndex)) {
+                const dep = dataTypeManager.getDataTypeFactory(namespaceIndex);
+                baseDataFactories.push(dep);
+                debugLog("   considering , ", baseDataFactory.targetNamespace, "index = ", baseDataFactory.dataTypeDictionaryNodeId.namespace);
             }
         }
-        debugLog("out ... populateDataTypeManager");
-    });
+        const dataTypeFactory = dataTypeManager.getDataTypeFactory(d.dataTypeDictionaryNodeId.namespace);
+        if (dataTypeFactory) {
+            dataTypeFactory.repairBaseDataFactories(baseDataFactories);
+        }
+    }
+    // --------------------
+    // now investigate DataTypeDescriptionType
+    async function processReferenceOnDataTypeDictionaryType(d) {
+        debugLog(chalk_1.default.cyan("processReferenceOnDataTypeDictionaryType on  "), d.targetNamespace);
+        const ref = d.reference;
+        const dataTypeDictionaryNodeId = d.reference.nodeId;
+        await _extractDataTypeDictionary(session, d, dataTypeManager);
+        /* istanbul ignore next */
+        if (doDebug) {
+            debugLog(chalk_1.default.bgWhite("                                         => "), ref.browseName.toString(), ref.nodeId.toString());
+        }
+        const dataTypeFactory = dataTypeManager.getDataTypeFactoryForNamespace(dataTypeDictionaryNodeId.namespace);
+        await _exploreDataTypeDefinition(session, dataTypeDictionaryNodeId, dataTypeFactory, dataTypeManager.namespaceArray);
+    }
+    // https://medium.com/swlh/dealing-with-multiple-promises-in-javascript-41d6c21f20ff
+    for (const d of dataTypeDictionaryInfo) {
+        try {
+            await processReferenceOnDataTypeDictionaryType(d).catch((e) => {
+                debugLog("processReferenceOnDataTypeDictionaryType has failed ");
+                debugLog("Error", e.message);
+                debugLog(e);
+                return e;
+            });
+        }
+        catch (err) {
+            debugLog(chalk_1.default.red("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "), err);
+        }
+    }
+    debugLog("out ... populateDataTypeManager");
 }
 exports.populateDataTypeManager103 = populateDataTypeManager103;
 //# sourceMappingURL=populate_data_type_manager_103.js.map