opcua-webapi-ts 1.1.5 → 1.1.7

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

@@ -2,11 +2,11 @@ import { UaNodeId, UaObjectType } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaObjectTypeDictionary {
     private _objectTypes;
-    private _remainingNodesToBrowse;
-    constructor();
+    private _returnAllAttributes;
+    constructor(simpleMode?: boolean);
     read(client: UaWebClient): Promise<void>;
     getObjectType(nodeId: UaNodeId): UaObjectType | null;
     getObjectTypes(): Array<UaObjectType>;
-    private __browseObjectTypes;
+    private _read;
     private __delay;
 }

package/dist/client/utils/UaObjectTypeDictionary.js

@@ -12,16 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaObjectTypeDictionary = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
+const UaNodeReader_1 = require("./UaNodeReader");
 class UaObjectTypeDictionary {
-    constructor() {
+    constructor(simpleMode) {
         this._objectTypes = new Map;
-        let baseObjectTypeId = new common_1.UaNodeId(common_1.ObjectTypeIds.BaseObjectType);
+        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
+        let baseObjectTypeId = common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType);
         this._objectTypes.set(baseObjectTypeId.toString(), new common_1.UaObjectType(baseObjectTypeId, "BaseObjectType", new common_1.UaLocalizedText("BaseObjectType"), false));
-        this._remainingNodesToBrowse = [baseObjectTypeId];
     }
     read(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.__browseObjectTypes(client);
+            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
+            yield this._read(browser, client);
         });
     }
     getObjectType(nodeId) {
@@ -31,37 +33,43 @@ class UaObjectTypeDictionary {
     getObjectTypes() {
         return [...this._objectTypes.values()];
     }
-    __browseObjectTypes(client) {
+    _read(browser, client) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (0 == this._remainingNodesToBrowse.length)
-                return;
-            let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
-            let nodesToBrowse = [];
-            for (let item of nodeIds) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasSubtype), false, opcua_webapi_1.NodeClass.ObjectType, 63);
-                nodesToBrowse.push(browseDescription);
+            // Browse child type
+            yield browser.browse(client);
+            let results = browser.results();
+            let referencesToRead = [];
+            for (let item of results) {
+                for (let reference of item.references)
+                    referencesToRead.push(reference);
             }
-            let results = yield client.browse(nodesToBrowse);
-            for (let i = 0; i < nodeIds.length; ++i) {
-                if (results[i].statusCode.isNotGood())
+            if (0 == referencesToRead.length)
+                return;
+            // Read child type
+            let nodeIdsToBrowse = [];
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._returnAllAttributes, false, false, this._returnAllAttributes);
+            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            for (let node of nodes) {
+                if (opcua_webapi_1.NodeClass.ObjectType != node.nodeClass)
                     continue;
-                let parentType = this._objectTypes.get(nodeIds[i].toString());
-                for (let item of results[i].references) {
-                    let objectTypeId = item.nodeId.getNodeId();
-                    if (null == objectTypeId || opcua_webapi_1.NodeClass.ObjectType != item.nodeClass ||
-                        !item.browseName || !item.displayName)
-                        continue;
-                    let objectType = new common_1.UaObjectType(objectTypeId, item.browseName, item.displayName, false);
-                    this._objectTypes.set(objectTypeId.toString(), objectType);
-                    this._remainingNodesToBrowse.push(objectTypeId);
-                    if (parentType)
+                nodeIdsToBrowse.push(node.nodeId);
+                this._objectTypes.set(node.nodeId.toString(), node);
+            }
+            // Build parent-child relationship
+            for (let item of results) {
+                let parentType = this._objectTypes.get(item.nodeId.toString());
+                for (let reference of item.references) {
+                    let objectType = this._objectTypes.get(reference.nodeId.toString());
+                    if (objectType && parentType)
                         objectType.setParentType(parentType);
                 }
             }
-            if (this._remainingNodesToBrowse.length != 0) {
-                yield this.__delay(20);
-                yield this.__browseObjectTypes(client);
-            }
+            if (0 == nodeIdsToBrowse.length)
+                return;
+            yield this.__delay(20);
+            // Continue to browse and read child type
+            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
+            yield this._read(childBrowser, client);
         });
     }
     __delay(ms) {

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

@@ -2,11 +2,11 @@ import { UaReferenceType, UaNodeId } from "../../common";
 import { UaWebClient } from "../UaWebClient";
 export declare class UaReferenceTypeDictionary {
     private _referenceTypes;
-    private _remainingNodesToBrowse;
-    constructor();
+    private _returnAllAttributes;
+    constructor(simpleMode?: boolean);
     read(client: UaWebClient): Promise<void>;
     getReferenceType(nodeId: UaNodeId): UaReferenceType | null;
     getReferenceTypes(): Array<UaReferenceType>;
-    private __browseReferenceTypes;
+    private _read;
     private __delay;
 }

package/dist/client/utils/UaReferenceTypeDictionary.js

@@ -12,16 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaReferenceTypeDictionary = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
+const UaNodeReader_1 = require("./UaNodeReader");
 class UaReferenceTypeDictionary {
-    constructor() {
+    constructor(simpleMode) {
         this._referenceTypes = new Map;
-        let referencesId = new common_1.UaNodeId(common_1.ReferenceTypeIds.References);
+        this._returnAllAttributes = (null == simpleMode) ? false : !simpleMode;
+        let referencesId = common_1.UaNodeId.from(common_1.ReferenceTypeIds.References);
         this._referenceTypes.set(referencesId.toString(), new common_1.UaReferenceType(referencesId, "References", new common_1.UaLocalizedText("References"), true, common_1.UaLocalizedText.nullText, true));
-        this._remainingNodesToBrowse = [referencesId];
     }
     read(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.__browseReferenceTypes(client);
+            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
+            yield this._read(browser, client);
         });
     }
     getReferenceType(nodeId) {
@@ -31,37 +33,43 @@ class UaReferenceTypeDictionary {
     getReferenceTypes() {
         return [...this._referenceTypes.values()];
     }
-    __browseReferenceTypes(client) {
+    _read(browser, client) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (0 == this._remainingNodesToBrowse.length)
-                return;
-            let nodeIds = this._remainingNodesToBrowse.splice(0, 15);
-            let nodesToBrowse = [];
-            for (let item of nodeIds) {
-                let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, new common_1.UaNodeId(common_1.ReferenceTypeIds.HasSubtype), false, opcua_webapi_1.NodeClass.ReferenceType, 31);
-                nodesToBrowse.push(browseDescription);
+            // Browse child type
+            yield browser.browse(client);
+            let results = browser.results();
+            let referencesToRead = [];
+            for (let item of results) {
+                for (let reference of item.references)
+                    referencesToRead.push(reference);
             }
-            let results = yield client.browse(nodesToBrowse);
-            for (let i = 0; i < nodeIds.length; ++i) {
-                if (results[i].statusCode.isNotGood())
+            if (0 == referencesToRead.length)
+                return;
+            // Read child type
+            let nodeIdsToBrowse = [];
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._returnAllAttributes, false, false, this._returnAllAttributes);
+            let nodes = yield nodeReader.readByReferences(referencesToRead, client);
+            for (let node of nodes) {
+                if (opcua_webapi_1.NodeClass.ReferenceType != node.nodeClass)
                     continue;
-                let parentType = this._referenceTypes.get(nodeIds[i].toString());
-                for (let item of results[i].references) {
-                    let referenceTypeId = item.nodeId.getNodeId();
-                    if (null == referenceTypeId || opcua_webapi_1.NodeClass.ReferenceType != item.nodeClass ||
-                        !item.browseName || !item.displayName)
-                        continue;
-                    let referenceType = new common_1.UaReferenceType(referenceTypeId, item.browseName, item.displayName, false, common_1.UaLocalizedText.nullText, false);
-                    this._referenceTypes.set(referenceTypeId.toString(), referenceType);
-                    this._remainingNodesToBrowse.push(referenceTypeId);
-                    if (parentType)
+                nodeIdsToBrowse.push(node.nodeId);
+                this._referenceTypes.set(node.nodeId.toString(), node);
+            }
+            // Build parent-child relationship
+            for (let item of results) {
+                let parentType = this._referenceTypes.get(item.nodeId.toString());
+                for (let reference of item.references) {
+                    let referenceType = this._referenceTypes.get(reference.nodeId.toString());
+                    if (referenceType && parentType)
                         referenceType.setParentType(parentType);
                 }
             }
-            if (this._remainingNodesToBrowse.length != 0) {
-                yield this.__delay(20);
-                yield this.__browseReferenceTypes(client);
-            }
+            if (0 == nodeIdsToBrowse.length)
+                return;
+            yield this.__delay(20);
+            // Continue to browse and read child type
+            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
+            yield this._read(childBrowser, client);
         });
     }
     __delay(ms) {

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

@@ -8,8 +8,8 @@ export declare class UaDataType extends UaDefintionNode {
     get nodeClass(): NodeClass;
     get valueType(): number;
     get enumValues(): Map<number, UaLocalizedText> | null;
-    setEnumVariable(node: UaVariable): void;
-    setEnumValues(value: UaVariant): void;
     classify(): void;
     toJson(): any;
+    setEnumVariable(node: UaVariable): void;
+    setEnumValues(value: UaVariant): void;
 }

package/dist/common/nodes/UaDataType.js

@@ -20,38 +20,6 @@ class UaDataType extends _1.UaDefintionNode {
     get enumValues() {
         return this._enumValues;
     }
-    setEnumVariable(node) {
-        if ("EnumStrings" == node.browseName ||
-            "EnumValues" == node.browseName) {
-            this.setEnumValues(node.value);
-        }
-    }
-    setEnumValues(value) {
-        if (types_1.UaVariantType.LocalizedText == value.type) {
-            let enumStrings = value.toLocalizedTexts();
-            if (null == enumStrings)
-                return;
-            this._enumValues = new Map;
-            let index = 0;
-            for (let item of enumStrings) {
-                this._enumValues.set(index, item);
-                index++;
-            }
-        }
-        else if (types_1.UaVariantType.ExtensionObject == value.type) {
-            let extensionObjects = value.toExtensionObjects();
-            if (null == extensionObjects)
-                return;
-            let enumValues = new Map;
-            for (let item of extensionObjects) {
-                let enumValue = structure_1.UaEnumValueType.fromExtensionObject(item);
-                if (!enumValue)
-                    return;
-                enumValues.set(enumValue.value, enumValue.displayName);
-            }
-            this._enumValues = enumValues;
-        }
-    }
     classify() {
         let isBasicDataType = false;
         if (0 == this._nodeId.nsIndex) {
@@ -73,7 +41,7 @@ class UaDataType extends _1.UaDefintionNode {
         if (this._enumValues) {
             for (let item of this._enumValues) {
                 enumValues.push({
-                    value: item[0],
+                    index: item[0],
                     text: item[1].text
                 });
             }
@@ -85,9 +53,42 @@ class UaDataType extends _1.UaDefintionNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             isAbstract: this._isAbstract,
-            enumValues: (enumValues.length == 0) ? enumValues : undefined
+            enumValues: (enumValues.length != 0) ? enumValues : undefined
         };
         return ret;
     }
+    setEnumVariable(node) {
+        if ("EnumStrings" == node.browseName ||
+            "EnumValues" == node.browseName) {
+            if (node.value)
+                this.setEnumValues(node.value);
+        }
+    }
+    setEnumValues(value) {
+        if (types_1.UaVariantType.LocalizedText == value.type) {
+            let enumStrings = value.toLocalizedTexts();
+            if (null == enumStrings)
+                return;
+            this._enumValues = new Map;
+            let index = 0;
+            for (let item of enumStrings) {
+                this._enumValues.set(index, item);
+                index++;
+            }
+        }
+        else if (types_1.UaVariantType.ExtensionObject == value.type) {
+            let extensionObjects = value.toExtensionObjects();
+            if (null == extensionObjects)
+                return;
+            let enumValues = new Map;
+            for (let item of extensionObjects) {
+                let enumValue = structure_1.UaEnumValueType.fromExtensionObject(item);
+                if (!enumValue)
+                    return;
+                enumValues.set(enumValue.value, enumValue.displayName);
+            }
+            this._enumValues = enumValues;
+        }
+    }
 }
 exports.UaDataType = UaDataType;

package/dist/common/nodes/UaMethod.js

@@ -66,8 +66,8 @@ class UaMethod extends _1.UaInstanceNode {
             name: this._browseName,
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
-            inputArguments: inputArgs,
-            outputArguments: outputArgs
+            inputArguments: (inputArgs.length != 0) ? inputArgs : undefined,
+            outputArguments: (outputArgs.length != 0) ? outputArgs : undefined
         };
         return ret;
     }

package/dist/common/nodes/UaObject.js

@@ -59,7 +59,7 @@ class UaObject extends _1.UaInstanceNode {
             name: this._browseName,
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
-            typeDefinition: this._typeDefinitionId.toString(),
+            typeDefinitionId: this._typeDefinitionId.toString(),
             eventNotifier: this._eventNotifier,
             children: (children.length != 0) ? children : undefined
         };

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

@@ -1,5 +1,5 @@
 import { NodeClass } from "opcua-webapi";
-import { UaLocalizedText, UaNodeId, UaVariant } from "../types";
+import { UaDataValue, UaLocalizedText, UaNodeId, UaVariant } from "../types";
 import { UaInstanceNode } from ".";
 export declare class UaVariable extends UaInstanceNode {
     private _typeDefinitionId;
@@ -8,7 +8,7 @@ export declare class UaVariable extends UaInstanceNode {
     private _accessLevel;
     private _userAccessLevel;
     private _historizing;
-    private _value;
+    private _dataValue;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, dataType: UaNodeId, valueRank: number, accessLevel: number, userAccessLevel: number, historizing: boolean, typeDefinitionId: UaNodeId);
     get nodeClass(): NodeClass;
     get dataType(): UaNodeId;
@@ -16,8 +16,9 @@ export declare class UaVariable extends UaInstanceNode {
     get accessLevel(): number;
     get userAccessLevel(): number;
     get historizing(): boolean;
-    get value(): UaVariant;
-    set value(val: UaVariant);
+    get value(): UaVariant | null;
+    get dataValue(): UaDataValue | null;
+    set dataValue(value: UaDataValue);
     get typeDefinitionId(): UaNodeId;
     addMember(node: UaVariable): void;
     get variableMembers(): Array<UaVariable>;

package/dist/common/nodes/UaVariable.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaVariable = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
-const types_1 = require("../types");
 const _1 = require(".");
 class UaVariable extends _1.UaInstanceNode {
     constructor(nodeId, browseName, displayName, dataType, valueRank, accessLevel, userAccessLevel, historizing, typeDefinitionId) {
@@ -12,8 +11,8 @@ class UaVariable extends _1.UaInstanceNode {
         this._accessLevel = accessLevel;
         this._userAccessLevel = userAccessLevel;
         this._historizing = historizing;
-        this._value = types_1.UaVariant.null();
         this._typeDefinitionId = typeDefinitionId;
+        this._dataValue = null;
     }
     get nodeClass() {
         return opcua_webapi_1.NodeClass.Variable;
@@ -34,10 +33,13 @@ class UaVariable extends _1.UaInstanceNode {
         return this._historizing;
     }
     get value() {
-        return this._value;
+        return (this._dataValue && this._dataValue.statusCode.isGood()) ? this._dataValue.value : null;
     }
-    set value(val) {
-        this._value = val;
+    get dataValue() {
+        return this._dataValue;
+    }
+    set dataValue(value) {
+        this._dataValue = value;
     }
     get typeDefinitionId() {
         return this._typeDefinitionId;
@@ -64,10 +66,12 @@ class UaVariable extends _1.UaInstanceNode {
             nodeClass: opcua_webapi_1.NodeClass.Variable,
             name: this._browseName,
             displayName: this._displayName.text,
-            typeDefinition: this._typeDefinitionId.toString(),
+            typeDefinitionId: this._typeDefinitionId.toString(),
             dataType: this._dataType.toString(),
             valueRank: this._valueRank,
             accessLevel: this._accessLevel,
+            historizing: this._historizing,
+            value: this._dataValue ? this._dataValue.value.value : undefined,
             children: (children.length != 0) ? children : undefined
         };
         return ret;

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

@@ -0,0 +1,23 @@
+import { UaLocalizedText, UaNodeId } from "../types";
+export declare class UaReference {
+    private _nodeId;
+    private _nodeClass;
+    private _browseName;
+    private _displayName;
+    private _referenceTypeId;
+    private _typeDefinitionId;
+    private _description;
+    constructor(nodeId: UaNodeId, nodeClass: number, browseName?: string, displayName?: UaLocalizedText, referenceTypeId?: UaNodeId, typeDefinitionId?: UaNodeId);
+    get nodeId(): UaNodeId;
+    get nodeClass(): number;
+    get browseName(): string;
+    get displayName(): UaLocalizedText;
+    set displayName(value: UaLocalizedText);
+    get referenceTypeId(): UaNodeId;
+    set referenceTypeId(value: UaNodeId);
+    get typeDefinitionId(): UaNodeId;
+    set typeDefinitionId(value: UaNodeId);
+    get description(): UaLocalizedText;
+    set description(value: UaLocalizedText);
+    toJson(): any;
+}

package/dist/common/types/UaReference.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaReference = void 0;
+const types_1 = require("../types");
+class UaReference {
+    constructor(nodeId, nodeClass, browseName, displayName, referenceTypeId, typeDefinitionId) {
+        this._nodeId = nodeId;
+        this._nodeClass = nodeClass;
+        this._browseName = (browseName) ? browseName : "";
+        this._displayName = (displayName) ? displayName : types_1.UaLocalizedText.nullText;
+        this._referenceTypeId = (referenceTypeId) ? referenceTypeId : types_1.UaNodeId.nullNodeId;
+        this._typeDefinitionId = (typeDefinitionId) ? typeDefinitionId : types_1.UaNodeId.nullNodeId;
+    }
+    get nodeId() {
+        return this._nodeId;
+    }
+    get nodeClass() {
+        return this._nodeClass;
+    }
+    get browseName() {
+        return this._browseName;
+    }
+    get displayName() {
+        return this._displayName;
+    }
+    set displayName(value) {
+        this._displayName = value;
+    }
+    get referenceTypeId() {
+        return this._referenceTypeId;
+    }
+    set referenceTypeId(value) {
+        this._referenceTypeId = value;
+    }
+    get typeDefinitionId() {
+        return this._typeDefinitionId;
+    }
+    set typeDefinitionId(value) {
+        this._typeDefinitionId = value;
+    }
+    get description() {
+        return this._description;
+    }
+    set description(value) {
+        this._description = value;
+    }
+    toJson() {
+        let ret = {
+            nodeId: this._nodeId.toString(),
+            nodeClass: this._nodeClass,
+            name: this._browseName,
+            displayName: this._displayName.text,
+            description: (this._description) ? this._description.text : undefined,
+            typeDefinitionId: (!this._typeDefinitionId.isEmpty()) ? this._typeDefinitionId.toString() : undefined,
+        };
+        return ret;
+    }
+}
+exports.UaReference = UaReference;

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

@@ -7,7 +7,6 @@ export * from "./UaHistoryDataResult";
 export * from "./UaHistoryEventFieldList";
 export * from "./UaHistoryEventResult";
 export * from "./UaLocalizedText";
-export * from "./UaLink";
 export * from "./UaNodeId";
 export * from "./UaQuery";
 export * from "./UaQueryFilter";
@@ -18,3 +17,4 @@ export * from "./UaAccessLevel";
 export * from "./UaBrowseMask";
 export * from "./UaValueRank";
 export * from "./UaWriteMask";
+export * from "./UaReference";

package/dist/common/types/index.js

@@ -23,7 +23,6 @@ __exportStar(require("./UaHistoryDataResult"), exports);
 __exportStar(require("./UaHistoryEventFieldList"), exports);
 __exportStar(require("./UaHistoryEventResult"), exports);
 __exportStar(require("./UaLocalizedText"), exports);
-__exportStar(require("./UaLink"), exports);
 __exportStar(require("./UaNodeId"), exports);
 __exportStar(require("./UaQuery"), exports);
 __exportStar(require("./UaQueryFilter"), exports);
@@ -34,3 +33,4 @@ __exportStar(require("./UaAccessLevel"), exports);
 __exportStar(require("./UaBrowseMask"), exports);
 __exportStar(require("./UaValueRank"), exports);
 __exportStar(require("./UaWriteMask"), exports);
+__exportStar(require("./UaReference"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "main": "./dist/cjs/index.js",