opcua-webapi-ts 1.1.16 → 1.1.18

package/dist/client/utils/UaNodeReader.js

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = exports.UaLinkBrowser = exports.UaChildBrowser = exports.UaNodeReferenceBrowser = void 0;
+exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = exports.UaSubtypeBrowser = exports.UaLinkBrowser = exports.UaChildBrowser = exports.UaNodeReferenceBrowser = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 class UaNodeReferenceBrowser {
-    constructor(nodeIds, referenceType, nodeClassToReturn, returnDescription, maxNodesPerBrowse, maxReferencesPerNode) {
+    constructor(client, nodeIds, referenceType, nodeClassToReturn, returnDescription, maxNodesPerBrowse, maxReferencesPerNode) {
+        this._client = client;
         this._nodesToBrowse = [];
         this._referenceType = referenceType;
         this._nodeClassToReturn = nodeClassToReturn;
         this._continuationPointToBrowse = [];
-        this._returnDescription = returnDescription;
+        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();
@@ -32,21 +33,21 @@ class UaNodeReferenceBrowser {
             }
         }
     }
-    browse(client) {
+    browse() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isFinish())
                 return;
-            yield this.browseOnce(client);
-            yield this.browse(client);
+            yield this.browseOnce();
+            yield this.browse();
         });
     }
-    browseOnce(client) {
+    browseOnce() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes(client);
+            if (this._continuationPointToBrowse.length != 0) {
+                yield this._browseContinuationPoints();
             }
-            else if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints(client);
+            else if (this._nodesToBrowse.length != 0) {
+                yield this._browseNodes();
             }
         });
     }
@@ -64,18 +65,16 @@ class UaNodeReferenceBrowser {
     isFinish() {
         return (this._nodesToBrowse.length == 0) && (this._continuationPointToBrowse.length == 0);
     }
-    _browseNodes(client) {
+    _browseNodes() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            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, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
                 browseDescriptions.push(browseDescription);
             }
-            let results = yield client.browse(browseDescriptions, this._maxReferencesPerNode);
+            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];
@@ -103,11 +102,11 @@ class UaNodeReferenceBrowser {
                     });
                 }
                 if (this._returnDescription)
-                    yield this._readDescriptions(client, newReferences);
+                    yield this._readDescriptions(newReferences);
             }
         });
     }
-    _browseContinuationPoints(client) {
+    _browseContinuationPoints() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             let cpsToBrowse = this._continuationPointToBrowse.splice(0, this._maxNodesPerBrowse);
@@ -115,7 +114,7 @@ class UaNodeReferenceBrowser {
             for (let item of cpsToBrowse) {
                 continuationPoints.push(item.continuationPoint);
             }
-            let results = yield client.browseNext(continuationPoints, false);
+            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];
@@ -143,11 +142,11 @@ class UaNodeReferenceBrowser {
                     });
                 }
                 if (this._returnDescription)
-                    yield this._readDescriptions(client, newReferences);
+                    yield this._readDescriptions(newReferences);
             }
         });
     }
-    _readDescriptions(client, references) {
+    _readDescriptions(references) {
         return __awaiter(this, void 0, void 0, function* () {
             if (references.length === 0)
                 return;
@@ -155,7 +154,7 @@ class UaNodeReferenceBrowser {
             for (let item of references) {
                 nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
             }
-            let dataValues = yield client.read(nodesToRead);
+            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();
@@ -168,19 +167,26 @@ class UaNodeReferenceBrowser {
 }
 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);
+    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(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);
+    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;
 class UaNodeReader {
-    constructor(returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+        this._client = client;
         this._returnDescription = (returnDescription) ? returnDescription : false;
         this._returnAttributes = (returnAttributes) ? returnAttributes : false;
         this._returnValue = (returnValue) ? returnValue : false;
@@ -203,7 +209,7 @@ class UaNodeReader {
             UaNodeReader.s_variablesNameToRead.add("EnumValues");
         }
     }
-    read(nodeIds, client) {
+    read(nodeIds) {
         return __awaiter(this, void 0, void 0, function* () {
             if (nodeIds.length == 0)
                 return [];
@@ -215,11 +221,11 @@ class UaNodeReader {
                 nodeIdsToRead.push(item);
                 nodeIdsSet.add(item.toString());
             }
-            let rootReferences = yield this._readRootNodes(nodeIdsToRead, client);
-            return yield this.readByReferences(rootReferences, client);
+            let rootReferences = yield this._readRootNodes(nodeIdsToRead);
+            return yield this.readByReferences(rootReferences);
         });
     }
-    readByReferences(references, client) {
+    readByReferences(references) {
         return __awaiter(this, void 0, void 0, function* () {
             if (references.length == 0)
                 return [];
@@ -233,8 +239,8 @@ class UaNodeReader {
                 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 nodeReferenceBrowser = new UaNodeReferenceBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
             for (let item of childReferences) {
@@ -250,8 +256,8 @@ class UaNodeReader {
             }
             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);
+                let childReferenceBrowser = new UaNodeReferenceBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
+                yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }
             let allReferences = [];
@@ -270,7 +276,7 @@ class UaNodeReader {
                 ;
             }
             let nodesMap = new Map();
-            yield this._readNodes(allReferences, nodesMap, client);
+            yield this._readNodes(allReferences, nodesMap);
             for (let item of variableReferences) {
                 this._buildNodeTree(item, nodesMap);
             }
@@ -286,7 +292,7 @@ class UaNodeReader {
             return rootNodes;
         });
     }
-    _readRootNodes(nodeIds, client) {
+    _readRootNodes(nodeIds) {
         return __awaiter(this, void 0, void 0, function* () {
             let nodesToRead = [];
             for (let item of nodeIds) {
@@ -294,7 +300,7 @@ class UaNodeReader {
                 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 dataValues = yield this._client.read(nodesToRead);
             let references = [];
             let typeDefinitionsToRead = [];
             for (let i = 0; i < nodeIds.length; ++i) {
@@ -327,7 +333,7 @@ class UaNodeReader {
                     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);
+                let results = yield this._client.browse(browseDescriptions);
                 for (let i = 0; i < browseDescriptions.length; ++i) {
                     if (results[i].statusCode.isNotGood())
                         throw new common_1.UaError(results[i].statusCode);
@@ -339,7 +345,7 @@ class UaNodeReader {
             return references;
         });
     }
-    _readNodes(references, nodes, client) {
+    _readNodes(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             if (references.length == 0)
                 return;
@@ -348,14 +354,14 @@ class UaNodeReader {
                 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);
+                yield this._readTypes(item, nodes);
+                yield this._readObjects(item, nodes);
+                yield this._readVariables(item, nodes);
+                yield this._readMethods(item, nodes);
             }
         });
     }
-    _readTypes(references, nodes, client) {
+    _readTypes(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             let typesToRead = [];
             let needReadAttributes = this._returnAttributes || this._returnDescription;
@@ -380,7 +386,7 @@ class UaNodeReader {
                         nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.ValueRank));
                     }
                 }
-                dataValues = yield client.read(nodesToRead);
+                dataValues = yield this._client.read(nodesToRead);
             }
             for (let i = 0; i < typesToRead.length; ++i) {
                 let isAbstract = false;
@@ -435,7 +441,7 @@ class UaNodeReader {
             }
         });
     }
-    _readObjects(references, nodes, client) {
+    _readObjects(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             let objectsToRead = [];
             for (let item of references) {
@@ -456,7 +462,7 @@ class UaNodeReader {
             }
             let dataValues = [];
             if (nodesToRead.length != 0) {
-                dataValues = yield client.read(nodesToRead);
+                dataValues = yield this._client.read(nodesToRead);
             }
             for (let i = 0; i < objectsToRead.length; ++i) {
                 let dataIndex = (this._returnAttributes && this._returnDescription) ? i * 2 : i;
@@ -483,7 +489,7 @@ class UaNodeReader {
             }
         });
     }
-    _readVariables(references, nodes, client) {
+    _readVariables(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             let variablesToRead = [];
             let nodeIds = [];
@@ -497,7 +503,7 @@ class UaNodeReader {
                 return;
             let results = [];
             if (this._returnAttributes) {
-                results = yield client.readVariableAttributes(nodeIds);
+                results = yield this._client.readVariableAttributes(nodeIds);
             }
             let variablesToReadValue = [];
             for (let i = 0; i < variablesToRead.length; ++i) {
@@ -518,7 +524,7 @@ class UaNodeReader {
                 for (let item of variablesToReadValue) {
                     valuesToRead.push(item.nodeId);
                 }
-                let values = yield client.readValues(valuesToRead);
+                let values = yield this._client.readValues(valuesToRead);
                 for (let i = 0; i < valuesToRead.length; ++i) {
                     let variableNode = nodes.get(valuesToRead[i].toString());
                     variableNode.dataValue = values[i];
@@ -526,7 +532,7 @@ class UaNodeReader {
             }
         });
     }
-    _readMethods(references, nodes, client) {
+    _readMethods(references, nodes) {
         return __awaiter(this, void 0, void 0, function* () {
             let methodsToRead = [];
             for (let item of references) {
@@ -544,7 +550,7 @@ class UaNodeReader {
             }
             let dataValues = [];
             if (nodesToRead.length != 0) {
-                dataValues = yield client.read(nodesToRead);
+                dataValues = yield this._client.read(nodesToRead);
             }
             for (let i = 0; i < methodsToRead.length; ++i) {
                 let methodNode = new common_1.UaMethod(methodsToRead[i].nodeId, methodsToRead[i].browseName, methodsToRead[i].displayName);
@@ -613,15 +619,15 @@ 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);
+    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, client) {
+    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, client);
+            let nodes = yield _super.read.call(this, nodeIds);
             let objectNodes = [];
             for (let item of nodes) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
@@ -634,15 +640,15 @@ class UaObjectReader extends UaNodeReader {
 }
 exports.UaObjectReader = UaObjectReader;
 class UaTypeReader extends UaNodeReader {
-    constructor() {
-        super(true, true, true, true, false);
+    constructor(client) {
+        super(client, true, true, true, true, false);
     }
-    read(nodeIds, client) {
+    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, client);
+            let nodes = yield _super.read.call(this, nodeIds);
             let typeNodes = [];
             for (let item of nodes) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||

package/dist/client/utils/UaObjectTypeDictionary.d.ts

@@ -1,10 +1,10 @@
 import { UaNodeId, UaObjectType } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaObjectTypeDictionary {
+    private _client;
     private _objectTypes;
-    private _returnAllAttributes;
-    constructor(simpleMode?: boolean);
-    read(client: UaWebClient): Promise<void>;
+    constructor(client: UaWebClient);
+    read(): Promise<void>;
     getObjectType(nodeId: UaNodeId): UaObjectType | null;
     getObjectTypes(): Array<UaObjectType>;
     private _read;

package/dist/client/utils/UaObjectTypeDictionary.js

@@ -14,16 +14,16 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeReader_1 = require("./UaNodeReader");
 class UaObjectTypeDictionary {
-    constructor(simpleMode) {
+    constructor(client) {
+        this._client = client;
         this._objectTypes = new Map;
-        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
         let baseObjectTypeId = common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType);
         this._objectTypes.set(baseObjectTypeId.toString(), new common_1.UaObjectType(baseObjectTypeId, "BaseObjectType", new common_1.UaLocalizedText("BaseObjectType"), false));
     }
-    read(client) {
+    read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
-            yield this._read(browser, client);
+            let browser = new UaNodeReader_1.UaSubtypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
+            yield this._read(browser);
         });
     }
     getObjectType(nodeId) {
@@ -33,10 +33,10 @@ class UaObjectTypeDictionary {
     getObjectTypes() {
         return [...this._objectTypes.values()];
     }
-    _read(browser, client) {
+    _read(browser) {
         return __awaiter(this, void 0, void 0, function* () {
             // Browse child type
-            yield browser.browse(client);
+            yield browser.browse();
             let results = browser.results();
             let referencesToRead = [];
             for (let item of results) {
@@ -47,8 +47,8 @@ class UaObjectTypeDictionary {
                 return;
             // Read child type
             let nodeIdsToBrowse = [];
-            let nodeReader = new UaNodeReader_1.UaNodeReader(this._returnAllAttributes, false, false, this._returnAllAttributes);
-            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._client, false, false, false, false, false);
+            let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.ObjectType != node.nodeClass)
                     continue;
@@ -68,8 +68,8 @@ class UaObjectTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
-            yield this._read(childBrowser, client);
+            let childBrowser = new UaNodeReader_1.UaSubtypeBrowser(this._client, nodeIdsToBrowse);
+            yield this._read(childBrowser);
         });
     }
     __delay(ms) {

package/dist/client/utils/UaReferenceTypeDictionary.d.ts

@@ -1,10 +1,10 @@
 import { UaReferenceType, UaNodeId } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaReferenceTypeDictionary {
+    private _client;
     private _referenceTypes;
-    private _returnAllAttributes;
-    constructor(simpleMode?: boolean);
-    read(client: UaWebClient): Promise<void>;
+    constructor(client: UaWebClient);
+    read(): Promise<void>;
     getReferenceType(nodeId: UaNodeId): UaReferenceType | null;
     getReferenceTypes(): Array<UaReferenceType>;
     private _read;

package/dist/client/utils/UaReferenceTypeDictionary.js

@@ -14,16 +14,16 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeReader_1 = require("./UaNodeReader");
 class UaReferenceTypeDictionary {
-    constructor(simpleMode) {
+    constructor(client) {
+        this._client = client;
         this._referenceTypes = new Map;
-        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
         let referencesId = common_1.UaNodeId.from(common_1.ReferenceTypeIds.References);
         this._referenceTypes.set(referencesId.toString(), new common_1.UaReferenceType(referencesId, "References", new common_1.UaLocalizedText("References"), true, common_1.UaLocalizedText.nullText, true));
     }
-    read(client) {
+    read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
-            yield this._read(browser, client);
+            let browser = new UaNodeReader_1.UaChildBrowser(this._client, [common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
+            yield this._read(browser);
         });
     }
     getReferenceType(nodeId) {
@@ -33,10 +33,10 @@ class UaReferenceTypeDictionary {
     getReferenceTypes() {
         return [...this._referenceTypes.values()];
     }
-    _read(browser, client) {
+    _read(browser) {
         return __awaiter(this, void 0, void 0, function* () {
             // Browse child type
-            yield browser.browse(client);
+            yield browser.browse();
             let results = browser.results();
             let referencesToRead = [];
             for (let item of results) {
@@ -47,8 +47,8 @@ class UaReferenceTypeDictionary {
                 return;
             // Read child type
             let nodeIdsToBrowse = [];
-            let nodeReader = new UaNodeReader_1.UaNodeReader(this._returnAllAttributes, false, false, this._returnAllAttributes);
-            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._client, false, false, false, false, false);
+            let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.ReferenceType != node.nodeClass)
                     continue;
@@ -68,8 +68,8 @@ class UaReferenceTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
-            yield this._read(childBrowser, client);
+            let childBrowser = new UaNodeReader_1.UaChildBrowser(this._client, nodeIdsToBrowse);
+            yield this._read(childBrowser);
         });
     }
     __delay(ms) {

package/dist/common/nodes/UaAttributes.d.ts

@@ -3,12 +3,8 @@ export type OpcUaNodeAttributes = {
     nodeClass: number;
     browseName: string;
     displayName: UaLocalizedText;
-    writeMask: number;
     description: UaLocalizedText | null;
 };
-export type OpcUaObjectAttributes = {
-    eventNotifier: number;
-};
 export type OpcUaVariableAttributes = {
     dataType: UaNodeId;
     valueRank: number;

package/dist/common/nodes/UaDataType.d.ts

@@ -4,7 +4,7 @@ import { UaDefintionNode, UaVariable } from ".";
 export declare class UaDataType extends UaDefintionNode {
     private _valueType;
     private _enumValues;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get nodeClass(): NodeClass;
     get valueType(): number;
     get enumValues(): Map<number, UaLocalizedText> | null;

package/dist/common/nodes/UaDataType.js

@@ -6,8 +6,8 @@ const types_1 = require("../types");
 const _1 = require(".");
 const structure_1 = require("../structure");
 class UaDataType extends _1.UaDefintionNode {
-    constructor(nodeId, browseName, displayName, isAbstract, writeMask) {
-        super(nodeId, browseName, displayName, isAbstract, writeMask);
+    constructor(nodeId, browseName, displayName, isAbstract) {
+        super(nodeId, browseName, displayName, isAbstract);
         this._valueType = 0;
         this._enumValues = null;
     }

package/dist/common/nodes/UaNode.d.ts

@@ -1,20 +1,21 @@
 import { NodeClass } from "opcua-webapi";
-import { UaLocalizedText, UaNodeId } from "../types";
+import { UaLocalizedText, UaModellingRule, UaNodeId } from "../types";
 export declare abstract class UaNode {
     protected _nodeId: UaNodeId;
     protected _browseName: string;
     protected _displayName: UaLocalizedText;
     protected _description: UaLocalizedText | null;
-    protected _writeMask: number;
+    protected _writeMask: number | null;
     protected _parent: UaNode | null;
     protected _children: Array<UaNode>;
     protected _refToParent: UaNodeId | null;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     abstract get nodeClass(): NodeClass;
     get nodeId(): UaNodeId;
     get browseName(): string;
     get displayName(): UaLocalizedText;
-    get writeMask(): number;
+    get writeMask(): number | null;
+    set writeMask(writeMask: number);
     get description(): UaLocalizedText | null;
     set description(description: UaLocalizedText | null);
     get refToParent(): UaNodeId | null;
@@ -23,7 +24,7 @@ export declare abstract class UaNode {
 }
 export declare abstract class UaDefintionNode extends UaNode {
     protected _isAbstract: boolean;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get isAbstract(): boolean;
     get refToParent(): UaNodeId | null;
     set refToParent(referenceTypeId: UaNodeId);
@@ -33,6 +34,9 @@ export declare abstract class UaDefintionNode extends UaNode {
     childTypes(): Array<UaDefintionNode>;
 }
 export declare abstract class UaInstanceNode extends UaNode {
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, writeMask?: number | null);
+    private _modellingRule;
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     getMembers(nodeClass?: NodeClass): Array<UaInstanceNode>;
+    get modellingRule(): UaModellingRule;
+    setModellingRule(modellingRuleId: UaNodeId): void;
 }

package/dist/common/nodes/UaNode.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaInstanceNode = exports.UaDefintionNode = exports.UaNode = void 0;
+const types_1 = require("../types");
+const _1 = require(".");
 class UaNode {
-    constructor(nodeId, browseName, displayName, writeMask) {
+    constructor(nodeId, browseName, displayName) {
         this._nodeId = nodeId;
         this._browseName = browseName;
         this._displayName = displayName;
         this._description = null;
-        this._writeMask = (writeMask) ? writeMask : 0;
+        this._writeMask = null;
         this._parent = null;
         this._children = [];
         this._refToParent = null;
@@ -24,6 +26,9 @@ class UaNode {
     get writeMask() {
         return this._writeMask;
     }
+    set writeMask(writeMask) {
+        this._writeMask = writeMask;
+    }
     get description() {
         return this._description;
     }
@@ -39,8 +44,8 @@ class UaNode {
 }
 exports.UaNode = UaNode;
 class UaDefintionNode extends UaNode {
-    constructor(nodeId, browseName, displayName, isAbstract, writeMask) {
-        super(nodeId, browseName, displayName, writeMask);
+    constructor(nodeId, browseName, displayName, isAbstract) {
+        super(nodeId, browseName, displayName);
         this._isAbstract = isAbstract;
     }
     get isAbstract() {
@@ -80,8 +85,9 @@ class UaDefintionNode extends UaNode {
 }
 exports.UaDefintionNode = UaDefintionNode;
 class UaInstanceNode extends UaNode {
-    constructor(nodeId, browseName, displayName, writeMask) {
-        super(nodeId, browseName, displayName, writeMask);
+    constructor(nodeId, browseName, displayName) {
+        super(nodeId, browseName, displayName);
+        this._modellingRule = types_1.UaModellingRule.None;
     }
     getMembers(nodeClass) {
         let ret = [];
@@ -92,5 +98,20 @@ class UaInstanceNode extends UaNode {
         }
         return ret;
     }
+    get modellingRule() {
+        return this._modellingRule;
+    }
+    setModellingRule(modellingRuleId) {
+        if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_Mandatory)))
+            this._modellingRule = types_1.UaModellingRule.Mandatory;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_Optional)))
+            this._modellingRule = types_1.UaModellingRule.Optional;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_OptionalPlaceholder)))
+            this._modellingRule = types_1.UaModellingRule.PlaceHolder;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_MandatoryPlaceholder)))
+            this._modellingRule = types_1.UaModellingRule.PlaceHolder;
+        else
+            this._modellingRule = types_1.UaModellingRule.None;
+    }
 }
 exports.UaInstanceNode = UaInstanceNode;