opcua-webapi-ts 1.1.5 → 1.1.7

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

@@ -9,179 +9,356 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaNodeLinkReader = exports.UaNodeChildReader = exports.UaNodeReader = exports.UaNodeReaderBase = void 0;
+exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = exports.UaLinkBrowser = exports.UaChildBrowser = exports.UaNodeReferenceBrowser = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
-class UaNodeReaderBase {
-    constructor(returnDescription, returnVariables, returnMethod) {
-        this._finished = false;
+class UaNodeReferenceBrowser {
+    constructor(nodeIds, referenceType, nodeClassToReturn, returnDescription, maxNodesPerBrowse, maxReferencesPerNode) {
         this._nodesToBrowse = [];
+        this._referenceType = referenceType;
+        this._nodeClassToReturn = nodeClassToReturn;
         this._continuationPointToBrowse = [];
-        this._browseResults = [];
-        this._readResults = new Map;
         this._returnDescription = returnDescription;
-        this._nodeClassToReturn = 0;
-        if (returnVariables)
-            this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
-        if (returnMethod)
-            this._nodeClassToReturn += opcua_webapi_1.NodeClass.Method;
-        if (null == UaNodeReaderBase.s_variableTypeWithoutMember) {
-            UaNodeReaderBase.s_variableTypeWithoutMember = new Set;
-            UaNodeReaderBase.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.BaseVariableType).toString());
-            UaNodeReaderBase.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.PropertyType).toString());
-            UaNodeReaderBase.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.BaseDataVariableType).toString());
+        this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
+        this._maxReferencesPerNode = (null == maxReferencesPerNode || maxReferencesPerNode < 0) ? 50 : maxReferencesPerNode;
+        this._readResults = new Map();
+        if (this._nodeClassToReturn != 0) {
+            let nodeIdSet = new Set;
+            for (let item of nodeIds) {
+                if (nodeIdSet.has(item.toString()))
+                    continue;
+                nodeIdSet.add(item.toString());
+                this._nodesToBrowse.push(item);
+            }
         }
-        if (null == UaNodeReaderBase.s_variableNameToReadValue) {
-            UaNodeReaderBase.s_variableNameToReadValue = new Set;
-            UaNodeReaderBase.s_variableNameToReadValue.add("InputArguments");
-            UaNodeReaderBase.s_variableNameToReadValue.add("OutputArguments");
-            UaNodeReaderBase.s_variableNameToReadValue.add("EnumStrings");
-            UaNodeReaderBase.s_variableNameToReadValue.add("EnumValues");
+    }
+    browse(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isFinish())
+                return;
+            yield this.browseOnce(client);
+            yield this.browse(client);
+        });
+    }
+    browseOnce(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._nodesToBrowse.length != 0) {
+                yield this._browseNodes(client);
+            }
+            else if (this._continuationPointToBrowse.length != 0) {
+                yield this._browseContinuationPoints(client);
+            }
+        });
+    }
+    results() {
+        let results = [];
+        for (let item of this._readResults) {
+            results.push({
+                nodeId: (0, common_1.parseUaNodeId)(item[0]),
+                references: item[1]
+            });
         }
+        this._readResults.clear();
+        return results;
+    }
+    isFinish() {
+        return (this._nodesToBrowse.length == 0) && (this._continuationPointToBrowse.length == 0);
     }
     _browseNodes(client) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            let nodesToBrowse = this._nodesToBrowse.splice(0, 50);
+            if (this._nodesToBrowse.length == 0)
+                return;
+            let nodesToBrowse = this._nodesToBrowse.splice(0, this._maxNodesPerBrowse);
             let browseDescriptions = [];
             for (let item of nodesToBrowse) {
-                let browseDescription = new common_1.UaBrowseDescription(item.nodeId, opcua_webapi_1.BrowseDirection.Forward, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), true, item.nodeClassToReturn, 63);
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
                 browseDescriptions.push(browseDescription);
             }
-            let results = yield client.browse(browseDescriptions, 50);
+            let results = yield client.browse(browseDescriptions, this._maxReferencesPerNode);
             for (let i = 0; i < nodesToBrowse.length; ++i) {
-                let currentNode = nodesToBrowse[i];
+                let currentNodeId = nodesToBrowse[i];
                 let currentResult = results[i];
                 if (currentResult.statusCode.isNotGood())
                     throw new common_1.UaError(currentResult.statusCode);
+                let currentReferences = this._readResults.get(currentNodeId.toString());
+                if (!currentReferences) {
+                    currentReferences = [];
+                    this._readResults.set(currentNodeId.toString(), currentReferences);
+                }
+                let newReferences = [];
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
                     let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
                     if (null == nodeId || null === typeDefinition)
                         continue;
-                    this._browseResults.push({
-                        fromNodeId: currentNode.nodeId,
-                        nodeId: nodeId,
-                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
-                        browseName: item.browseName ? item.browseName : "",
-                        displayName: item.displayName ? item.displayName : common_1.UaLocalizedText.nullText,
-                        referenceTypeId: item.referenceTypeId ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
-                        isForward: (item.isForward) ? item.isForward : false,
-                        typeDefinitionId: (typeDefinition) ? typeDefinition : undefined
-                    });
-                    this._updateNodesToBrowse(item);
+                    let reference = new common_1.UaReference(nodeId, (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified, item.browseName ? item.browseName : "", item.displayName ? item.displayName : common_1.UaLocalizedText.nullText, item.referenceTypeId ? item.referenceTypeId : common_1.UaNodeId.nullNodeId, (typeDefinition) ? typeDefinition : common_1.UaNodeId.nullNodeId);
+                    currentReferences.push(reference);
+                    newReferences.push(reference);
                 }
                 if (currentResult.continuationPoint) {
                     this._continuationPointToBrowse.push({
-                        nodeId: currentNode.nodeId,
+                        nodeId: currentNodeId,
                         continuationPoint: currentResult.continuationPoint
                     });
                 }
+                if (this._returnDescription)
+                    yield this._readDescriptions(client, newReferences);
             }
         });
     }
     _browseContinuationPoints(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            let cpsToBrowse = this._continuationPointToBrowse.splice(0, 50);
+            var _a;
+            let cpsToBrowse = this._continuationPointToBrowse.splice(0, this._maxNodesPerBrowse);
             let continuationPoints = [];
             for (let item of cpsToBrowse) {
                 continuationPoints.push(item.continuationPoint);
             }
             let results = yield client.browseNext(continuationPoints, false);
             for (let i = 0; i < cpsToBrowse.length; ++i) {
-                let currentNode = cpsToBrowse[i];
+                let currentNodeId = cpsToBrowse[i].nodeId;
                 let currentResult = results[i];
                 if (currentResult.statusCode.isNotGood())
                     throw new common_1.UaError(currentResult.statusCode);
+                let newReferences = [];
                 for (let item of currentResult.references) {
                     let nodeId = item.nodeId.getNodeId();
-                    let typeDefinition = item.typeDefinition ? item.typeDefinition.getNodeId() : undefined;
-                    if (null == nodeId)
+                    let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
+                    if (null == nodeId || null === typeDefinition)
                         continue;
-                    this._browseResults.push({
-                        fromNodeId: currentNode.nodeId,
-                        nodeId: nodeId,
-                        nodeClass: item.nodeClass,
-                        browseName: item.browseName,
-                        displayName: item.displayName,
-                        referenceTypeId: item.referenceTypeId,
-                        isForward: item.isForward,
-                        typeDefinitionId: (typeDefinition) ? typeDefinition : undefined
-                    });
-                    this._updateNodesToBrowse(item);
+                    let currentReferences = this._readResults.get(currentNodeId.toString());
+                    if (!currentReferences) {
+                        currentReferences = [];
+                        this._readResults.set(currentNodeId.toString(), currentReferences);
+                    }
+                    let reference = new common_1.UaReference(nodeId, (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified, item.browseName ? item.browseName : "", item.displayName ? item.displayName : common_1.UaLocalizedText.nullText, item.referenceTypeId ? item.referenceTypeId : common_1.UaNodeId.nullNodeId, (typeDefinition) ? typeDefinition : common_1.UaNodeId.nullNodeId);
+                    currentReferences.push(reference);
+                    newReferences.push(reference);
                 }
-                if (currentResult.continuationPoint && currentResult.continuationPoint.length != 0) {
+                if (currentResult.continuationPoint) {
                     this._continuationPointToBrowse.push({
-                        nodeId: currentNode.nodeId,
+                        nodeId: currentNodeId,
                         continuationPoint: currentResult.continuationPoint
                     });
                 }
+                if (this._returnDescription)
+                    yield this._readDescriptions(client, newReferences);
             }
         });
     }
-    _readNodes(client) {
+    _readDescriptions(client, references) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._browseResults.length == 0)
+            if (references.length === 0)
                 return;
-            let nodesToRead = this._browseResults.splice(0, 100);
-            yield this._readTypes(nodesToRead, client);
-            yield this._readObjects(nodesToRead, client);
-            yield this._readVariables(nodesToRead, client);
-            yield this._readMethods(nodesToRead, client);
+            let nodesToRead = [];
+            for (let item of references) {
+                nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
+            }
+            let dataValues = yield client.read(nodesToRead);
+            for (let i = 0; i < references.length; ++i) {
+                if (dataValues[i].statusCode.isGood()) {
+                    let description = dataValues[i].value.toLocalizedText();
+                    if (description)
+                        references[i].description = description;
+                }
+            }
         });
     }
-    _buildNodeTree() {
-        if (this._finished)
-            return;
-        for (let item of this._readResults) {
-            let childNode = item[1].node;
-            let parentNode = this._readResults.get(item[1].parentId.toString());
-            if (!parentNode)
-                continue;
-            if (opcua_webapi_1.NodeClass.Object == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass ||
-                    opcua_webapi_1.NodeClass.Method == childNode.nodeClass) {
-                    parent.addMember(childNode);
-                }
+}
+exports.UaNodeReferenceBrowser = UaNodeReferenceBrowser;
+class UaChildBrowser extends UaNodeReferenceBrowser {
+    constructor(nodeIds, returnDescription) {
+        super(nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.ObjectType | opcua_webapi_1.NodeClass.VariableType | opcua_webapi_1.NodeClass.DataType | opcua_webapi_1.NodeClass.ReferenceType, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
+    }
+}
+exports.UaChildBrowser = UaChildBrowser;
+class UaLinkBrowser extends UaNodeReferenceBrowser {
+    constructor(nodeIds, returnDescription) {
+        super(nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), opcua_webapi_1.NodeClass.Object, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
+    }
+}
+exports.UaLinkBrowser = UaLinkBrowser;
+class UaNodeReader {
+    constructor(returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+        this._returnDescription = (returnDescription) ? returnDescription : false;
+        this._returnAttributes = (returnAttributes) ? returnAttributes : false;
+        this._returnValue = (returnValue) ? returnValue : false;
+        this._nodeClassToReturn = 0;
+        if (returnVariable)
+            this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
+        if (returnMethod)
+            this._nodeClassToReturn += opcua_webapi_1.NodeClass.Method;
+        if (null == UaNodeReader.s_variableTypeWithoutMember) {
+            UaNodeReader.s_variableTypeWithoutMember = new Set;
+            UaNodeReader.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.BaseVariableType).toString());
+            UaNodeReader.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.PropertyType).toString());
+            UaNodeReader.s_variableTypeWithoutMember.add(new common_1.UaNodeId(common_1.VariableTypeIds.BaseDataVariableType).toString());
+        }
+        if (null == UaNodeReader.s_variablesNameToRead) {
+            UaNodeReader.s_variablesNameToRead = new Set;
+            UaNodeReader.s_variablesNameToRead.add("InputArguments");
+            UaNodeReader.s_variablesNameToRead.add("OutputArguments");
+            UaNodeReader.s_variablesNameToRead.add("EnumStrings");
+            UaNodeReader.s_variablesNameToRead.add("EnumValues");
+        }
+    }
+    read(nodeIds, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (nodeIds.length == 0)
+                return [];
+            let nodeIdsToRead = [];
+            let nodeIdsSet = new Set();
+            for (let item of nodeIds) {
+                if (nodeIdsSet.has(item.toString()))
+                    continue;
+                nodeIdsToRead.push(item);
+                nodeIdsSet.add(item.toString());
             }
-            else if (opcua_webapi_1.NodeClass.Variable == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
-                    parent.addMember(childNode);
+            let rootReferences = yield this._readRootNodes(nodeIdsToRead, client);
+            return yield this.readByReferences(rootReferences, client);
+        });
+    }
+    readByReferences(references, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (references.length == 0)
+                return [];
+            let referencesToRead = [];
+            let nodeIdsToBrowse = [];
+            let nodeIdsSet = new Set();
+            for (let item of references) {
+                if (nodeIdsSet.has(item.nodeId.toString()))
+                    continue;
+                referencesToRead.push(item);
+                nodeIdsToBrowse.push(item.nodeId);
+                nodeIdsSet.add(item.nodeId.toString());
+            }
+            let nodeReferenceBrowser = new UaNodeReferenceBrowser(nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            yield nodeReferenceBrowser.browse(client);
+            let childReferences = nodeReferenceBrowser.results();
+            let childNodesToBrowse = [];
+            for (let item of childReferences) {
+                for (let reference of item.references) {
+                    if (opcua_webapi_1.NodeClass.Variable == reference.nodeClass &&
+                        !UaNodeReader.s_variableTypeWithoutMember.has(reference.typeDefinitionId.toString())) {
+                        childNodesToBrowse.push(reference.nodeId);
+                    }
+                    if (opcua_webapi_1.NodeClass.Method == reference.nodeClass) {
+                        childNodesToBrowse.push(reference.nodeId);
+                    }
                 }
             }
-            else if (opcua_webapi_1.NodeClass.Method == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
-                    parent.addMember(childNode);
+            let variableReferences = [];
+            if (childNodesToBrowse.length != 0) {
+                let childReferenceBrowser = new UaNodeReferenceBrowser(childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
+                yield childReferenceBrowser.browse(client);
+                variableReferences = childReferenceBrowser.results();
+            }
+            let allReferences = [];
+            for (let item of references) {
+                allReferences.push(item);
+            }
+            for (let item of childReferences) {
+                for (let reference of item.references) {
+                    allReferences.push(reference);
                 }
             }
-            else if (opcua_webapi_1.NodeClass.ObjectType == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass ||
-                    opcua_webapi_1.NodeClass.Method == childNode.nodeClass) {
-                    parent.addMember(childNode);
+            for (let item of variableReferences) {
+                for (let reference of item.references) {
+                    allReferences.push(reference);
                 }
+                ;
             }
-            else if (opcua_webapi_1.NodeClass.VariableType == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
-                    parent.addMember(childNode);
+            let nodesMap = new Map();
+            yield this._readNodes(allReferences, nodesMap, client);
+            for (let item of variableReferences) {
+                this._buildNodeTree(item, nodesMap);
+            }
+            for (let item of childReferences) {
+                this._buildNodeTree(item, nodesMap);
+            }
+            let rootNodes = [];
+            for (let item of references) {
+                let node = nodesMap.get(item.nodeId.toString());
+                if (node)
+                    rootNodes.push(node);
+            }
+            return rootNodes;
+        });
+    }
+    _readRootNodes(nodeIds, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodesToRead = [];
+            for (let item of nodeIds) {
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.NodeClass));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.BrowseName));
+                nodesToRead.push(new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.DisplayName));
+            }
+            let dataValues = yield client.read(nodesToRead);
+            let references = [];
+            let typeDefinitionsToRead = [];
+            for (let i = 0; i < nodeIds.length; ++i) {
+                let dataIndex = i * 3;
+                let currentNodeId = nodeIds[i];
+                if (dataValues[dataIndex].statusCode.isNotGood())
+                    throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                let nodeClass = dataValues[dataIndex].value.toNumber();
+                dataIndex++;
+                if (dataValues[dataIndex].statusCode.isNotGood())
+                    throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                let browseName = dataValues[dataIndex].value.toString();
+                dataIndex++;
+                if (dataValues[dataIndex].statusCode.isNotGood())
+                    throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                let displayName = dataValues[dataIndex].value.toLocalizedText();
+                dataIndex++;
+                if (null == nodeClass || null == browseName || null == displayName)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
+                if (opcua_webapi_1.NodeClass.Unspecified != this._nodeClassToReturn) {
+                    let newReference = new common_1.UaReference(currentNodeId, nodeClass, browseName, displayName);
+                    references.push(newReference);
+                    if (opcua_webapi_1.NodeClass.Object == nodeClass)
+                        typeDefinitionsToRead.push(newReference);
                 }
             }
-            else if (opcua_webapi_1.NodeClass.DataType == parentNode.node.nodeClass) {
-                let parent = parentNode.node;
-                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
-                    parent.setEnumVariable(childNode);
+            if (typeDefinitionsToRead.length != 0) {
+                let browseDescriptions = [];
+                for (let item of typeDefinitionsToRead) {
+                    let browseDescription = new common_1.UaBrowseDescription(item.nodeId, opcua_webapi_1.BrowseDirection.Forward, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasTypeDefinition), false, opcua_webapi_1.NodeClass.ObjectType, 0);
+                    browseDescriptions.push(browseDescription);
+                }
+                let results = yield client.browse(browseDescriptions);
+                for (let i = 0; i < browseDescriptions.length; ++i) {
+                    if (results[i].statusCode.isNotGood())
+                        throw new common_1.UaError(results[i].statusCode);
+                    if (results[i].references.length != 1)
+                        continue;
+                    typeDefinitionsToRead[i].typeDefinitionId = results[i].references[0].nodeId.getNodeId();
                 }
             }
-        }
-        this._finished = true;
+            return references;
+        });
     }
-    _readTypes(references, client) {
+    _readNodes(references, nodes, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (references.length == 0)
+                return;
+            let refrencesToRead = [];
+            while (references.length != 0) {
+                refrencesToRead.push(references.splice(0, 100));
+            }
+            for (let item of refrencesToRead) {
+                yield this._readTypes(item, nodes, client);
+                yield this._readObjects(item, nodes, client);
+                yield this._readVariables(item, nodes, client);
+                yield this._readMethods(item, nodes, client);
+            }
+        });
+    }
+    _readTypes(references, nodes, client) {
         return __awaiter(this, void 0, void 0, function* () {
             let typesToRead = [];
+            let needReadAttributes = this._returnAttributes || this._returnDescription;
             for (let item of references) {
                 if (item.nodeClass != opcua_webapi_1.NodeClass.ObjectType &&
                     item.nodeClass != opcua_webapi_1.NodeClass.DataType &&
@@ -192,42 +369,50 @@ class UaNodeReaderBase {
             }
             if (0 == typesToRead.length)
                 return;
-            let nodesToRead = [];
-            for (let item of typesToRead) {
-                nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.IsAbstract));
-                if (item.nodeClass == opcua_webapi_1.NodeClass.VariableType) {
-                    nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.DataType));
-                    nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.ValueRank));
-                }
-                if (this._returnDescription) {
+            let dataValues = [];
+            if (needReadAttributes) {
+                let nodesToRead = [];
+                for (let item of typesToRead) {
+                    nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.IsAbstract));
                     nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
+                    if (item.nodeClass == opcua_webapi_1.NodeClass.VariableType) {
+                        nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.DataType));
+                        nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.ValueRank));
+                    }
                 }
+                dataValues = yield client.read(nodesToRead);
             }
-            let dataValues = yield client.read(nodesToRead);
             for (let i = 0; i < typesToRead.length; ++i) {
-                let dataIndex;
-                if (this._returnDescription) {
-                    dataIndex = (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) ? i * 4 : i * 2;
-                }
-                else {
-                    dataIndex = (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) ? i * 3 : i;
-                }
-                if (dataValues[dataIndex].statusCode.isNotGood())
-                    throw new common_1.UaError(dataValues[dataIndex].statusCode);
-                let isAbstract = dataValues[dataIndex].value.toBoolean();
-                if (null == isAbstract)
-                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
+                let isAbstract = false;
+                let description = undefined;
                 let dataType = common_1.UaNodeId.nullNodeId;
                 let valueRank = -1;
-                if (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) {
-                    if (dataValues[dataIndex + 1].statusCode.isNotGood())
-                        throw new common_1.UaError(dataValues[dataIndex + 1].statusCode);
-                    if (dataValues[dataIndex + 2].statusCode.isNotGood())
-                        throw new common_1.UaError(dataValues[dataIndex + 2].statusCode);
-                    dataType = dataValues[dataIndex + 1].value.toNodeId();
-                    valueRank = dataValues[dataIndex + 2].value.toNumber();
-                    if (null == dataType || null == valueRank)
+                if (needReadAttributes) {
+                    let dataIndex = (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) ? i * 4 : i * 2;
+                    if (dataValues[dataIndex].statusCode.isNotGood())
+                        throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                    isAbstract = dataValues[dataIndex].value.toBoolean();
+                    if (null == isAbstract)
                         throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
+                    dataIndex++;
+                    if (this._returnDescription && dataValues[dataIndex].statusCode.isGood()) {
+                        description = dataValues[dataIndex].value.toLocalizedText();
+                        if (null == description)
+                            description = undefined;
+                    }
+                    dataIndex++;
+                    if (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) {
+                        if (dataValues[dataIndex].statusCode.isNotGood())
+                            throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                        dataType = dataValues[dataIndex].value.toNodeId();
+                        dataIndex++;
+                        if (dataValues[dataIndex].statusCode.isNotGood())
+                            throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                        valueRank = dataValues[dataIndex].value.toNumber();
+                        dataIndex++;
+                        if (null == dataType || null == valueRank)
+                            throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
+                    }
                 }
                 let typeNode;
                 if (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.ObjectType) {
@@ -242,23 +427,15 @@ class UaNodeReaderBase {
                 else if (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
                     typeNode = new common_1.UaReferenceType(typesToRead[i].nodeId, typesToRead[i].browseName, typesToRead[i].displayName, isAbstract, common_1.UaLocalizedText.nullText, false);
                 }
-                if (this._returnDescription) {
-                    let descriptionIndex = (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) ? dataIndex + 3 : dataIndex + 1;
-                    if (dataValues[descriptionIndex].statusCode.isGood()) {
-                        let descriptionValue = dataValues[descriptionIndex].value.toLocalizedText();
-                        if (null != descriptionValue)
-                            typeNode.description = descriptionValue;
-                    }
+                if (this._returnDescription && description) {
+                    typeNode.description = description;
                 }
                 typeNode.refToParent = typesToRead[i].referenceTypeId;
-                this._readResults.set(typeNode.nodeId.toString(), {
-                    parentId: typesToRead[i].fromNodeId,
-                    node: typeNode
-                });
+                nodes.set(typeNode.nodeId.toString(), typeNode);
             }
         });
     }
-    _readObjects(references, client) {
+    _readObjects(references, nodes, client) {
         return __awaiter(this, void 0, void 0, function* () {
             let objectsToRead = [];
             for (let item of references) {
@@ -270,38 +447,43 @@ class UaNodeReaderBase {
                 return;
             let nodesToRead = [];
             for (let item of objectsToRead) {
-                nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.EventNotifier));
+                if (this._returnAttributes) {
+                    nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.EventNotifier));
+                }
                 if (this._returnDescription) {
                     nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
                 }
             }
-            let dataValues = yield client.read(nodesToRead);
+            let dataValues = [];
+            if (nodesToRead.length != 0) {
+                dataValues = yield client.read(nodesToRead);
+            }
             for (let i = 0; i < objectsToRead.length; ++i) {
-                if (!objectsToRead[i].typeDefinitionId)
-                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-                let dataIndex = (this._returnDescription) ? i * 2 : i;
+                let dataIndex = (this._returnAttributes && this._returnDescription) ? i * 2 : i;
                 let eventNotifier = 0;
-                if (dataValues[dataIndex].statusCode.isGood()) {
+                let description = undefined;
+                if (this._returnAttributes && dataValues[dataIndex].statusCode.isGood()) {
                     eventNotifier = dataValues[dataIndex].value.toNumber();
+                    if (null == eventNotifier)
+                        eventNotifier = 0;
+                    dataIndex++;
+                }
+                if (this._returnDescription && dataValues[dataIndex].statusCode.isGood()) {
+                    description = dataValues[dataIndex].value.toLocalizedText();
+                    if (null == description)
+                        description = undefined;
+                    dataIndex++;
                 }
                 let objectNode = new common_1.UaObject(objectsToRead[i].nodeId, objectsToRead[i].browseName, objectsToRead[i].displayName, eventNotifier, objectsToRead[i].typeDefinitionId);
                 objectNode.refToParent = objectsToRead[i].referenceTypeId;
-                if (this._returnDescription) {
-                    let descriptionIndex = dataIndex + 1;
-                    if (dataValues[descriptionIndex].statusCode.isGood()) {
-                        let descriptionValue = dataValues[descriptionIndex].value.toLocalizedText();
-                        if (null != descriptionValue)
-                            objectNode.description = descriptionValue;
-                    }
+                if (this._returnDescription && description) {
+                    objectNode.description = description;
                 }
-                this._readResults.set(objectNode.nodeId.toString(), {
-                    parentId: objectsToRead[i].fromNodeId,
-                    node: objectNode
-                });
+                nodes.set(objectNode.nodeId.toString(), objectNode);
             }
         });
     }
-    _readVariables(references, client) {
+    _readVariables(references, nodes, client) {
         return __awaiter(this, void 0, void 0, function* () {
             let variablesToRead = [];
             let nodeIds = [];
@@ -313,418 +495,165 @@ class UaNodeReaderBase {
             }
             if (0 == nodeIds.length)
                 return;
-            let results = yield client.readVariableAttributes(nodeIds);
-            let valuesToRead = [];
+            let results = [];
+            if (this._returnAttributes) {
+                results = yield client.readVariableAttributes(nodeIds);
+            }
+            let variablesToReadValue = [];
             for (let i = 0; i < variablesToRead.length; ++i) {
-                let variableNode = new common_1.UaVariable(variablesToRead[i].nodeId, variablesToRead[i].browseName, variablesToRead[i].displayName, results[i].dataType, results[i].valueRank, results[i].accessLevel, results[i].userAccessLevel, results[i].historizing, variablesToRead[i].typeDefinitionId);
-                this._readResults.set(variableNode.nodeId.toString(), {
-                    parentId: variablesToRead[i].fromNodeId,
-                    node: variableNode
-                });
-                if (UaNodeReaderBase.s_variableNameToReadValue.has(variableNode.browseName))
-                    valuesToRead.push(variableNode.nodeId);
-            }
-            if (valuesToRead.length != 0) {
+                let variableNode;
+                if (this._returnAttributes) {
+                    variableNode = new common_1.UaVariable(variablesToRead[i].nodeId, variablesToRead[i].browseName, variablesToRead[i].displayName, results[i].dataType, results[i].valueRank, results[i].accessLevel, results[i].userAccessLevel, results[i].historizing, variablesToRead[i].typeDefinitionId);
+                }
+                else {
+                    variableNode = new common_1.UaVariable(variablesToRead[i].nodeId, variablesToRead[i].browseName, variablesToRead[i].displayName, common_1.UaNodeId.nullNodeId, -1, 0, 0, false, variablesToRead[i].typeDefinitionId);
+                }
+                nodes.set(variableNode.nodeId.toString(), variableNode);
+                if (this._returnValue || (UaNodeReader.s_variablesNameToRead.has(variableNode.browseName))) {
+                    variablesToReadValue.push(variableNode);
+                }
+            }
+            if (variablesToReadValue.length != 0) {
+                let valuesToRead = [];
+                for (let item of variablesToReadValue) {
+                    valuesToRead.push(item.nodeId);
+                }
                 let values = yield client.readValues(valuesToRead);
                 for (let i = 0; i < valuesToRead.length; ++i) {
-                    if (values[i].statusCode.isNotGood())
-                        throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-                    let variableNode = this._readResults.get(valuesToRead[i].toString());
-                    variableNode.node.value = values[i].value;
+                    let variableNode = nodes.get(valuesToRead[i].toString());
+                    variableNode.dataValue = values[i];
                 }
             }
         });
     }
-    _readMethods(references, client) {
+    _readMethods(references, nodes, client) {
         return __awaiter(this, void 0, void 0, function* () {
+            let methodsToRead = [];
             for (let item of references) {
                 if (item.nodeClass != opcua_webapi_1.NodeClass.Method)
                     continue;
-                let methodNode = new common_1.UaMethod(item.nodeId, item.browseName, item.displayName);
-                this._readResults.set(methodNode.nodeId.toString(), {
-                    parentId: item.fromNodeId,
-                    node: methodNode
-                });
+                methodsToRead.push(item);
             }
-        });
-    }
-    _updateNodesToBrowse(reference) {
-        let nodeClassToReturn = opcua_webapi_1.NodeClass.Unspecified;
-        if (reference.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
-            reference.nodeClass == opcua_webapi_1.NodeClass.Object) {
-            nodeClassToReturn = this._nodeClassToReturn;
-        }
-        else if (reference.nodeClass == opcua_webapi_1.NodeClass.Variable) {
-            if (reference.typeDefinition &&
-                !UaNodeReaderBase.s_variableTypeWithoutMember.has(reference.typeDefinition.toString())) {
-                nodeClassToReturn = opcua_webapi_1.NodeClass.Variable;
-            }
-        }
-        else if (reference.nodeClass == opcua_webapi_1.NodeClass.Method ||
-            reference.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
-            reference.nodeClass == opcua_webapi_1.NodeClass.DataType) {
-            nodeClassToReturn = opcua_webapi_1.NodeClass.Variable;
-        }
-        if (opcua_webapi_1.NodeClass.Unspecified != nodeClassToReturn) {
-            this._nodesToBrowse.push({
-                nodeId: reference.nodeId.getNodeId(),
-                nodeClassToReturn: nodeClassToReturn
-            });
-        }
-    }
-}
-exports.UaNodeReaderBase = UaNodeReaderBase;
-UaNodeReaderBase.s_variableTypeWithoutMember = null;
-UaNodeReaderBase.s_variableNameToReadValue = null;
-class UaNodeReader extends UaNodeReaderBase {
-    constructor(nodeIds, returnDescription, returnVariables, returnMethod) {
-        super(returnDescription ? returnDescription : false, returnVariables ? returnVariables : false, returnMethod ? returnMethod : false);
-        if (nodeIds.length == 0)
-            this._finished = true;
-        this._nodeIds = new Set;
-        for (let item of nodeIds) {
-            this._nodeIds.add(item.toString());
-        }
-    }
-    readAll(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
+            if (0 == methodsToRead.length)
                 return;
-            yield this.read(client);
-            yield this.readAll(client);
-        });
-    }
-    read(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._finished)
-                return;
-            if (!this._isRootNodeRead) {
-                yield this._readRootNodes(client);
-            }
-            else if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints(client);
-            }
-            else if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes(client);
-            }
-            else if (this._browseResults.length != 0) {
-                yield this._readNodes(client);
-            }
-            else {
-                this._buildNodeTree();
-            }
-        });
-    }
-    isFinish() {
-        return this._finished;
-    }
-    getResults() {
-        let ret = [];
-        for (let item of this._readResults) {
-            if (!this._nodeIds.has(item[1].node.nodeId.toString()))
-                continue;
-            ret.push(item[1].node);
-        }
-        return [...ret.values()];
-    }
-    _readRootNodes(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._isRootNodeRead)
-                return;
-            let nodeIds = [];
             let nodesToRead = [];
-            for (let item of this._nodeIds) {
-                let nodeId = (0, common_1.parseUaNodeId)(item);
-                nodeIds.push(nodeId);
-                nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.NodeClass));
-                nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.BrowseName));
-                nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.DisplayName));
-            }
-            let dataValues = yield client.read(nodesToRead);
-            let browseResults = new Map;
-            for (let i = 0; i < nodeIds.length; ++i) {
-                let dataIndex = i * 3;
-                let currentNodeId = nodeIds[i];
-                if (dataValues[dataIndex].statusCode.isNotGood())
-                    throw new common_1.UaError(dataValues[dataIndex].statusCode);
-                if (dataValues[dataIndex + 1].statusCode.isNotGood())
-                    throw new common_1.UaError(dataValues[dataIndex + 1].statusCode);
-                if (dataValues[dataIndex + 2].statusCode.isNotGood())
-                    throw new common_1.UaError(dataValues[dataIndex + 2].statusCode);
-                let nodeClass = dataValues[dataIndex].value.toNumber();
-                let browseName = dataValues[dataIndex + 1].value.toString();
-                let displayName = dataValues[dataIndex + 2].value.toLocalizedText();
-                if (null == nodeClass || null == browseName || null == displayName)
-                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-                if (opcua_webapi_1.NodeClass.Unspecified != this._nodeClassToReturn) {
-                    this._nodesToBrowse.push({
-                        nodeId: currentNodeId,
-                        nodeClassToReturn: this._nodeClassToReturn
-                    });
+            if (this._returnDescription) {
+                for (let item of methodsToRead) {
+                    nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
                 }
-                browseResults.set(currentNodeId.toString(), {
-                    fromNodeId: common_1.UaNodeId.nullNodeId,
-                    nodeId: currentNodeId,
-                    nodeClass: nodeClass,
-                    browseName: browseName,
-                    displayName: displayName,
-                    referenceTypeId: common_1.UaNodeId.nullNodeId,
-                    isForward: true,
-                    typeDefinitionId: common_1.UaNodeId.nullNodeId
-                });
             }
-            let browseDescriptions = [];
-            for (let item of browseResults) {
-                let currentNode = item[1];
-                if (currentNode.nodeClass != opcua_webapi_1.NodeClass.Object &&
-                    currentNode.nodeClass != opcua_webapi_1.NodeClass.Variable)
-                    continue;
-                let browseDescription = new common_1.UaBrowseDescription(currentNode.nodeId, opcua_webapi_1.BrowseDirection.Forward, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasTypeDefinition), false, opcua_webapi_1.NodeClass.ObjectType | opcua_webapi_1.NodeClass.VariableType, 0);
-                browseDescriptions.push(browseDescription);
+            let dataValues = [];
+            if (nodesToRead.length != 0) {
+                dataValues = yield client.read(nodesToRead);
             }
-            if (browseDescriptions.length != 0) {
-                let results = yield client.browse(browseDescriptions);
-                for (let i = 0; i < browseDescriptions.length; ++i) {
-                    let browseResult = browseResults.get(browseDescriptions[i].nodeId.toString());
-                    if (undefined == browseResult)
-                        throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadUnexpectedError));
-                    if (results[i].statusCode.isNotGood())
-                        throw new common_1.UaError(results[i].statusCode);
-                    if (results[i].references.length != 1)
-                        continue;
-                    browseResult.typeDefinitionId = results[i].references[0].nodeId.getNodeId();
+            for (let i = 0; i < methodsToRead.length; ++i) {
+                let methodNode = new common_1.UaMethod(methodsToRead[i].nodeId, methodsToRead[i].browseName, methodsToRead[i].displayName);
+                if (this._returnDescription) {
+                    if (dataValues[i].statusCode.isGood()) {
+                        let description = dataValues[i].value.toLocalizedText();
+                        if (null == description)
+                            description = undefined;
+                        methodNode.description = description;
+                    }
                 }
+                nodes.set(methodNode.nodeId.toString(), methodNode);
             }
-            this._browseResults = Array.from(browseResults.values());
-            this._isRootNodeRead = true;
-        });
-    }
-}
-exports.UaNodeReader = UaNodeReader;
-class UaNodeChildReader extends UaNodeReaderBase {
-    constructor(nodeIds, returnDescription, returnVariables, returnMethod) {
-        super((returnDescription) ? returnDescription : false, (returnVariables) ? returnVariables : false, (returnMethod) ? returnMethod : false);
-        if (nodeIds.length == 0)
-            this._finished = true;
-        this._nodeIds = new Set;
-        for (let item of nodeIds) {
-            this._nodeIds.add(item.toString());
-            this._nodesToBrowse.push({
-                nodeId: item,
-                nodeClassToReturn: opcua_webapi_1.NodeClass.Object | opcua_webapi_1.NodeClass.ObjectType | opcua_webapi_1.NodeClass.VariableType | opcua_webapi_1.NodeClass.DataType
-            });
-        }
-    }
-    readAll(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
-                return;
-            yield this.read(client);
-            yield this.readAll(client);
         });
     }
-    read(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._finished)
-                return;
-            if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints(client);
+    _buildNodeTree(referenceResult, nodes) {
+        let parentNode = nodes.get(referenceResult.nodeId.toString());
+        if (null == parentNode)
+            return;
+        for (let item of referenceResult.references) {
+            let childNode = nodes.get(item.nodeId.toString());
+            if (!childNode)
+                continue;
+            if (opcua_webapi_1.NodeClass.Object == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass ||
+                    opcua_webapi_1.NodeClass.Method == childNode.nodeClass) {
+                    parent.addMember(childNode);
+                }
             }
-            else if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes(client);
+            else if (opcua_webapi_1.NodeClass.Variable == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
+                    parent.addMember(childNode);
+                }
             }
-            else if (this._browseResults.length != 0) {
-                yield this._readNodes(client);
+            else if (opcua_webapi_1.NodeClass.Method == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
+                    parent.addMember(childNode);
+                }
             }
-            else {
-                this._buildNodeTree();
+            else if (opcua_webapi_1.NodeClass.ObjectType == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass ||
+                    opcua_webapi_1.NodeClass.Method == childNode.nodeClass) {
+                    parent.addMember(childNode);
+                }
             }
-        });
-    }
-    isFinish() {
-        return this._finished;
-    }
-    getResults() {
-        let ret = new Map;
-        for (let item of this._readResults) {
-            if (!this._nodeIds.has(item[1].parentId.toString()))
-                continue;
-            let result;
-            let parentId = item[1].parentId.toString();
-            if (ret.has(parentId)) {
-                result = ret.get(parentId);
+            else if (opcua_webapi_1.NodeClass.VariableType == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
+                    parent.addMember(childNode);
+                }
             }
-            else {
-                result = { nodeId: item[1].parentId, children: [] };
-                ret.set(parentId, result);
+            else if (opcua_webapi_1.NodeClass.DataType == parentNode.nodeClass) {
+                let parent = parentNode;
+                if (opcua_webapi_1.NodeClass.Variable == childNode.nodeClass) {
+                    parent.setEnumVariable(childNode);
+                }
             }
-            result.children.push(item[1].node);
         }
-        return [...ret.values()];
     }
 }
-exports.UaNodeChildReader = UaNodeChildReader;
-class UaNodeLinkReader {
-    constructor(nodeIds, returnDescription) {
-        this._nodesToBrowse = nodeIds;
-        this._continuationPointToBrowse = [];
-        this._browseResults = [];
-        this._returnDescription = (returnDescription) ? returnDescription : false;
-        this._readResults = null;
-    }
-    readAll(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
-                return;
-            yield this.read(client);
-            yield this.readAll(client);
-        });
-    }
-    read(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
-                return;
-            if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes(client);
-            }
-            else if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints(client);
-            }
-            else {
-                this._buildResults();
-                yield this._readDescriptions(client);
-            }
-        });
-    }
-    isFinish() {
-        return null != this._readResults;
-    }
-    getResults() {
-        return (this._readResults) ? this._readResults : [];
+exports.UaNodeReader = UaNodeReader;
+UaNodeReader.s_variableTypeWithoutMember = null;
+UaNodeReader.s_variablesNameToRead = null;
+class UaObjectReader extends UaNodeReader {
+    constructor(returnDescription, returnValue) {
+        super(returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, true, true, true, returnValue !== null && returnValue !== void 0 ? returnValue : false);
     }
-    _browseNodes(client) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this._nodesToBrowse.length == 0)
-                return;
-            let nodesToBrowse = this._nodesToBrowse.splice(0, 50);
-            let browseDescriptions = [];
-            for (let item of nodesToBrowse) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Both, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), true, opcua_webapi_1.NodeClass.Object, 63);
-                browseDescriptions.push(browseDescription);
-            }
-            let results = yield client.browse(browseDescriptions, 50);
-            for (let i = 0; i < nodesToBrowse.length; ++i) {
-                let currentNodeId = nodesToBrowse[i];
-                let currentResult = results[i];
-                if (currentResult.statusCode.isNotGood())
-                    throw new common_1.UaError(currentResult.statusCode);
-                for (let item of currentResult.references) {
-                    let nodeId = item.nodeId.getNodeId();
-                    let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null === typeDefinition)
-                        continue;
-                    this._browseResults.push({
-                        fromNodeId: currentNodeId,
-                        nodeId: nodeId,
-                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
-                        browseName: (item.browseName) ? item.browseName : "",
-                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
-                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
-                        isForward: item.isForward,
-                        typeDefinitionId: typeDefinition
-                    });
-                }
-                if (currentResult.continuationPoint) {
-                    this._continuationPointToBrowse.push({
-                        nodeId: currentNodeId,
-                        continuationPoint: currentResult.continuationPoint
-                    });
-                }
-            }
+    read(nodeIds, client) {
+        const _super = Object.create(null, {
+            read: { get: () => super.read }
         });
-    }
-    _browseContinuationPoints(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let cpsToBrowse = this._continuationPointToBrowse.splice(0, 50);
-            let continuationPoints = [];
-            for (let item of cpsToBrowse) {
-                continuationPoints.push(item.continuationPoint);
-            }
-            let results = yield client.browseNext(continuationPoints, false);
-            for (let i = 0; i < cpsToBrowse.length; ++i) {
-                let currentNodeId = cpsToBrowse[i].nodeId;
-                let currentResult = results[i];
-                if (currentResult.statusCode.isNotGood())
-                    throw new common_1.UaError(currentResult.statusCode);
-                for (let item of currentResult.references) {
-                    let nodeId = item.nodeId.getNodeId();
-                    let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null === typeDefinition)
-                        continue;
-                    this._browseResults.push({
-                        fromNodeId: currentNodeId,
-                        nodeId: nodeId,
-                        nodeClass: (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified,
-                        browseName: (item.browseName) ? item.browseName : "",
-                        displayName: (item.displayName) ? item.displayName : common_1.UaLocalizedText.nullText,
-                        referenceTypeId: (item.referenceTypeId) ? item.referenceTypeId : common_1.UaNodeId.nullNodeId,
-                        isForward: item.isForward,
-                        typeDefinitionId: typeDefinition
-                    });
-                }
-                if (currentResult.continuationPoint) {
-                    this._continuationPointToBrowse.push({
-                        nodeId: currentNodeId,
-                        continuationPoint: currentResult.continuationPoint
-                    });
+            let nodes = yield _super.read.call(this, nodeIds, client);
+            let objectNodes = [];
+            for (let item of nodes) {
+                if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
+                    objectNodes.push(item);
                 }
             }
+            return objectNodes;
         });
     }
-    _buildResults() {
-        if (this._readResults != null)
-            return;
-        this._readResults = [];
-        let ret = new Map;
-        for (let item of this._browseResults) {
-            let result = ret.get(item.fromNodeId.toString());
-            if (!result) {
-                result = {
-                    nodeId: item.fromNodeId,
-                    links: []
-                };
-                ret.set(item.fromNodeId.toString(), result);
-            }
-            result.links.push(new common_1.UaLink(item.nodeId, item.nodeClass, item.browseName, item.displayName, item.referenceTypeId, item.isForward));
-        }
-        this._readResults = Array.from(ret.values());
+}
+exports.UaObjectReader = UaObjectReader;
+class UaTypeReader extends UaNodeReader {
+    constructor() {
+        super(true, true, true, true, false);
     }
-    _readDescriptions(client) {
+    read(nodeIds, client) {
+        const _super = Object.create(null, {
+            read: { get: () => super.read }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._returnDescription)
-                return;
-            let linkedNodesToRead = [];
-            for (let item of this._readResults) {
-                for (let link of item.links) {
-                    if (link.nodeClass == opcua_webapi_1.NodeClass.Object)
-                        linkedNodesToRead.push(link);
-                }
-            }
-            if (linkedNodesToRead.length == 0)
-                return;
-            let nodesToRead = [];
-            for (let item of linkedNodesToRead) {
-                nodesToRead.push(new common_1.UaReadValueId(item.targetId, opcua_webapi_1.Attributes.Description));
-            }
-            let dataValues = yield client.read(nodesToRead);
-            for (let i = 0; i < linkedNodesToRead.length; ++i) {
-                if (dataValues[i].statusCode.isGood()) {
-                    linkedNodesToRead[i].description = dataValues[i].value.toLocalizedText();
+            let nodes = yield _super.read.call(this, nodeIds, client);
+            let typeNodes = [];
+            for (let item of nodes) {
+                if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
+                    item.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
+                    item.nodeClass == opcua_webapi_1.NodeClass.DataType ||
+                    item.nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
+                    typeNodes.push(item);
                 }
             }
+            return typeNodes;
         });
     }
 }
-exports.UaNodeLinkReader = UaNodeLinkReader;
+exports.UaTypeReader = UaTypeReader;