opcua-webapi-ts 1.1.18 → 1.1.19

package/dist/cjs/client/UaWebClient.js

@@ -89,6 +89,22 @@ class UaWebClient {
                 throw new common_1.UaError(results[0]);
         });
     }
+    methodCall(objectId, methodId, inputArguments) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let inputs = [];
+            for (let item of inputArguments) {
+                inputs.push(common_1.UaPayloadMapper.variantToWebApi(item));
+            }
+            let methodsToCall = [
+                new common_2.UaCallMethodRequest(objectId, methodId, inputArguments)
+            ];
+            let results = yield this.call(methodsToCall);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let outputs = results[0].outputArguments;
+            return outputs;
+        });
+    }
     readNodeAttributes(nodeId, returnDescription) {
         return __awaiter(this, void 0, void 0, function* () {
             let nodesToRead = [
@@ -125,6 +141,67 @@ class UaWebClient {
             return ret;
         });
     }
+    readMethodArguments(nodeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let ret = { inputArguments: [], outputArguments: [] };
+            let browseResult = yield this.browseChild(nodeId, opcua_webapi_1.NodeClass.Variable);
+            let inputArgumentsId = null;
+            let outputArgumentsId = null;
+            for (let item of browseResult.results) {
+                if ("InputArguments" == item.browseName)
+                    inputArgumentsId = item.nodeId.getNodeId();
+                if ("OutputArguments" == item.browseName)
+                    outputArgumentsId = item.nodeId.getNodeId();
+            }
+            let nodesToRead = [];
+            if (inputArgumentsId)
+                nodesToRead.push(inputArgumentsId);
+            if (outputArgumentsId)
+                nodesToRead.push(outputArgumentsId);
+            if (0 == nodesToRead.length)
+                return ret;
+            let readResults = yield this.readValues(nodesToRead);
+            let argsArr = [];
+            for (let item of readResults) {
+                if (item.statusCode.isNotGood() ||
+                    common_1.UaVariantType.ExtensionObject != item.value.type ||
+                    common_1.UaArrayType.Array != item.value.arrayType)
+                    throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadInvalidArgument));
+                let extensionObjects = item.value.value;
+                let args = [];
+                for (let itemL2 of extensionObjects) {
+                    let arg = common_1.UaArgument.fromExtensionObject(itemL2);
+                    if (!arg)
+                        throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadInvalidArgument));
+                    args.push(arg);
+                }
+                argsArr.push(args);
+            }
+            if (inputArgumentsId && outputArgumentsId) {
+                ret.inputArguments = argsArr[0];
+                ret.outputArguments = argsArr[1];
+            }
+            else if (inputArgumentsId) {
+                ret.inputArguments = argsArr[0];
+            }
+            else if (outputArgumentsId) {
+                ret.outputArguments = argsArr[0];
+            }
+            return ret;
+        });
+    }
+    readObjectEventNotifier(nodeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodesToRead = [];
+            nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.EventNotifier));
+            let results = yield this.read(nodesToRead);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            if (common_1.UaVariantType.Byte == results[0].value.type)
+                return results[0].value.value;
+            return 0;
+        });
+    }
     readVariableAttributes(nodeIds) {
         return __awaiter(this, void 0, void 0, function* () {
             if (nodeIds.length == 0)
@@ -179,20 +256,26 @@ class UaWebClient {
             return ret;
         });
     }
-    methodCall(objectId, methodId, inputArguments) {
+    readWriteMasks(nodeIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            let inputs = [];
-            for (let item of inputArguments) {
-                inputs.push(common_1.UaPayloadMapper.variantToWebApi(item));
+            if (nodeIds.length == 0)
+                return [];
+            let nodesToRead = [];
+            for (let item of nodeIds) {
+                let nodeIdToRead = new common_1.UaReadValueId(item, opcua_webapi_1.Attributes.UserWriteMask);
+                nodesToRead.push(nodeIdToRead);
             }
-            let methodsToCall = [
-                new common_2.UaCallMethodRequest(objectId, methodId, inputArguments)
-            ];
-            let results = yield this.call(methodsToCall);
-            if (results[0].statusCode.isNotGood())
-                throw new common_1.UaError(results[0].statusCode);
-            let outputs = results[0].outputArguments;
-            return outputs;
+            let results = yield this.read(nodesToRead);
+            let writeMasks = [];
+            for (let result of results) {
+                if (result.statusCode.isGood() && result.value.type == common_1.UaVariantType.UInt32) {
+                    writeMasks.push(result.value.value);
+                }
+                else {
+                    writeMasks.push(0);
+                }
+            }
+            return writeMasks;
         });
     }
     getGeneratedEventType(typeId) {
@@ -706,6 +789,7 @@ class UaWebClient {
                     response = yield this.api.addNodes(request, { signal: controller.signal });
                 }
                 catch (error) {
+                    console.error(error);
                     throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadCommunicationError));
                 }
                 finally {

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

@@ -22,7 +22,7 @@ class UaDataTypeDictionary {
     }
     read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new __1.UaChildBrowser(this._client, [common_1.UaNodeId.from(common_1.DataTypeIds.BaseDataType)]);
+            let browser = new __1.UaTypeBrowser(this._client, [common_1.UaNodeId.from(common_1.DataTypeIds.BaseDataType)]);
             yield this._read(browser);
         });
     }
@@ -71,7 +71,7 @@ class UaDataTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new __1.UaChildBrowser(this._client, nodeIdsToBrowse);
+            let childBrowser = new __1.UaTypeBrowser(this._client, nodeIdsToBrowse);
             yield this._read(childBrowser);
         });
     }

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

@@ -14,13 +14,12 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const __1 = require("../..");
 class UaModelling {
-    constructor(client, objectTypeDictionary) {
+    constructor(client) {
         this._client = client;
-        this._objectTypeDictionary = objectTypeDictionary;
     }
-    getObjectTypeToAdd(objectTypeId) {
+    getObjectTypeToAdd(objectTypeId, dictionary) {
         return __awaiter(this, void 0, void 0, function* () {
-            let objectType = yield this._readObjectMembers(objectTypeId);
+            let objectType = yield this._readObjectMembers(objectTypeId, dictionary);
             if (!objectType)
                 return [];
             let ret = [];
@@ -28,7 +27,7 @@ class UaModelling {
             for (let item of objectMembers) {
                 if (item.modellingRule != common_1.UaModellingRule.PlaceHolder)
                     continue;
-                let childObjectType = this._objectTypeDictionary.getObjectType(item.typeDefinitionId);
+                let childObjectType = dictionary.getObjectType(item.typeDefinitionId);
                 if (!childObjectType)
                     continue;
                 ret.push(childObjectType);
@@ -36,11 +35,31 @@ class UaModelling {
             return ret;
         });
     }
-    addObject(parentNodeId, objectType, displayName, browseName) {
+    getWriteMask(nodes) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodesToRead = [];
+            for (let node of nodes) {
+                if (node.writeMask != null)
+                    continue;
+                nodesToRead.push(node.nodeId);
+            }
+            if (0 == nodesToRead.length)
+                return;
+            let results = yield this._client.readWriteMasks(nodesToRead);
+            let index = 0;
+            for (let node of nodes) {
+                if (node.writeMask != null)
+                    continue;
+                node.writeMask = results[index];
+                index++;
+            }
+        });
+    }
+    addObject(parentNodeId, objectTypeId, displayName, browseName) {
         return __awaiter(this, void 0, void 0, function* () {
             let objectAttributes = new __1.UaObjectAttributes(displayName);
             let extensionObject = objectAttributes.toExtensionObject();
-            let nodeToAdd = new common_1.UaAddNodesItem(new common_1.UaExpandedNodeId(parentNodeId), opcua_webapi_1.NodeClass.Object, extensionObject, new common_1.UaExpandedNodeId(objectType.nodeId), null, browseName !== null && browseName !== void 0 ? browseName : null, null);
+            let nodeToAdd = new common_1.UaAddNodesItem(new common_1.UaExpandedNodeId(parentNodeId), opcua_webapi_1.NodeClass.Object, extensionObject, new common_1.UaExpandedNodeId(objectTypeId), null, browseName !== null && browseName !== void 0 ? browseName : null, null);
             let results = yield this._client.addNodes([nodeToAdd]);
             if (results[0].statusCode.isNotGood())
                 throw new common_1.UaError(results[0].statusCode);
@@ -56,41 +75,30 @@ class UaModelling {
                 throw new common_1.UaError(results[0]);
         });
     }
-    getWriteMask(nodes) {
+    rename(nodeId, name) {
         return __awaiter(this, void 0, void 0, function* () {
-            let nodesToRead = [];
-            for (let node of nodes) {
-                if (node.writeMask != null)
-                    continue;
-                let nodeIdToRead = new common_1.UaReadValueId(node.nodeId, opcua_webapi_1.Attributes.UserWriteMask);
-                nodesToRead.push(nodeIdToRead);
-            }
-            if (0 == nodesToRead.length)
-                return;
-            let results = yield this._client.read(nodesToRead);
-            let index = 0;
-            for (let node of nodes) {
-                if (node.writeMask != null)
-                    continue;
-                let result = results[index];
-                let writeMask = 0;
-                if (result.statusCode.isGood() &&
-                    result.value.type == common_1.UaVariantType.UInt32) {
-                    writeMask = result.value.value;
-                }
-                node.writeMask = writeMask;
-                index++;
-            }
+            let writeValue = new common_1.UaWriteValue(nodeId, common_1.UaVariant.localizedText(name), opcua_webapi_1.Attributes.DisplayName);
+            let results = yield this._client.write([writeValue]);
+            if (results[0].isNotGood())
+                throw new common_1.UaError(results[0]);
+        });
+    }
+    setDescription(nodeId, description) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let writeValue = new common_1.UaWriteValue(nodeId, common_1.UaVariant.localizedText(description), opcua_webapi_1.Attributes.Description);
+            let results = yield this._client.write([writeValue]);
+            if (results[0].isNotGood())
+                throw new common_1.UaError(results[0]);
         });
     }
-    _readObjectMembers(objectTypeId) {
+    _readObjectMembers(objectTypeId, dictionary) {
         return __awaiter(this, void 0, void 0, function* () {
-            let objectType = this._objectTypeDictionary.getObjectType(objectTypeId);
+            let objectType = dictionary.getObjectType(objectTypeId);
             if (!objectType)
                 return null;
             if (objectType.isObjectMemberRead)
                 return objectType;
-            let typeMemberBrowser = new __1.UaNodeReferenceBrowser(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, false);
             yield typeMemberBrowser.browse();
             let browseMemberResults = typeMemberBrowser.results();
             let instanceNodes = new Map();
@@ -105,7 +113,7 @@ class UaModelling {
             for (let node of instanceNodes) {
                 memberObjectIds.push(node[1].nodeId);
             }
-            let modellingRuleBrowser = new __1.UaNodeReferenceBrowser(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, false);
             yield modellingRuleBrowser.browse();
             let browseModellingRuleResults = modellingRuleBrowser.results();
             for (let item of browseModellingRuleResults) {

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

@@ -0,0 +1,186 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaTypeBrowser = exports.UaLinkBrowser = 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) {
+        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();
+        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);
+            }
+        }
+    }
+    browse() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isFinish())
+                return;
+            yield this.browseOnce();
+            yield this.browse();
+        });
+    }
+    browseOnce() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._continuationPointToBrowse.length != 0) {
+                yield this._browseContinuationPoints();
+            }
+            else if (this._nodesToBrowse.length != 0) {
+                yield this._browseNodes();
+            }
+        });
+    }
+    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() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let nodesToBrowse = this._nodesToBrowse.splice(0, this._maxNodesPerBrowse);
+            let browseDescriptions = [];
+            for (let item of nodesToBrowse) {
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
+                browseDescriptions.push(browseDescription);
+            }
+            let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
+            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);
+                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;
+                    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: currentNodeId,
+                        continuationPoint: currentResult.continuationPoint
+                    });
+                }
+                if (this._returnDescription)
+                    yield this._readDescriptions(newReferences);
+            }
+        });
+    }
+    _browseContinuationPoints() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let cpsToBrowse = this._continuationPointToBrowse.splice(0, this._maxNodesPerBrowse);
+            let continuationPoints = [];
+            for (let item of cpsToBrowse) {
+                continuationPoints.push(item.continuationPoint);
+            }
+            let results = yield this._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);
+                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;
+                    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) {
+                    this._continuationPointToBrowse.push({
+                        nodeId: currentNodeId,
+                        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);
+    }
+}
+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);
+    }
+}
+exports.UaTypeBrowser = UaTypeBrowser;

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

@@ -9,181 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = exports.UaSubtypeBrowser = exports.UaLinkBrowser = exports.UaChildBrowser = exports.UaNodeReferenceBrowser = void 0;
+exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
-class UaNodeReferenceBrowser {
-    constructor(client, nodeIds, referenceType, nodeClassToReturn, returnDescription, 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();
-        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);
-            }
-        }
-    }
-    browse() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
-                return;
-            yield this.browseOnce();
-            yield this.browse();
-        });
-    }
-    browseOnce() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints();
-            }
-            else if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes();
-            }
-        });
-    }
-    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() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let nodesToBrowse = this._nodesToBrowse.splice(0, this._maxNodesPerBrowse);
-            let browseDescriptions = [];
-            for (let item of nodesToBrowse) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
-                browseDescriptions.push(browseDescription);
-            }
-            let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
-            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);
-                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;
-                    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: currentNodeId,
-                        continuationPoint: currentResult.continuationPoint
-                    });
-                }
-                if (this._returnDescription)
-                    yield this._readDescriptions(newReferences);
-            }
-        });
-    }
-    _browseContinuationPoints() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let cpsToBrowse = this._continuationPointToBrowse.splice(0, this._maxNodesPerBrowse);
-            let continuationPoints = [];
-            for (let item of cpsToBrowse) {
-                continuationPoints.push(item.continuationPoint);
-            }
-            let results = yield this._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);
-                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;
-                    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) {
-                    this._continuationPointToBrowse.push({
-                        nodeId: currentNodeId,
-                        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.UaNodeReferenceBrowser = UaNodeReferenceBrowser;
-class UaChildBrowser extends UaNodeReferenceBrowser {
-    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);
-    }
-}
-exports.UaChildBrowser = UaChildBrowser;
-class UaLinkBrowser extends UaNodeReferenceBrowser {
-    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 UaSubtypeBrowser extends UaNodeReferenceBrowser {
-    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);
-    }
-}
-exports.UaSubtypeBrowser = UaSubtypeBrowser;
+const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
     constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
         this._client = client;
@@ -239,7 +68,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeReferenceBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -256,7 +85,7 @@ class UaNodeReader {
             }
             let variableReferences = [];
             if (childNodesToBrowse.length != 0) {
-                let childReferenceBrowser = new UaNodeReferenceBrowser(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.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
                 yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }