opcua-webapi-ts 1.1.16 → 1.1.18

package/dist/cjs/client/UaWebClient.js

@@ -95,7 +95,6 @@ class UaWebClient {
                 new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.NodeClass),
                 new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.BrowseName),
                 new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.DisplayName),
-                new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.WriteMask)
             ];
             if (returnDescription) {
                 nodesToRead.push(new common_1.UaReadValueId(nodeId, opcua_webapi_1.Attributes.Description));
@@ -114,16 +113,13 @@ class UaWebClient {
                 common_1.UaVariantType.QualifiedName != browseNameValue.type ||
                 common_1.UaVariantType.LocalizedText != displayNameValue.type)
                 throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-            let writeMaskValue = (results[3].statusCode.isGood() &&
-                results[3].value.type == common_1.UaVariantType.UInt32) ? results[3].value : undefined;
             let descriptionValue = (returnDescription &&
-                results[4].statusCode.isGood() &&
-                results[4].value.type == common_1.UaVariantType.LocalizedText) ? results[4].value : undefined;
+                results[3].statusCode.isGood() &&
+                results[3].value.type == common_1.UaVariantType.LocalizedText) ? results[3].value : undefined;
             let ret = {
                 nodeClass: nodeClassValue.value,
                 browseName: browseNameValue.value,
                 displayName: displayNameValue.value,
-                writeMask: (writeMaskValue) ? writeMaskValue.value : 0,
                 description: (descriptionValue) ? descriptionValue.value : undefined
             };
             return ret;
@@ -183,72 +179,6 @@ 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;
-        });
-    }
-    readObjectAttributes(nodeId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let nodesToRead = [
-                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);
-            let eventNotifierValue = results[0].value;
-            if (common_1.UaVariantType.Byte != eventNotifierValue.type)
-                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadNodeAttributesInvalid));
-            let ret = {
-                eventNotifier: eventNotifierValue.value
-            };
-            return ret;
-        });
-    }
     methodCall(objectId, methodId, inputArguments) {
         return __awaiter(this, void 0, void 0, function* () {
             let inputs = [];
@@ -369,26 +299,6 @@ class UaWebClient {
             return ret;
         });
     }
-    addObject(parentNodeId, typeDefinitionNodeId, displayName, browseName, referenceTypeId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let objectAttributes = new common_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(typeDefinitionNodeId), null, browseName, referenceTypeId);
-            let results = yield this.addNodes([nodeToAdd]);
-            if (results[0].statusCode.isNotGood())
-                throw new common_1.UaError(results[0].statusCode);
-            let newNodeId = results[0].addedNodeId;
-            return newNodeId;
-        });
-    }
-    deleteNode(nodeId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let nodeToDelete = new common_1.UaDeleteNodesItem(nodeId);
-            let results = yield this.deleteNodes([nodeToDelete]);
-            if (results[0].isNotGood())
-                throw new common_1.UaError(results[0]);
-        });
-    }
     // Native APIs
     browse(nodesToBrowse, maxReferencesPerNode, view, additionalParameters) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -14,16 +14,16 @@ const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const __1 = require("../..");
 class UaDataTypeDictionary {
-    constructor(simpleMode) {
+    constructor(client) {
+        this._client = client;
         this._dataTypes = new Map;
-        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
         let baseDataTypeId = new common_1.UaNodeId(common_1.DataTypeIds.BaseDataType);
         this._dataTypes.set(baseDataTypeId.toString(), new common_1.UaDataType(baseDataTypeId, "BaseDataType", new common_1.UaLocalizedText("BaseDataType"), true));
     }
-    read(client) {
+    read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new __1.UaChildBrowser([common_1.UaNodeId.from(common_1.DataTypeIds.BaseDataType)]);
-            yield this._read(browser, client);
+            let browser = new __1.UaChildBrowser(this._client, [common_1.UaNodeId.from(common_1.DataTypeIds.BaseDataType)]);
+            yield this._read(browser);
         });
     }
     getDataType(nodeId) {
@@ -33,10 +33,10 @@ class UaDataTypeDictionary {
     getDataTypes() {
         return [...this._dataTypes.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 = [];
             let needToReadEnumValue = false;
@@ -50,8 +50,8 @@ class UaDataTypeDictionary {
                 return;
             // Read child type
             let nodeIdsToBrowse = [];
-            let nodeReader = new __1.UaNodeReader(this._returnAllAttributes, needToReadEnumValue, false, this._returnAllAttributes);
-            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            let nodeReader = new __1.UaNodeReader(this._client, false, needToReadEnumValue, false, false, true);
+            let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.DataType != node.nodeClass)
                     continue;
@@ -71,8 +71,8 @@ class UaDataTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new __1.UaChildBrowser(nodeIdsToBrowse);
-            yield this._read(childBrowser, client);
+            let childBrowser = new __1.UaChildBrowser(this._client, nodeIdsToBrowse);
+            yield this._read(childBrowser);
         });
     }
     __delay(ms) {

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

@@ -0,0 +1,129 @@
+"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.UaModelling = void 0;
+const opcua_webapi_1 = require("opcua-webapi");
+const common_1 = require("../../common");
+const __1 = require("../..");
+class UaModelling {
+    constructor(client, objectTypeDictionary) {
+        this._client = client;
+        this._objectTypeDictionary = objectTypeDictionary;
+    }
+    getObjectTypeToAdd(objectTypeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectType = yield this._readObjectMembers(objectTypeId);
+            if (!objectType)
+                return [];
+            let ret = [];
+            let objectMembers = objectType.objectMembers;
+            for (let item of objectMembers) {
+                if (item.modellingRule != common_1.UaModellingRule.PlaceHolder)
+                    continue;
+                let childObjectType = this._objectTypeDictionary.getObjectType(item.typeDefinitionId);
+                if (!childObjectType)
+                    continue;
+                ret.push(childObjectType);
+            }
+            return ret;
+        });
+    }
+    addObject(parentNodeId, objectType, 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 results = yield this._client.addNodes([nodeToAdd]);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let newNodeId = results[0].addedNodeId;
+            return newNodeId;
+        });
+    }
+    deleteNode(nodeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodeToDelete = new common_1.UaDeleteNodesItem(nodeId);
+            let results = yield this._client.deleteNodes([nodeToDelete]);
+            if (results[0].isNotGood())
+                throw new common_1.UaError(results[0]);
+        });
+    }
+    getWriteMask(nodes) {
+        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++;
+            }
+        });
+    }
+    _readObjectMembers(objectTypeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectType = this._objectTypeDictionary.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);
+            yield typeMemberBrowser.browse();
+            let browseMemberResults = typeMemberBrowser.results();
+            let instanceNodes = new Map();
+            for (let item of browseMemberResults) {
+                for (let reference of item.references) {
+                    if (reference.nodeClass != opcua_webapi_1.NodeClass.Object)
+                        continue;
+                    instanceNodes.set(reference.nodeId.toString(), new common_1.UaObject(reference.nodeId, reference.browseName, reference.displayName, 0, reference.typeDefinitionId));
+                }
+            }
+            let memberObjectIds = [];
+            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);
+            yield modellingRuleBrowser.browse();
+            let browseModellingRuleResults = modellingRuleBrowser.results();
+            for (let item of browseModellingRuleResults) {
+                let instanceNode = instanceNodes.get(item.nodeId.toString());
+                if (!instanceNode)
+                    continue;
+                if (0 == item.references.length)
+                    continue;
+                instanceNode.setModellingRule(item.references[0].nodeId);
+            }
+            for (let node of instanceNodes) {
+                if (node[1].modellingRule == common_1.UaModellingRule.None)
+                    continue;
+                objectType.addMember(node[1]);
+            }
+            objectType.isObjectMemberRead = true;
+            return objectType;
+        });
+    }
+}
+exports.UaModelling = UaModelling;