opcua-webapi-ts 1.1.17 → 1.1.19

package/dist/client/utils/UaObjectTypeDictionary.js

@@ -13,17 +13,18 @@ exports.UaObjectTypeDictionary = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeReader_1 = require("./UaNodeReader");
+const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaObjectTypeDictionary {
-    constructor(simpleMode) {
+    constructor(client) {
+        this._client = client;
         this._objectTypes = new Map;
-        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));
     }
-    read(client) {
+    read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
-            yield this._read(browser, client);
+            let browser = new UaNodeBrowser_1.UaTypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
+            yield this._read(browser);
         });
     }
     getObjectType(nodeId) {
@@ -33,10 +34,10 @@ class UaObjectTypeDictionary {
     getObjectTypes() {
         return [...this._objectTypes.values()];
     }
-    _read(browser, client) {
+    _read(browser) {
         return __awaiter(this, void 0, void 0, function* () {
             // Browse child type
-            yield browser.browse(client);
+            yield browser.browse();
             let results = browser.results();
             let referencesToRead = [];
             for (let item of results) {
@@ -47,8 +48,8 @@ class UaObjectTypeDictionary {
                 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);
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._client, false, false, false, false, false);
+            let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.ObjectType != node.nodeClass)
                     continue;
@@ -68,8 +69,8 @@ class UaObjectTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
-            yield this._read(childBrowser, client);
+            let childBrowser = new UaNodeBrowser_1.UaTypeBrowser(this._client, nodeIdsToBrowse);
+            yield this._read(childBrowser);
         });
     }
     __delay(ms) {

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

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

package/dist/client/utils/UaReferenceTypeDictionary.js

@@ -13,17 +13,18 @@ exports.UaReferenceTypeDictionary = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
 const UaNodeReader_1 = require("./UaNodeReader");
+const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaReferenceTypeDictionary {
-    constructor(simpleMode) {
+    constructor(client) {
+        this._client = client;
         this._referenceTypes = new Map;
-        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));
     }
-    read(client) {
+    read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaChildBrowser([common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
-            yield this._read(browser, client);
+            let browser = new UaNodeBrowser_1.UaTypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
+            yield this._read(browser);
         });
     }
     getReferenceType(nodeId) {
@@ -33,10 +34,10 @@ class UaReferenceTypeDictionary {
     getReferenceTypes() {
         return [...this._referenceTypes.values()];
     }
-    _read(browser, client) {
+    _read(browser) {
         return __awaiter(this, void 0, void 0, function* () {
             // Browse child type
-            yield browser.browse(client);
+            yield browser.browse();
             let results = browser.results();
             let referencesToRead = [];
             for (let item of results) {
@@ -47,8 +48,8 @@ class UaReferenceTypeDictionary {
                 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);
+            let nodeReader = new UaNodeReader_1.UaNodeReader(this._client, false, false, false, false, false);
+            let nodes = yield nodeReader.readByReferences(referencesToRead);
             for (let node of nodes) {
                 if (opcua_webapi_1.NodeClass.ReferenceType != node.nodeClass)
                     continue;
@@ -68,8 +69,8 @@ class UaReferenceTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaChildBrowser(nodeIdsToBrowse);
-            yield this._read(childBrowser, client);
+            let childBrowser = new UaNodeBrowser_1.UaTypeBrowser(this._client, nodeIdsToBrowse);
+            yield this._read(childBrowser);
         });
     }
     __delay(ms) {

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

@@ -1,4 +1,6 @@
 export * from "./UaDataTypeDictionary";
 export * from "./UaObjectTypeDictionary";
 export * from "./UaReferenceTypeDictionary";
+export * from "./UaNodeBrowser";
 export * from "./UaNodeReader";
+export * from "./UaModelling";

package/dist/client/utils/index.js

@@ -17,4 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./UaDataTypeDictionary"), exports);
 __exportStar(require("./UaObjectTypeDictionary"), exports);
 __exportStar(require("./UaReferenceTypeDictionary"), exports);
+__exportStar(require("./UaNodeBrowser"), exports);
 __exportStar(require("./UaNodeReader"), exports);
+__exportStar(require("./UaModelling"), exports);

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

@@ -3,12 +3,8 @@ export type OpcUaNodeAttributes = {
     nodeClass: number;
     browseName: string;
     displayName: UaLocalizedText;
-    writeMask: number;
     description: UaLocalizedText | null;
 };
-export type OpcUaObjectAttributes = {
-    eventNotifier: number;
-};
 export type OpcUaVariableAttributes = {
     dataType: UaNodeId;
     valueRank: number;

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

@@ -4,7 +4,7 @@ import { UaDefintionNode, UaVariable } from ".";
 export declare class UaDataType extends UaDefintionNode {
     private _valueType;
     private _enumValues;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get nodeClass(): NodeClass;
     get valueType(): number;
     get enumValues(): Map<number, UaLocalizedText> | null;

package/dist/common/nodes/UaDataType.js

@@ -6,8 +6,8 @@ const types_1 = require("../types");
 const _1 = require(".");
 const structure_1 = require("../structure");
 class UaDataType extends _1.UaDefintionNode {
-    constructor(nodeId, browseName, displayName, isAbstract, writeMask) {
-        super(nodeId, browseName, displayName, isAbstract, writeMask);
+    constructor(nodeId, browseName, displayName, isAbstract) {
+        super(nodeId, browseName, displayName, isAbstract);
         this._valueType = 0;
         this._enumValues = null;
     }

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

@@ -1,20 +1,21 @@
 import { NodeClass } from "opcua-webapi";
-import { UaLocalizedText, UaNodeId } from "../types";
+import { UaLocalizedText, UaModellingRule, UaNodeId } from "../types";
 export declare abstract class UaNode {
     protected _nodeId: UaNodeId;
     protected _browseName: string;
     protected _displayName: UaLocalizedText;
     protected _description: UaLocalizedText | null;
-    protected _writeMask: number;
+    protected _writeMask: number | null;
     protected _parent: UaNode | null;
     protected _children: Array<UaNode>;
     protected _refToParent: UaNodeId | null;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     abstract get nodeClass(): NodeClass;
     get nodeId(): UaNodeId;
     get browseName(): string;
     get displayName(): UaLocalizedText;
-    get writeMask(): number;
+    get writeMask(): number | null;
+    set writeMask(writeMask: number);
     get description(): UaLocalizedText | null;
     set description(description: UaLocalizedText | null);
     get refToParent(): UaNodeId | null;
@@ -23,7 +24,7 @@ export declare abstract class UaNode {
 }
 export declare abstract class UaDefintionNode extends UaNode {
     protected _isAbstract: boolean;
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean, writeMask?: number | null);
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get isAbstract(): boolean;
     get refToParent(): UaNodeId | null;
     set refToParent(referenceTypeId: UaNodeId);
@@ -33,6 +34,9 @@ export declare abstract class UaDefintionNode extends UaNode {
     childTypes(): Array<UaDefintionNode>;
 }
 export declare abstract class UaInstanceNode extends UaNode {
-    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, writeMask?: number | null);
+    private _modellingRule;
+    constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText);
     getMembers(nodeClass?: NodeClass): Array<UaInstanceNode>;
+    get modellingRule(): UaModellingRule;
+    setModellingRule(modellingRuleId: UaNodeId): void;
 }

package/dist/common/nodes/UaNode.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaInstanceNode = exports.UaDefintionNode = exports.UaNode = void 0;
+const types_1 = require("../types");
+const _1 = require(".");
 class UaNode {
-    constructor(nodeId, browseName, displayName, writeMask) {
+    constructor(nodeId, browseName, displayName) {
         this._nodeId = nodeId;
         this._browseName = browseName;
         this._displayName = displayName;
         this._description = null;
-        this._writeMask = (writeMask) ? writeMask : 0;
+        this._writeMask = null;
         this._parent = null;
         this._children = [];
         this._refToParent = null;
@@ -24,6 +26,9 @@ class UaNode {
     get writeMask() {
         return this._writeMask;
     }
+    set writeMask(writeMask) {
+        this._writeMask = writeMask;
+    }
     get description() {
         return this._description;
     }
@@ -39,8 +44,8 @@ class UaNode {
 }
 exports.UaNode = UaNode;
 class UaDefintionNode extends UaNode {
-    constructor(nodeId, browseName, displayName, isAbstract, writeMask) {
-        super(nodeId, browseName, displayName, writeMask);
+    constructor(nodeId, browseName, displayName, isAbstract) {
+        super(nodeId, browseName, displayName);
         this._isAbstract = isAbstract;
     }
     get isAbstract() {
@@ -80,8 +85,9 @@ class UaDefintionNode extends UaNode {
 }
 exports.UaDefintionNode = UaDefintionNode;
 class UaInstanceNode extends UaNode {
-    constructor(nodeId, browseName, displayName, writeMask) {
-        super(nodeId, browseName, displayName, writeMask);
+    constructor(nodeId, browseName, displayName) {
+        super(nodeId, browseName, displayName);
+        this._modellingRule = types_1.UaModellingRule.None;
     }
     getMembers(nodeClass) {
         let ret = [];
@@ -92,5 +98,20 @@ class UaInstanceNode extends UaNode {
         }
         return ret;
     }
+    get modellingRule() {
+        return this._modellingRule;
+    }
+    setModellingRule(modellingRuleId) {
+        if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_Mandatory)))
+            this._modellingRule = types_1.UaModellingRule.Mandatory;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_Optional)))
+            this._modellingRule = types_1.UaModellingRule.Optional;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_OptionalPlaceholder)))
+            this._modellingRule = types_1.UaModellingRule.PlaceHolder;
+        else if (modellingRuleId.equal(types_1.UaNodeId.from(_1.ObjectIds.ModellingRule_MandatoryPlaceholder)))
+            this._modellingRule = types_1.UaModellingRule.PlaceHolder;
+        else
+            this._modellingRule = types_1.UaModellingRule.None;
+    }
 }
 exports.UaInstanceNode = UaInstanceNode;

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

@@ -2,11 +2,14 @@ import { NodeClass } from "opcua-webapi";
 import { UaLocalizedText, UaNodeId } from "../types";
 import { UaDefintionNode, UaObject, UaMethod, UaVariable, UaInstanceNode } from ".";
 export declare class UaObjectType extends UaDefintionNode {
+    private _isObjectMemberRead;
     constructor(nodeId: UaNodeId, browseName: string, displayName: UaLocalizedText, isAbstract: boolean);
     get nodeClass(): NodeClass;
     addMember(node: UaInstanceNode): void;
     get objectMembers(): Array<UaObject>;
     get variableMembers(): Array<UaVariable>;
     get methodMembers(): Array<UaMethod>;
+    get isObjectMemberRead(): boolean;
+    set isObjectMemberRead(value: boolean);
     toJson(): any;
 }

package/dist/common/nodes/UaObjectType.js

@@ -6,6 +6,7 @@ const _1 = require(".");
 class UaObjectType extends _1.UaDefintionNode {
     constructor(nodeId, browseName, displayName, isAbstract) {
         super(nodeId, browseName, displayName, isAbstract);
+        this._isObjectMemberRead = false;
     }
     get nodeClass() {
         return opcua_webapi_1.NodeClass.ObjectType;
@@ -40,6 +41,12 @@ class UaObjectType extends _1.UaDefintionNode {
         }
         return ret;
     }
+    get isObjectMemberRead() {
+        return this._isObjectMemberRead;
+    }
+    set isObjectMemberRead(value) {
+        this._isObjectMemberRead = value;
+    }
     toJson() {
         let children = [];
         for (let item of this._children) {

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

@@ -0,0 +1,6 @@
+export declare enum UaModellingRule {
+    None = 0,
+    Mandatory = 1,
+    Optional = 2,
+    PlaceHolder = 3
+}

package/dist/common/types/UaModellingRule.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaModellingRule = void 0;
+var UaModellingRule;
+(function (UaModellingRule) {
+    UaModellingRule[UaModellingRule["None"] = 0] = "None";
+    UaModellingRule[UaModellingRule["Mandatory"] = 1] = "Mandatory";
+    UaModellingRule[UaModellingRule["Optional"] = 2] = "Optional";
+    UaModellingRule[UaModellingRule["PlaceHolder"] = 3] = "PlaceHolder";
+})(UaModellingRule || (exports.UaModellingRule = UaModellingRule = {}));

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

@@ -1,4 +1,3 @@
-export * from "./UaTypes";
 export * from "./UaDataValue";
 export * from "./UaError";
 export * from "./UaExpandedNodeId";
@@ -18,4 +17,5 @@ export * from "./UaBrowseMask";
 export * from "./UaValueRank";
 export * from "./UaWriteMask";
 export * from "./UaReference";
+export * from "./UaModellingRule";
 export * from "./UaEventNotifier";

package/dist/common/types/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./UaTypes"), exports);
 __exportStar(require("./UaDataValue"), exports);
 __exportStar(require("./UaError"), exports);
 __exportStar(require("./UaExpandedNodeId"), exports);
@@ -34,4 +33,5 @@ __exportStar(require("./UaBrowseMask"), exports);
 __exportStar(require("./UaValueRank"), exports);
 __exportStar(require("./UaWriteMask"), exports);
 __exportStar(require("./UaReference"), exports);
+__exportStar(require("./UaModellingRule"), exports);
 __exportStar(require("./UaEventNotifier"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "license": "MIT",
@@ -25,7 +25,7 @@
   "scripts": {
     "build": "tsc && tsc -p tsconfig.cjs.json",
     "prepare": "npm run build",
-    "dev": "tsx watch --clear-screen=false test/test.ts"
+    "test": "tsx test/test.ts"
   },
   "devDependencies": {
     "tsx": "^4.22.3",