opcua-webapi-ts 1.1.21 → 1.1.23

package/dist/cjs/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 = void 0;
+exports.UaObjectDataReader = exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
-    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue, referenceTypeToReturn) {
         this._client = client;
         this._returnDescription = (returnDescription) ? returnDescription : false;
         this._returnAttributes = (returnAttributes) ? returnAttributes : false;
         this._returnValue = (returnValue) ? returnValue : false;
+        this._referenceTypeToReturn = (referenceTypeToReturn) ? referenceTypeToReturn : common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences);
         this._nodeClassToReturn = 0;
         if (returnVariable)
             this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
@@ -68,7 +69,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -457,15 +458,35 @@ class UaObjectReader extends UaNodeReader {
         });
         return __awaiter(this, void 0, void 0, function* () {
             let nodes = yield _super.read.call(this, nodeIds);
-            let objectNodes = [];
-            for (let item of nodes) {
+            return this._processResult(nodes);
+        });
+    }
+    readByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectReferences = [];
+            for (let item of references) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
-                    objectNodes.push(item);
+                    objectReferences.push(item);
                 }
             }
-            return objectNodes;
+            if (0 == objectReferences.length)
+                return [];
+            let nodes = yield _super.readByReferences.call(this, objectReferences);
+            return this._processResult(nodes);
         });
     }
+    _processResult(nodes) {
+        let objectNodes = [];
+        for (let item of nodes) {
+            if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
+                objectNodes.push(item);
+            }
+        }
+        return objectNodes;
+    }
 }
 exports.UaObjectReader = UaObjectReader;
 class UaTypeReader extends UaNodeReader {
@@ -478,17 +499,83 @@ class UaTypeReader extends UaNodeReader {
         });
         return __awaiter(this, void 0, void 0, function* () {
             let nodes = yield _super.read.call(this, nodeIds);
-            let typeNodes = [];
-            for (let item of nodes) {
+            return this._processResult(nodes);
+        });
+    }
+    readByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let typeReferences = [];
+            for (let item of references) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.DataType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
-                    typeNodes.push(item);
+                    typeReferences.push(item);
                 }
             }
-            return typeNodes;
+            if (0 == typeReferences.length)
+                return [];
+            let nodes = yield _super.readByReferences.call(this, typeReferences);
+            return this._processResult(nodes);
         });
     }
+    _processResult(nodes) {
+        let typeNodes = [];
+        for (let item of nodes) {
+            if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.DataType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
+                typeNodes.push(item);
+            }
+        }
+        return typeNodes;
+    }
 }
 exports.UaTypeReader = UaTypeReader;
+class UaObjectDataReader extends UaNodeReader {
+    constructor(client) {
+        super(client, false, true, false, false, true);
+    }
+    readValues(nodeIds) {
+        const _super = Object.create(null, {
+            read: { get: () => super.read }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodes = yield _super.read.call(this, nodeIds);
+            return this._processResult(nodes);
+        });
+    }
+    readValuesByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodes = yield _super.readByReferences.call(this, references);
+            return this._processResult(nodes);
+        });
+    }
+    _processResult(nodes) {
+        let ret = new Map();
+        for (let item of nodes) {
+            if (item.nodeClass != opcua_webapi_1.NodeClass.Object)
+                continue;
+            let id = item.nodeId.toString();
+            let objectNode = item;
+            let members = objectNode.getMembers(opcua_webapi_1.NodeClass.Variable);
+            let serializedObject = {};
+            serializedObject["_id"] = id;
+            serializedObject["_name"] = objectNode.displayName.text;
+            for (let member of members) {
+                let value = member.value;
+                serializedObject[member.browseName] = (null == value) ? null : value.value;
+            }
+            ret.set(id, serializedObject);
+        }
+        return ret;
+    }
+}
+exports.UaObjectDataReader = UaObjectDataReader;

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

@@ -49,9 +49,15 @@ class UaObject extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let variables = [];
+        let methods = [];
         for (let item of this._children) {
-            children.push(item.toJson());
+            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
+                variables.push(item.toJson());
+            }
+            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
+                methods.push(item.toJson());
+            }
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -60,8 +66,9 @@ 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,
+            variables: (variables.length != 0) ? variables : undefined,
+            methods: (methods.length != 0) ? methods : undefined
         };
         return ret;
     }

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

@@ -48,11 +48,17 @@ class UaObjectType extends _1.UaDefintionNode {
         this._isObjectMemberRead = value;
     }
     toJson() {
-        let children = [];
+        let variables = [];
+        let methods = [];
         for (let item of this._children) {
             if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType)
                 continue;
-            children.push(item.toJson());
+            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
+                variables.push(item.toJson());
+            }
+            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
+                methods.push(item.toJson());
+            }
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -61,7 +67,8 @@ 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
+            variables: (variables.length != 0) ? variables : undefined,
+            methods: (methods.length != 0) ? methods : undefined
         };
         return ret;
     }

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

@@ -68,9 +68,9 @@ 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
         };

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

@@ -1,4 +1,4 @@
-import { UaNode, UaNodeId, UaReference } from "../../common";
+import { UaNode, UaNodeId, UaObject, UaReference, UaDefintionNode } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaNodeReader {
     private _client;
@@ -6,9 +6,10 @@ export declare class UaNodeReader {
     private _returnDescription;
     private _returnAttributes;
     private _returnValue;
+    private _referenceTypeToReturn;
     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);
+    constructor(client: UaWebClient, returnDescription?: boolean | null, returnVariable?: boolean | null, returnMethod?: boolean | null, returnAttributes?: boolean | null, returnValue?: boolean | null, referenceTypeToReturn?: UaNodeId);
     read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
     readByReferences(references: Array<UaReference>): Promise<Array<UaNode>>;
     private _readRootNodes;
@@ -21,9 +22,19 @@ export declare class UaNodeReader {
 }
 export declare class UaObjectReader extends UaNodeReader {
     constructor(client: UaWebClient, returnDescription?: boolean | null, returnValue?: boolean | null);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
+    read(nodeIds: Array<UaNodeId>): Promise<Array<UaObject>>;
+    readByReferences(references: Array<UaReference>): Promise<Array<UaObject>>;
+    private _processResult;
 }
 export declare class UaTypeReader extends UaNodeReader {
     constructor(client: UaWebClient);
-    read(nodeIds: Array<UaNodeId>): Promise<Array<UaNode>>;
+    read(nodeIds: Array<UaNodeId>): Promise<Array<UaDefintionNode>>;
+    readByReferences(references: Array<UaReference>): Promise<Array<UaDefintionNode>>;
+    private _processResult;
+}
+export declare class UaObjectDataReader extends UaNodeReader {
+    constructor(client: UaWebClient);
+    readValues(nodeIds: Array<UaNodeId>): Promise<Map<string, any>>;
+    readValuesByReferences(references: Array<UaReference>): Promise<Map<string, any>>;
+    private _processResult;
 }

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 = void 0;
+exports.UaObjectDataReader = exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
-    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
+    constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue, referenceTypeToReturn) {
         this._client = client;
         this._returnDescription = (returnDescription) ? returnDescription : false;
         this._returnAttributes = (returnAttributes) ? returnAttributes : false;
         this._returnValue = (returnValue) ? returnValue : false;
+        this._referenceTypeToReturn = (referenceTypeToReturn) ? referenceTypeToReturn : common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences);
         this._nodeClassToReturn = 0;
         if (returnVariable)
             this._nodeClassToReturn += opcua_webapi_1.NodeClass.Variable;
@@ -68,7 +69,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -457,15 +458,35 @@ class UaObjectReader extends UaNodeReader {
         });
         return __awaiter(this, void 0, void 0, function* () {
             let nodes = yield _super.read.call(this, nodeIds);
-            let objectNodes = [];
-            for (let item of nodes) {
+            return this._processResult(nodes);
+        });
+    }
+    readByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectReferences = [];
+            for (let item of references) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
-                    objectNodes.push(item);
+                    objectReferences.push(item);
                 }
             }
-            return objectNodes;
+            if (0 == objectReferences.length)
+                return [];
+            let nodes = yield _super.readByReferences.call(this, objectReferences);
+            return this._processResult(nodes);
         });
     }
+    _processResult(nodes) {
+        let objectNodes = [];
+        for (let item of nodes) {
+            if (item.nodeClass == opcua_webapi_1.NodeClass.Object) {
+                objectNodes.push(item);
+            }
+        }
+        return objectNodes;
+    }
 }
 exports.UaObjectReader = UaObjectReader;
 class UaTypeReader extends UaNodeReader {
@@ -478,17 +499,83 @@ class UaTypeReader extends UaNodeReader {
         });
         return __awaiter(this, void 0, void 0, function* () {
             let nodes = yield _super.read.call(this, nodeIds);
-            let typeNodes = [];
-            for (let item of nodes) {
+            return this._processResult(nodes);
+        });
+    }
+    readByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let typeReferences = [];
+            for (let item of references) {
                 if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.DataType ||
                     item.nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
-                    typeNodes.push(item);
+                    typeReferences.push(item);
                 }
             }
-            return typeNodes;
+            if (0 == typeReferences.length)
+                return [];
+            let nodes = yield _super.readByReferences.call(this, typeReferences);
+            return this._processResult(nodes);
         });
     }
+    _processResult(nodes) {
+        let typeNodes = [];
+        for (let item of nodes) {
+            if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.VariableType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.DataType ||
+                item.nodeClass == opcua_webapi_1.NodeClass.ReferenceType) {
+                typeNodes.push(item);
+            }
+        }
+        return typeNodes;
+    }
 }
 exports.UaTypeReader = UaTypeReader;
+class UaObjectDataReader extends UaNodeReader {
+    constructor(client) {
+        super(client, false, true, false, false, true);
+    }
+    readValues(nodeIds) {
+        const _super = Object.create(null, {
+            read: { get: () => super.read }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodes = yield _super.read.call(this, nodeIds);
+            return this._processResult(nodes);
+        });
+    }
+    readValuesByReferences(references) {
+        const _super = Object.create(null, {
+            readByReferences: { get: () => super.readByReferences }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodes = yield _super.readByReferences.call(this, references);
+            return this._processResult(nodes);
+        });
+    }
+    _processResult(nodes) {
+        let ret = new Map();
+        for (let item of nodes) {
+            if (item.nodeClass != opcua_webapi_1.NodeClass.Object)
+                continue;
+            let id = item.nodeId.toString();
+            let objectNode = item;
+            let members = objectNode.getMembers(opcua_webapi_1.NodeClass.Variable);
+            let serializedObject = {};
+            serializedObject["_id"] = id;
+            serializedObject["_name"] = objectNode.displayName.text;
+            for (let member of members) {
+                let value = member.value;
+                serializedObject[member.browseName] = (null == value) ? null : value.value;
+            }
+            ret.set(id, serializedObject);
+        }
+        return ret;
+    }
+}
+exports.UaObjectDataReader = UaObjectDataReader;

package/dist/common/nodes/UaObject.js

@@ -49,9 +49,15 @@ class UaObject extends _1.UaInstanceNode {
         return ret;
     }
     toJson() {
-        let children = [];
+        let variables = [];
+        let methods = [];
         for (let item of this._children) {
-            children.push(item.toJson());
+            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
+                variables.push(item.toJson());
+            }
+            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
+                methods.push(item.toJson());
+            }
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -60,8 +66,9 @@ 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,
+            variables: (variables.length != 0) ? variables : undefined,
+            methods: (methods.length != 0) ? methods : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaObjectType.js

@@ -48,11 +48,17 @@ class UaObjectType extends _1.UaDefintionNode {
         this._isObjectMemberRead = value;
     }
     toJson() {
-        let children = [];
+        let variables = [];
+        let methods = [];
         for (let item of this._children) {
             if (item.nodeClass == opcua_webapi_1.NodeClass.ObjectType)
                 continue;
-            children.push(item.toJson());
+            if (opcua_webapi_1.NodeClass.Variable == item.nodeClass) {
+                variables.push(item.toJson());
+            }
+            else if (opcua_webapi_1.NodeClass.Method == item.nodeClass) {
+                methods.push(item.toJson());
+            }
         }
         let ret = {
             nodeId: this._nodeId.toString(),
@@ -61,7 +67,8 @@ 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
+            variables: (variables.length != 0) ? variables : undefined,
+            methods: (methods.length != 0) ? methods : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaVariable.js

@@ -68,9 +68,9 @@ 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
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",