opcua-webapi-ts 1.1.5 → 1.1.7

package/dist/cjs/client/utils/UaDataTypeDictionary.js

@@ -12,27 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaDataTypeDictionary = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
+const __1 = require("../..");
 class UaDataTypeDictionary {
-    constructor() {
-        if (null == UaDataTypeDictionary._abstractDataTypeIds) {
-            UaDataTypeDictionary._abstractDataTypeIds = new Set;
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.BaseDataType);
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.Number);
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.Structure);
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.Integer);
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.UInteger);
-            UaDataTypeDictionary._abstractDataTypeIds.add(common_1.DataTypeIds.Enumeration);
-        }
+    constructor(simpleMode) {
         this._dataTypes = new Map;
+        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
         let baseDataTypeId = new common_1.UaNodeId(common_1.DataTypeIds.BaseDataType);
         this._dataTypes.set(baseDataTypeId.toString(), new common_1.UaDataType(baseDataTypeId, "BaseDataType", new common_1.UaLocalizedText("BaseDataType"), true));
-        this._remainingNodesToBrowse = [new common_1.UaNodeId(common_1.DataTypeIds.BaseDataType)];
-        this._remainingEnumerationToRead = [];
     }
     read(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.__browseDataTypes(client);
-            yield this.__readEnumValues(client);
+            let browser = new __1.UaChildBrowser([common_1.UaNodeId.from(common_1.DataTypeIds.BaseDataType)]);
+            yield this._read(browser, client);
         });
     }
     getDataType(nodeId) {
@@ -42,89 +33,46 @@ class UaDataTypeDictionary {
     getDataTypes() {
         return [...this._dataTypes.values()];
     }
-    __browseDataTypes(client) {
+    _read(browser, client) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (0 == this._remainingNodesToBrowse.length)
-                return;
-            let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
-            let nodesToBrowse = [];
-            for (let item of nodeIds) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasSubtype), false, opcua_webapi_1.NodeClass.DataType, 31);
-                nodesToBrowse.push(browseDescription);
+            // Browse child type
+            yield browser.browse(client);
+            let results = browser.results();
+            let referencesToRead = [];
+            let needToReadEnumValue = false;
+            for (let item of results) {
+                for (let reference of item.references)
+                    referencesToRead.push(reference);
+                if (item.nodeId.equal(common_1.UaNodeId.from(common_1.DataTypeIds.Enumeration)))
+                    needToReadEnumValue = true;
             }
-            let results = yield client.browse(nodesToBrowse);
-            for (let i = 0; i < nodeIds.length; ++i) {
-                if (results[i].statusCode.isNotGood())
-                    continue;
-                let parentType = this._dataTypes.get(nodeIds[i].toString());
-                for (let item of results[i].references) {
-                    let dataTypeId = item.nodeId.getNodeId();
-                    if (null == dataTypeId ||
-                        opcua_webapi_1.NodeClass.DataType != item.nodeClass ||
-                        !item.browseName || !item.displayName)
-                        continue;
-                    let isAbstract = false;
-                    if (dataTypeId.nsIndex == 0 &&
-                        UaDataTypeDictionary._abstractDataTypeIds.has(dataTypeId.numericId()))
-                        isAbstract = true;
-                    let dataType = new common_1.UaDataType(dataTypeId, item.browseName, item.displayName, isAbstract);
-                    this._dataTypes.set(dataTypeId.toString(), dataType);
-                    this._remainingNodesToBrowse.push(dataTypeId);
-                    if (parentType)
-                        dataType.setParentType(parentType);
-                    dataType.classify();
-                    if (common_1.DataTypeIds.Enumeration == dataType.valueType) {
-                        this._remainingEnumerationToRead.push(dataType.nodeId);
-                    }
-                }
-            }
-            if (this._remainingNodesToBrowse.length != 0) {
-                yield this.__delay(20);
-                yield this.__browseDataTypes(client);
-            }
-        });
-    }
-    __readEnumValues(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._remainingEnumerationToRead.length == 0)
+            if (0 == referencesToRead.length)
                 return;
-            let nodeIds = this._remainingEnumerationToRead.splice(0, 20);
-            let nodesToBrowse = [];
-            for (let item of nodeIds) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasProperty), false, opcua_webapi_1.NodeClass.Variable, 8);
-                nodesToBrowse.push(browseDescription);
-            }
-            let results = yield client.browse(nodesToBrowse);
-            let enumDataTypeIds = [];
-            let enumValueIds = [];
-            for (let i = 0; i < nodeIds.length; ++i) {
-                if (results[i].statusCode.isNotGood() ||
-                    results[i].references.length == 0)
+            // Read child type
+            let nodeIdsToBrowse = [];
+            let nodeReader = new __1.UaNodeReader(this._returnAllAttributes, needToReadEnumValue, false, this._returnAllAttributes);
+            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            for (let node of nodes) {
+                if (opcua_webapi_1.NodeClass.DataType != node.nodeClass)
                     continue;
-                if (results[i].references[0].browseName == "EnumStrings" || results[i].references[0].browseName == "EnumValues") {
-                    let enumValueId = results[i].references[0].nodeId.getNodeId();
-                    if (enumValueId) {
-                        enumDataTypeIds.push(nodeIds[i]);
-                        enumValueIds.push(enumValueId);
-                    }
-                }
+                nodeIdsToBrowse.push(node.nodeId);
+                this._dataTypes.set(node.nodeId.toString(), node);
             }
-            if (enumDataTypeIds.length != 0) {
-                let values = yield client.readValues(enumValueIds);
-                for (let i = 0; i < enumValueIds.length; ++i) {
-                    if (values[i].statusCode.isNotGood() ||
-                        values[i].value.arrayType != common_1.UaArrayType.Array)
-                        continue;
-                    let dataType = this._dataTypes.get(enumDataTypeIds[i].toString());
-                    if (!dataType)
-                        continue;
-                    dataType.setEnumValues(values[i].value);
+            // Build parent-child relationship
+            for (let item of results) {
+                let parentType = this._dataTypes.get(item.nodeId.toString());
+                for (let reference of item.references) {
+                    let dataType = this._dataTypes.get(reference.nodeId.toString());
+                    if (dataType && parentType)
+                        dataType.setParentType(parentType);
                 }
             }
-            if (this._remainingEnumerationToRead.length != 0) {
-                yield this.__delay(20);
-                yield this.__readEnumValues(client);
-            }
+            if (0 == nodeIdsToBrowse.length)
+                return;
+            yield this.__delay(20);
+            // Continue to browse and read child type
+            let childBrowser = new __1.UaChildBrowser(nodeIdsToBrowse);
+            yield this._read(childBrowser, client);
         });
     }
     __delay(ms) {
@@ -134,4 +82,3 @@ class UaDataTypeDictionary {
     }
 }
 exports.UaDataTypeDictionary = UaDataTypeDictionary;
-UaDataTypeDictionary._abstractDataTypeIds = null;