opcua-webapi-ts 1.1.22 → 1.1.24

package/dist/cjs/common/nodes/UaMethod.js

@@ -71,6 +71,28 @@ class UaMethod extends _1.UaInstanceNode {
         };
         return ret;
     }
+    toReadableJson() {
+        let inputArgs = [];
+        let outputArgs = [];
+        if (this._inputArguments) {
+            for (let item of this._inputArguments) {
+                inputArgs.push(item.toJson());
+            }
+        }
+        if (this._outputArguments) {
+            for (let item of this._outputArguments) {
+                outputArgs.push(item.toJson());
+            }
+        }
+        return {
+            id: this._nodeId.toString(),
+            name: this._browseName,
+            displayName: this._displayName.text,
+            description: (this._description) ? this._description.text : undefined,
+            inputArguments: (inputArgs.length != 0) ? inputArgs : undefined,
+            outputArguments: (outputArgs.length != 0) ? outputArgs : undefined
+        };
+    }
 }
 exports.UaMethod = UaMethod;
 UaMethod.InputArguments = "InputArguments";

package/dist/cjs/common/nodes/UaNode.js

@@ -12,7 +12,6 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
-        this._refToParent = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -35,12 +34,6 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
-    get refToParent() {
-        return this._refToParent;
-    }
-    set refToParent(referenceTypeId) {
-        this._refToParent = referenceTypeId;
-    }
 }
 exports.UaNode = UaNode;
 class UaDefintionNode extends UaNode {
@@ -51,12 +44,6 @@ class UaDefintionNode extends UaNode {
     get isAbstract() {
         return this._isAbstract;
     }
-    get refToParent() {
-        return (this._refToParent) ? this._refToParent : null;
-    }
-    set refToParent(referenceTypeId) {
-        this._refToParent = referenceTypeId;
-    }
     setParentType(parentType) {
         if (parentType.nodeClass != this.nodeClass ||
             null != this._parent)

package/dist/cjs/common/nodes/UaObject.js

@@ -49,9 +49,9 @@ class UaObject extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -60,8 +60,8 @@ class UaObject extends _1.UaInstanceNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             typeDefinitionId: this._typeDefinitionId.toString(),
-            eventNotifier: this._eventNotifier,
-            children: (children.length != 0) ? children : undefined
+            eventNotifier: (this._eventNotifier != 0) ? this._eventNotifier : undefined,
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/cjs/common/nodes/UaObjectType.js

@@ -48,11 +48,9 @@ class UaObjectType extends _1.UaDefintionNode {
         this._isObjectMemberRead = value;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
-            if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType)
-                continue;
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -61,7 +59,7 @@ class UaObjectType extends _1.UaDefintionNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             isAbstract: this._isAbstract,
-            children: (children.length != 0) ? children : undefined
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/cjs/common/nodes/UaVariable.js

@@ -13,6 +13,7 @@ class UaVariable extends _1.UaInstanceNode {
         this._historizing = historizing;
         this._typeDefinitionId = typeDefinitionId;
         this._dataValue = null;
+        this._isProperty = false;
     }
     get nodeClass() {
         return opcua_webapi_1.NodeClass.Variable;
@@ -32,6 +33,9 @@ class UaVariable extends _1.UaInstanceNode {
     get historizing() {
         return this._historizing;
     }
+    get typeDefinitionId() {
+        return this._typeDefinitionId;
+    }
     get value() {
         return (this._dataValue && this._dataValue.statusCode.isGood()) ? this._dataValue.value : null;
     }
@@ -41,8 +45,11 @@ class UaVariable extends _1.UaInstanceNode {
     set dataValue(value) {
         this._dataValue = value;
     }
-    get typeDefinitionId() {
-        return this._typeDefinitionId;
+    get isProperty() {
+        return this._isProperty;
+    }
+    set isProperty(value) {
+        this._isProperty = value;
     }
     addMember(node) {
         this._children.push(node);
@@ -55,11 +62,11 @@ class UaVariable extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let members = [];
         for (let item of this._children) {
             if (item.nodeClass != opcua_webapi_1.NodeClass.Variable)
                 continue;
-            children.push(item.toJson());
+            members.push(item.toJson());
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -68,11 +75,11 @@ class UaVariable extends _1.UaInstanceNode {
             displayName: this._displayName.text,
             typeDefinitionId: this._typeDefinitionId.toString(),
             dataType: this._dataType.toString(),
-            valueRank: this._valueRank,
+            valueRank: (this._valueRank != 0) ? this._valueRank : undefined,
             accessLevel: this._accessLevel,
-            historizing: this._historizing,
+            historizing: (this._historizing) ? true : undefined,
             value: this._dataValue ? this._dataValue.value.value : undefined,
-            children: (children.length != 0) ? children : undefined
+            members: (members.length != 0) ? members : undefined
         };
         return ret;
     }

package/dist/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/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/client/utils/UaNodeBrowser.d.ts

@@ -10,25 +10,20 @@ export declare class UaNodeBrowser {
     private _continuationPointToBrowse;
     private _referenceType;
     private _nodeClassToReturn;
-    private _returnDescription;
     private _maxNodesPerBrowse;
     private _maxReferencesPerNode;
     private _readResults;
-    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, nodeClassToReturn: number, returnDescription?: boolean, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
+    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, nodeClassToReturn: number, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
     browse(): Promise<void>;
     browseOnce(): Promise<void>;
     results(): Array<BrowseReferenceResult>;
     isFinish(): boolean;
     private _browseNodes;
     private _browseContinuationPoints;
-    private _readDescriptions;
 }
 export declare class UaObjectBrowser extends UaNodeBrowser {
-    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, returnDescription?: boolean);
-}
-export declare class UaLinkBrowser extends UaNodeBrowser {
-    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, returnDescription?: boolean);
+    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType?: UaNodeId);
 }
 export declare class UaTypeBrowser extends UaNodeBrowser {
-    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, returnDescription?: boolean);
+    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>);
 }

package/dist/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/client/utils/UaNodeReader.d.ts

@@ -1,15 +1,18 @@
-import { UaNode, UaNodeId, UaObject, UaReference, UaDefintionNode } from "../../common";
+import { UaNode, UaNodeId, UaReference } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaNodeReader {
     private _client;
     private _nodeClassToReturn;
     private _returnDescription;
-    private _returnAttributes;
-    private _returnValue;
     private _referenceTypeToReturn;
+    private _returnObjectAttributes;
+    private _returnVariableAttributes;
+    private _returnVariableValue;
+    private _returnPropertyAttributes;
+    private _returnPropertyValue;
     private static s_variableTypeWithoutMember;
     private static s_variablesNameToRead;
-    constructor(client: UaWebClient, returnDescription?: boolean | null, returnVariable?: boolean | null, returnMethod?: boolean | null, returnAttributes?: boolean | null, returnValue?: boolean | null, referenceTypeToReturn?: UaNodeId);
+    constructor(client: UaWebClient, returnDescription: boolean, returnVariable: boolean, returnMethod: boolean, referenceTypeToReturn: UaNodeId, returnObjectAttributes: boolean, returnVariableAttributes: boolean, returnVariableValue: boolean, returnPropertyAttributes: boolean, returnPropertyValue: boolean);
     read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
     readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
     private _readRootNodes;
@@ -21,10 +24,14 @@ export declare class UaNodeReader {
     private _buildNodeTree;
 }
 export declare class UaObjectReader extends UaNodeReader {
-    constructor(client: UaWebClient, returnDescription?: boolean | null, returnValue?: boolean | null);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaObject>>;
+    constructor(client: UaWebClient, returnVariable?: boolean, returnMethod?: boolean, returnDescription?: boolean);
+    readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
+}
+export declare class UaFullObjectReader extends UaNodeReader {
+    constructor(client: UaWebClient, returnDescription?: boolean, returnValue?: boolean);
+    readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
 }
 export declare class UaTypeReader extends UaNodeReader {
-    constructor(client: UaWebClient);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaDefintionNode>>;
+    constructor(client: UaWebClient, returnDescription?: boolean);
+    readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
 }