opcua-webapi-ts 1.1.25 → 1.1.27

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/UaDataType.js

@@ -5,7 +5,7 @@ const opcua_webapi_1 = require("opcua-webapi");
 const types_1 = require("../types");
 const _1 = require(".");
 const structure_1 = require("../structure");
-class UaDataType extends _1.UaDefintionNode {
+class UaDataType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName, isAbstract);
         this._valueType = 0;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaInstanceNode = exports.UaDefintionNode = exports.UaNode = void 0;
+exports.UaInstanceNode = exports.UaDefinitionNode = exports.UaNode = void 0;
 const types_1 = require("../types");
 const _1 = require(".");
 class UaNode {
@@ -12,6 +12,7 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
+        this._customizedData = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -34,9 +35,15 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
+    get customizedData() {
+        return this._customizedData;
+    }
+    set customizedData(customizedData) {
+        this._customizedData = customizedData;
+    }
 }
 exports.UaNode = UaNode;
-class UaDefintionNode extends UaNode {
+class UaDefinitionNode extends UaNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName);
         this._isAbstract = isAbstract;
@@ -70,7 +77,7 @@ class UaDefintionNode extends UaNode {
         return ret;
     }
 }
-exports.UaDefintionNode = UaDefintionNode;
+exports.UaDefinitionNode = UaDefinitionNode;
 class UaInstanceNode extends UaNode {
     constructor(nodeId, browseName, displayName) {
         super(nodeId, browseName, displayName);

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaObjectType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaObjectType extends _1.UaDefintionNode {
+class UaObjectType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName, isAbstract);
         this._isObjectMemberRead = false;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaReferenceType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaReferenceType extends _1.UaDefintionNode {
+class UaReferenceType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract, inverseName, symmetric) {
         super(nodeId, browseName, displayName, isAbstract);
         this._inverseName = inverseName;

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/nodes/UaVariableType.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaVariableType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaVariableType extends _1.UaDefintionNode {
+class UaVariableType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract, dataType, valueRank) {
         super(nodeId, browseName, displayName, isAbstract);
         this._dataType = dataType;

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/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/UaDataType.d.ts

@@ -1,7 +1,7 @@
 import { NodeClass } from "opcua-webapi";
 import { UaLocalizedText, UaNodeId, UaVariant } from "../types";
-import { UaDefintionNode, UaVariable } from ".";
-export declare class UaDataType extends UaDefintionNode {
+import { UaDefinitionNode, UaVariable } from ".";
+export declare class UaDataType extends UaDefinitionNode {
     private _valueType;
     private _enumValues;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);

package/dist/common/nodes/UaDataType.js

@@ -5,7 +5,7 @@ const opcua_webapi_1 = require("opcua-webapi");
 const types_1 = require("../types");
 const _1 = require(".");
 const structure_1 = require("../structure");
-class UaDataType extends _1.UaDefintionNode {
+class UaDataType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName, isAbstract);
         this._valueType = 0;

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,16 +18,18 @@ 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 UaDefintionNode extends UaNode {
+export declare abstract class UaDefinitionNode extends UaNode {
     protected _isAbstract: boolean;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get isAbstract(): boolean;
-    setParentType(parentType: UaDefintionNode): void;
+    setParentType(parentType: UaDefinitionNode): void;
     isSubtypeOf(typeId: UaNodeId): boolean;
-    parentType(): UaDefintionNode | null;
-    childTypes(): Array<UaDefintionNode>;
+    parentType(): UaDefinitionNode | null;
+    childTypes(): Array<UaDefinitionNode>;
 }
 export declare abstract class UaInstanceNode extends UaNode {
     private _modellingRule;

package/dist/common/nodes/UaNode.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaInstanceNode = exports.UaDefintionNode = exports.UaNode = void 0;
+exports.UaInstanceNode = exports.UaDefinitionNode = exports.UaNode = void 0;
 const types_1 = require("../types");
 const _1 = require(".");
 class UaNode {
@@ -12,6 +12,7 @@ class UaNode {
         this._writeMask = null;
         this._parent = null;
         this._children = [];
+        this._customizedData = null;
     }
     get nodeId() {
         return this._nodeId;
@@ -34,9 +35,15 @@ class UaNode {
     set description(description) {
         this._description = description;
     }
+    get customizedData() {
+        return this._customizedData;
+    }
+    set customizedData(customizedData) {
+        this._customizedData = customizedData;
+    }
 }
 exports.UaNode = UaNode;
-class UaDefintionNode extends UaNode {
+class UaDefinitionNode extends UaNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName);
         this._isAbstract = isAbstract;
@@ -70,7 +77,7 @@ class UaDefintionNode extends UaNode {
         return ret;
     }
 }
-exports.UaDefintionNode = UaDefintionNode;
+exports.UaDefinitionNode = UaDefinitionNode;
 class UaInstanceNode extends UaNode {
     constructor(nodeId, browseName, displayName) {
         super(nodeId, browseName, displayName);

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

@@ -1,7 +1,7 @@
 import { NodeClass } from "opcua-webapi";
 import { UaLocalizedText, UaNodeId } from "../types";
-import { UaDefintionNode, UaObject, UaMethod, UaVariable, UaInstanceNode } from ".";
-export declare class UaObjectType extends UaDefintionNode {
+import { UaDefinitionNode, UaObject, UaMethod, UaVariable, UaInstanceNode } from ".";
+export declare class UaObjectType extends UaDefinitionNode {
     private _isObjectMemberRead;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get nodeClass(): NodeClass;

package/dist/common/nodes/UaObjectType.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaObjectType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaObjectType extends _1.UaDefintionNode {
+class UaObjectType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName, isAbstract);
         this._isObjectMemberRead = false;

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

@@ -1,7 +1,7 @@
 import { NodeClass } from "opcua-webapi";
 import { UaLocalizedText, UaNodeId } from "../types";
-import { UaDefintionNode } from ".";
-export declare class UaReferenceType extends UaDefintionNode {
+import { UaDefinitionNode } from ".";
+export declare class UaReferenceType extends UaDefinitionNode {
     private _inverseName;
     private _symmetric;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, inverseName: UaLocalizedText, symmetric: boolean);

package/dist/common/nodes/UaReferenceType.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaReferenceType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaReferenceType extends _1.UaDefintionNode {
+class UaReferenceType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract, inverseName, symmetric) {
         super(nodeId, browseName, displayName, isAbstract);
         this._inverseName = inverseName;

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/nodes/UaVariableType.d.ts

@@ -1,7 +1,7 @@
 import { NodeClass } from "opcua-webapi";
 import { UaLocalizedText, UaNodeId } from "../types";
-import { UaDefintionNode, UaVariable } from ".";
-export declare class UaVariableType extends UaDefintionNode {
+import { UaDefinitionNode, UaVariable } from ".";
+export declare class UaVariableType extends UaDefinitionNode {
     private _dataType;
     private _valueRank;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, dataType: UaNodeId, valueRank: number);

package/dist/common/nodes/UaVariableType.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaVariableType = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const _1 = require(".");
-class UaVariableType extends _1.UaDefintionNode {
+class UaVariableType extends _1.UaDefinitionNode {
     constructor(nodeId, browseName, displayName, isAbstract, dataType, valueRank) {
         super(nodeId, browseName, displayName, isAbstract);
         this._dataType = dataType;

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.25",
+  "version": "1.1.27",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",