opcua-webapi-ts 1.1.26 → 1.1.28

package/dist/cjs/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);
+            let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, 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);
+            let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), false, opcua_webapi_1.NodeClass.Object);
             yield modellingRuleBrowser.browse();
             let browseModellingRuleResults = modellingRuleBrowser.results();
             for (let item of browseModellingRuleResults) {

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

@@ -13,10 +13,11 @@ 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, maxNodesPerBrowse, maxReferencesPerNode) {
+    constructor(client, nodeIds, referenceType, includeSubtypes, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
         this._client = client;
         this._nodesToBrowse = [];
         this._referenceType = referenceType;
+        this._includeSubtypes = includeSubtypes;
         this._nodeClassToReturn = nodeClassToReturn;
         this._continuationPointToBrowse = [];
         this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
@@ -70,7 +71,7 @@ class UaNodeBrowser {
             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);
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, this._includeSubtypes, this._nodeClassToReturn, 63);
                 browseDescriptions.push(browseDescription);
             }
             let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
@@ -145,13 +146,13 @@ class UaNodeBrowser {
 exports.UaNodeBrowser = UaNodeBrowser;
 class UaObjectBrowser extends UaNodeBrowser {
     constructor(client, nodeIds, referenceType = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences)) {
-        super(client, nodeIds, referenceType, opcua_webapi_1.NodeClass.Object, 20);
+        super(client, nodeIds, referenceType, true, opcua_webapi_1.NodeClass.Object, 20);
     }
 }
 exports.UaObjectBrowser = UaObjectBrowser;
 class UaTypeBrowser extends UaNodeBrowser {
     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);
+        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasSubtype), false, 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/cjs/client/utils/UaNodeReader.js

@@ -70,7 +70,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, true, this._nodeClassToReturn);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -87,7 +87,7 @@ class UaNodeReader {
             }
             let variableReferences = [];
             if (childNodesToBrowse.length != 0) {
-                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Variable);
+                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Variable);
                 yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }

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

@@ -18,7 +18,7 @@ class UaObjectSerializer {
                 let propertyJson = {
                     name: variable.browseName,
                     displayName: variable.displayName.text,
-                    value: (variable.value) ? variable.value.value : null
+                    value: (variable.value) ? variable.value.jsonValue() : null
                 };
                 properties.push(propertyJson);
             }

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

@@ -12,6 +12,7 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
+        this._customizedData = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -34,6 +35,12 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
+    get customizedData() {
+        return this._customizedData;
+    }
+    set customizedData(customizedData) {
+        this._customizedData = customizedData;
+    }
 }
 exports.UaNode = UaNode;
 class UaDefinitionNode extends UaNode {

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

@@ -78,7 +78,7 @@ class UaVariable extends _1.UaInstanceNode {
             valueRank: (this._valueRank != 0) ? this._valueRank : undefined,
             accessLevel: this._accessLevel,
             historizing: (this._historizing) ? true : undefined,
-            value: this._dataValue ? this._dataValue.value.value : undefined,
+            value: this._dataValue ? this._dataValue.value.jsonValue() : undefined,
             members: (members.length != 0) ? members : undefined
         };
         return ret;

package/dist/cjs/common/types/UaVariant.js

@@ -18,6 +18,89 @@ class UaVariant {
     get arrayType() {
         return this._arrayType;
     }
+    jsonValue() {
+        if (UaVariantType.NodeId == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let nodeIds = this._value;
+                let value = [];
+                for (let item of nodeIds) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.ExpandedNodeId == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let nodeIds = this._value;
+                let value = [];
+                for (let item of nodeIds) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.DateTime == this._type) {
+            if (this.isScalar()) {
+                return this._value.toISOString();
+            }
+            else {
+                let dateTimes = this._value;
+                let value = [];
+                for (let item of dateTimes) {
+                    value.push(item.toISOString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.LocalizedText == this._type) {
+            if (this.isScalar()) {
+                return this._value.text;
+            }
+            else {
+                let localizedTexts = this._value;
+                let value = [];
+                for (let item of localizedTexts) {
+                    value.push(item.text);
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.StatusCode == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let statusCodes = this._value;
+                let value = [];
+                for (let item of statusCodes) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.ExtensionObject == this._type) {
+            if (this.isScalar()) {
+                return this._value.body;
+            }
+            else {
+                let extensionObjects = this._value;
+                let value = [];
+                for (let item of extensionObjects) {
+                    value.push(item.body);
+                }
+                return value;
+            }
+        }
+        else {
+            return this._value;
+        }
+    }
     isScalar() {
         return (UaArrayType.Scalar == this._arrayType) ? true : false;
     }

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);
+            let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, 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);
+            let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), false, opcua_webapi_1.NodeClass.Object);
             yield modellingRuleBrowser.browse();
             let browseModellingRuleResults = modellingRuleBrowser.results();
             for (let item of browseModellingRuleResults) {

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

@@ -9,11 +9,12 @@ export declare class UaNodeBrowser {
     private _nodesToBrowse;
     private _continuationPointToBrowse;
     private _referenceType;
+    private _includeSubtypes;
     private _nodeClassToReturn;
     private _maxNodesPerBrowse;
     private _maxReferencesPerNode;
     private _readResults;
-    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, nodeClassToReturn: number, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
+    constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, includeSubtypes: boolean, nodeClassToReturn: number, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
     browse(): Promise<void>;
     browseOnce(): Promise<void>;
     results(): Array<BrowseReferenceResult>;

package/dist/client/utils/UaNodeBrowser.js

@@ -13,10 +13,11 @@ 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, maxNodesPerBrowse, maxReferencesPerNode) {
+    constructor(client, nodeIds, referenceType, includeSubtypes, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
         this._client = client;
         this._nodesToBrowse = [];
         this._referenceType = referenceType;
+        this._includeSubtypes = includeSubtypes;
         this._nodeClassToReturn = nodeClassToReturn;
         this._continuationPointToBrowse = [];
         this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
@@ -70,7 +71,7 @@ class UaNodeBrowser {
             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);
+                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, this._includeSubtypes, this._nodeClassToReturn, 63);
                 browseDescriptions.push(browseDescription);
             }
             let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
@@ -145,13 +146,13 @@ class UaNodeBrowser {
 exports.UaNodeBrowser = UaNodeBrowser;
 class UaObjectBrowser extends UaNodeBrowser {
     constructor(client, nodeIds, referenceType = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences)) {
-        super(client, nodeIds, referenceType, opcua_webapi_1.NodeClass.Object, 20);
+        super(client, nodeIds, referenceType, true, opcua_webapi_1.NodeClass.Object, 20);
     }
 }
 exports.UaObjectBrowser = UaObjectBrowser;
 class UaTypeBrowser extends UaNodeBrowser {
     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);
+        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasSubtype), false, 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.js

@@ -70,7 +70,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, true, this._nodeClassToReturn);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -87,7 +87,7 @@ class UaNodeReader {
             }
             let variableReferences = [];
             if (childNodesToBrowse.length != 0) {
-                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Variable);
+                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Variable);
                 yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }

package/dist/client/utils/UaNodeSerializer.js

@@ -18,7 +18,7 @@ class UaObjectSerializer {
                 let propertyJson = {
                     name: variable.browseName,
                     displayName: variable.displayName.text,
-                    value: (variable.value) ? variable.value.value : null
+                    value: (variable.value) ? variable.value.jsonValue() : null
                 };
                 properties.push(propertyJson);
             }

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

@@ -8,6 +8,7 @@ export declare abstract class UaNode {
     protected _writeMask: number | null;
     protected _parent: UaNode | null;
     protected _children: Array<UaNode>;
+    private _customizedData;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     abstract get nodeClass(): NodeClass;
     get nodeId(): UaNodeId;
@@ -17,6 +18,8 @@ export declare abstract class UaNode {
     set writeMask(writeMask: number);
     get description(): UaLocalizedText | null;
     set description(description: UaLocalizedText | null);
+    get customizedData(): any | null;
+    set customizedData(customizedData: any | null);
     abstract toJson(): any;
 }
 export declare abstract class UaDefinitionNode extends UaNode {

package/dist/common/nodes/UaNode.js

@@ -12,6 +12,7 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
+        this._customizedData = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -34,6 +35,12 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
+    get customizedData() {
+        return this._customizedData;
+    }
+    set customizedData(customizedData) {
+        this._customizedData = customizedData;
+    }
 }
 exports.UaNode = UaNode;
 class UaDefinitionNode extends UaNode {

package/dist/common/nodes/UaVariable.js

@@ -78,7 +78,7 @@ class UaVariable extends _1.UaInstanceNode {
             valueRank: (this._valueRank != 0) ? this._valueRank : undefined,
             accessLevel: this._accessLevel,
             historizing: (this._historizing) ? true : undefined,
-            value: this._dataValue ? this._dataValue.value.value : undefined,
+            value: this._dataValue ? this._dataValue.value.jsonValue() : undefined,
             members: (members.length != 0) ? members : undefined
         };
         return ret;

package/dist/common/types/UaVariant.d.ts

@@ -6,6 +6,7 @@ export declare class UaVariant {
     get value(): any;
     get type(): UaVariantType;
     get arrayType(): UaArrayType;
+    jsonValue(): any;
     isScalar(): boolean;
     isArray(): boolean;
     isNull(): boolean;

package/dist/common/types/UaVariant.js

@@ -18,6 +18,89 @@ class UaVariant {
     get arrayType() {
         return this._arrayType;
     }
+    jsonValue() {
+        if (UaVariantType.NodeId == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let nodeIds = this._value;
+                let value = [];
+                for (let item of nodeIds) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.ExpandedNodeId == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let nodeIds = this._value;
+                let value = [];
+                for (let item of nodeIds) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.DateTime == this._type) {
+            if (this.isScalar()) {
+                return this._value.toISOString();
+            }
+            else {
+                let dateTimes = this._value;
+                let value = [];
+                for (let item of dateTimes) {
+                    value.push(item.toISOString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.LocalizedText == this._type) {
+            if (this.isScalar()) {
+                return this._value.text;
+            }
+            else {
+                let localizedTexts = this._value;
+                let value = [];
+                for (let item of localizedTexts) {
+                    value.push(item.text);
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.StatusCode == this._type) {
+            if (this.isScalar()) {
+                return this._value.toString();
+            }
+            else {
+                let statusCodes = this._value;
+                let value = [];
+                for (let item of statusCodes) {
+                    value.push(item.toString());
+                }
+                return value;
+            }
+        }
+        else if (UaVariantType.ExtensionObject == this._type) {
+            if (this.isScalar()) {
+                return this._value.body;
+            }
+            else {
+                let extensionObjects = this._value;
+                let value = [];
+                for (let item of extensionObjects) {
+                    value.push(item.body);
+                }
+                return value;
+            }
+        }
+        else {
+            return this._value;
+        }
+    }
     isScalar() {
         return (UaArrayType.Scalar == this._arrayType) ? true : false;
     }

package/package.json

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