opcua-webapi-ts 1.1.23 → 1.1.24

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

@@ -50,7 +50,7 @@ class UaDataTypeDictionary {
                 return;
             // Read child type
             let nodeIdsToBrowse = [];
-            let nodeReader = new __1.UaNodeReader(this._client, false, needToReadEnumValue, false, false, true);
+            let nodeReader = new __1.UaNodeReader(this._client, false, needToReadEnumValue, false, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasProperty), false, false, false, false, false);
             let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.DataType != node.nodeClass)

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

@@ -98,7 +98,7 @@ class UaModelling {
                 return null;
             if (objectType.isObjectMemberRead)
                 return objectType;
-            let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Object, false);
+            let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Object);
             yield typeMemberBrowser.browse();
             let browseMemberResults = typeMemberBrowser.results();
             let instanceNodes = new Map();
@@ -113,7 +113,7 @@ class UaModelling {
             for (let node of instanceNodes) {
                 memberObjectIds.push(node[1].nodeId);
             }
-            let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), opcua_webapi_1.NodeClass.Object, false);
+            let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), opcua_webapi_1.NodeClass.Object);
             yield modellingRuleBrowser.browse();
             let browseModellingRuleResults = modellingRuleBrowser.results();
             for (let item of browseModellingRuleResults) {

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

@@ -9,17 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaTypeBrowser = exports.UaLinkBrowser = exports.UaObjectBrowser = exports.UaNodeBrowser = void 0;
+exports.UaTypeBrowser = exports.UaObjectBrowser = exports.UaNodeBrowser = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 class UaNodeBrowser {
-    constructor(client, nodeIds, referenceType, nodeClassToReturn, returnDescription, maxNodesPerBrowse, maxReferencesPerNode) {
+    constructor(client, nodeIds, referenceType, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
         this._client = client;
         this._nodesToBrowse = [];
         this._referenceType = referenceType;
         this._nodeClassToReturn = nodeClassToReturn;
         this._continuationPointToBrowse = [];
-        this._returnDescription = returnDescription !== null && returnDescription !== void 0 ? returnDescription : false;
         this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
         this._maxReferencesPerNode = (null == maxReferencesPerNode || maxReferencesPerNode < 0) ? 50 : maxReferencesPerNode;
         this._readResults = new Map();
@@ -63,7 +62,7 @@ class UaNodeBrowser {
         return results;
     }
     isFinish() {
-        return (this._nodesToBrowse.length == 0) && (this._continuationPointToBrowse.length == 0);
+        return ((this._nodesToBrowse.length == 0) && (this._continuationPointToBrowse.length == 0)) || 0 == this._nodeClassToReturn;
     }
     _browseNodes() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -101,8 +100,6 @@ class UaNodeBrowser {
                         continuationPoint: currentResult.continuationPoint
                     });
                 }
-                if (this._returnDescription)
-                    yield this._readDescriptions(newReferences);
             }
         });
     }
@@ -141,46 +138,20 @@ class UaNodeBrowser {
                         continuationPoint: currentResult.continuationPoint
                     });
                 }
-                if (this._returnDescription)
-                    yield this._readDescriptions(newReferences);
-            }
-        });
-    }
-    _readDescriptions(references) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (references.length === 0)
-                return;
-            let nodesToRead = [];
-            for (let item of references) {
-                nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
-            }
-            let dataValues = yield this._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;
-                }
             }
         });
     }
 }
 exports.UaNodeBrowser = UaNodeBrowser;
 class UaObjectBrowser extends UaNodeBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Object, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
+    constructor(client, nodeIds, referenceType = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences)) {
+        super(client, nodeIds, referenceType, opcua_webapi_1.NodeClass.Object, 20);
     }
 }
 exports.UaObjectBrowser = UaObjectBrowser;
-class UaLinkBrowser extends UaNodeBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        super(client, 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 UaTypeBrowser extends UaNodeBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), 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);
+    constructor(client, nodeIds) {
+        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.ObjectType | opcua_webapi_1.NodeClass.VariableType | opcua_webapi_1.NodeClass.DataType | opcua_webapi_1.NodeClass.ReferenceType, 20);
     }
 }
 exports.UaTypeBrowser = UaTypeBrowser;

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

@@ -9,17 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaObjectDataReader = exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
+exports.UaTypeReader = exports.UaFullObjectReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
-    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue, referenceTypeToReturn) {
+    constructor(client, returnDescription, returnVariable, returnMethod, referenceTypeToReturn, returnObjectAttributes, returnVariableAttributes, returnVariableValue, returnPropertyAttributes, returnPropertyValue) {
         this._client = client;
-        this._returnDescription = (returnDescription) ? returnDescription : false;
-        this._returnAttributes = (returnAttributes) ? returnAttributes : false;
-        this._returnValue = (returnValue) ? returnValue : false;
-        this._referenceTypeToReturn = (referenceTypeToReturn) ? referenceTypeToReturn : common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences);
+        this._returnDescription = returnDescription;
+        this._referenceTypeToReturn = referenceTypeToReturn;
+        this._returnObjectAttributes = returnObjectAttributes;
+        this._returnVariableAttributes = returnVariableAttributes;
+        this._returnVariableValue = returnVariableValue;
+        this._returnPropertyAttributes = returnPropertyAttributes;
+        this._returnPropertyValue = returnPropertyValue;
         this._nodeClassToReturn = 0;
         if (returnVariable)
             this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
@@ -59,17 +62,15 @@ class UaNodeReader {
         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 UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -86,7 +87,7 @@ class UaNodeReader {
             }
             let variableReferences = [];
             if (childNodesToBrowse.length != 0) {
-                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
+                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Variable);
                 yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }
@@ -194,7 +195,6 @@ class UaNodeReader {
     _readTypes(references, nodes) {
         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 &&
@@ -206,49 +206,45 @@ class UaNodeReader {
             if (0 == typesToRead.length)
                 return;
             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));
-                    }
+            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 this._client.read(nodesToRead);
             }
+            dataValues = yield this._client.read(nodesToRead);
             for (let i = 0; i < typesToRead.length; ++i) {
                 let isAbstract = false;
                 let description = undefined;
                 let dataType = common_1.UaNodeId.nullNodeId;
                 let valueRank = -1;
-                if (needReadAttributes) {
-                    let dataIndex = (typesToRead[i].nodeClass == opcua_webapi_1.NodeClass.VariableType) ? i * 4 : i * 2;
+                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 (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);
-                    isAbstract = dataValues[dataIndex].value.toBoolean();
-                    if (null == isAbstract)
-                        throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
+                    dataType = dataValues[dataIndex].value.toNodeId();
                     dataIndex++;
-                    if (this._returnDescription && dataValues[dataIndex].statusCode.isGood()) {
-                        description = dataValues[dataIndex].value.toLocalizedText();
-                        if (null == description)
-                            description = undefined;
-                    }
+                    if (dataValues[dataIndex].statusCode.isNotGood())
+                        throw new common_1.UaError(dataValues[dataIndex].statusCode);
+                    valueRank = dataValues[dataIndex].value.toNumber();
                     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));
-                    }
+                    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) {
@@ -263,10 +259,9 @@ class UaNodeReader {
                 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 && description) {
+                if (description) {
                     typeNode.description = description;
                 }
-                typeNode.refToParent = typesToRead[i].referenceTypeId;
                 nodes.set(typeNode.nodeId.toString(), typeNode);
             }
         });
@@ -283,7 +278,7 @@ class UaNodeReader {
                 return;
             let nodesToRead = [];
             for (let item of objectsToRead) {
-                if (this._returnAttributes) {
+                if (this._returnObjectAttributes) {
                     nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.EventNotifier));
                 }
                 if (this._returnDescription) {
@@ -295,10 +290,10 @@ class UaNodeReader {
                 dataValues = yield this._client.read(nodesToRead);
             }
             for (let i = 0; i < objectsToRead.length; ++i) {
-                let dataIndex = (this._returnAttributes && this._returnDescription) ? i * 2 : i;
+                let dataIndex = (this._returnObjectAttributes && this._returnDescription) ? i * 2 : i;
                 let eventNotifier = 0;
                 let description = undefined;
-                if (this._returnAttributes && dataValues[dataIndex].statusCode.isGood()) {
+                if (this._returnObjectAttributes && dataValues[dataIndex].statusCode.isGood()) {
                     eventNotifier = dataValues[dataIndex].value.toNumber();
                     if (null == eventNotifier)
                         eventNotifier = 0;
@@ -311,7 +306,6 @@ class UaNodeReader {
                     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 && description) {
                     objectNode.description = description;
                 }
@@ -322,30 +316,56 @@ class UaNodeReader {
     _readVariables(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             let variablesToRead = [];
-            let nodeIds = [];
+            let nodeIdsToReadAttributes = [];
+            let variablesToReadValue = [];
             for (let item of references) {
                 if (item.nodeClass != opcua_webapi_1.NodeClass.Variable)
                     continue;
                 variablesToRead.push(item);
-                nodeIds.push(item.nodeId);
             }
-            if (0 == nodeIds.length)
+            if (0 == variablesToRead.length)
                 return;
+            let hasPropertyId = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasProperty);
+            let attributeIndexMap = new Map();
+            for (let i = 0; i < variablesToRead.length; ++i) {
+                let item = variablesToRead[i];
+                if (item.referenceTypeId.equal(hasPropertyId)) {
+                    if (this._returnPropertyAttributes) {
+                        attributeIndexMap.set(i, nodeIdsToReadAttributes.length);
+                        nodeIdsToReadAttributes.push(item.nodeId);
+                    }
+                }
+                else {
+                    if (this._returnVariableAttributes) {
+                        attributeIndexMap.set(i, nodeIdsToReadAttributes.length);
+                        nodeIdsToReadAttributes.push(item.nodeId);
+                    }
+                }
+            }
             let results = [];
-            if (this._returnAttributes) {
-                results = yield this._client.readVariableAttributes(nodeIds);
+            if (nodeIdsToReadAttributes.length != 0) {
+                results = yield this._client.readVariableAttributes(nodeIdsToReadAttributes);
             }
-            let variablesToReadValue = [];
             for (let i = 0; i < variablesToRead.length; ++i) {
                 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);
+                let attributeIndex = attributeIndexMap.get(i);
+                if (null != attributeIndex) {
+                    variableNode = new common_1.UaVariable(variablesToRead[i].nodeId, variablesToRead[i].browseName, variablesToRead[i].displayName, results[attributeIndex].dataType, results[attributeIndex].valueRank, results[attributeIndex].accessLevel, results[attributeIndex].userAccessLevel, results[attributeIndex].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))) {
+                if (variablesToRead[i].referenceTypeId.equal(hasPropertyId)) {
+                    variableNode.isProperty = true;
+                }
+                if (this._returnVariableValue && !variableNode.isProperty) {
+                    variablesToReadValue.push(variableNode);
+                }
+                else if (this._returnPropertyValue && variableNode.isProperty) {
+                    variablesToReadValue.push(variableNode);
+                }
+                else if (UaNodeReader.s_variablesNameToRead.has(variableNode.browseName)) {
                     variablesToReadValue.push(variableNode);
                 }
             }
@@ -449,17 +469,8 @@ exports.UaNodeReader = UaNodeReader;
 UaNodeReader.s_variableTypeWithoutMember = null;
 UaNodeReader.s_variablesNameToRead = null;
 class UaObjectReader extends UaNodeReader {
-    constructor(client, returnDescription, returnValue) {
-        super(client, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, true, true, true, returnValue !== null && returnValue !== void 0 ? returnValue : false);
-    }
-    read(nodeIds) {
-        const _super = Object.create(null, {
-            read: { get: () => super.read }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let nodes = yield _super.read.call(this, nodeIds);
-            return this._processResult(nodes);
-        });
+    constructor(client, returnVariable = true, returnMethod = true, returnDescription = false) {
+        super(client, returnDescription, returnVariable, returnMethod, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), false, true, false, false, true);
     }
     readByReferences(references) {
         const _super = Object.create(null, {
@@ -474,34 +485,37 @@ class UaObjectReader extends UaNodeReader {
             }
             if (0 == objectReferences.length)
                 return [];
-            let nodes = yield _super.readByReferences.call(this, objectReferences);
-            return this._processResult(nodes);
+            return yield _super.readByReferences.call(this, objectReferences);
         });
     }
-    _processResult(nodes) {
-        let objectNodes = [];
-        for (let item of nodes) {
-            if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
-                objectNodes.push(item);
-            }
-        }
-        return objectNodes;
-    }
 }
 exports.UaObjectReader = UaObjectReader;
-class UaTypeReader extends UaNodeReader {
-    constructor(client) {
-        super(client, true, true, true, true, false);
+class UaFullObjectReader extends UaNodeReader {
+    constructor(client, returnDescription = true, returnValue = false) {
+        super(client, returnDescription, true, true, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, true, returnValue, true, returnValue);
     }
-    read(nodeIds) {
+    readByReferences(references) {
         const _super = Object.create(null, {
-            read: { get: () => super.read }
+            readByReferences: { get: () => super.readByReferences }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            let nodes = yield _super.read.call(this, nodeIds);
-            return this._processResult(nodes);
+            let objectReferences = [];
+            for (let item of references) {
+                if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
+                    objectReferences.push(item);
+                }
+            }
+            if (0 == objectReferences.length)
+                return [];
+            return yield _super.readByReferences.call(this, objectReferences);
         });
     }
+}
+exports.UaFullObjectReader = UaFullObjectReader;
+class UaTypeReader extends UaNodeReader {
+    constructor(client, returnDescription = false) {
+        super(client, returnDescription, true, true, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), false, true, false, true, false);
+    }
     readByReferences(references) {
         const _super = Object.create(null, {
             readByReferences: { get: () => super.readByReferences }
@@ -518,64 +532,8 @@ class UaTypeReader extends UaNodeReader {
             }
             if (0 == typeReferences.length)
                 return [];
-            let nodes = yield _super.readByReferences.call(this, typeReferences);
-            return this._processResult(nodes);
+            return yield _super.readByReferences.call(this, typeReferences);
         });
     }
-    _processResult(nodes) {
-        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.UaTypeReader = UaTypeReader;
-class UaObjectDataReader extends UaNodeReader {
-    constructor(client) {
-        super(client, false, true, false, false, true);
-    }
-    readValues(nodeIds) {
-        const _super = Object.create(null, {
-            read: { get: () => super.read }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let nodes = yield _super.read.call(this, nodeIds);
-            return this._processResult(nodes);
-        });
-    }
-    readValuesByReferences(references) {
-        const _super = Object.create(null, {
-            readByReferences: { get: () => super.readByReferences }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let nodes = yield _super.readByReferences.call(this, references);
-            return this._processResult(nodes);
-        });
-    }
-    _processResult(nodes) {
-        let ret = new Map();
-        for (let item of nodes) {
-            if (item.nodeClass != opcua_webapi_1.NodeClass.Object)
-                continue;
-            let id = item.nodeId.toString();
-            let objectNode = item;
-            let members = objectNode.getMembers(opcua_webapi_1.NodeClass.Variable);
-            let serializedObject = {};
-            serializedObject["_id"] = id;
-            serializedObject["_name"] = objectNode.displayName.text;
-            for (let member of members) {
-                let value = member.value;
-                serializedObject[member.browseName] = (null == value) ? null : value.value;
-            }
-            ret.set(id, serializedObject);
-        }
-        return ret;
-    }
-}
-exports.UaObjectDataReader = UaObjectDataReader;